Major cleanup of MainWindow constructor. All widgets have now the visible...

Major cleanup of MainWindow constructor. All widgets have now the visible property set to false on its constructor

src/main.cc

@@ -36,7 +36,7 @@ This file is part of the PIXHAWK project
 
 /* SDL does ugly things to main() */
 #ifdef main
-#	undef main
+  #undef main
 #endif
 
 /**

src/ui/DebugConsole.cc

@@ -101,6 +101,8 @@ DebugConsole::DebugConsole(QWidget *parent) :
     connect(m_ui->holdCheckBox, SIGNAL(clicked(bool)), this, SLOT(setAutoHold(bool)));
     // Connect hold button
     connect(m_ui->holdButton, SIGNAL(toggled(bool)), this, SLOT(hold(bool)));
+
+    this->setVisible(false);
 }
 
 DebugConsole::~DebugConsole()

src/ui/HDDisplay.cc

@@ -100,6 +100,8 @@ HDDisplay::HDDisplay(QStringList* plotList, QWidget *parent) :
     // Connect with UAS
     connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
     //start();
+
+    this->setVisible(false);
 }
 
 HDDisplay::~HDDisplay()

src/ui/HSIDisplay.cc

@@ -100,6 +100,7 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
 
     xCenterPos = vwidth/2.0f;
     yCenterPos = vheight/2.0f + topMargin - bottomMargin;
+    this->setVisible(false);
 }
 
 void HSIDisplay::paintEvent(QPaintEvent * event)

src/ui/HUD.cc

@@ -153,6 +153,8 @@ HUD::HUD(int width, int height, QWidget* parent)
     // Connect with UAS
     UASManager* manager = UASManager::instance();
     connect(manager, SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
+
+    this->setVisible(false);
 }
 
 HUD::~HUD()

src/ui/MainWindow.cc

@@ -62,94 +62,23 @@ This file is part of the QGROUNDCONTROL project
 *
 * @see QMainWindow::show()
 **/
-MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
-settings()
+MainWindow::MainWindow(QWidget *parent) :
+  QMainWindow(parent),
+  settings()
 {
     this->hide();
     this->setVisible(false);
 
-    mavlink = new MAVLinkProtocol();
-
     // Setup user interface
     ui.setupUi(this);
 
-    // Initialize views, NOT show them yet, only initialize model and controller
-    centerStack = new QStackedWidget(this);
-    linechart = new Linecharts(this);
-    linechart->setActive(false);
-    connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), linechart, SLOT(addSystem(UASInterface*)));
-    connect(UASManager::instance(), SIGNAL(activeUASSet(int)), linechart, SLOT(selectSystem(int)));
-    centerStack->addWidget(linechart);
-    control = new UASControlWidget(this);
-    //controlDock = new QDockWidget(this);
-    //controlDock->setWidget(control);
-    list = new UASListWidget(this);
-    list->setVisible(false);
-    waypoints = new WaypointList(this, NULL);
-    waypoints->setVisible(false);
-    info = new UASInfoWidget(this);
-    info->setVisible(false);
-    detection = new ObjectDetectionView("patterns", this);
-    detection->setVisible(false);
-    hud = new HUD(640, 480, this);
-    hud->setVisible(false);
-    debugConsole = new DebugConsole(this);
-    debugConsole->setVisible(false);
-    map = new MapWidget(this);
-    map->setVisible(false);
-    protocol = new XMLCommProtocolWidget(this);
-    protocol->setVisible(false);
-    centerStack->addWidget(protocol);
-    parameters = new ParameterInterface(this);
-    parameters->setVisible(false);
-    watchdogControl = new WatchdogControl(this);
-    watchdogControl->setVisible(false);
-    hsi = new HSIDisplay(this);
-    hsi->setVisible(false);
-
-    QStringList* acceptList = new QStringList();
-    acceptList->append("roll IMU");
-    acceptList->append("pitch IMU");
-    acceptList->append("yaw IMU");
-    acceptList->append("rollspeed IMU");
-    acceptList->append("pitchspeed IMU");
-    acceptList->append("yawspeed IMU");
-    headDown1 = new HDDisplay(acceptList, this);
-    headDown1->setVisible(false);
-
-    QStringList* acceptList2 = new QStringList();
-    acceptList2->append("Battery");
-    acceptList2->append("Pressure");
-    headDown2 = new HDDisplay(acceptList2, this);
-    headDown2->setVisible(false);
-    centerStack->addWidget(map);
-    centerStack->addWidget(hud);
-    setCentralWidget(centerStack);
-
-    // Get IPs
-    QList<QHostAddress> hostAddresses = QNetworkInterface::allAddresses();
-
-    QString windowname = qApp->applicationName() + " " + qApp->applicationVersion();
-
-    windowname.append(" (" + QHostInfo::localHostName() + ": ");
-    bool prevAddr = false;
-    for (int i = 0; i < hostAddresses.size(); i++)
-    {
-        // Exclude loopback IPv4 and all IPv6 addresses
-        if (hostAddresses.at(i) != QHostAddress("127.0.0.1") && !hostAddresses.at(i).toString().contains(":"))
-        {
-            if(prevAddr) windowname.append("/");
-            windowname.append(hostAddresses.at(i).toString());
-            prevAddr = true;
-        }
-    }
+    buildWidgets();
 
