Merge pull request #1883 from DonLakeFlyer/ParamSearch

Paramedter Editor search support

QGCApplication.pro

@@ -335,7 +335,6 @@ HEADERS += \
     src/ui/WaypointViewOnlyView.h \
     src/ViewWidgets/CustomCommandWidget.h \
     src/ViewWidgets/CustomCommandWidgetController.h \
-    src/ViewWidgets/ParameterEditorWidget.h \
     src/ViewWidgets/ViewWidgetController.h \
     src/MissionItem.h \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.h
@@ -464,7 +463,6 @@ SOURCES += \
     src/ui/WaypointViewOnlyView.cc \
     src/ViewWidgets/CustomCommandWidget.cc \
     src/ViewWidgets/CustomCommandWidgetController.cc \
-    src/ViewWidgets/ParameterEditorWidget.cc \
     src/ViewWidgets/ViewWidgetController.cc \
     src/MissionItem.cc \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc

qgroundcontrol.qrc

@@ -110,7 +110,6 @@
         <file alias="SetupParameterEditor.qml">src/VehicleSetup/SetupParameterEditor.qml</file>
 
         <file alias="ScreenToolsFontQuery.qml">src/QmlControls/ScreenToolsFontQuery.qml</file>
-        <file alias="ParameterEditorWidget.qml">src/ViewWidgets/ParameterEditorWidget.qml</file>
         <file alias="CustomCommandWidget.qml">src/ViewWidgets/CustomCommandWidget.qml</file>
         <file alias="SafetyComponent.qml">src/AutoPilotPlugins/PX4/SafetyComponent.qml</file>
         <file alias="RadioComponent.qml">src/AutoPilotPlugins/PX4/RadioComponent.qml</file>

src/AutoPilotPlugins/AutoPilotPlugin.cc

@@ -157,9 +157,9 @@ Fact* AutoPilotPlugin::getFact(FactSystem::Provider_t provider, int componentId,
     return NULL;
 }
 
-QStringList AutoPilotPlugin::parameterNames(void)
+QStringList AutoPilotPlugin::parameterNames(int componentId)
 {
-	return _getParameterLoader()->parameterNames();
+	return _getParameterLoader()->parameterNames(componentId);
 }
 
 const QMap<int, QMap<QString, QStringList> >& AutoPilotPlugin::getGroupMap(void)

src/AutoPilotPlugins/AutoPilotPlugin.h

@@ -81,8 +81,7 @@ public:
     Q_INVOKABLE bool parameterExists(int componentId, const QString& name);
 	
 	/// Returns all parameter names
-	/// FIXME: component id missing, generic to fact
-	QStringList parameterNames(void);
+	QStringList parameterNames(int componentId);
 	
 	/// Returns the specified parameter Fact from the default component
 	/// WARNING: Returns a default Fact if parameter does not exists. If that possibility exists, check for existince first with

src/FactSystem/ParameterLoader.cc

@@ -388,11 +388,11 @@ Fact* ParameterLoader::getFact(int componentId, const QString& name)
     return _mapParameterName2Variant[componentId][name].value<Fact*>();
 }
 
-QStringList ParameterLoader::parameterNames(void)
+QStringList ParameterLoader::parameterNames(int componentId)
 {
 	QStringList names;
 	
-	foreach(QString paramName, _mapParameterName2Variant[_defaultComponentId].keys()) {
+	foreach(QString paramName, _mapParameterName2Variant[_actualComponentId(componentId)].keys()) {
 		names << paramName;
 	}
 	

src/FactSystem/ParameterLoader.h

@@ -69,8 +69,7 @@ public:
 						 const QString& name);          ///< fact name
 	
 	/// Returns all parameter names
-	/// FIXME: component id missing
-	QStringList parameterNames(void);
+	QStringList parameterNames(int componentId);
     
     /// Returns the specified Fact.
     /// WARNING: Will assert if parameter does not exists. If that possibily exists, check for existince first with

src/QmlControls/ParameterEditorController.cc

@@ -53,13 +53,35 @@ QStringList ParameterEditorController::getGroupsForComponent(int componentId)
 	return groupMap[componentId].keys();
 }
 
