Add search bar to OSCollapsibleItemList

src/openstudio_lib/ApplyMeasureNowDialog.hpp

@@ -32,7 +32,6 @@
 
 #include "../shared_gui_components/HeaderViews.hpp"
 #include "../shared_gui_components/OSDialog.hpp"
-#include "../shared_gui_components/OSListView.hpp"
 
 #include <openstudio/model/Model.hpp>
 

src/openstudio_lib/OSCollapsibleItemList.cpp

@@ -36,6 +36,7 @@
 #include <openstudio/utilities/core/Assert.hpp>
 
 #include <QHBoxLayout>
+#include <QLineEdit>
 #include <QPainter>
 #include <QPushButton>
 #include <QResizeEvent>
@@ -50,6 +51,7 @@ OSCollapsibleItemList::OSCollapsibleItemList(bool addScrollArea, QWidget* parent
     m_vLayout(nullptr),
     m_contentLayout(nullptr),
     m_selectedCollapsibleItem(nullptr),
+    m_searchActive(false),
     m_itemsDraggable(false),
     m_itemsRemoveable(false),
     m_itemsType(OSItemType::ListItem) {
@@ -59,6 +61,11 @@ OSCollapsibleItemList::OSCollapsibleItemList(bool addScrollArea, QWidget* parent
   outerVLayout->setContentsMargins(0, 0, 0, 0);
   this->setLayout(outerVLayout);
 
+  m_searchBox = new QLineEdit();
+  m_searchBox->setClearButtonEnabled(true);
+  outerVLayout->addWidget(m_searchBox);
+  connect(m_searchBox, &QLineEdit::textEdited, this, &OSCollapsibleItemList::onSearchTextEdited);
+
   auto* outerWidget = new QWidget();
 
   if (addScrollArea) {
@@ -158,18 +165,11 @@ void OSCollapsibleItemList::addCollapsibleItem(OSCollapsibleItem* collapsibleIte
   connect(collapsibleItem, &OSCollapsibleItem::selectionCleared, this, &OSCollapsibleItemList::selectionCleared);
 
   connect(collapsibleItem, &OSCollapsibleItem::openLibDlgClicked, this, &OSCollapsibleItemList::openLibDlgClicked);
-
-  if (!selectedItem()) {
-    collapsibleItem->itemList()->selectItem(collapsibleItem->itemList()->firstItem());
-  }
-
-  collapsibleItem->setSelected(true);
 }
 
 void OSCollapsibleItemList::onCollapsableItemSelected(OSCollapsibleItem* selectedItem) {
   QLayoutItem* layoutItem = nullptr;
   OSCollapsibleItem* collapsibleItem = nullptr;
-  OSItem* newSelectedItem = nullptr;
 
   for (int i = 0; i < m_vLayout->count(); ++i) {
 
@@ -181,18 +181,21 @@ void OSCollapsibleItemList::onCollapsableItemSelected(OSCollapsibleItem* selecte
       if (collapsibleItem == selectedItem) {
 
         if (m_selectedCollapsibleItem != collapsibleItem) {
-          // select new item
+          // no need to select collapsibleItem since it is already selected
+          // expand collapsable item and select first item inside
           m_selectedCollapsibleItem = collapsibleItem;
           m_selectedCollapsibleItem->setExpanded(true);
-          newSelectedItem = m_selectedCollapsibleItem->itemList()->firstItem();
+          OSItem* newSelectedItem = m_selectedCollapsibleItem->itemList()->firstItem();
           m_selectedCollapsibleItem->itemList()->selectItem(newSelectedItem);
         }
 
       } else {
-        // deselect
+        // deselect other collapsable items
         collapsibleItem->setSelected(false);
-        collapsibleItem->setExpanded(false);
-        collapsibleItem->itemList()->clearSelection();
+        if (!m_searchActive) {
+          collapsibleItem->setExpanded(false);
+        }
+        //collapsibleItem->itemList()->clearSelection();
       }
     }
   }
@@ -212,14 +215,63 @@ void OSCollapsibleItemList::onItemSelected(OSItem* item) {
       std::vector<OSItem*> items = collapsibleItem->itemList()->items();
       if (std::find(items.begin(), items.end(), item) != items.end()) {
 
-        // select item
-        m_selectedCollapsibleItem = collapsibleItem;
-        m_selectedCollapsibleItem->setSelected(true);
+        if (m_selectedCollapsibleItem != collapsibleItem) {
+          // no need to select item since it is already selected
+          // expand collapsable item and select first item inside
+          m_selectedCollapsibleItem = collapsibleItem;
+          m_selectedCollapsibleItem->setSelected(true);
+          m_selectedCollapsibleItem->setExpanded(true);
+        }
 
       } else {
-        // deselect
+        // deselect other collapsable items
         collapsibleItem->setSelected(false);
-        collapsibleItem->itemList()->clearSelection();
+        if (!m_searchActive) {
+          collapsibleItem->setExpanded(false);
+        }
+        //collapsibleItem->itemList()->clearSelection();
+      }
+    }
+  }
+}
+
+void OSCollapsibleItemList::onSearchTextEdited(const QString& text) {
+  m_searchActive = !text.isEmpty();
+
+  OSItem* newSelectedItem = nullptr;
+  for (int i = 0; i < m_vLayout->count(); ++i) {
+
+    QLayoutItem* layoutItem = m_vLayout->itemAt(i);
+    QWidget* widget = layoutItem->widget();
+
+    OSCollapsibleItem* collapsibleItem = qobject_cast<OSCollapsibleItem*>(widget);
+    if (collapsibleItem) {
+      std::vector<OSItem*> items = collapsibleItem->itemList()->items();
+      unsigned numVisible = 0;
+      for (const auto& item : items) {
+        if (m_searchActive) {
+          if (item->text().contains(text, Qt::CaseInsensitive)) {
+            item->setVisible(true);
+            if (!newSelectedItem) {
+              newSelectedItem = item;
+              collapsibleItem->itemList()->selectItem(newSelectedItem);
+            }
+            ++numVisible;
+          } else {
+            item->setVisible(false);
+          }
+        } else {
+          item->setVisible(true);
+          ++numVisible;
+        }
+      }
+
+      if (!m_searchActive) {
+        collapsibleItem->setExpanded(collapsibleItem->isSelected());
+        collapsibleItem->setVisible(true);
+      } else {
+        collapsibleItem->setExpanded(numVisible > 0);
+        collapsibleItem->setVisible(numVisible > 0);
       }
     }
   }

src/openstudio_lib/OSCollapsibleItemList.hpp

@@ -35,6 +35,7 @@
 
 class QVBoxLayout;
 class QHBoxLayout;
+class QLineEdit;
 
 namespace openstudio {
 
@@ -77,14 +78,18 @@ class OSCollapsibleItemList : public OSItemSelector
 
   void onItemSelected(OSItem* item);
 
+  void onSearchTextEdited(const QString& text);
+
  protected:
   void paintEvent(QPaintEvent* event) override;
 
  private:
   QVBoxLayout* m_vLayout;
+  QLineEdit* m_searchBox;
   QHBoxLayout* m_contentLayout;
   OSCollapsibleItem* m_selectedCollapsibleItem;
   std::vector<OSCollapsibleItem*> m_collapsibleItems;
+  bool m_searchActive;
   bool m_itemsDraggable;
   bool m_itemsRemoveable;
   OSItemType m_itemsType;

src/openstudio_lib/RefrigerationGraphicsItems.hpp

@@ -34,7 +34,6 @@
 #include "OSItem.hpp"
 #include "OSDropZone.hpp"
 #include "../shared_gui_components/OSListController.hpp"
-#include "../shared_gui_components/OSListView.hpp"
 #include "../shared_gui_components/GraphicsItems.hpp"
 #include <openstudio/utilities/idf/Handle.hpp>
 

src/openstudio_lib/VRFGraphicsItems.hpp

@@ -34,7 +34,6 @@
 #include "OSItem.hpp"
 #include "OSDropZone.hpp"
 #include "../shared_gui_components/OSListController.hpp"
-#include "../shared_gui_components/OSListView.hpp"
 #include "../shared_gui_components/GraphicsItems.hpp"
 
 class QGraphicsView;