pass along important data model signals via param mgr

src/uas/QGCUASParamManager.cc

@@ -40,6 +40,15 @@ void QGCUASParamManager::connectToModelAndComms()
 
     connect(paramCommsMgr, SIGNAL(parameterListUpToDate()),
             this, SIGNAL(parameterListUpToDate()));
+
+    // Pass along data model updates
+    connect(&paramDataModel, SIGNAL(parameterUpdated(int, QString , QVariant )),
+            this, SIGNAL(parameterUpdated(int, QString , QVariant )));
+
+    connect(&paramDataModel, SIGNAL(pendingParamUpdate(int , const QString& , QVariant , bool )),
+            this, SIGNAL(pendingParamUpdate(int , const QString& , QVariant , bool )));
+
+
 }
 
 

src/uas/QGCUASParamManager.h

@@ -72,6 +72,12 @@ signals:
     /** @brief We have received a complete list of all parameters onboard the MAV */
     void parameterListUpToDate();
 
+    /** @brief We've received an update of a parameter's value */
+    void parameterUpdated(int compId, QString paramName, QVariant value);
+
+    /** @brief Notifies listeners that a param was added to or removed from the pending list */
+    void pendingParamUpdate(int compId, const QString& paramName, QVariant value, bool isPending);
+
 
 
 public slots:

src/ui/QGCBaseParamWidget.cc

@@ -53,10 +53,10 @@ void QGCBaseParamWidget::connectToParamManager()
     paramMgr = mav->getParamManager();
     //TODO route via paramManager instead?
     // Listen to updated param signals from the data model
-    connect(paramMgr->dataModel(), SIGNAL(parameterUpdated(int, QString , QVariant )),
+    connect(paramMgr, SIGNAL(parameterUpdated(int, QString , QVariant )),
             this, SLOT(handleOnboardParamUpdate(int,QString,QVariant)));
 
-    connect(paramMgr->dataModel(), SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
+    connect(paramMgr, SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
             this, SLOT(handlePendingParamUpdate(int , const QString& ,  QVariant, bool )));
 
     // Listen for param list reload finished
@@ -71,10 +71,10 @@ void QGCBaseParamWidget::connectToParamManager()
 
 void QGCBaseParamWidget::disconnectFromParamManager()
 {
-    disconnect(paramMgr->dataModel(), SIGNAL(parameterUpdated(int, QString , QVariant )),
+    disconnect(paramMgr, SIGNAL(parameterUpdated(int, QString , QVariant )),
             this, SLOT(handleOnboardParamUpdate(int,QString,QVariant)));
 
-    disconnect(paramMgr->dataModel(), SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
+    disconnect(paramMgr, SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
             this, SLOT(handlePendingParamUpdate(int , const QString& ,  QVariant, bool )));
 
     disconnect(paramMgr, SIGNAL(parameterListUpToDate()),

src/ui/QGCPendingParamWidget.cc

@@ -16,9 +16,9 @@ QGCPendingParamWidget::QGCPendingParamWidget(QObject *parent) :
 void QGCPendingParamWidget::connectToParamManager()
 {
     paramMgr = mav->getParamManager();
-    //TODO route via paramManager instead?
+
     // Listen to updated param signals from the data model
-    connect(paramMgr->dataModel(), SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
+    connect(paramMgr, SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
             this, SLOT(handlePendingParamUpdate(int , const QString& ,  QVariant, bool )));
 
     // Listen to communications status messages so we can display them
@@ -29,9 +29,8 @@ void QGCPendingParamWidget::connectToParamManager()
 
 void QGCPendingParamWidget::disconnectFromParamManager()
 {
-    //TODO route via paramManager instead?
     // Listen to updated param signals from the data model
-    disconnect(paramMgr->dataModel(), SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
+    disconnect(paramMgr, SIGNAL(pendingParamUpdate(int , const QString&, QVariant , bool )),
             this, SLOT(handlePendingParamUpdate(int , const QString& ,  QVariant, bool )));
 
     // Listen to communications status messages so we can display them
@@ -76,7 +75,14 @@ void QGCPendingParamWidget::handlePendingParamUpdate(int compId, const QString&
     }
     else {
         //we don't display non-pending items
-        paramItem->parent()->removeChild(paramItem);
+        QTreeWidgetItem* parentItem = paramItem->parent();
+
+        if (NULL != parentItem && 1 == parentItem->childCount()) {
+            parentItem->parent()->removeChild(parentItem);
+        }
+        else {
+            paramItem->parent()->removeChild(paramItem);
+        }
     }
 
     updatingParamNameLock.clear();