Merge pull request #1778 from DonLakeFlyer/VehicleErrors

Show vehicle errors after parameters load

src/FactSystem/ParameterLoader.cc

@@ -758,20 +758,25 @@ void ParameterLoader::_checkInitialLoadComplete(void)
     UASMessageHandler* msgHandler = UASMessageHandler::instance();
     if (msgHandler->getErrorCountTotal()) {
         QString errors;
+        bool firstError = true;
         
         msgHandler->lockAccess();
         foreach (UASMessage* msg, msgHandler->messages()) {
             if (msg->severityIsError()) {
-                errors += msg->getText();
+                if (!firstError) {
                     errors += "\n";
                 }
+                errors += " - ";
+                errors += msg->getText();
+                firstError = false;
+            }
         }
         msgHandler->unlockAccess();
         
-        QGCMessageBox::critical("Vehicle startup errors",
-                                QString("Errors were detected during vehicle startup:\n"
-                                        "%1"
-                                        "You should resolve these prior to flight.").arg(errors));
+        if (!firstError) {
+            QString errorMsg = QString("Errors were detected during vehicle startup. You should resolve these prior to flight.\n%1").arg(errors);
+            qgcApp()->showToolBarMessage(errorMsg);
+        }
     }
     
     // Warn of parameter load failure

src/QGCApplication.cc

@@ -772,3 +772,13 @@ MavManager* QGCApplication::getMavManager()
 {
     return _pMavManager;
 }
+
+void QGCApplication::showToolBarMessage(const QString& message)
+{
+    MainWindow* mainWindow = MainWindow::instance();
+    if (mainWindow) {
+        mainWindow->getMainToolBar()->showToolBarMessage(message);
+    } else {
+        QGCMessageBox::information("", message);
+    }
+}

src/QGCApplication.h

@@ -107,6 +107,9 @@ public:
     /// MavManager accessor
     MavManager* getMavManager();
     
+    /// Show a non-modal message to the user
+    void showToolBarMessage(const QString& message);
+    
 public slots:
     /// You can connect to this slot to show an information message box from a different thread.
     void informationMessageBoxOnMainThread(const QString& title, const QString& msg);

src/QGCQmlWidgetHolder.cpp

@@ -30,7 +30,7 @@ QGCQmlWidgetHolder::QGCQmlWidgetHolder(QWidget *parent) :
     QWidget(parent)
 {
     _ui.setupUi(this);
-    _ui.qmlWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+    setResizeMode(QQuickWidget::SizeRootObjectToView);
 }
 
 QGCQmlWidgetHolder::~QGCQmlWidgetHolder()
@@ -62,3 +62,8 @@ QQuickItem* QGCQmlWidgetHolder::getRootObject(void)
 {
     return _ui.qmlWidget->rootObject();
 }
+
+void QGCQmlWidgetHolder::setResizeMode(QQuickWidget::ResizeMode resizeMode)
+{
+    _ui.qmlWidget->setResizeMode(resizeMode);
+}
\ No newline at end of file

src/QGCQmlWidgetHolder.h

@@ -61,6 +61,9 @@ public:
 
     void setContextPropertyObject(const QString& name, QObject* object);
     
+    /// Sets the resize mode for the QQuickWidget container
+    void setResizeMode(QQuickWidget::ResizeMode resizeMode);
+
 private:
     Ui::QGCQmlWidgetHolder _ui;
 };

src/ui/toolbar/MainToolBar.cc

@@ -92,6 +92,8 @@ MainToolBar::MainToolBar(QWidget* parent)
         SLOT(_telemetryChanged(LinkInterface*, unsigned, unsigned, unsigned, unsigned, unsigned, unsigned, unsigned)));
     connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(_setActiveUAS(UASInterface*)));
     connect(UASManager::instance(), SIGNAL(UASDeleted(UASInterface*)),   this, SLOT(_forgetUAS(UASInterface*)));
+    
+    connect(this, &MainToolBar::heightChanged, this, &MainToolBar::_heightChanged);
 }
 
 MainToolBar::~MainToolBar()
@@ -396,3 +398,9 @@ void MainToolBar::_setProgressBarValue(float value)
     _progressBarValue = value;
     emit progressBarValueChanged(value);
 }
+
+void MainToolBar::_heightChanged(double height)
+{
+    setMinimumHeight(height);
+    setMaximumHeight(height);
+}

src/ui/toolbar/MainToolBar.h

@@ -69,6 +69,7 @@ public:
     Q_INVOKABLE void    onDisconnect(QString conf);
     Q_INVOKABLE void    onEnterMessageArea(int x, int y);
 