-    windowname.append(")");
+    connectWidgets();
 
-    setWindowTitle(windowname);
-#ifndef Q_WS_MAC
-    //qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
-#endif
+    arrangeCenterStack();
+
+    configureWindowName();
 
     // Add status bar
     setStatusBar(createStatusBar());
@@ -157,10 +86,10 @@ settings()
     // Set the application style (not the same as a style sheet)
     // Set the style to Plastique
     qApp->setStyle("plastique");
+
     // Set style sheet as last step
     reloadStylesheet();
 
-    joystick = new JoystickInput();
 
     // Create actions
     connectActions();
@@ -170,9 +99,6 @@ settings()
 
     // Adjust the size
     adjustSize();
-
-    //
-    connect(mavlink, SIGNAL(receiveLossChanged(int, float)), info, SLOT(updateSendLoss(int, float)));
 }
 
 MainWindow::~MainWindow()
@@ -181,6 +107,86 @@ MainWindow::~MainWindow()
     statusBar = NULL;
 }
 
+
+void MainWindow::buildWidgets()
+{
+  QStringList* acceptList = new QStringList();
+  acceptList->append("roll IMU");
+  acceptList->append("pitch IMU");
+  acceptList->append("yaw IMU");
+  acceptList->append("rollspeed IMU");
+  acceptList->append("pitchspeed IMU");
+  acceptList->append("yawspeed IMU");
+
+  QStringList* acceptList2 = new QStringList();
+  acceptList2->append("Battery");
+  acceptList2->append("Pressure");
+
+
+  mavlink     = new MAVLinkProtocol();
+  linechart   = new Linecharts(this);
+  control     = new UASControlWidget(this);
+  list        = new UASListWidget(this);
+  waypoints   = new WaypointList(this, NULL);
+  info        = new UASInfoWidget(this);
+  detection   = new ObjectDetectionView("patterns", this);
+  hud         = new HUD(640, 480, this);
+  debugConsole= new DebugConsole(this);
+  map         = new MapWidget(this);
+  protocol    = new XMLCommProtocolWidget(this);
+  parameters  = new ParameterInterface(this);
+  watchdogControl = new WatchdogControl(this);
+  hsi         = new HSIDisplay(this);
+  headDown1   = new HDDisplay(acceptList, this);
+  headDown2   = new HDDisplay(acceptList2, this);
+  joystick    = new JoystickInput();
+}
+
+void MainWindow::connectWidgets(){
+  connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), linechart, SLOT(addSystem(UASInterface*)));
+  connect(UASManager::instance(), SIGNAL(activeUASSet(int)), linechart, SLOT(selectSystem(int)));
+  connect(mavlink, SIGNAL(receiveLossChanged(int, float)), info, SLOT(updateSendLoss(int, float)));
+}
+
+void MainWindow::arrangeCenterStack(){
+
+  centerStack = new QStackedWidget(this);
+
+  centerStack->addWidget(linechart);
+  centerStack->addWidget(protocol);
+  centerStack->addWidget(map);
+  centerStack->addWidget(hud);
+
+  setCentralWidget(centerStack);
+}
+
+void MainWindow::configureWindowName(){
+  QList<QHostAddress> hostAddresses = QNetworkInterface::allAddresses();
+  QString windowname = qApp->applicationName() + " " + qApp->applicationVersion();
+  bool prevAddr = false;
+
+  windowname.append(" (" + QHostInfo::localHostName() + ": ");
+
+  for (int i = 0; i < hostAddresses.size(); i++)
+  {
+      // Exclude loopback IPv4 and all IPv6 addresses
+      if (hostAddresses.at(i) != QHostAddress("127.0.0.1") && !hostAddresses.at(i).toString().contains(":"))
+      {
+          if(prevAddr) windowname.append("/");
+          windowname.append(hostAddresses.at(i).toString());
+          prevAddr = true;
+      }
+  }
+
+  windowname.append(")");
+
+  setWindowTitle(windowname);
+
+#ifndef Q_WS_MAC
+  //qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
+#endif
+}
+
 QStatusBar* MainWindow::createStatusBar()
 {
     QStatusBar* bar = new QStatusBar();

src/ui/MainWindow.h

@@ -129,6 +129,10 @@ protected:
     void loadWidgets();
     void connectActions();
     void clearView();
+    void buildWidgets();
+    void connectWidgets();
+    void arrangeCenterStack();
+    void configureWindowName();
 
     // TODO Should be moved elsewhere, as the protocol does not belong to the UI
     MAVLinkProtocol* mavlink;
@@ -178,6 +182,7 @@ protected:
 
 private:
     Ui::MainWindow ui;
+
 };
 
 #endif /* _MAINWINDOW_H_ */

