zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merged

QGC4.4
pixhawk 15 years ago
parent
6fbddedd2f 3d2866df48
commit
8e4eb03a60
3 changed files with 175 additions and 159 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 300
      mavground.pri
  2. 21
      src/Core.cc
  3. 13
      src/ui/MainWindow.cc

300
mavground.pri
Unescape View File

@ -1,145 +1,155 @@
#------------------------------------------------- #-------------------------------------------------
# #
# MAVGround - Micro Air Vehicle Groundstation # QGroundControl - Micro Air Vehicle Groundstation
# #
# Please see our website at <http://pixhawk.ethz.ch> # Please see our website at <http://qgroundcontrol.org>
# #
# Original Author: # Original Author:
# Lorenz Meier <mavteam@student.ethz.ch> # Lorenz Meier <mavteam@student.ethz.ch>
# #
# Contributing Authors (in alphabetical order): # Contributing Authors (in alphabetical order):
# #
# (c) 2009 PIXHAWK Team # (c) 2009 PIXHAWK Team
# #
# This file is part of the mav groundstation project # This file is part of the mav groundstation project
# MAVGround is free software: you can redistribute it and/or modify # MAVGround is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or # the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# MAVGround is distributed in the hope that it will be useful, # MAVGround is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with MAVGround. If not, see <http://www.gnu.org/licenses/>. # along with MAVGround. If not, see <http://www.gnu.org/licenses/>.
# #
#------------------------------------------------- #-------------------------------------------------
QT += network opengl svg xml phonon QT += network opengl svg xml phonon
TEMPLATE = app TEMPLATE = app
TARGET = qgroundcontrol TARGET = qgroundcontrol
BASEDIR = . BASEDIR = .
BUILDDIR = build BUILDDIR = build
LANGUAGE = C++ LANGUAGE = C++
#CONFIG += static debug #CONFIG += static debug
#CONFIG += static release console #CONFIG += static release console
CONFIG += static debug_and_release console CONFIG += static debug_and_release console
OBJECTS_DIR = $$BUILDDIR/obj OBJECTS_DIR = $$BUILDDIR/obj
MOC_DIR = $$BUILDDIR/moc MOC_DIR = $$BUILDDIR/moc
UI_HEADERS_DIR = src/ui/generated UI_HEADERS_DIR = src/ui/generated
# Add external libraries # Add external libraries
INCLUDEPATH += $$BASEDIR/lib/flite/include \ INCLUDEPATH += $$BASEDIR/lib/flite/include \
$$BASEDIR/lib/flite/lang $$BASEDIR/lib/flite/lang
#$$BASEDIR/lib/qextserialport/include #$$BASEDIR/lib/qextserialport/include
# $$BASEDIR/lib/openjaus/libjaus/include \ # $$BASEDIR/lib/openjaus/libjaus/include \
# $$BASEDIR/lib/openjaus/libopenJaus/include # $$BASEDIR/lib/openjaus/libopenJaus/include
message(Qt version $$[QT_VERSION]) message(Qt version $$[QT_VERSION])
# MAC OS X # MAC OS X
macx { macx {
message(Building for Mac OS X 64bit) CONFIG += x86 #x86_64
CONFIG -= static phonon
CONFIG += x86_64
CONFIG -= x86 static phonon HARDWARE_PLATFORM = $$system(uname -a)
contains( HARDWARE_PLATFORM, x86_64 ) {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 # x64 Mac OS X Snow Leopard 10.6 and later
CONFIG += x86_64
DESTDIR = $$BASEDIR/bin/mac CONFIG -= x86 static phonon
INCLUDEPATH += -framework SDL \ message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
$$BASEDIR/../mavlink/src } else {
# x86 Mac OS X Leopard 10.5 and earlier
LIBS += -framework IOKit \ CONFIG += x86 static phonon
-framework SDL \ message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
-framework CoreFoundation \ }
-framework ApplicationServices \
-lm QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
# Enable function-profiling with the OS X saturn tool DESTDIR = $$BASEDIR/bin/mac
debug { INCLUDEPATH += -framework SDL \
#QMAKE_CXXFLAGS += -finstrument-functions $$BASEDIR/../mavlink/src
#LIBS += -lSaturn
} LIBS += -framework IOKit \
-framework SDL \
ICON = $$BASEDIR/images/icons/macx.icns -framework CoreFoundation \
} -framework ApplicationServices \
-lm
# GNU/Linux
linux-g++ { # Enable function-profiling with the OS X saturn tool
debug {
message(Building for GNU/Linux) #QMAKE_CXXFLAGS += -finstrument-functions
#LIBS += -lSaturn
debug { }
DESTDIR = $$BASEDIR
} ICON = $$BASEDIR/images/icons/macx.icns
}
release {
DESTDIR = $$BASEDIR # GNU/Linux
} linux-g++ {
INCLUDEPATH += /usr/include
debug {
HARDWARE_PLATFORM = $$system(uname -a) DESTDIR = $$BASEDIR
contains( HARDWARE_PLATFORM, x86_64 ) { }
# 64-bit Linux
LIBS += \ release {
-L$$BASEDIR/lib/flite/linux64 DESTDIR = $$BASEDIR
} else { }
# 32-bit Linux INCLUDEPATH += /usr/include
LIBS += \
-L$$BASEDIR/lib/flite/linux32 HARDWARE_PLATFORM = $$system(uname -a)
} contains( HARDWARE_PLATFORM, x86_64 ) {
LIBS += -lm \ # 64-bit Linux
-lflite_cmu_us_awb \ LIBS += \
-lflite_cmu_us_rms \ -L$$BASEDIR/lib/flite/linux64
-lflite_cmu_us_slt \ message(Building for GNU/Linux 64bit/x64)
-lflite_usenglish \ } else {
-lflite_cmulex \ # 32-bit Linux
-lflite \ LIBS += \
-lSDL \ -L$$BASEDIR/lib/flite/linux32
-lSDLmain message(Building for GNU/Linux 32bit/i386)
} }
LIBS += -lm \
-lflite_cmu_us_awb \
# Windows (32bit/64bit) -lflite_cmu_us_rms \
win32 { -lflite_cmu_us_slt \
-lflite_usenglish \
message(Building for Windows Platform (32/64bit)) -lflite_cmulex \
-lflite \
# Special settings for debug -lSDL \
#CONFIG += CONSOLE -lSDLmain
LIBS += -L$$BASEDIR\lib\sdl\win32 \ }
-lmingw32 -lSDLmain -lSDL -mwindows
INCLUDEPATH += $$BASEDIR/lib/sdl/include # Windows (32bit/64bit)
win32 {
debug {
DESTDIR = $$BASEDIR/bin message(Building for Windows Platform (32/64bit))
}
# Special settings for debug
release { #CONFIG += CONSOLE
DESTDIR = $$BASEDIR/bin LIBS += -L$$BASEDIR\lib\sdl\win32 \
} -lmingw32 -lSDLmain -lSDL -mwindows
} INCLUDEPATH += $$BASEDIR/lib/sdl/include
debug {
DESTDIR = $$BASEDIR/bin
}
release {
DESTDIR = $$BASEDIR/bin
}
}

