From 1ef1d53478d5ec4c7b2cfe0432534005542dca4d Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 10 Mar 2017 17:06:26 -0800 Subject: [PATCH] Fixes for using Vehicle Setup pages in core plugin --- .../PX4/PX4AutoPilotPlugin.cc | 2 +- src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h | 8 +++++--- src/AutoPilotPlugins/PX4/SafetyComponent.h | 20 +++++++++---------- src/AutoPilotPlugins/PX4/SensorsComponent.h | 18 ++++++++--------- src/VehicleSetup/SetupView.qml | 2 +- src/api/QGCCorePlugin.cc | 2 +- 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc index 3036a1576..2e68cdc22 100644 --- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc +++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc @@ -23,6 +23,7 @@ PX4AutoPilotPlugin::PX4AutoPilotPlugin(Vehicle* vehicle, QObject* parent) : AutoPilotPlugin(vehicle, parent) + , _incorrectParameterVersion(false) , _airframeComponent(NULL) , _radioComponent(NULL) , _esp8266Component(NULL) @@ -33,7 +34,6 @@ PX4AutoPilotPlugin::PX4AutoPilotPlugin(Vehicle* vehicle, QObject* parent) , _motorComponent(NULL) , _tuningComponent(NULL) , _mixersComponent(NULL) - , _incorrectParameterVersion(false) { Q_ASSERT(vehicle); diff --git a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h index e5f0efa6c..428ffa2dd 100644 --- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h +++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h @@ -41,8 +41,8 @@ public: ~PX4AutoPilotPlugin(); // Overrides from AutoPilotPlugin - const QVariantList& vehicleComponents(void) final; - void parametersReadyPreChecks(void) final; + const QVariantList& vehicleComponents(void) override; + void parametersReadyPreChecks(void) override; // These methods should only be used by objects within the plugin AirframeComponent* airframeComponent(void) { return _airframeComponent; } @@ -57,6 +57,9 @@ public: PX4TuningComponent* tuningComponent(void) { return _tuningComponent; } MixersComponent* mixersComponent(void) { return _mixersComponent; } +protected: + bool _incorrectParameterVersion; ///< true: parameter version incorrect, setup not allowed + private: PX4AirframeLoader* _airframeFacts; QVariantList _components; @@ -71,7 +74,6 @@ private: MotorComponent* _motorComponent; PX4TuningComponent* _tuningComponent; MixersComponent* _mixersComponent; - bool _incorrectParameterVersion; ///< true: parameter version incorrect, setup not allowed }; #endif diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.h b/src/AutoPilotPlugins/PX4/SafetyComponent.h index 3a7ae0319..aeb521b61 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.h +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.h @@ -26,18 +26,18 @@ public: SafetyComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from VehicleComponent - QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const override; // Virtuals from VehicleComponent - QString name(void) const final; - QString description(void) const final; - QString iconResource(void) const final; - bool requiresSetup(void) const final; - bool setupComplete(void) const final; - QUrl setupSource(void) const final; - QUrl summaryQmlSource(void) const final; - QString prerequisiteSetup(void) const final; - bool allowSetupWhileArmed(void) const final { return true; } + QString name(void) const override; + QString description(void) const override; + QString iconResource(void) const override; + bool requiresSetup(void) const override; + bool setupComplete(void) const override; + QUrl setupSource(void) const override; + QUrl summaryQmlSource(void) const override; + QString prerequisiteSetup(void) const override; + bool allowSetupWhileArmed(void) const override { return true; } private: const QString _name; diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.h b/src/AutoPilotPlugins/PX4/SensorsComponent.h index 7525420bd..b2319eec6 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.h +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.h @@ -25,17 +25,17 @@ public: SensorsComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from VehicleComponent - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const override; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + virtual QString name(void) const override; + virtual QString description(void) const override; + virtual QString iconResource(void) const override; + virtual bool requiresSetup(void) const override; + virtual bool setupComplete(void) const override; + virtual QUrl setupSource(void) const override; + virtual QUrl summaryQmlSource(void) const override; + virtual QString prerequisiteSetup(void) const override; private: const QString _name; diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml index 2680b4570..9a71e646c 100644 --- a/src/VehicleSetup/SetupView.qml +++ b/src/VehicleSetup/SetupView.qml @@ -307,7 +307,7 @@ Rectangle { SubMenuButton { setupIndicator: false exclusiveGroup: setupButtonGroup - visible: QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable + visible: QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable && QGroundControl.corePlugin.showAdvancedUI text: "Parameters" Layout.fillWidth: true diff --git a/src/api/QGCCorePlugin.cc b/src/api/QGCCorePlugin.cc index 02100348e..d38bfb82b 100644 --- a/src/api/QGCCorePlugin.cc +++ b/src/api/QGCCorePlugin.cc @@ -82,7 +82,7 @@ QGCCorePlugin::~QGCCorePlugin() QGCCorePlugin::QGCCorePlugin(QGCApplication *app) : QGCTool(app) , _showTouchAreas(false) - , _showAdvancedUI(false) + , _showAdvancedUI(true) { _p = new QGCCorePlugin_p; } -- 2.22.0