src/ui/MapWidget.cc

@@ -107,6 +107,8 @@ MapWidget::MapWidget(QWidget *parent) :
     mc->setZoom(3);
 
     connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(addUAS(UASInterface*)));
+
+    this->setVisible(false);
 }
 
 MapWidget::~MapWidget()

src/ui/ObjectDetectionView.cc

@@ -57,6 +57,8 @@ ObjectDetectionView::ObjectDetectionView(QString folder, QWidget *parent) :
     letterTimer.start(1000);
     connect(&letterTimer, SIGNAL(timeout()), this, SLOT(decreaseLetterTime()));
     connect(m_ui->clearButton, SIGNAL(clicked()), this, SLOT(clearLists()));
+
+    this->setVisible(false);
 }
 
 ObjectDetectionView::~ObjectDetectionView()

src/ui/ParameterInterface.cc

@@ -23,6 +23,7 @@ ParameterInterface::ParameterInterface(QWidget *parent) :
 
     // Setup MAV connections
     connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(addUAS(UASInterface*)));
+    this->setVisible(false);
 }
 
 ParameterInterface::~ParameterInterface()

src/ui/WaypointList.cc

@@ -84,6 +84,8 @@ WaypointList::WaypointList(QWidget *parent, UASInterface* uas) :
 
     // STATUS LABEL
     updateStatusLabel("");
+
+    this->setVisible(false);
 }
 
 WaypointList::~WaypointList()

src/ui/XMLCommProtocolWidget.cc

@@ -24,6 +24,8 @@ XMLCommProtocolWidget::XMLCommProtocolWidget(QWidget *parent) :
     connect(m_ui->selectOutputButton, SIGNAL(clicked()), this, SLOT(selectOutputDirectory()));
     connect(m_ui->generateButton, SIGNAL(clicked()), this, SLOT(generate()));
     connect(m_ui->saveButton, SIGNAL(clicked()), this, SLOT(save()));
+
+    this->setVisible(false);
 }
 
 void XMLCommProtocolWidget::selectXMLFile()

src/ui/linechart/Linecharts.cc

@@ -5,6 +5,7 @@ Linecharts::Linecharts(QWidget *parent) :
         plots(),
         active(true)
 {
+  this->setVisible(false);
 }
 
 

src/ui/uas/UASInfoWidget.cc

@@ -75,6 +75,8 @@ UASInfoWidget::UASInfoWidget(QWidget *parent, QString name) : QWidget(parent)
     connect(updateTimer, SIGNAL(timeout()), this, SLOT(refresh()));
     updateTimer->start(50);
 
+    this->setVisible(false);
+
 }
 
 UASInfoWidget::~UASInfoWidget()

src/ui/uas/UASListWidget.cc

@@ -51,6 +51,8 @@ UASListWidget::UASListWidget(QWidget *parent) : QWidget(parent), m_ui(new Ui::UA
     this->setMinimumWidth(250);
 
     uasViews = QMap<UASInterface*, UASView*>();
+
+    this->setVisible(false);
 }
 
 UASListWidget::~UASListWidget()

src/ui/watchdog/WatchdogControl.cc

@@ -24,6 +24,8 @@ WatchdogControl::WatchdogControl(QWidget *parent) :
     ui->mainWidget->setLayout(listLayout);
 
     connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(setUAS(UASInterface*)));
+
+    this->setVisible(false);
 }
 
 WatchdogControl::~WatchdogControl()