Merge branch 'next' into revo-next

ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp

@@ -50,15 +50,10 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
     m_config->setupUi(this);
 
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    addApplySaveButtons(m_config->saveRCOutputToRAM,m_config->saveRCOutputToSD);
-    addUAVObject("ActuatorSettings");
 
     UAVSettingsImportExportFactory * importexportplugin =  pm->getObject<UAVSettingsImportExportFactory>();
     connect(importexportplugin,SIGNAL(importAboutToBegin()),this,SLOT(stopTests()));
 
-    addApplySaveButtons(m_config->saveRCOutputToRAM,m_config->saveRCOutputToSD);
-        addUAVObject("ActuatorSettings");
-
     // NOTE: we have channel indices from 0 to 9, but the convention for OP is Channel 1 to Channel 10.
     // Register for ActuatorSettings changes:
     for (unsigned int i = 0; i < ActuatorCommand::CHANNEL_NUMELEM; i++)
@@ -73,23 +68,37 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
 
     connect(m_config->channelOutTest, SIGNAL(toggled(bool)), this, SLOT(runChannelTests(bool)));
 
-    refreshWidgetsValues();
 
     firstUpdate = true;
 
+    // Configure the task widget
     // Connect the help button
     connect(m_config->outputHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
+
+    // Add custom handling of displaying things
+    connect(this,SIGNAL(refreshWidgetsValuesRequested()), this, SLOT(refreshOutputWidgetsValues()));
+
+    addApplySaveButtons(m_config->saveRCOutputToRAM,m_config->saveRCOutputToSD);
+
+    // Track the ActuatorSettings object
+    addUAVObject("ActuatorSettings");
+
+    // Associate the buttons with their UAVO fields
     addWidget(m_config->cb_outputRate4);
     addWidget(m_config->cb_outputRate3);
     addWidget(m_config->cb_outputRate2);
     addWidget(m_config->cb_outputRate1);
     addWidget(m_config->spinningArmed);
 
+    disconnect(this, SLOT(refreshWidgetsValues(UAVObject*)));
+
     UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
     UAVObject* obj = objManager->getObject(QString("ActuatorCommand"));
     if(UAVObject::GetGcsTelemetryUpdateMode(obj->getMetadata()) == UAVObject::UPDATEMODE_ONCHANGE)
         this->setEnabled(false);
     connect(obj,SIGNAL(objectUpdated(UAVObject*)),this,SLOT(disableIfNotMe(UAVObject*)));
+
+    refreshWidgetsValues();
 }
 void ConfigOutputWidget::enableControls(bool enable)
 {
@@ -222,10 +231,8 @@ void ConfigOutputWidget::sendChannelTest(int index, int value)
 /**
   Request the current config from the board (RC Output)
   */
-void ConfigOutputWidget::refreshWidgetsValues(UAVObject *)
+void ConfigOutputWidget::refreshOutputWidgetsValues(UAVObject *)
 {
-    bool dirty=isDirty();
-
     // Reset all channel assignements:
     QList<OutputChannelForm*> outputChannelForms = findChildren<OutputChannelForm*>();
     foreach(OutputChannelForm *outputChannelForm, outputChannelForms)
@@ -318,8 +325,6 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *)
         int neutral = actuatorSettingsData.ChannelNeutral[outputChannelForm->index()];
         outputChannelForm->neutral(neutral);
     }
-
-    setDirty(dirty);
 }
 
 /**

ground/openpilotgcs/src/plugins/config/configoutputwidget.h

@@ -69,7 +69,7 @@ private:
 private slots:
         void stopTests();
         void disableIfNotMe(UAVObject *obj);
-        virtual void refreshWidgetsValues(UAVObject * obj = NULL);
+        void refreshOutputWidgetsValues(UAVObject * obj = NULL);
         void updateObjectsFromWidgets();
 	void runChannelTests(bool state);
         void sendChannelTest(int index, int value);

ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp

@@ -32,7 +32,7 @@
 /**
  * Constructor
  */
-ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent),isConnected(false),smartsave(NULL),dirty(false),outOfLimitsStyle("background-color: rgb(255, 0, 0);"),timeOut(NULL)
+ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent),isConnected(false),smartsave(NULL),dirty(false),outOfLimitsStyle("background-color: rgb(255, 0, 0);"),timeOut(NULL),allowWidgetUpdates(true)
 {
     pm = ExtensionSystem::PluginManager::instance();
     objManager = pm->getObject<UAVObjectManager>();
@@ -127,7 +127,7 @@ void ConfigTaskWidget::addUAVObjectToWidgetRelation(QString object, QString fiel
         Q_ASSERT(obj);
         objectUpdates.insert(obj,true);
         connect(obj, SIGNAL(objectUpdated(UAVObject*)),this, SLOT(objectUpdated(UAVObject*)));
-        connect(obj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(refreshWidgetsValues(UAVObject*)));
+        connect(obj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(refreshWidgetsValues(UAVObject*)), Qt::UniqueConnection);
     }
     if(!field.isEmpty() && obj)
         _field = obj->getField(QString(field));
@@ -258,6 +258,9 @@ void ConfigTaskWidget::populateWidgets()
  */
 void ConfigTaskWidget::refreshWidgetsValues(UAVObject * obj)
 {
+    if (!allowWidgetUpdates)
+        return;
+
     bool dirtyBack=dirty;
     emit refreshWidgetsValuesRequested();
     foreach(objectToWidget * ow,objOfInterest)
@@ -452,10 +455,10 @@ bool ConfigTaskWidget::isDirty()
  */
 void ConfigTaskWidget::disableObjUpdates()
 {
+    allowWidgetUpdates = false;
     foreach(objectToWidget * obj,objOfInterest)
     {
-        if(obj->object)
+        if(obj->object)disconnect(obj->object, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(refreshWidgetsValues(UAVObject*)));
-            disconnect(obj->object, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(refreshWidgetsValues()));
     }
 }
 /**
@@ -463,10 +466,11 @@ void ConfigTaskWidget::disableObjUpdates()
  */
 void ConfigTaskWidget::enableObjUpdates()
 {
+    allowWidgetUpdates = true;
     foreach(objectToWidget * obj,objOfInterest)
     {
         if(obj->object)
-            connect(obj->object, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(refreshWidgetsValues(UAVObject*)));
+            connect(obj->object, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(refreshWidgetsValues(UAVObject*)), Qt::UniqueConnection);
     }
 }
 /**

ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h

@@ -145,6 +145,7 @@ private slots:
     void reloadButtonClicked();
 private:
     bool isConnected;
+    bool allowWidgetUpdates;
     QStringList objectsList;
     QList <objectToWidget*> objOfInterest;
     ExtensionSystem::PluginManager *pm;