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

#2127 Sim Well Branches : Move logic related to uiOrdering to RiaSimWellBranchTools

Browse Source
This commit is contained in:
Magne Sjaastad 2017-12-08 09:44:33 +01:00
parent 9c4077a040
commit 0e5e88008a
5 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/Application/Tools/RiaSimWellBranchTools.cpp
View File

@ -72,7 +72,7 @@ QList<caf::PdmOptionItemInfo> RiaSimWellBranchTools::valueOptionsForBranchIndexF
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequired(caf::PdmUiOrdering* uiOrdering,
void RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromWellName(caf::PdmUiOrdering* uiOrdering,
const QString& wellPathOrSimWellName,
const caf::PdmField<bool>& branchDetectionField,
const caf::PdmField<int>& branchIndexField)
@ -81,6 +81,21 @@ void RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequired(caf::PdmUiOrderi
{
const QString simWellName = RimWellPlotTools::simWellName(wellPathOrSimWellName);
RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromSimWellName(uiOrdering,
simWellName,
branchDetectionField,
branchIndexField);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromSimWellName(caf::PdmUiOrdering* uiOrdering,
const QString& simWellName,
const caf::PdmField<bool>& branchDetectionField,
const caf::PdmField<int>& branchIndexField)
{
if (RiaSimWellBranchTools::simulationWellBranches(simWellName, true).size() > 1)
{
uiOrdering->add(&branchDetectionField);
@ -91,4 +106,3 @@ void RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequired(caf::PdmUiOrderi
}
}
}
}

6
ApplicationCode/Application/Tools/RiaSimWellBranchTools.h
View File

@ -44,7 +44,11 @@ public:
static QList<caf::PdmOptionItemInfo>
valueOptionsForBranchIndexField(const std::vector<const RigWellPath*>& simulationWellPaths);
static void appendSimWellBranchFieldsIfRequired(caf::PdmUiOrdering* uiOrdering, const QString& wellPathOrSimWellName,
static void appendSimWellBranchFieldsIfRequiredFromWellName(caf::PdmUiOrdering* uiOrdering, const QString& wellPathOrSimWellName,
const caf::PdmField<bool>& branchDetectionField,
const caf::PdmField<int>& branchIndexField);
static void appendSimWellBranchFieldsIfRequiredFromSimWellName(caf::PdmUiOrdering* uiOrdering, const QString& simWellName,
const caf::PdmField<bool>& branchDetectionField,
const caf::PdmField<int>& branchIndexField);
};

2
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@ -759,7 +759,7 @@ void RimWellRftPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
uiOrdering.add(&m_userName);
uiOrdering.add(&m_wellPathNameOrSimWellName);
RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequired(&uiOrdering,
RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromWellName(&uiOrdering,
m_wellPathNameOrSimWellName,
m_branchDetection,
m_branchIndex);

12
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@ -353,15 +353,11 @@ void RimWellLogRftCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup("Curve Data");
curveDataGroup->add(&m_eclipseResultCase);
curveDataGroup->add(&m_wellName);
if (!RimWellPlotTools::hasAssociatedWellPath(m_wellName))
{
curveDataGroup->add(&m_branchDetection);
if (RiaSimWellBranchTools::simulationWellBranches(RimWellPlotTools::simWellName(m_wellName), m_branchDetection).size() > 1)
{
curveDataGroup->add(&m_branchIndex);
}
}
RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromWellName(curveDataGroup,
m_wellName,
m_branchDetection,
m_branchIndex);
curveDataGroup->add(&m_wellLogChannelName);
curveDataGroup->add(&m_timeStep);

10
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@ -727,13 +727,11 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
else
{
formationGroup->add(&m_formationSimWellName);
formationGroup->add(&m_formationBranchDetection);
auto simulationWellBranches = RiaSimWellBranchTools::simulationWellBranches(m_formationSimWellName(), m_formationBranchDetection);
if (simulationWellBranches.size() > 1)
{
formationGroup->add(&m_formationBranchIndex);
}
RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromSimWellName(formationGroup,
m_formationSimWellName,
m_formationBranchDetection,
m_formationBranchIndex);
}
}
else if (m_formationSource() == WELL_PICK)