21
src/Core.cc
Unescape View File

@ -61,6 +61,14 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
this->setApplicationName("OpenMAV Ground Control Station"); this->setApplicationName("OpenMAV Ground Control Station");
this->setApplicationVersion("v. 0.0.5"); this->setApplicationVersion("v. 0.0.5");
this->setOrganizationName(QLatin1String("OpenMAV Association")); this->setOrganizationName(QLatin1String("OpenMAV Association"));
this->setOrganizationDomain("http://qgroundcontrol.org");
// Show splash screen
QPixmap splashImage(":images/splash.png");
QSplashScreen* splashScreen = new QSplashScreen(splashImage, Qt::WindowStaysOnTopHint);
splashScreen->show();
splashScreen->showMessage(tr("Loading application fonts"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
// Exit main application when last window is closed // Exit main application when last window is closed
connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit())); connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit()));
@ -73,17 +81,12 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
fontDatabase.addApplicationFont(fontFileName); fontDatabase.addApplicationFont(fontFileName);
setFont(fontDatabase.font(fontFamilyName, "Roman", 12)); setFont(fontDatabase.font(fontFamilyName, "Roman", 12));
// Show splash screen
QPixmap splashImage(":images/splash.png");
QSplashScreen* splashScreen = new QSplashScreen(splashImage, Qt::WindowStaysOnTopHint);
splashScreen->show();
// Start the comm link manager // Start the comm link manager
splashScreen->showMessage(tr("Starting Communication Links")); splashScreen->showMessage(tr("Starting Communication Links"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
startLinkManager(); startLinkManager();
// Start the UAS Manager // Start the UAS Manager
splashScreen->showMessage(tr("Starting UAS Manager")); splashScreen->showMessage(tr("Starting UAS Manager"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
startUASManager(); startUASManager();
// Start audio output // Start audio output
@ -93,7 +96,7 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
//tarsus->start(); //tarsus->start();
// Start the user interface // Start the user interface
splashScreen->showMessage(tr("Starting User Interface")); splashScreen->showMessage(tr("Starting User Interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
startUI(); startUI();
// Remove splash screen // Remove splash screen
@ -140,7 +143,5 @@ void Core::startUI()
{ {
// Start UI // Start UI
mainWindow = new MainWindow(); mainWindow = new MainWindow();
// Make UI visible
mainWindow->show();
} }

13
src/ui/MainWindow.cc
Unescape View File

@ -60,6 +60,9 @@ This file is part of the PIXHAWK project
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
{ {
this->hide();
this->setVisible(false);
// Quick hack // Quick hack
//comp = new LogCompressor("/home/pixhawk/Desktop/test.txt"); //comp = new LogCompressor("/home/pixhawk/Desktop/test.txt");
@ -142,10 +145,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
// Add status bar // Add status bar
setStatusBar(createStatusBar()); setStatusBar(createStatusBar());
// Load widgets
loadWidgets();
// Adjust the size
adjustSize();
// Create actions // Create actions
connectActions(); connectActions();
@ -173,6 +172,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
//CommConfigurationWindow* simulationWidget = new CommConfigurationWindow(simulationLink, mavlink, this); //CommConfigurationWindow* simulationWidget = new CommConfigurationWindow(simulationLink, mavlink, this);
//ui.menuNetwork->addAction(commWidget->getAction()); //ui.menuNetwork->addAction(commWidget->getAction());
simulationLink->connect(); simulationLink->connect();
// Load widgets and show application window
loadWidgets();
// Adjust the size
adjustSize();
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()

Write Preview
Loading…
Cancel
Save