-QStringList ParameterEditorController::getFactsForGroup(int componentId, QString group)
+QStringList ParameterEditorController::getParametersForGroup(int componentId, QString group)
 {
 	const QMap<int, QMap<QString, QStringList> >& groupMap = _autopilot->getGroupMap();
 	
 	return groupMap[componentId][group];
 }
 
+QStringList ParameterEditorController::searchParametersForComponent(int componentId, const QString& searchText, bool searchInName, bool searchInDescriptions)
+{
+    QStringList list;
+    
+    foreach(QString paramName, _autopilot->parameterNames(componentId)) {
+        if (searchText.isEmpty()) {
+            list += paramName;
+        } else {
+            Fact* fact = _autopilot->getParameterFact(componentId, paramName);
+            
+            if (searchInName && fact->name().contains(searchText, Qt::CaseInsensitive)) {
+                list += paramName;
+            } else if (searchInDescriptions && (fact->shortDescription().contains(searchText, Qt::CaseInsensitive) || fact->longDescription().contains(searchText, Qt::CaseInsensitive))) {
+                list += paramName;
+            }
+        }
+    }
+    list.sort();
+    
+    return list;
+}
+
 void ParameterEditorController::clearRCToParam(void)
 {
 	Q_ASSERT(_uas);

src/QmlControls/ParameterEditorController.h

@@ -45,7 +45,8 @@ public:
     Q_PROPERTY(QStringList componentIds MEMBER _componentIds CONSTANT)
 	
 	Q_INVOKABLE QStringList getGroupsForComponent(int componentId);
-	Q_INVOKABLE QStringList getFactsForGroup(int componentId, QString group);
+	Q_INVOKABLE QStringList getParametersForGroup(int componentId, QString group);
+    Q_INVOKABLE QStringList searchParametersForComponent(int componentId, const QString& searchText, bool searchInName, bool searchInDescriptions);
 	
 	Q_INVOKABLE void clearRCToParam(void);
 	Q_INVOKABLE void saveToFile(void);

src/QmlControls/QGCView.qml

@@ -106,6 +106,9 @@ FactPanel {
         } else if (buttons & StandardButton.Abort) {
             __rejectButton.text = "Abort"
             __rejectButton.visible = true
+        } else if (buttons & StandardButton.Reset) {
+            __rejectButton.text = "Reset"
+            __rejectButton.visible = true
         }
     }
 

src/VehicleSetup/SetupParameterEditor.qml

@@ -29,5 +29,5 @@ import QGroundControl.ScreenTools 1.0
 import QGroundControl.Palette 1.0
 
 ParameterEditor {
-    fullMode: true
+
 }

src/ViewWidgets/ParameterEditorWidget.cc

-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-This file is part of the QGROUNDCONTROL project
-
-    QGROUNDCONTROL is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QGROUNDCONTROL is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/**
- * @file
- *   @brief Definition of class ParameterEditorWidget
- *   @author Lorenz Meier <mavteam@student.ethz.ch>
- *
- */
-
-#include "ParameterEditorWidget.h"
-
-ParameterEditorWidget::ParameterEditorWidget(QWidget *parent) :
-    QGCQmlWidgetHolder(parent)
-{
-	setSource(QUrl::fromUserInput("qrc:/qml/ParameterEditorWidget.qml"));
-}

src/ViewWidgets/ParameterEditorWidget.h

-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-This file is part of the QGROUNDCONTROL project
-
-    QGROUNDCONTROL is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QGROUNDCONTROL is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/// @file
-///     @author Don Gagne <don@thegagnes.com>
-
-#ifndef PARAMETEREDITORWIDGET_H
-#define PARAMETEREDITORWIDGET_H
-
-#include "QGCQmlWidgetHolder.h"
-
-class ParameterEditorWidget : public QGCQmlWidgetHolder
-{
-    Q_OBJECT
-	
-public:
-    ParameterEditorWidget(QWidget *parent = 0);
-};
-
-#endif

