Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into planViewSizing

Vagrantfile

@@ -15,7 +15,7 @@ Vagrant.configure(2) do |config|
   config.vm.provider "virtualbox"
   config.vm.provider "vmware_fusion"
 
-  config.vm.box = "boxcutter/ubuntu1604"
+  config.vm.box = "ubuntu/xenial64"
   config.vm.provider :docker do |docker, override|
     override.vm.box = "tknerr/baseimage-ubuntu-16.04"
   end

src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml

@@ -3379,7 +3379,7 @@ by initializing the estimator to the LPE_LAT/LON parameters when global informat
       <short_desc>Integer bitmask controlling data fusion</short_desc>
       <long_desc>Set bits in the following positions to enable: 0 : Set to true to fuse GPS data if available, also requires GPS for altitude init 1 : Set to true to fuse optical flow data if available 2 : Set to true to fuse vision position 3 : Set to true to enable landing target 4 : Set to true to fuse land detector 5 : Set to true to publish AGL as local position down component 6 : Set to true to enable flow gyro compensation 7 : Set to true to enable baro fusion default (145 - GPS, baro, land detector)</long_desc>
       <min>0</min>
-      <max>4294967295</max>
+      <max>255</max>
       <scope>modules/local_position_estimator</scope>
       <bitmask>
         <bit index="0"> fuse GPS, requires GPS for alt. init</bit>
@@ -5482,7 +5482,7 @@ the setpoint will be capped to MPC_XY_VEL_MAX</short_desc>
     <parameter default="3" name="PLD_MAX_SRCH" type="INT32">
       <short_desc>Maximum number of search attempts</short_desc>
       <long_desc>Maximum number of times to seach for the landing target if it is lost during the precision landing.</long_desc>
-      <min>0.0</min>
+      <min>0</min>
       <max>100</max>
       <scope>modules/navigator</scope>
     </parameter>

src/MissionManager/MissionController.cc

@@ -1216,8 +1216,6 @@ void MissionController::_recalcMissionFlightStatus()
         }
     }
 
-    qDebug() << "Gimbal calc";
-
     for (int i=0; i<_visualItems->count(); i++) {
         VisualMissionItem* item = qobject_cast<VisualMissionItem*>(_visualItems->get(i));
         SimpleMissionItem* simpleItem = qobject_cast<SimpleMissionItem*>(item);
@@ -1247,7 +1245,6 @@ void MissionController::_recalcMissionFlightStatus()
         // Look for gimbal change
         double gimbalYaw = item->specifiedGimbalYaw();
         if (!qIsNaN(gimbalYaw)) {
-            qDebug() << _editMode << gimbalYaw;
             _missionFlightStatus.gimbalYaw = gimbalYaw;
         }
         double gimbalPitch = item->specifiedGimbalPitch();
@@ -1353,7 +1350,6 @@ void MissionController::_recalcMissionFlightStatus()
                     _addTimeDistance(vtolInHover, hoverTime, cruiseTime, extraTime, distance, item->sequenceNumber());
                 }
 
-                qDebug() << "setMissionFlightStatus" << item->sequenceNumber() << _missionFlightStatus.gimbalYaw << item->commandName();
                 item->setMissionFlightStatus(_missionFlightStatus);
             }
 

src/MissionManager/MissionSettingsItem.cc

@@ -297,6 +297,11 @@ void MissionSettingsItem::setMissionEndRTL(bool missionEndRTL)
 void MissionSettingsItem::_setHomeAltFromTerrain(double terrainAltitude)
 {
     if (!_plannedHomePositionFromVehicle) {
+		// We need to stop this from signalling, Otherwise the dirty but get set on a delay
+		// which then marks the Plan view as incorrectly dirty
+        _plannedHomePositionAltitudeFact.setSendValueChangedSignals(false);
         _plannedHomePositionAltitudeFact.setRawValue(terrainAltitude);
+        _plannedHomePositionAltitudeFact.clearDeferredValueChangeSignal();
+        _plannedHomePositionAltitudeFact.setSendValueChangedSignals(false);
     }
 }

src/MissionManager/QGCMapPolygonVisuals.qml

@@ -453,6 +453,7 @@ Item {
                         id:                 radiusField
                         text:               _circleRadius.toFixed(2)
                         onEditingFinished:  setRadiusFromDialog()
+                        inputMethodHints:   Qt.ImhFormattedNumbersOnly
                     }
                 }
 

src/PlanView/MissionItemStatus.qml

@@ -31,7 +31,7 @@ Rectangle {
     readonly property real _margins: ScreenTools.defaultFontPixelWidth
 
     onMaxWidthChanged: {
-        var calcLength = (statusListView.count + 1)*statusListView.contentItem.children[0].width
+        var calcLength = (statusListView.count + 1) * (statusListView.count ? statusListView.contentItem.children[0].width : 1)
         root.width = root.maxWidth > calcLength ? calcLength : root.maxWidth
     }
 
@@ -63,7 +63,7 @@ Rectangle {
         currentIndex:           _missionController.currentPlanViewIndex
 
         onCountChanged: {
-            var calcLength = (statusListView.count + 1)*statusListView.contentItem.children[0].width
+            var calcLength = (statusListView.count + 1) * (statusListView.count ? statusListView.contentItem.children[0].width : 1)
             root.width = root.maxWidth > calcLength ? calcLength : root.maxWidth
         }
 

src/PlanView/MissionSettingsEditor.qml

@@ -15,7 +15,7 @@ import QGroundControl.Controllers       1.0
 Rectangle {
     id:                 valuesRect
     width:              availableWidth
-    height:             deferedload.status == Loader.Ready ? (visible ? deferedload.item.height : 0) : 0
+    height:             valuesColumn.height + (_margin * 2)
     color:              qgcPal.windowShadeDark
     visible:            missionItem.isCurrentItem
     radius:             _radius
@@ -39,51 +39,19 @@ Rectangle {
 
     readonly property string _firmwareLabel:    qsTr("Firmware")
     readonly property string _vehicleLabel:     qsTr("Vehicle")
+    readonly property real  _margin:            ScreenTools.defaultFontPixelWidth / 2
 
     QGCPalette { id: qgcPal }
     QGCFileDialogController { id: fileController }
 
-    Loader {
-        id:              deferedload
-        active:          valuesRect.visible
-        asynchronous:    true
-        anchors.margins: _margin
-        anchors.left:    valuesRect.left
-        anchors.right:   valuesRect.right
-        anchors.top:     valuesRect.top
-
-        sourceComponent: Component {
-            Item {
-                id:                 valuesItem
-                height:             valuesColumn.height + (_margin * 2)
-
     Column {
         id:                 valuesColumn
+        anchors.margins:    _margin
         anchors.left:       parent.left
         anchors.right:      parent.right
         anchors.top:        parent.top
         spacing:            _margin
 
-                    Loader {
-                        anchors.left:       parent.left
-                        anchors.right:      parent.right
-                        sourceComponent:    missionSettings
-                    }
-                } // Column
-            } // Item
-        } // Component
-    } // Loader
-
-    Component {
-        id: missionSettings
-
-        Column {
-            id:             valuesColumn
-            anchors.left:   parent ? parent.left  : undefined
-            anchors.right:  parent ? parent.right : undefined
-            anchors.top:    parent ? parent.top   : undefined
-            spacing:        _margin
-
         Column {
             anchors.left:   parent.left
             anchors.right:  parent.right
@@ -263,5 +231,4 @@ Rectangle {
             }
         }
     } // Column
-    } // Deferred loader
 } // Rectangle