Skip to content

Commit

Permalink
When you switch to SI units, the new schedule dialog still shows uppe…
Browse files Browse the repository at this point in the history
…r and lower limits in IP.

[#86121908]
  • Loading branch information
macumber committed Feb 5, 2015
1 parent 5018c7e commit 97638bb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
7 changes: 7 additions & 0 deletions openstudiocore/src/openstudio_lib/ScheduleDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ ScheduleDialog::ScheduleDialog(bool isIP,
createLayout();
}

void ScheduleDialog::setIsIP(bool isIP)
{
m_isIP = isIP;

onCurrentIndexChanged(m_scheduleTypeComboBox->currentIndex());
}

void ScheduleDialog::createLayout()
{
okButton()->setText("Apply");
Expand Down
2 changes: 2 additions & 0 deletions openstudiocore/src/openstudio_lib/ScheduleDialog.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class ScheduleDialog : public OSDialog

virtual ~ScheduleDialog() {}

void setIsIP(bool isIP);

private slots:

void onCurrentIndexChanged(int index);
Expand Down
4 changes: 4 additions & 0 deletions openstudiocore/src/openstudio_lib/SchedulesTabController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,10 @@ void SchedulesTabController::onItemDropped(const OSItemId& itemId)
void SchedulesTabController::toggleUnits(bool displayIP)
{
m_isIP = displayIP;

if (m_scheduleDialog){
m_scheduleDialog->setIsIP(displayIP);
}
}

double SchedulesTabController::defaultStartingValue(const model::ScheduleDay& scheduleDay) {
Expand Down

2 comments on commit 97638bb

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

86121908_copy_schedule (macumber) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2066 of 2190 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.

86121908_copy_schedule (macumber) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: Build Failed

Build Badge

Please sign in to comment.