From d74a19ce0098f7ace35423535b2dd9476d0059d9 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sat, 6 Dec 2014 20:55:16 -0800
Subject: [PATCH] Don't request parameter list unless user requested

Also only update the full tree one time once the full parameter list is
ready.
---
 src/ui/QGCBaseParamWidget.cc |  5 +++--
 src/ui/QGCParamWidget.cc     | 11 +++++++++--
 src/ui/QGCParamWidget.h      |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/ui/QGCBaseParamWidget.cc b/src/ui/QGCBaseParamWidget.cc
index eda71c278..35e868518 100644
--- a/src/ui/QGCBaseParamWidget.cc
+++ b/src/ui/QGCBaseParamWidget.cc
@@ -40,8 +40,6 @@ void QGCBaseParamWidget::setUAS(UASInterface* uas)
             connectToParamManager();
             connectViewSignalsAndSlots();
             layoutWidget();
-
-            paramMgr->requestParameterListIfEmpty();
         }
     }
 
@@ -62,6 +60,9 @@ void QGCBaseParamWidget::connectToParamManager()
     // Listen for param list reload finished
     connect(paramMgr, SIGNAL(parameterListUpToDate()),
             this, SLOT(handleOnboardParameterListUpToDate()));
+    if (paramMgr->parametersReady()) {
+        handleOnboardParameterListUpToDate();
+    }
 
     // Listen to communications status messages so we can display them
     connect(paramMgr, SIGNAL(parameterStatusMsgUpdated(QString,int)),
diff --git a/src/ui/QGCParamWidget.cc b/src/ui/QGCParamWidget.cc
index a99572650..d0ab5349a 100644
--- a/src/ui/QGCParamWidget.cc
+++ b/src/ui/QGCParamWidget.cc
@@ -51,7 +51,8 @@ QGCParamWidget::QGCParamWidget(QWidget *parent) :
     QGCBaseParamWidget(parent),
     componentItems(new QMap<int, QTreeWidgetItem*>()),
     statusLabel(new QLabel(this)),
-    tree(new QTreeWidget(this))
+    tree(new QTreeWidget(this)),
+    _fullParamListLoaded(false)
 {
 
 
@@ -236,9 +237,15 @@ void QGCParamWidget::handleOnboardParamUpdate(int compId, const QString& paramNa
 
 void QGCParamWidget::handleOnboardParameterListUpToDate()
 {
+    // Don't load full param list more than once
+    if (_fullParamListLoaded) {
+        return;
+    }
+    
+    _fullParamListLoaded = true;
+    
     //turn off updates while we refresh the entire list
     tree->setUpdatesEnabled(false);
-    qDebug() << "WARN: LIST UPDATE";
 
     //rewrite the component item tree after receiving the full list
     QMap<int, QMap<QString, QVariant>*>::iterator i;
diff --git a/src/ui/QGCParamWidget.h b/src/ui/QGCParamWidget.h
index 5581c5f2c..5db5a6fd3 100644
--- a/src/ui/QGCParamWidget.h
+++ b/src/ui/QGCParamWidget.h
@@ -104,7 +104,9 @@ protected:
     QLabel* statusLabel; ///< User-facing parameter status label
     QTreeWidget* tree;   ///< The parameter tree
     QStringList _filterList;
-
+    
+private:
+    bool _fullParamListLoaded;
 };
 
 #endif // QGCPARAMWIDGET_H
-- 
2.22.0