+    Q_PROPERTY(double       height              MEMBER _toolbarHeight           NOTIFY heightChanged)
     Q_PROPERTY(ViewType_t   currentView         MEMBER _currentView             NOTIFY currentViewChanged)
     Q_PROPERTY(QStringList  configList          MEMBER _linkConfigurations      NOTIFY configListChanged)
     Q_PROPERTY(int          connectionCount     READ connectionCount            NOTIFY connectionCountChanged)
@@ -90,6 +91,8 @@ public:
     int         telemetryLRSSI          () { return _telemetryLRSSI; }
     int         connectionCount         () { return _connectionCount; }
     
+    void showToolBarMessage(const QString& message) { emit showMessage(message); }
+    
 signals:
     void connectionCountChanged         (int count);
     void currentViewChanged             ();
@@ -104,6 +107,10 @@ signals:
     void remoteRSSIChanged              (int value);
     void telemetryRRSSIChanged          (int value);
     void telemetryLRSSIChanged          (int value);
+    void heightChanged                  (double height);
+    
+    /// Shows a non-modal message below the toolbar
+    void showMessage(const QString& message);
 
 private slots:
     void _forgetUAS                     (UASInterface* uas);
@@ -115,6 +122,7 @@ private slots:
     void _setProgressBarValue           (float value);
     void _remoteControlRSSIChanged      (uint8_t rssi);
     void _telemetryChanged              (LinkInterface* link, unsigned rxerrors, unsigned fixed, unsigned rssi, unsigned remrssi, unsigned txbuf, unsigned noise, unsigned remnoise);
+    void _heightChanged                 (double height);
 
 private:
     void _updateConnection              (LinkInterface *disconnectedLink = NULL);
@@ -137,6 +145,7 @@ private:
     double          _remoteRSSIstore;
     int             _telemetryRRSSI;
     int             _telemetryLRSSI;
+    double          _toolbarHeight;
 
     UASMessageViewRollDown* _rollDownMessages;
 };

src/ui/toolbar/MainToolBar.qml

