Skip to content

Commit

Permalink
[#81725284] Do not allow main vertical tabs to be duplicated via Appl…
Browse files Browse the repository at this point in the history
…yMeasureNow.
  • Loading branch information
evanweaver committed Oct 29, 2014
1 parent b11ae95 commit 0c740ef
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion openstudiocore/src/openstudio_lib/OSDocument.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,10 @@ void OSDocument::setModel(const model::Model& model, bool modified, bool saveCur
// DLM: this might work to reload weather file if changed?
this->setFullWeatherFilePath();

createTabButtons();
if (!m_tabButtonsCreated) {
m_tabButtonsCreated = true;
createTabButtons();
}
createTab(m_verticalId);

QTimer::singleShot(0, this, SLOT(initializeModel()));
Expand Down
2 changes: 2 additions & 0 deletions openstudiocore/src/openstudio_lib/OSDocument.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,8 @@ class OPENSTUDIO_API OSDocument : public OSQObjectController {
std::vector<int> m_subTabIds;

bool m_enableTabsAfterRun = true;

bool m_tabButtonsCreated = false;
};

} // openstudio
Expand Down

5 comments on commit 0c740ef

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (evanweaver) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2126 of 2146 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (evanweaver) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (evanweaver) - x86_64-MacOS-10.9-clang: OK (2127 of 2146 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (evanweaver) - i386-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (evanweaver) - i386-Windows-7-VisualStudio-12: OK (2130 of 2146 tests passed)

Build Badge Test Badge

Please sign in to comment.