From 29b33453f36a6a362948c52f6a9cfb634f0e2f23 Mon Sep 17 00:00:00 2001
From: Philippe Renon <philippe_renon@yahoo.fr>
Date: Sat, 23 Apr 2016 18:35:18 +0200
Subject: [PATCH] LP-286 minor optimization: replace map contains+get with get

---
 .../src/plugins/uavobjectbrowser/treeitem.h   |  4 ++--
 .../uavobjectbrowserwidget.cpp                | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ground/gcs/src/plugins/uavobjectbrowser/treeitem.h b/ground/gcs/src/plugins/uavobjectbrowser/treeitem.h
index bd8504870..253ec041c 100644
--- a/ground/gcs/src/plugins/uavobjectbrowser/treeitem.h
+++ b/ground/gcs/src/plugins/uavobjectbrowser/treeitem.h
@@ -259,7 +259,7 @@ public:
 
     DataObjectTreeItem *findDataObjectTreeItemByObjectId(quint32 objectId)
     {
-        return m_objectTreeItemsPerObjectIds.contains(objectId) ? m_objectTreeItemsPerObjectIds[objectId] : 0;
+        return m_objectTreeItemsPerObjectIds.value(objectId, 0);
     }
 
     void addMetaObjectTreeItem(quint32 objectId, MetaObjectTreeItem *oti)
@@ -269,7 +269,7 @@ public:
 
     MetaObjectTreeItem *findMetaObjectTreeItemByObjectId(quint32 objectId)
     {
-        return m_metaObjectTreeItemsPerObjectIds.contains(objectId) ? m_metaObjectTreeItemsPerObjectIds[objectId] : 0;
+        return m_metaObjectTreeItemsPerObjectIds.value(objectId, 0);
     }
 
     QList<MetaObjectTreeItem *> getMetaObjectItems();
diff --git a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
index 9d13b2c40..beb314263 100644
--- a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
+++ b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
@@ -115,6 +115,7 @@ void UAVObjectBrowserWidget::setSplitterState(QByteArray state)
 
 void UAVObjectBrowserWidget::showMetaData(bool show)
 {
+    // TODO update the model directly instead of hiding rows...
     QList<QModelIndex> metaIndexes = m_model->getMetaDataIndexes();
     foreach(QModelIndex modelIndex, metaIndexes) {
         QModelIndex proxyModelIndex = m_modelProxy->mapFromSource(modelIndex);
@@ -130,6 +131,8 @@ void UAVObjectBrowserWidget::showDescription(bool show)
 
 void UAVObjectBrowserWidget::categorize(bool categorize)
 {
+    // TODO we should update the model instead of rebuilding it
+    // a side effect of rebuilding is that some state is lost (expand state, ...)
     UAVObjectTreeModel *model = new UAVObjectTreeModel(0, categorize, m_viewoptions->cbScientific->isChecked());
 
     model->setRecentlyUpdatedColor(m_recentlyUpdatedColor);
@@ -145,13 +148,16 @@ void UAVObjectBrowserWidget::categorize(bool categorize)
 
     showMetaData(m_viewoptions->cbMetaData->isChecked());
 
-    // FIXME this causes a collapse all if filter is on
-    searchLineChanged(m_browser->searchLine->text());
+    // force an expand all if search text is not empty
+    if (!m_browser->searchLine->text().isEmpty()) {
+        searchLineChanged(m_browser->searchLine->text());
+    }
 }
 
 void UAVObjectBrowserWidget::useScientificNotation(bool scientific)
 {
-    // TODO we should have the model update itself instead of rebuilding it
+    // TODO we should update the model instead of rebuilding it
+    // a side effect of rebuilding is that some state is lost (expand state, ...)
     UAVObjectTreeModel *model = new UAVObjectTreeModel(0, m_viewoptions->cbCategorized->isChecked(), scientific);
 
     model->setManuallyChangedColor(m_manuallyChangedColor);
@@ -165,14 +171,19 @@ void UAVObjectBrowserWidget::useScientificNotation(bool scientific)
 
     showMetaData(m_viewoptions->cbMetaData->isChecked());
 
-    // FIXME this causes a collapse all if filter is on
-    searchLineChanged(m_browser->searchLine->text());
+    // force an expand all if search text is not empty
+    if (!m_browser->searchLine->text().isEmpty()) {
+        searchLineChanged(m_browser->searchLine->text());
+    }
 }
 
 void UAVObjectBrowserWidget::sendUpdate()
 {
+    // TODO why steal focys ?
     this->setFocus();
+
     ObjectTreeItem *objItem = findCurrentObjectTreeItem();
+
     if (objItem != NULL) {
         objItem->apply();
         UAVObject *obj = objItem->object();
@@ -221,12 +232,15 @@ QString UAVObjectBrowserWidget::loadFileIntoString(QString fileName)
 
 void UAVObjectBrowserWidget::saveObject()
 {
+    // TODO why steal focys ?
     this->setFocus();
+
     // Send update so that the latest value is saved
     sendUpdate();
 
     // Save object
     ObjectTreeItem *objItem = findCurrentObjectTreeItem();
+
     if (objItem != NULL) {
         UAVObject *obj = objItem->object();
         Q_ASSERT(obj);