commit

QGCApplication.pro

@@ -548,7 +548,8 @@ SOURCES += \
 #
 
 INCLUDEPATH += \
-    src/VehicleSetup
+    src/VehicleSetup \
+    src/AutoPilotPlugins/PX4 \
 
 FORMS += \
     src/VehicleSetup/SetupView.ui \

src/AutoPilotPlugins/PX4/AirframeComponentController.cc

@@ -38,14 +38,10 @@
 bool AirframeComponentController::_typesRegistered = false;
 
 AirframeComponentController::AirframeComponentController(void) :
-    _uas(NULL),
     _currentVehicleIndex(0),
     _autostartId(0),
     _showCustomConfigPanel(false)
 {
-    _uas = UASManager::instance()->getActiveUAS();
-    Q_ASSERT(_uas);
-
     if (!_typesRegistered) {
         _typesRegistered = true;
         qmlRegisterUncreatableType<AirframeType>("QGroundControl.Controllers", 1, 0, "AiframeType", "Can only reference AirframeType");

src/AutoPilotPlugins/PX4/AirframeComponentController.h

@@ -66,7 +66,6 @@ signals:
 private:
     static bool _typesRegistered;
     
-    UASInterface*       _uas;
     QVariantList        _airframeTypes;
     QString             _currentAirframeType;
     QString             _currentVehicleName;

src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc

@@ -75,9 +75,6 @@ PX4AutoPilotPlugin::PX4AutoPilotPlugin(UASInterface* uas, QObject* parent) :
 {
     Q_ASSERT(uas);
     
-    qmlRegisterType<FlightModesComponentController>("QGroundControl.Controllers", 1, 0, "FlightModesComponentController");
-    qmlRegisterType<AirframeComponentController>("QGroundControl.Controllers", 1, 0, "AirframeComponentController");
-    
     _parameterFacts = new PX4ParameterLoader(this, uas, this);
     Q_CHECK_PTR(_parameterFacts);
     

src/AutoPilotPlugins/PX4/SensorsComponent.cc

@@ -110,11 +110,7 @@ QWidget* SensorsComponent::setupWidget(void) const
     QGCQmlWidgetHolder* holder = new QGCQmlWidgetHolder();
     Q_CHECK_PTR(holder);
     
-    holder->setAutoPilot(_autopilot);
-    
-    SensorsComponentController* controller = new SensorsComponentController(_autopilot, holder);
-    holder->setContextPropertyObject("controller", controller);
-    
+    holder->setAutoPilot(_autopilot);    
     holder->setSource(QUrl::fromUserInput("qrc:/qml/SensorsComponent.qml"));
     
     return holder;

src/AutoPilotPlugins/PX4/SensorsComponentController.cc

@@ -32,8 +32,7 @@
 #include <QVariant>
 #include <QQmlProperty>
 
-SensorsComponentController::SensorsComponentController(AutoPilotPlugin* autopilot, QObject* parent) :
-    QObject(parent),
+SensorsComponentController::SensorsComponentController(void) :
     _statusLog(NULL),
     _progressBar(NULL),
     _compassButton(NULL),
@@ -67,15 +66,8 @@ SensorsComponentController::SensorsComponentController(AutoPilotPlugin* autopilo
     _orientationCalLeftSideRotate(false),
     _orientationCalNoseDownSideRotate(false),
     _unknownFirmwareVersion(false),
-    _waitingForCancel(false),
-    _autopilot(autopilot)
+    _waitingForCancel(false)
 {
-    Q_ASSERT(_autopilot);
-    Q_ASSERT(_autopilot->pluginReady());
-    
-    _uas = _autopilot->uas();
-    Q_ASSERT(_uas);
-    
     // Mag rotation parameters are optional
     _showCompass0 = _autopilot->parameterExists("CAL_MAG0_ROT") &&
                         _autopilot->getParameterFact("CAL_MAG0_ROT")->value().toInt() >= 0;

src/AutoPilotPlugins/PX4/SensorsComponentController.h

@@ -31,15 +31,15 @@
 #include <QQuickItem>
 
 #include "UASInterface.h"
-#include "AutoPilotPlugin.h"
+#include "FactPanelController.h"
 
 /// Sensors Component MVC Controller for SensorsComponent.qml.
-class SensorsComponentController : public QObject
+class SensorsComponentController : public FactPanelController
 {
     Q_OBJECT
     
 public:
-    SensorsComponentController(AutoPilotPlugin* autopilot, QObject* parent = NULL);
+    SensorsComponentController(void);
     
     Q_PROPERTY(bool fixedWing READ fixedWing CONSTANT)
     
@@ -167,9 +167,6 @@ private:
     
     bool _unknownFirmwareVersion;
     bool _waitingForCancel;
-    
-    AutoPilotPlugin*    _autopilot;
-    UASInterface*       _uas;
 };
 
 #endif

src/FactSystem/FactControls/FactPanel.qml

@@ -31,7 +31,11 @@ import QGroundControl.FactSystem 1.0
 import QGroundControl.Controls 1.0
 import QGroundControl.Palette 1.0
 
-Item {
+Rectangle {
+    color: __qgcPal.window
+
+    QGCPalette { id: __qgcPal; colorGroupEnabled: true }
+
     property string __missingFacts: ""
 
     function showMissingFactOverlay(missingFactName) {
@@ -43,8 +47,6 @@ Item {
     }
 
     Rectangle {
-        QGCPalette { id: __qgcPal; colorGroupEnabled: true }
-
         id:             __missingFactOverlay
         anchors.fill:   parent
         z:              9999

src/FactSystem/FactControls/FactPanelController.cc

@@ -33,10 +33,10 @@ FactPanelController::FactPanelController(void) :
 	_autopilot(NULL),
     _factPanel(NULL)
 {
-    UASInterface* uas = UASManager::instance()->getActiveUAS();
-    Q_ASSERT(uas);
+    _uas = UASManager::instance()->getActiveUAS();
+    Q_ASSERT(_uas);
     
-    _autopilot = AutoPilotPluginManager::instance()->getInstanceForAutoPilotPlugin(uas);
+    _autopilot = AutoPilotPluginManager::instance()->getInstanceForAutoPilotPlugin(_uas);
     Q_ASSERT(_autopilot);
     Q_ASSERT(_autopilot->pluginReady());
     

src/FactSystem/FactControls/FactPanelController.h

@@ -56,6 +56,7 @@ protected:
     /// Report a missing fact to the FactPanel Qml element
     void _reportMissingFact(const QString& missingFact);
     
+    UASInterface*       _uas;
 	AutoPilotPlugin*    _autopilot;
     
 private slots:

src/QGCApplication.cc

@@ -62,6 +62,9 @@
 #include "ViewWidgetController.h"
 #include "ParameterEditorController.h"
 #include "CustomCommandWidgetController.h"
+#include "FlightModesComponentController.h"
+#include "AirframeComponentController.h"
+#include "SensorsComponentController.h"
 
 #include "ScreenTools.h"
 #include "MavManager.h"
@@ -310,13 +313,20 @@ void QGCApplication::_initCommon(void)
     // setFont(fontDatabase.font(fontFamilyName, "Roman", 12));
     
     // Register our Qml objects
+    
     qmlRegisterType<QGCPalette>("QGroundControl.Palette", 1, 0, "QGCPalette");
+    
 	qmlRegisterType<ViewWidgetController>("QGroundControl.Controllers", 1, 0, "ViewWidgetController");
 	qmlRegisterType<ParameterEditorController>("QGroundControl.Controllers", 1, 0, "ParameterEditorController");
     qmlRegisterType<CustomCommandWidgetController>("QGroundControl.Controllers", 1, 0, "CustomCommandWidgetController");
+    qmlRegisterType<FlightModesComponentController>("QGroundControl.Controllers", 1, 0, "FlightModesComponentController");
+    qmlRegisterType<AirframeComponentController>("QGroundControl.Controllers", 1, 0, "AirframeComponentController");
+    qmlRegisterType<SensorsComponentController>("QGroundControl.Controllers", 1, 0, "SensorsComponentController");
+    
     //-- Create QML Singleton Interfaces
     qmlRegisterSingletonType<ScreenTools>("QGroundControl.ScreenTools", 1, 0, "ScreenTools", screenToolsSingletonFactory);
     qmlRegisterSingletonType<MavManager>("QGroundControl.MavManager", 1, 0, "MavManager", mavManagerSingletonFactory);
+    
     //-- Register Waypoint Interface
     qmlRegisterInterface<Waypoint>("Waypoint");
 }

src/QmlControls/QGCViewDialog.qml

@@ -30,8 +30,11 @@ import QtQuick.Controls 1.3
 import QGroundControl.Controls 1.0
 import QGroundControl.Palette 1.0
 
-Rectangle {
-    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
+import QGroundControl.FactSystem 1.0
+import QGroundControl.FactControls 1.0
+
+FactPanel {
+    QGCPalette { id: __qgcPal; colorGroupEnabled: enabled }
 
     signal hideDialog
 
@@ -43,5 +46,5 @@ Rectangle {
         hideDialog()
     }
 
-    color: qgcPal.windowShadeDark
+    color: __qgcPal.windowShadeDark
 }

src/QmlControls/QGCViewPanel.qml

@@ -30,12 +30,15 @@ import QtQuick.Controls 1.3
 import QGroundControl.Palette 1.0
 import QGroundControl.Controls 1.0
 
-Rectangle {
-    property QGCPalette qgcPal: QGCPalette { colorGroupEnabled: enabled }
+import QGroundControl.FactSystem 1.0
+import QGroundControl.FactControls 1.0
+
+FactPanel {
+    QGCPalette { id: __qgcPal; colorGroupEnabled: enabled }
 
     signal showDialog(Component component, string title, int charWidth, int buttons)
     signal hideDialog
     signal showMessage(string title, string message, int buttons)
 
-    color: qgcPal.window
+    color: __qgcPal.window
 }