Stable update

ChangeLog.md

@@ -11,6 +11,7 @@ Note: This file only contains high level features or important fixes.
 ### 4.0.6 - Not yet released
 
 * Plan: Much better conversion of missions to KML for 3d visualization/verification of missions
+* Analyze/Log Download - Fix download on mobile versions of QGC
 
 ### 4.0.5 - Stable
 

src/AnalyzeView/LogDownloadController.cc

@@ -519,19 +519,9 @@ void
 LogDownloadController::download(QString path)
 {
     QString dir = path;
-#if defined(__mobile__)
-    if(dir.isEmpty()) {
+    if (dir.isEmpty()) {
         dir = qgcApp()->toolbox()->settingsManager()->appSettings()->logSavePath();
     }
-#else
-    if(dir.isEmpty()) {
-        dir = QString(); //-- TODO: QGCQFileDialog::getExistingDirectory(
-        //        MainWindow::instance(),
-        //        tr("Log Download Directory"),
-        //        QDir::homePath(),
-        //        QGCQFileDialog::ShowDirsOnly | QGCQFileDialog::DontResolveSymlinks);
-    }
-#endif
     downloadToDirectory(dir);
 }
 

src/AnalyzeView/LogDownloadPage.qml

@@ -147,12 +147,17 @@ AnalyzePage {
                             var o = logController.model.get(rowIndex)
                             if (o) o.selected = true
                         })
+                        if (ScreenTools.isMobile) {
+                            // You can't pick folders in mobile, only default location is used
+                            logController.download()
+                        } else {
                             fileDialog.title =          qsTr("Select save directory")
                             fileDialog.selectExisting = true
                             fileDialog.folder =         QGroundControl.settingsManager.appSettings.logSavePath
                             fileDialog.selectFolder =   true
                             fileDialog.openForLoad()
                         }
+                    }
                     QGCFileDialog {
                         id: fileDialog
                         onAcceptedForLoad: {

src/FlightMap/MapItems/MissionItemIndicator.qml

@@ -31,7 +31,8 @@ MapQuickItem {
         MissionItemIndexLabel {
             id:                 _label
             checked:            _isCurrentItem
-            label:              missionItem ? missionItem.abbreviation : ""
+            label:              missionItem.abbreviation
+            index:              missionItem.abbreviation.charAt(0) > 'A' && missionItem.abbreviation.charAt(0) < 'z' ? -1 : missionItem.sequenceNumber
             gimbalYaw:          missionItem.missionGimbalYaw
             vehicleYaw:         missionItem.missionVehicleYaw
             showGimbalYaw:      !isNaN(missionItem.missionGimbalYaw)

src/PlanView/MissionItemStatus.qml

@@ -99,12 +99,32 @@ Rectangle {
                 checked:                    object.isCurrentItem
                 label:                      object.abbreviation.charAt(0)
                 index:                      object.abbreviation.charAt(0) > 'A' && object.abbreviation.charAt(0) < 'z' ? -1 : object.sequenceNumber
-                showSequenceNumbers:        true
-                visible:                    true
+                showSequenceNumbers:        false
+            }
+
+            Rectangle {
+                id:                     indexBackground
+                anchors.leftMargin:     -2
+                anchors.rightMargin:    -2
+                anchors.fill:           indexLabel
+                color:                  qgcPal.window
+                opacity:                0.3
+                visible:                indexLabel.visible
+                transform:              Rotation { angle: 90; origin.x: indexBackground.width / 2; origin.y: indexBackground.height / 2 }
+            }
+
+            QGCLabel {
+                id:                 indexLabel
+                anchors.centerIn:   parent
+                text:               object.sequenceNumber
+                visible:            indicator.index != -1
+                transform:          Rotation { angle: 90; origin.x: indexLabel.width / 2; origin.y: indexLabel.height / 2 }
+            }
+
+            MouseArea {
+                anchors.fill:   parent
                 onClicked:      root.setCurrentSeqNum(object.sequenceNumber)
             }
         }
     }
 }
-
-

src/QmlControls/MissionItemIndexLabel.qml

@@ -25,7 +25,7 @@ Canvas {
     property real   gimbalYaw
     property real   vehicleYaw
     property bool   showGimbalYaw:          false
-    property bool   showSequenceNumbers:    false
+    property bool   showSequenceNumbers:    true
 
     property real   _width:             showGimbalYaw ? Math.max(_gimbalYawWidth, labelControl.visible ? labelControl.width : indicator.width) : (labelControl.visible ? labelControl.width : indicator.width)
     property real   _height:            showGimbalYaw ? _gimbalYawWidth : (labelControl.visible ? labelControl.height : indicator.height)

src/Vehicle/Vehicle.cc

@@ -3287,7 +3287,7 @@ void Vehicle::setCurrentMissionSequence(int seq)
         &msg,
         static_cast<uint8_t>(id()),
         _compID,
-        static_cast<uint8_t>(seq));
+        static_cast<uint16_t>(seq));
     sendMessageOnLink(priorityLink(), msg);
 }