From f862388b6916366c1fa8bbc402a60cd17b40d957 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 15 Mar 2017 13:33:13 -0700 Subject: [PATCH] Fix problems with core plugin virtually --- src/api/QGCCorePlugin.h | 7 +++++-- src/api/QGCOptions.h | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/api/QGCCorePlugin.h b/src/api/QGCCorePlugin.h index 2786978e3..d932e04b6 100644 --- a/src/api/QGCCorePlugin.h +++ b/src/api/QGCCorePlugin.h @@ -37,8 +37,8 @@ public: Q_PROPERTY(int defaultSettings READ defaultSettings CONSTANT) Q_PROPERTY(QGCOptions* options READ options CONSTANT) - Q_PROPERTY(bool showTouchAreas MEMBER _showTouchAreas NOTIFY showTouchAreasChanged) - Q_PROPERTY(bool showAdvancedUI MEMBER _showAdvancedUI NOTIFY showAdvancedUIChanged) + Q_PROPERTY(bool showTouchAreas READ showTouchAreas NOTIFY showTouchAreasChanged) + Q_PROPERTY(bool showAdvancedUI READ showAdvancedUI NOTIFY showAdvancedUIChanged) Q_PROPERTY(QString brandImageIndoor READ brandImageIndoor CONSTANT) Q_PROPERTY(QString brandImageOutdoor READ brandImageIndoor CONSTANT) @@ -71,6 +71,9 @@ public: /// Return the resource file which contains the brand image for for Outdoor theme. virtual QString brandImageOutdoor(void) const { return QString(); } + bool showTouchAreas(void) { return _showTouchAreas; } + bool showAdvancedUI(void) { return _showAdvancedUI; } + // Override from QGCTool void setToolbox (QGCToolbox *toolbox); diff --git a/src/api/QGCOptions.h b/src/api/QGCOptions.h index 9c5b54600..1a41a0ee5 100644 --- a/src/api/QGCOptions.h +++ b/src/api/QGCOptions.h @@ -52,12 +52,12 @@ public: virtual CustomInstrumentWidget* instrumentWidget(); /// By returning false you can hide the following sensor calibration pages - bool showSensorCalibrationCompass () const { return true; } - bool showSensorCalibrationGyro () const { return true; } - bool showSensorCalibrationAccel () const { return true; } - bool showSensorCalibrationLevel () const { return true; } - bool showSensorCalibrationAirspeed () const { return true; } - bool showSensorCalibrationOrient () const { return true; } + virtual bool showSensorCalibrationCompass () const { return true; } + virtual bool showSensorCalibrationGyro () const { return true; } + virtual bool showSensorCalibrationAccel () const { return true; } + virtual bool showSensorCalibrationLevel () const { return true; } + virtual bool showSensorCalibrationAirspeed () const { return true; } + virtual bool showSensorCalibrationOrient () const { return true; } signals: void showSensorCalibrationCompassChanged (bool show); -- 2.22.0