Merge pull request #790 from openstudiocoalition/develop

Merge for 1.9.0 release

Author: macumber

CMakeLists.txt

@@ -272,7 +272,7 @@ endif()
 
 # TODO: Modify the more specific variables as needed to indicate prerelease, etc
 # Keep in beta in-between release cycles. Set to empty string (or comment out) for official)
-set(PROJECT_VERSION_PRERELEASE "rc1")
+set(PROJECT_VERSION_PRERELEASE "")
 
 # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
 set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

src/openstudio_lib/ModelObjectTypeListView.cpp

@@ -35,6 +35,7 @@ ModelObjectTypeListView::ModelObjectTypeListView(const std::vector<std::pair<Idd
        ++modelObjectTypeAndName) {
     addModelObjectType(modelObjectTypeAndName->first, modelObjectTypeAndName->second);
   }
+  selectFirstCollapsibleItem();
 }
 
 void ModelObjectTypeListView::addModelObjectType(const IddObjectType& iddObjectType, const std::string& name) {

src/openstudio_lib/OSCollapsibleItemList.cpp

@@ -113,6 +113,8 @@ void OSCollapsibleItemList::setItemsType(OSItemType type) {
 void OSCollapsibleItemList::addCollapsibleItem(OSCollapsibleItem* collapsibleItem) {
   OS_ASSERT(collapsibleItem);
 
+  m_collapsibleItems.push_back(collapsibleItem);
+
   collapsibleItem->setItemsDraggable(m_itemsDraggable);
 
   collapsibleItem->setItemsRemoveable(m_itemsRemoveable);
@@ -145,6 +147,13 @@ void OSCollapsibleItemList::addCollapsibleItem(OSCollapsibleItem* collapsibleIte
   connect(collapsibleItem, &OSCollapsibleItem::openLibDlgClicked, this, &OSCollapsibleItemList::openLibDlgClicked);
 }
 
+void OSCollapsibleItemList::selectFirstCollapsibleItem() {
+  if (!m_collapsibleItems.empty()) {
+    // items are added in order from bottom to top
+    m_collapsibleItems.back()->setSelected(true);
+  }
+}
+
 void OSCollapsibleItemList::addCategoryPlaceholderItem(OSCategoryPlaceholder* categoryPlaceholderItem) {
 
   m_placeholderItems.push_back(categoryPlaceholderItem);

src/openstudio_lib/OSCollapsibleItemList.hpp

@@ -32,6 +32,7 @@ class OSCollapsibleItemList : public OSItemSelector
 
   void addCollapsibleItem(OSCollapsibleItem* collapsibleItem);
   void addCategoryPlaceholderItem(OSCategoryPlaceholder* categoryPlaceholderItem);
+  void selectFirstCollapsibleItem();
 
   OSCollapsibleItem* selectedCollapsibleItem() const;