From bd3f692e6aa11f66d8f34833ac5bbe16acabf90f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 10 Jan 2016 14:53:44 -0800 Subject: [PATCH] RCToParam is PX4 stack specific --- src/QmlControls/ParameterEditor.qml | 39 ++++++----------------- src/QmlControls/ParameterEditorDialog.qml | 3 +- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index eafefda2c..3d76203ca 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -42,12 +42,13 @@ QGCView { QGCPalette { id: __qgcPal; colorGroupEnabled: true } - property Fact __editorDialogFact: Fact { } + property Fact _editorDialogFact: Fact { } property int _rowHeight: ScreenTools.defaultFontPixelHeight * 2 property int _rowWidth: 10 // Dynamic adjusted at runtime property bool _searchFilter: false ///< true: showing results of search property var _searchResults ///< List of parameter names from search results property string _currentGroup: "" + property bool _showRCToParam: !ScreenTools.isMobile && multiVehicleManager.activeVehicle.px4Firmware ParameterEditorController { id: controller; @@ -133,11 +134,11 @@ QGCView { onTriggered: controller.saveToFile() visible: !ScreenTools.isMobile } - MenuSeparator { visible: !ScreenTools.isMobile } + MenuSeparator { visible: _showRCToParam } MenuItem { text: "Clear RC to Param" onTriggered: controller.clearRCToParam() - visible: !ScreenTools.isMobile + visible: _showRCToParam } } } @@ -314,7 +315,7 @@ QGCView { anchors.fill: parent acceptedButtons: Qt.LeftButton onClicked: { - __editorDialogFact = factRow.modelFact + _editorDialogFact = factRow.modelFact showDialog(editorDialogComponent, "Parameter Editor", qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Save) } } @@ -325,7 +326,11 @@ QGCView { Component { id: editorDialogComponent - ParameterEditorDialog { fact: __editorDialogFact } + + ParameterEditorDialog { + fact: _editorDialogFact + showRCToParam: _showRCToParam + } } Component { @@ -356,30 +361,6 @@ QGCView { width: ScreenTools.defaultFontPixelWidth * 20 } -/* - // Leaving in for possible future use. We'll see if needed from user comments. - QGCLabel { - id: searchInLabel - anchors.topMargin: defaultTextHeight - anchors.top: searchFor.bottom - text: "Search in:" - } - - QGCCheckBox { - id: searchInName - anchors.topMargin: defaultTextHeight / 3 - anchors.top: searchInLabel.bottom - text: "Name" - } - - QGCCheckBox { - id: searchInDescriptions - anchors.topMargin: defaultTextHeight / 3 - anchors.top: searchInName.bottom - text: "Descriptions" - } -*/ - QGCLabel { anchors.topMargin: defaultTextHeight anchors.top: searchFor.bottom diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index 56d95ebd6..30f5698b3 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -38,6 +38,7 @@ QGCViewDialog { id: root property Fact fact + property bool showRCToParam: false property bool validate: false property string validateValue @@ -185,7 +186,7 @@ QGCViewDialog { anchors.right: parent.right anchors.bottom: parent.bottom text: "Set RC to Param..." - visible: !validate && !ScreenTools.isMobile + visible: !validate && showRCToParam onClicked: controller.setRCToParam(fact.name) } } // QGCViewDialog -- 2.22.0