From 09ff186bbefa0d05f1b9f1717271b172bf08efe6 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Sat, 1 Feb 2025 21:54:36 -0700 Subject: [PATCH 1/3] Fixes #785 by selecting the first idd object type of a model object type list view --- src/openstudio_lib/ModelObjectTypeListView.cpp | 1 + src/openstudio_lib/OSCollapsibleItemList.cpp | 9 +++++++++ src/openstudio_lib/OSCollapsibleItemList.hpp | 1 + 3 files changed, 11 insertions(+) diff --git a/src/openstudio_lib/ModelObjectTypeListView.cpp b/src/openstudio_lib/ModelObjectTypeListView.cpp index 292a3cab5..0132115ef 100644 --- a/src/openstudio_lib/ModelObjectTypeListView.cpp +++ b/src/openstudio_lib/ModelObjectTypeListView.cpp @@ -35,6 +35,7 @@ ModelObjectTypeListView::ModelObjectTypeListView(const std::vectorfirst, modelObjectTypeAndName->second); } + selectFirstCollapsibleItem(); } void ModelObjectTypeListView::addModelObjectType(const IddObjectType& iddObjectType, const std::string& name) { diff --git a/src/openstudio_lib/OSCollapsibleItemList.cpp b/src/openstudio_lib/OSCollapsibleItemList.cpp index d03653354..71f3a90e2 100644 --- a/src/openstudio_lib/OSCollapsibleItemList.cpp +++ b/src/openstudio_lib/OSCollapsibleItemList.cpp @@ -112,6 +112,8 @@ void OSCollapsibleItemList::setItemsType(OSItemType type) { void OSCollapsibleItemList::addCollapsibleItem(OSCollapsibleItem* collapsibleItem) { OS_ASSERT(collapsibleItem); + + m_collapsibleItems.push_back(collapsibleItem); collapsibleItem->setItemsDraggable(m_itemsDraggable); @@ -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); diff --git a/src/openstudio_lib/OSCollapsibleItemList.hpp b/src/openstudio_lib/OSCollapsibleItemList.hpp index 9ea3eb3e7..f1de26a99 100644 --- a/src/openstudio_lib/OSCollapsibleItemList.hpp +++ b/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; From 1fdf1c848efb86c2c12937a3b699bb42bd70565e Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Sat, 1 Feb 2025 22:13:22 -0700 Subject: [PATCH 2/3] Clang format --- src/openstudio_lib/OSCollapsibleItemList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openstudio_lib/OSCollapsibleItemList.cpp b/src/openstudio_lib/OSCollapsibleItemList.cpp index 71f3a90e2..63b4655a5 100644 --- a/src/openstudio_lib/OSCollapsibleItemList.cpp +++ b/src/openstudio_lib/OSCollapsibleItemList.cpp @@ -112,7 +112,7 @@ void OSCollapsibleItemList::setItemsType(OSItemType type) { void OSCollapsibleItemList::addCollapsibleItem(OSCollapsibleItem* collapsibleItem) { OS_ASSERT(collapsibleItem); - + m_collapsibleItems.push_back(collapsibleItem); collapsibleItem->setItemsDraggable(m_itemsDraggable); From f48695def834b7f960ff65eadc21bc46e292d666 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Thu, 6 Feb 2025 21:19:26 -0700 Subject: [PATCH 3/3] Remove pre-release --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e827969c2..6502d17fc 100644 --- a/CMakeLists.txt +++ b/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}")