Merge pull request #4382 from DonLakeFlyer/DropZOrder

DropButton: Drop z order incorrect

src/FactSystem/ParameterManager.cc

@@ -875,9 +875,9 @@ QString ParameterManager::readParametersFromStream(QTextStream& stream)
 
 void ParameterManager::writeParametersToStream(QTextStream &stream)
 {
-    stream << "# Onboard parameters for vehicle " << _vehicle->id() << "\n";
+    stream << "# Onboard parameters for Vehicle " << _vehicle->id() << "\n";
     stream << "#\n";
-    stream << "# MAV ID  COMPONENT ID  PARAM NAME  VALUE (FLOAT)\n";
+    stream << "# Vehicle-Id Component-Id Name Value Type\n";
 
     foreach (int componentId, _mapParameterName2Variant.keys()) {
         foreach (const QString &paramName, _mapParameterName2Variant[componentId].keys()) {

src/MissionEditor/SurveyItemEditor.qml

@@ -29,28 +29,6 @@ Rectangle {
     readonly property int _gridTypeCustomCamera:    1
     readonly property int _gridTypeCamera:          2
 
-    Component.onCompleted: {
-        console.log("gridAltitude", missionItem.gridAltitude.value)
-        console.log("gridAltitudeRelative", missionItem.gridAltitudeRelative)
-        console.log("gridAngle", missionItem.gridAngle.value)
-        console.log("gridSpacing", missionItem.gridSpacing.value)
-        console.log("turnaroundDist", missionItem.turnaroundDist.value)
-        console.log("cameraTrigger", missionItem.cameraTrigger)
-        console.log("cameraTriggerDistance", missionItem.cameraTriggerDistance.value)
-        console.log("groundResolution", missionItem.groundResolution.value)
-        console.log("frontalOverlap", missionItem.frontalOverlap.value)
-        console.log("sideOverlap", missionItem.sideOverlap.value)
-        console.log("cameraSensorWidth", missionItem.cameraSensorWidth.value)
-        console.log("cameraSensorHeight", missionItem.cameraSensorHeight.value)
-        console.log("cameraResolutionWidth", missionItem.cameraResolutionWidth.value)
-        console.log("cameraResolutionHeight", missionItem.cameraResolutionHeight.value)
-        console.log("cameraFocalLength", missionItem.cameraFocalLength.value)
-        console.log("fixedValueIsAltitude", missionItem.fixedValueIsAltitude)
-        console.log("cameraOrientationLandscape", missionItem.cameraOrientationLandscape)
-        console.log("manualGrid", missionItem.manualGrid)
-        console.log("camera", missionItem.camera)
-    }
-
     ListModel {
         id: cameraModelList
 

src/QmlControls/DropButton.qml

@@ -2,11 +2,13 @@ import QtQuick                  2.4
 import QtQuick.Controls         1.2
 import QtQuick.Controls.Styles  1.2
 
+import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0
 import QGroundControl.Palette       1.0
 
 Item {
     id: _root
+    z:  QGroundControl.zOrderWidgets
 
     signal          clicked()
     property alias  buttonImage:        roundButton.buttonImage