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

#3957 Restore UI-order in Well Path Valve property editor

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-01-15 17:12:51 +01:00
parent f2668eae4e
commit 314a5747db
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ void RimWellPathValve::perforationIntervalUpdated()
this->firstAncestorOrThisOfType(perfInterval); this->firstAncestorOrThisOfType(perfInterval);
double startMD = perfInterval->startMD(); double startMD = perfInterval->startMD();
double endMD = perfInterval->endMD(); double endMD = perfInterval->endMD();
m_measuredDepth = cvf::Math::clamp(m_measuredDepth(), startMD, endMD); m_measuredDepth = cvf::Math::clamp(m_measuredDepth(), std::min(startMD, endMD), std::max(startMD, endMD));
} }
else if (componentType() == RiaDefines::ICD || componentType() == RiaDefines::AICD) else if (componentType() == RiaDefines::ICD || componentType() == RiaDefines::AICD)
{ {
@ -464,12 +464,6 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
} }
} }
if (m_valveTemplate())
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Parameters from Template");
m_valveTemplate->uiOrdering("InsideValve", *group);
}
if (componentType() == RiaDefines::ICV || componentType() == RiaDefines::ICD) if (componentType() == RiaDefines::ICV || componentType() == RiaDefines::ICD)
{ {
if (componentType() == RiaDefines::ICV) if (componentType() == RiaDefines::ICV)
@ -487,7 +481,7 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
m_measuredDepth.uiCapability()->setUiName("Measured Depth [ft]"); m_measuredDepth.uiCapability()->setUiName("Measured Depth [ft]");
} }
} }
uiOrdering.add(&m_measuredDepth); uiOrdering.add(&m_measuredDepth, { true, 3, 1 });
} }
} }
@ -496,7 +490,13 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Multiple Valve Locations"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("Multiple Valve Locations");
m_multipleValveLocations->uiOrdering(uiConfigName, *group); m_multipleValveLocations->uiOrdering(uiConfigName, *group);
} }
if (m_valveTemplate())
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Parameters from Template");
m_valveTemplate->uiOrdering("InsideValve", *group);
}
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }