Merge pull request #566 from DonLakeFlyer/MoreConnect

More failed QObject::connect calls

src/ui/MainWindow.cc

@@ -2045,27 +2045,6 @@ void MainWindow::loadMAVLinkView()
     }
 }
 
-//void MainWindow::loadDataView(QString fileName)
-//{
-//    // Plot is now selected, now load data from file
-//    if (dataView)
-//    {
-//        //dataView->setCentralWidget(new QGCDataPlot2D(this));
-//        QGCDataPlot2D *plot = qobject_cast<QGCDataPlot2D*>(dataView->centralWidget());
-//        if (plot)
-//        {
-//            plot->loadFile(fileName);
-//        }
-//    }
-//    /*QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
-//    if (centerStack)
-//    {
-//        centerStack->setCurrentWidget(dataView);
-//        dataplotWidget->loadFile(fileName);
-//    }*/
-//}
-
-
 QList<QAction*> MainWindow::listLinkMenuActions()
 {
     return ui.menuNetwork->actions();

src/ui/MainWindow.h

@@ -281,9 +281,6 @@ public slots:
 
     void closeEvent(QCloseEvent* event);
 
-    /** @brief Load data view, allowing to plot flight data */
-//    void loadDataView(QString fileName);
-
     /**
      * @brief Shows a Widget from the center stack based on the action sender
      *

src/ui/configuration/FlightModeConfig.cc

@@ -216,12 +216,10 @@ void FlightModeConfig::saveButtonClicked(void)
 // rc channel value.
 void FlightModeConfig::remoteControlChannelRawChanged(int chan, float val)
 {
-    qDebug() << chan << val << _modeSwitchRCChannel;
     // Until we get the _modeSwitchRCChannel value from a parameter it will be set
     // to -1, which is an invalid channel thus the labels won't update
     if (chan == _modeSwitchRCChannel)
     {
-        qDebug() << chan << val;
         size_t highlightIndex = _cModes; // initialize to unreachable index
         
         for (size_t i=0; i<_cModes; i++) {

src/ui/designer/QGCToolWidget.h

@@ -48,6 +48,7 @@ public slots:
     void importWidget();
     /** @brief Store all widgets of this type to QSettings */
     void storeWidgetsToSettings() { QSettings settings; QGCToolWidget::storeWidgetsToSettings(settings); }
+    void showLabel(QString name,int num);
 
 public:
     void loadSettings(QVariantMap& settings);
@@ -61,7 +62,6 @@ public:
     QList<QString> getParamList();
     void setParameterValue(int uas, int component, QString parameterName, const QVariant value);
     bool fromMetaData() const { return isFromMetaData; }
-    void showLabel(QString name,int num);
 
 signals:
     void titleChanged(const QString &title);

src/ui/linechart/Linecharts.cc

@@ -22,8 +22,6 @@ Linecharts::Linecharts(QWidget *parent) :
             this, SLOT(addSystem(UASInterface*)));
     connect(UASManager::instance(), SIGNAL(activeUASSet(int)),
             this, SLOT(selectSystem(int)));
-    connect(this, SIGNAL(logfileWritten(QString)),
-            MainWindow::instance(), SLOT(loadDataView(QString)));
 }
 
 void Linecharts::showEvent(QShowEvent* event)

src/ui/uas/UASView.cc

@@ -105,9 +105,6 @@ UASView::UASView(UASInterface* uas, QWidget *parent) :
     connect(uas, SIGNAL(textMessageReceived(int,int,int,QString)), this, SLOT(showStatusText(int, int, int, QString)));
     connect(uas, SIGNAL(navModeChanged(int, int, QString)), this, SLOT(updateNavMode(int, int, QString)));
 
-    // Setup UAS selection
-    connect(this, SIGNAL(clicked(bool)), this, SLOT(setUASasActive(bool)));
-
     // Setup user interaction
     connect(m_ui->liftoffButton, SIGNAL(clicked()), uas, SLOT(launch()));
     connect(m_ui->haltButton, SIGNAL(clicked()), uas, SLOT(halt()));