OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3984 Improve layout for new/edit template buttons for valve/fractures

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-01-28 14:57:54 +01:00
parent 64c30d00d1
commit a185929826
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
View File

@ -220,7 +220,7 @@ void RimWellPathFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
{ {
uiOrdering.add(nameField(), caf::PdmUiOrdering::LayoutOptions(true, 3, 1)); uiOrdering.add(nameField(), caf::PdmUiOrdering::LayoutOptions(true, 3, 1));
uiOrdering.add(&m_fractureTemplate, {true, 2, 1}); uiOrdering.add(&m_fractureTemplate, {true, 2, 1});
uiOrdering.add(&m_editFractureTemplate, false); uiOrdering.add(&m_editFractureTemplate, { false, 1, 0 });
} }
else else
{ {

9
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@ -49,12 +49,13 @@ RimWellPathValve::RimWellPathValve()
CAF_PDM_InitFieldNoDefault(&m_valveTemplate, "ValveTemplate", "Valve Template", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_valveTemplate, "ValveTemplate", "Valve Template", "", "", "");
CAF_PDM_InitField(&m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD", "", "", ""); CAF_PDM_InitField(&m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_multipleValveLocations, "ValveLocations", "Valve Locations", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_multipleValveLocations, "ValveLocations", "Valve Locations", "", "", "");
CAF_PDM_InitField(&m_createOrEditValveTemplate, "CreateTemplate", false, "Create new", "", "", ""); CAF_PDM_InitField(&m_createOrEditValveTemplate, "CreateTemplate", false, "New", "", "", "");
m_measuredDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); m_measuredDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
m_multipleValveLocations = new RimMultipleValveLocations; m_multipleValveLocations = new RimMultipleValveLocations;
m_multipleValveLocations.uiCapability()->setUiTreeHidden(true); m_multipleValveLocations.uiCapability()->setUiTreeHidden(true);
m_multipleValveLocations.uiCapability()->setUiTreeChildrenHidden(true); m_multipleValveLocations.uiCapability()->setUiTreeChildrenHidden(true);
m_createOrEditValveTemplate.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_createOrEditValveTemplate.uiCapability()->setUiEditorTypeName(caf::PdmUiToolButtonEditor::uiEditorTypeName()); m_createOrEditValveTemplate.uiCapability()->setUiEditorTypeName(caf::PdmUiToolButtonEditor::uiEditorTypeName());
nameField()->uiCapability()->setUiReadOnly(true); nameField()->uiCapability()->setUiReadOnly(true);
@ -450,10 +451,9 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
{ {
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
uiOrdering.add(&m_valveTemplate); uiOrdering.add(&m_valveTemplate, { true, 2, 1 });
{ {
uiOrdering.add(&m_createOrEditValveTemplate, false);
if (m_valveTemplate() == nullptr) if (m_valveTemplate() == nullptr)
{ {
m_createOrEditValveTemplate.uiCapability()->setUiName("New"); m_createOrEditValveTemplate.uiCapability()->setUiName("New");
@ -462,6 +462,7 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
{ {
m_createOrEditValveTemplate.uiCapability()->setUiName("Edit"); m_createOrEditValveTemplate.uiCapability()->setUiName("Edit");
} }
uiOrdering.add(&m_createOrEditValveTemplate, { false, 1, 0 });
} }
if (componentType() == RiaDefines::ICV || componentType() == RiaDefines::ICD) if (componentType() == RiaDefines::ICV || componentType() == RiaDefines::ICD)
@ -491,7 +492,7 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
m_multipleValveLocations->uiOrdering(uiConfigName, *group); m_multipleValveLocations->uiOrdering(uiConfigName, *group);
} }
if (m_valveTemplate()) if (m_valveTemplate() != nullptr)
{ {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Parameters from Template"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("Parameters from Template");
m_valveTemplate->uiOrdering("InsideValve", *group); m_valveTemplate->uiOrdering("InsideValve", *group);