Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

images/style-mission.css

+* { font-family: "Bitstream Vera Sans"; font: "Roman"; font-size: 12px; }
 QWidget#colorIcon {}
 
 QWidget {

src/Core.cc

@@ -72,6 +72,8 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
     // Show splash screen
     QPixmap splashImage(":images/splash.png");
     QSplashScreen* splashScreen = new QSplashScreen(splashImage, Qt::WindowStaysOnTopHint);
+    // Delete splash screen after mainWindow was displayed
+    splashScreen->setAttribute(Qt::WA_DeleteOnClose);
     splashScreen->show();
     splashScreen->showMessage(tr("Loading application fonts"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
 
@@ -79,13 +81,15 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
     // Exit main application when last window is closed
     connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit()));
 
-    // Set application font
+    // Load application font
     QFontDatabase fontDatabase = QFontDatabase();
     const QString fontFileName = ":/general/vera.ttf"; ///< Font file is part of the QRC file and compiled into the app
     const QString fontFamilyName = "Bitstream Vera Sans";
     if(!QFile::exists(fontFileName)) printf("ERROR! font file: %s DOES NOT EXIST!\n", fontFileName.toStdString().c_str());
     fontDatabase.addApplicationFont(fontFileName);
-    setFont(fontDatabase.font(fontFamilyName, "Roman", 12));
+    // Avoid Using setFont(). In the Qt docu you can read the following:
+    //     "Warning: Do not use this function in conjunction with Qt Style Sheets."
+    // setFont(fontDatabase.font(fontFamilyName, "Roman", 12));
 
     // Start the comm link manager
     splashScreen->showMessage(tr("Starting Communication Links"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));

src/uas/PxQuadMAV.cc

@@ -139,7 +139,6 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit errCountChanged(uasId, "IMU", "SPI0", status.spi0_err_count);
                 emit errCountChanged(uasId, "IMU", "SPI1", status.spi1_err_count);
                 emit errCountChanged(uasId, "IMU", "UART", status.uart_total_err_count);
-                qDebug() << "System Load:" << status.load;
                 emit UAS::valueChanged(this, "Load", ((float)status.load)/1000.0f, MG::TIME::getGroundTimeNow());
             }
             break;

src/ui/MainWindow.h

@@ -154,24 +154,26 @@ protected:
     LinkInterface* udpLink;
 
     QSettings settings;
-    UASControlWidget* control;
-    Linecharts* linechart;
-    UASInfoWidget* info;
-    CameraView* camera;
-    UASListWidget* list;
-    WaypointList* waypoints;
-    ObjectDetectionView* detection;
-    HUD* hud;
-    DebugConsole* debugConsole;
-    MapWidget* map;
-    ParameterInterface* parameters;
-    XMLCommProtocolWidget* protocol;
-    HDDisplay* headDown1;
-    HDDisplay* headDown2;
-    WatchdogControl* watchdogControl;
-    HSIDisplay* hsi;
-    QGCDataPlot2D* dataplot;
-    QGCRemoteControlView* rcView;
+    // Center widgets
+    QPointer<Linecharts> linechartWidget;
+    QPointer<HUD> hudWidget;
+    QPointer<MapWidget> mapWidget;
+    QPointer<XMLCommProtocolWidget> protocolWidget;
+    QPointer<QGCDataPlot2D> dataplotWidget;
+    // Dock widgets
+    QPointer<QDockWidget> controlDockWidget;
+    QPointer<QDockWidget> infoDockWidget;
+    QPointer<QDockWidget> cameraDockWidget;
+    QPointer<QDockWidget> listDockWidget;
+    QPointer<QDockWidget> waypointsDockWidget;
+    QPointer<QDockWidget> detectionDockWidget;
+    QPointer<QDockWidget> debugConsoleDockWidget;
+    QPointer<QDockWidget> parametersDockWidget;
+    QPointer<QDockWidget> headDown1DockWidget;
+    QPointer<QDockWidget> headDown2DockWidget;
+    QPointer<QDockWidget> watchdogControlDockWidget;
+    QPointer<QDockWidget> hsiDockWidget;
+    QPointer<QDockWidget> rcViewDockWidget;
 
     // Popup widgets
     JoystickWidget* joystickWidget;
@@ -187,9 +189,6 @@ protected:
     QAction* killUASAct;
     QAction* simulateUASAct;
 
-    QDockWidget* controlDock;
-    QStackedWidget* centerStack;
-
     LogCompressor* comp;
     QString screenFileName;
     QTimer* videoTimer;

src/ui/QGCParamWidget.cc

@@ -2,9 +2,7 @@
 
 QGroundControl Open Source Ground Control Station
 
-(c) 2009, 2010 QGROUNDCONTROL/PIXHAWK PROJECT
-<http://www.qgroundcontrol.org>
-<http://pixhawk.ethz.ch>
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
 
 This file is part of the QGROUNDCONTROL project
 
@@ -22,7 +20,6 @@ This file is part of the QGROUNDCONTROL project
     along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
 
 ======================================================================*/
-
 /**
  * @file
  *   @brief Implementation of class QGCParamWidget

src/ui/uas/UASControlWidget.cc

@@ -51,13 +51,13 @@ This file is part of the PIXHAWK project
 #define CONTROL_MODE_TEST2  "MODE TEST2"
 #define CONTROL_MODE_TEST3  "MODE TEST3"
 
-#define CONTROL_MODE_LOCKED_INDEX 2
-#define CONTROL_MODE_MANUAL_INDEX 3
-#define CONTROL_MODE_GUIDED_INDEX 4
-#define CONTROL_MODE_AUTO_INDEX   5
-#define CONTROL_MODE_TEST1_INDEX  6
-#define CONTROL_MODE_TEST2_INDEX  7
-#define CONTROL_MODE_TEST3_INDEX  8
+#define CONTROL_MODE_LOCKED_INDEX 1
+#define CONTROL_MODE_MANUAL_INDEX 2
+#define CONTROL_MODE_GUIDED_INDEX 3
+#define CONTROL_MODE_AUTO_INDEX   4
+#define CONTROL_MODE_TEST1_INDEX  5
+#define CONTROL_MODE_TEST2_INDEX  6
+#define CONTROL_MODE_TEST3_INDEX  7
 
 UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
 uas(0),