Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Differentiating optional measure tags #923

Merged
merged 1 commit into from
Mar 21, 2014
Merged

Differentiating optional measure tags #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 23 additions & 2 deletions openstudiocore/src/openstudio_lib/ConstructionCfactorUndergroundWallInspectorView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,26 @@ void ConstructionCfactorUndergroundWallInspectorView::createLayout()
++row;

// Standards
QFrame * line;
line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

label = new QLabel();
label->setText("Measure Tags (Optional):");
label->setObjectName("H2");
mainGridLayout->addWidget(label,row,0);

++row;

QVBoxLayout* vLayout = new QVBoxLayout();

label = new QLabel();
label->setText("Intended Surface Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_intendedSurfaceType = new OSComboBox2();
Expand All @@ -90,7 +104,7 @@ void ConstructionCfactorUndergroundWallInspectorView::createLayout()

label = new QLabel();
label->setText("Standards Construction Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_standardsConstructionType = new QComboBox();
Expand All @@ -103,6 +117,13 @@ void ConstructionCfactorUndergroundWallInspectorView::createLayout()

++row;

line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

// C-Factor

label = new QLabel("C-Factor: ");
Expand Down
25 changes: 23 additions & 2 deletions openstudiocore/src/openstudio_lib/ConstructionFfactorGroundFloorInspectorView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,26 @@ void ConstructionFfactorGroundFloorInspectorView::createLayout()
++row;

// Standards
QFrame * line;
line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

label = new QLabel();
label->setText("Measure Tags (Optional):");
label->setObjectName("H2");
mainGridLayout->addWidget(label,row,0);

++row;

QVBoxLayout* vLayout = new QVBoxLayout();

label = new QLabel();
label->setText("Intended Surface Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_intendedSurfaceType = new OSComboBox2();
Expand All @@ -91,7 +105,7 @@ void ConstructionFfactorGroundFloorInspectorView::createLayout()

label = new QLabel();
label->setText("Standards Construction Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_standardsConstructionType = new QComboBox();
Expand All @@ -104,6 +118,13 @@ void ConstructionFfactorGroundFloorInspectorView::createLayout()

++row;

line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

// F-Factor

label = new QLabel("F-Factor: ");
Expand Down
25 changes: 23 additions & 2 deletions openstudiocore/src/openstudio_lib/ConstructionInspectorView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,26 @@ void ConstructionInspectorView::createLayout()
++row;

// Standards
QFrame * line;
line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

label = new QLabel();
label->setText("Measure Tags (Optional):");
label->setObjectName("H2");
mainGridLayout->addWidget(label,row,0);

++row;

QVBoxLayout* vLayout = new QVBoxLayout();

label = new QLabel();
label->setText("Intended Surface Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_intendedSurfaceType = new OSComboBox2();
Expand All @@ -101,7 +115,7 @@ void ConstructionInspectorView::createLayout()

label = new QLabel();
label->setText("Standards Construction Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_standardsConstructionType = new QComboBox();
Expand All @@ -114,6 +128,13 @@ void ConstructionInspectorView::createLayout()

++row;

line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

// Layer

label = new QLabel("Layer: ");
Expand Down
25 changes: 23 additions & 2 deletions openstudiocore/src/openstudio_lib/ConstructionInternalSourceInspectorView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,26 @@ void ConstructionInternalSourceInspectorView::createLayout()
++row;

// Standards
QFrame * line;
line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

label = new QLabel();
label->setText("Measure Tags (Optional):");
label->setObjectName("H2");
mainGridLayout->addWidget(label,row,0);

++row;

QVBoxLayout* vLayout = new QVBoxLayout();

label = new QLabel();
label->setText("Intended Surface Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_intendedSurfaceType = new OSComboBox2();
Expand All @@ -103,7 +117,7 @@ void ConstructionInternalSourceInspectorView::createLayout()

label = new QLabel();
label->setText("Standards Construction Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_standardsConstructionType = new QComboBox();
Expand All @@ -116,6 +130,13 @@ void ConstructionInternalSourceInspectorView::createLayout()

++row;

line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,3);

++row;

// Layer

label = new QLabel("Layer: ");
Expand Down
15 changes: 14 additions & 1 deletion openstudiocore/src/openstudio_lib/LocationTabView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,13 @@ LocationView::LocationView(const model::Model & model,
setLayout(mainVLayout);

// ***** Climate Zones *****
label = new QLabel("Climate Zone:");
QFrame * line;
line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainVLayout->addWidget(line);

label = new QLabel("Measure Tags (Optional):");
label->setObjectName("H2");
mainVLayout->addWidget(label);

Expand All @@ -112,6 +118,7 @@ LocationView::LocationView(const model::Model & model,
hLayout->addLayout(vLayout);

label = new QLabel("ASHRAE Climate Zone");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_ashraeClimateZone = new QComboBox();
Expand Down Expand Up @@ -144,6 +151,7 @@ LocationView::LocationView(const model::Model & model,
hLayout->addLayout(vLayout);

label = new QLabel("CEC Climate Zone");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_cecClimateZone = new QComboBox();
Expand Down Expand Up @@ -173,6 +181,11 @@ LocationView::LocationView(const model::Model & model,
hLayout->addStretch();
mainVLayout->addLayout(hLayout);

line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainVLayout->addWidget(line);

// ***** Weather File *****
label = new QLabel("Weather File");
label->setObjectName("H2");
Expand Down
26 changes: 24 additions & 2 deletions openstudiocore/src/openstudio_lib/SpaceTypeInspectorView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,26 @@ SpaceTypeInspectorView::SpaceTypeInspectorView(const openstudio::model::Model& m
++row;

// standards info
QFrame * line;
line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,2);

++row;

label = new QLabel();
label->setText("Measure Tags (Optional):");
label->setObjectName("H2");
mainGridLayout->addWidget(label,row,0);

++row;

vLayout = new QVBoxLayout();

label = new QLabel();
label->setText("Standards Building Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_standardsBuildingTypeComboBox = new QComboBox();
Expand All @@ -575,7 +590,7 @@ SpaceTypeInspectorView::SpaceTypeInspectorView(const openstudio::model::Model& m

label = new QLabel();
label->setText("Standards Space Type: ");
label->setObjectName("H2");
label->setObjectName("StandardsInfo");
vLayout->addWidget(label);

m_standardsSpaceTypeComboBox = new QComboBox();
Expand All @@ -588,6 +603,13 @@ SpaceTypeInspectorView::SpaceTypeInspectorView(const openstudio::model::Model& m

++row;

line = new QFrame();
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
mainGridLayout->addWidget(line,row,0,1,2);

++row;

// default construction and schedule sets
vLayout = new QVBoxLayout();

Expand Down
5 changes: 5 additions & 0 deletions openstudiocore/src/openstudio_lib/openstudiolib.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,11 @@ QLabel#H2 {
font: bold;
}

QLabel#StandardsInfo {
font-size: 12px;
font: italic;
}

QListView {
show-decoration-selected: 1; /* make the selection span the entire width of the view */
}
Expand Down