src/ViewWidgets/ParameterEditorWidget.qml

-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-This file is part of the QGROUNDCONTROL project
-
-QGROUNDCONTROL is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-QGROUNDCONTROL is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/// @file
-///     @author Don Gagne <don@thegagnes.com>
-
-import QtQuick 2.2
-
-import QGroundControl.Palette 1.0
-import QGroundControl.Controls 1.0
-
-ViewWidget {
-	connectedComponent: editorComponent
-
-	Component {
-		id: editorComponent
-
-		ParameterEditor {
-			fullMode: false
-		}
-	}
-}

src/ui/MainWindow.cc

@@ -90,7 +90,6 @@ const char* MainWindow::_uasControlDockWidgetName = "UNMANNED_SYSTEM_CONTROL_DOC
 const char* MainWindow::_uasListDockWidgetName = "UNMANNED_SYSTEM_LIST_DOCKWIDGET";
 const char* MainWindow::_waypointsDockWidgetName = "WAYPOINT_LIST_DOCKWIDGET";
 const char* MainWindow::_mavlinkDockWidgetName = "MAVLINK_INSPECTOR_DOCKWIDGET";
-const char* MainWindow::_parametersDockWidgetName = "PARAMETER_INTERFACE_DOCKWIDGET";
 const char* MainWindow::_customCommandWidgetName = "CUSTOM_COMMAND_DOCKWIDGET";
 const char* MainWindow::_filesDockWidgetName = "FILE_VIEW_DOCKWIDGET";
 const char* MainWindow::_uasStatusDetailsDockWidgetName = "UAS_STATUS_DETAILS_DOCKWIDGET";
@@ -393,7 +392,6 @@ void MainWindow::_buildCommonWidgets(void)
         { _uasListDockWidgetName,           "Unmanned Systems",         Qt::RightDockWidgetArea },
         { _waypointsDockWidgetName,         "Mission Plan",             Qt::BottomDockWidgetArea },
         { _mavlinkDockWidgetName,           "MAVLink Inspector",        Qt::RightDockWidgetArea },
-        { _parametersDockWidgetName,        "Parameter Editor",			Qt::RightDockWidgetArea },
         { _customCommandWidgetName,         "Custom Command",			Qt::RightDockWidgetArea },
         { _filesDockWidgetName,             "Onboard Files",            Qt::RightDockWidgetArea },
         { _uasStatusDetailsDockWidgetName,  "Status Details",           Qt::RightDockWidgetArea },
@@ -497,8 +495,6 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
         widget = new QGCWaypointListMulti(this);
     } else if (widgetName == _mavlinkDockWidgetName) {
         widget = new QGCMAVLinkInspector(MAVLinkProtocol::instance(),this);
-    } else if (widgetName == _parametersDockWidgetName) {
-        widget = new ParameterEditorWidget(this);
     } else if (widgetName == _customCommandWidgetName) {
         widget = new CustomCommandWidget(this);
     } else if (widgetName == _filesDockWidgetName) {

src/ui/MainWindow.h

@@ -49,7 +49,6 @@ This file is part of the QGROUNDCONTROL project
 #if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
 #include "Mouse6dofInput.h"
 #endif // QGC_MOUSE_ENABLED_WIN
-#include "ParameterEditorWidget.h"
 #include "opmapcontrol.h"
 #include "MainToolBar.h"
 #include "LogCompressor.h"
@@ -291,7 +290,6 @@ private:
     static const char* _uasListDockWidgetName;
     static const char* _waypointsDockWidgetName;
     static const char* _mavlinkDockWidgetName;
-    static const char* _parametersDockWidgetName;
     static const char* _customCommandWidgetName;
     static const char* _filesDockWidgetName;
     static const char* _uasStatusDetailsDockWidgetName;