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

Make valve templates a bit more accessible

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-04-08 12:56:38 +02:00
parent 4e10aa8ffa
commit 64f537ad05
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ QString RimValveTemplate::typeLabel() const
//--------------------------------------------------------------------------------------------------
QString RimValveTemplate::fullLabel() const
{
QString label = QString("%1 (%2)").arg(m_userLabel()).arg(typeLabel());
QString label = QString("%1: %2").arg(typeLabel()).arg(m_userLabel());
return label;
}

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

@@ -49,14 +49,18 @@ RimWellPathValve::RimWellPathValve()
CAF_PDM_InitFieldNoDefault(&m_valveTemplate, "ValveTemplate", "Valve Template", "", "", "");
CAF_PDM_InitField(&m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_multipleValveLocations, "ValveLocations", "Valve Locations", "", "", "");
CAF_PDM_InitField(&m_createOrEditValveTemplate, "CreateTemplate", false, "New", "", "", "");
CAF_PDM_InitField(&m_editValveTemplate, "EditTemplate", false, "Edit", "", "", "");
CAF_PDM_InitField(&m_createValveTemplate, "CreateTemplate", false, "Create", "", "", "");
m_measuredDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
m_multipleValveLocations = new RimMultipleValveLocations;
m_multipleValveLocations.uiCapability()->setUiTreeHidden(true);
m_multipleValveLocations.uiCapability()->setUiTreeChildrenHidden(true);
m_createOrEditValveTemplate.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_createOrEditValveTemplate.uiCapability()->setUiEditorTypeName(caf::PdmUiToolButtonEditor::uiEditorTypeName());
m_editValveTemplate.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_editValveTemplate.uiCapability()->setUiEditorTypeName(caf::PdmUiToolButtonEditor::uiEditorTypeName());
m_createValveTemplate.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_createValveTemplate.uiCapability()->setUiEditorTypeName(caf::PdmUiToolButtonEditor::uiEditorTypeName());
nameField()->uiCapability()->setUiReadOnly(true);
}
@@ -422,17 +426,14 @@ void RimWellPathValve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
applyValveLabelAndIcon();
this->updateConnectedEditors();
}
else if (changedField == &m_createOrEditValveTemplate)
else if (changedField == &m_createValveTemplate)
{
m_createOrEditValveTemplate = false;
if (m_valveTemplate == nullptr)
{
RicNewValveTemplateFeature::createNewValveTemplateForValveAndUpdate(this);
}
else
{
Riu3DMainWindowTools::selectAsCurrentItem(m_valveTemplate());
}
m_createValveTemplate = false;
RicNewValveTemplateFeature::createNewValveTemplateForValveAndUpdate(this);
}
else if (changedField == &m_editValveTemplate)
{
Riu3DMainWindowTools::selectAsCurrentItem(m_valveTemplate());
}
RimPerforationInterval* perfInterval;
@@ -454,15 +455,11 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
uiOrdering.add(&m_valveTemplate, { true, 2, 1 });
{
if (m_valveTemplate() == nullptr)
if (m_valveTemplate() != nullptr)
{
m_createOrEditValveTemplate.uiCapability()->setUiName("New");
uiOrdering.add(&m_editValveTemplate, false);
}
else
{
m_createOrEditValveTemplate.uiCapability()->setUiName("Edit");
}
uiOrdering.add(&m_createOrEditValveTemplate, { false, 1, 0 });
uiOrdering.add(&m_createValveTemplate, false);
}
if (componentType() == RiaDefines::ICV || componentType() == RiaDefines::ICD)

4
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.h
View File

@@ -83,8 +83,8 @@ private:
caf::PdmPtrField<RimValveTemplate*> m_valveTemplate;
caf::PdmField<double> m_measuredDepth;
caf::PdmChildField<RimMultipleValveLocations*> m_multipleValveLocations;
caf::PdmField<bool> m_createOrEditValveTemplate;
caf::PdmField<bool> m_editValveTemplate;
caf::PdmField<bool> m_createValveTemplate;
};