@@ -43,14 +43,18 @@ Rectangle {
 
     property var qgcPal: QGCPalette { id: palette; colorGroupEnabled: true }
 
+    readonly property real toolBarHeight:   ScreenTools.defaultFontPixelHeight * 3
     property int cellSpacerSize:            ScreenTools.isMobile ? getProportionalDimmension(6) : getProportionalDimmension(4)
-    property int cellHeight:     getProportionalDimmension(30)
+    readonly property int cellHeight:       toolBarHeight * 0.75
 
-    property var colorBlue:       "#1a6eaa"
-    property var colorGreen:      "#329147"
-    property var colorRed:        "#942324"
-    property var colorOrange:     "#a76f26"
-    property var colorWhite:      "#f0f0f0"
+    readonly property real horizontalMargins:   ScreenTools.defaultFontPixelWidth / 2
+    readonly property real verticalMargins:     ScreenTools.defaultFontPixelHeight / 4
+
+    readonly property var colorBlue:    "#1a6eaa"
+    readonly property var colorGreen:   "#329147"
+    readonly property var colorRed:     "#942324"
+    readonly property var colorOrange:  "#a76f26"
+    readonly property var colorWhite:   "#f0f0f0"
 
     property var colorOrangeText: (qgcPal.globalTheme === QGCPalette.Light) ? "#b75711" : "#ea8225"
     property var colorRedText:    (qgcPal.globalTheme === QGCPalette.Light) ? "#ee1112" : "#ef2526"
@@ -59,8 +63,18 @@ Rectangle {
 
     color:  qgcPal.windowShade
 
+    Connections {
+        target: mainToolBar
+
+        onShowMessage: {
+            toolBarMessage.text = message
+            mainToolBar.height = toolBarHeight + toolBarMessage.contentHeight + verticalMargins
+            toolBarMessageArea.visible = true
+        }
+    }
+
     function getProportionalDimmension(val) {
-        return toolBarHolder.height * val / 40
+        return toolBarHeight * val / 40
     }
 
     function getMessageColor() {
@@ -177,15 +191,14 @@ Rectangle {
                 mainToolBar.onFlyViewMenu();
             }
         }
-    }
+    } // Menu
 
     Row {
-        id:                     row1
+        id:         toolRow
+        x:          horizontalMargins
+        y:          (toolBarHeight - cellHeight) / 2
         height:     cellHeight
-        anchors.left:           parent.left
         spacing:    getProportionalDimmension(4)
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.leftMargin:     getProportionalDimmension(10)
 
         //---------------------------------------------------------------------
         //-- Main menu for Non Mobile Devices (Chevron Buttons)
@@ -193,8 +206,9 @@ Rectangle {
             id:             row11
             height:         cellHeight
             spacing:        -getProportionalDimmension(12)
-            anchors.verticalCenter: parent.verticalCenter
+            anchors.top:    parent.top
             visible:        !ScreenTools.isMobile
+
             Connections {
                 target: ScreenTools
                 onRepaintRequested: {
@@ -213,7 +227,6 @@ Rectangle {
                 height: cellHeight
                 exclusiveGroup: mainActionGroup
                 text: qsTr("Setup")
-                anchors.verticalCenter: parent.verticalCenter
                 checked: (mainToolBar.currentView === MainToolBar.ViewSetup)
                 onClicked: {
                     mainToolBar.onSetupView();
@@ -227,7 +240,6 @@ Rectangle {
                 height: cellHeight
                 exclusiveGroup: mainActionGroup
                 text: qsTr("Plan")
-                anchors.verticalCenter: parent.verticalCenter
                 checked: (mainToolBar.currentView === MainToolBar.ViewPlan)
                 onClicked: {
                     mainToolBar.onPlanView();
@@ -241,7 +253,6 @@ Rectangle {
                 height: cellHeight
                 exclusiveGroup: mainActionGroup
                 text: qsTr("Fly")
-                anchors.verticalCenter: parent.verticalCenter
                 checked: (mainToolBar.currentView === MainToolBar.ViewFly)
                 onClicked: {
                     mainToolBar.onFlyView();
@@ -255,15 +266,13 @@ Rectangle {
                 height: cellHeight
                 exclusiveGroup: mainActionGroup
                 text: qsTr("Analyze")
-                anchors.verticalCenter: parent.verticalCenter
                 checked: (mainToolBar.currentView === MainToolBar.ViewAnalyze)
                 onClicked: {
                     mainToolBar.onAnalyzeView();
                 }
                 z: 700
             }
-
-        }
+        } // Row
 
         //---------------------------------------------------------------------
         //-- Indicators
@@ -667,17 +676,17 @@ Rectangle {
                     color: colorRedText
                 }
             }
-        }
-    }
+        } // Row
+    } // Row
 
     Row {
-        id: row2
-        height: cellHeight
-        spacing: cellSpacerSize
+        id:                     connectRow
+        anchors.rightMargin:    verticalMargins
         anchors.right:          parent.right
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.leftMargin:  getProportionalDimmension(10)
-        anchors.rightMargin: getProportionalDimmension(10)
+        anchors.top:            toolRow.top
+        anchors.verticalCenter: toolRow.verticalCenter
+        height:                 toolRow.height
+        spacing:                cellSpacerSize
 
         Menu {
             id: connectMenu
@@ -712,7 +721,6 @@ Rectangle {
             visible:    mainToolBar.connectionCount === 0
             text:       qsTr("Connect")
             menu:       connectMenu
-            anchors.verticalCenter: parent.verticalCenter
         }
 
         QGCButton {
@@ -720,7 +728,6 @@ Rectangle {
             width:      getProportionalDimmension(100)
             visible:    mainToolBar.connectionCount === 1
             text:       qsTr("Disconnect")
-            anchors.verticalCenter: parent.verticalCenter
             onClicked: {
                 mainToolBar.onDisconnect("");
             }
@@ -750,18 +757,47 @@ Rectangle {
             text:       "Disconnect"
             visible:    mainToolBar.connectionCount > 1
             menu:       disconnectMenu
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
         }
+    } // Row
 
     // Progress bar
     Rectangle {
-        readonly property int progressBarHeight: getProportionalDimmension(3)
-        y:      parent.height  - progressBarHeight
-        height: progressBarHeight
+        id:             progressBar
+        anchors.top:    toolRow.bottom
+        height:         getProportionalDimmension(3)
         width:          parent.width * mainToolBar.progressBarValue
         color:          qgcPal.text
     }
-}
 
+    // Toolbar message area
+    Rectangle {
+        id:                 toolBarMessageArea
+        anchors.margins:    horizontalMargins
+        anchors.top:        progressBar.bottom
+        anchors.bottom:     parent.bottom
+        anchors.left:       parent.left
+        anchors.right:      parent.right
+        color:              qgcPal.windowShadeDark
+        visible:            false
+
+        QGCLabel {
+            id:             toolBarMessage
+            anchors.fill:   parent
+            wrapMode:       Text.WordWrap
+        }
+
+        QGCButton {
+            id:                     toolBarMessageCloseButton
+            anchors.rightMargin:    horizontalMargins
+            anchors.topMargin:      verticalMargins
+            anchors.top:            parent.top
+            anchors.right:          parent.right
+            text:                   "Close Message"
+
+            onClicked: {
+                parent.visible = false
+                mainToolBar.height = toolBarHeight
+            }
+        }
+    }
+} // Rectangle