#1928 Curve Creator. Appearance label fix. Move group boxes

This commit is contained in:
Bjørn Erik Jensen 2017-09-22 14:39:54 +02:00
parent edd39b6ff1
commit 2bad74b4aa
2 changed files with 13 additions and 15 deletions

View File

@ -591,14 +591,15 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
// Appearance settings
caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroupWithKeyword("Appearance Settings", RicSummaryCurveCreatorUiKeywords::appearance());
caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroupWithKeyword("Curve Appearance Settings", RicSummaryCurveCreatorUiKeywords::appearance());
caf::PdmUiGroup* appearanceSubGroup = appearanceGroup->addNewGroup("Appearance Type Assignment");
appearanceGroup->setCollapsedByDefault(true);
appearanceGroup->add(&m_useAutoAppearanceAssignment);
appearanceGroup->add(&m_caseAppearanceType);
appearanceGroup->add(&m_variableAppearanceType);
appearanceGroup->add(&m_wellAppearanceType);
appearanceGroup->add(&m_groupAppearanceType);
appearanceGroup->add(&m_regionAppearanceType);
appearanceSubGroup->add(&m_useAutoAppearanceAssignment);
appearanceSubGroup->add(&m_caseAppearanceType);
appearanceSubGroup->add(&m_variableAppearanceType);
appearanceSubGroup->add(&m_wellAppearanceType);
appearanceSubGroup->add(&m_groupAppearanceType);
appearanceSubGroup->add(&m_regionAppearanceType);
appearanceGroup->add(&m_appearanceApplyButton);
// Appearance option sensitivity

View File

@ -87,22 +87,19 @@ void RicSummaryCurveCreatorSplitterUi::recursivelyConfigureAndUpdateTopLevelUiIt
}
}
m_lowerLeftLayout->insertWidget(0, getOrCreateCurveTreeWidget(), 1);
caf::PdmUiGroup* appearanceGroup = findGroupByKeyword(topLevelUiItems, RicSummaryCurveCreatorUiKeywords::appearance(), uiConfigName);
auto appearanceGroupBox = createGroupBoxWithContent(appearanceGroup, uiConfigName);
m_lowerLeftLayout->insertWidget(1, appearanceGroupBox);
m_lowerLeftLayout->insertWidget(0, appearanceGroupBox);
caf::PdmUiGroup* nameConfigGroup = findGroupByKeyword(topLevelUiItems, RicSummaryCurveCreatorUiKeywords::nameConfig(), uiConfigName);
auto nameConfigGroupBox = createGroupBoxWithContent(nameConfigGroup, uiConfigName);
m_lowerLeftLayout->insertWidget(2, nameConfigGroupBox);
m_lowerLeftLayout->insertWidget(1, nameConfigGroupBox);
m_lowerLeftLayout->insertWidget(2, getOrCreateCurveTreeWidget(), 1);
m_secondRowLayout->insertWidget(1, getOrCreatePlotWidget());
// Fields at bottom of dialog
configureAndUpdateFields(1, m_bottomFieldLayout, topLevelUiItems, uiConfigName);
}