Skip to content

Commit da2618b

Browse files
authored
Merge pull request #788 from openstudiocoalition/issue_785
Fixes #785 by selecting the first idd object type
2 parents c3e8c04 + 1fdf1c8 commit da2618b

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

src/openstudio_lib/ModelObjectTypeListView.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ ModelObjectTypeListView::ModelObjectTypeListView(const std::vector<std::pair<Idd
3535
++modelObjectTypeAndName) {
3636
addModelObjectType(modelObjectTypeAndName->first, modelObjectTypeAndName->second);
3737
}
38+
selectFirstCollapsibleItem();
3839
}
3940

4041
void ModelObjectTypeListView::addModelObjectType(const IddObjectType& iddObjectType, const std::string& name) {

src/openstudio_lib/OSCollapsibleItemList.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ void OSCollapsibleItemList::setItemsType(OSItemType type) {
113113
void OSCollapsibleItemList::addCollapsibleItem(OSCollapsibleItem* collapsibleItem) {
114114
OS_ASSERT(collapsibleItem);
115115

116+
m_collapsibleItems.push_back(collapsibleItem);
117+
116118
collapsibleItem->setItemsDraggable(m_itemsDraggable);
117119

118120
collapsibleItem->setItemsRemoveable(m_itemsRemoveable);
@@ -145,6 +147,13 @@ void OSCollapsibleItemList::addCollapsibleItem(OSCollapsibleItem* collapsibleIte
145147
connect(collapsibleItem, &OSCollapsibleItem::openLibDlgClicked, this, &OSCollapsibleItemList::openLibDlgClicked);
146148
}
147149

150+
void OSCollapsibleItemList::selectFirstCollapsibleItem() {
151+
if (!m_collapsibleItems.empty()) {
152+
// items are added in order from bottom to top
153+
m_collapsibleItems.back()->setSelected(true);
154+
}
155+
}
156+
148157
void OSCollapsibleItemList::addCategoryPlaceholderItem(OSCategoryPlaceholder* categoryPlaceholderItem) {
149158

150159
m_placeholderItems.push_back(categoryPlaceholderItem);

src/openstudio_lib/OSCollapsibleItemList.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class OSCollapsibleItemList : public OSItemSelector
3232

3333
void addCollapsibleItem(OSCollapsibleItem* collapsibleItem);
3434
void addCategoryPlaceholderItem(OSCategoryPlaceholder* categoryPlaceholderItem);
35+
void selectFirstCollapsibleItem();
3536

3637
OSCollapsibleItem* selectedCollapsibleItem() const;
3738

0 commit comments

Comments
 (0)