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

#1799 Ensure tracers and time steps have values when entering flow characteristics plot initially

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-08-22 11:45:06 +02:00
parent b66e957e28
commit 279ffe1730
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@@ -175,16 +175,13 @@ QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(
{ {
std::vector<RimEclipseResultCase*> cases; std::vector<RimEclipseResultCase*> cases;
proj->descendantsIncludingThisOfType(cases); proj->descendantsIncludingThisOfType(cases);
RimEclipseResultCase* defaultCase = nullptr;
for ( RimEclipseResultCase* c : cases ) for ( RimEclipseResultCase* c : cases )
{ {
if ( c->defaultFlowDiagSolution() ) if ( c->defaultFlowDiagSolution() )
{ {
options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c, false, c->uiIcon())); options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c, false, c->uiIcon()));
if (!defaultCase) defaultCase = c; // Select first
} }
} }
if (!m_case() && defaultCase) m_case = defaultCase;
} }
} }
else if ( fieldNeedingOptions == &m_flowDiagSolution ) else if ( fieldNeedingOptions == &m_flowDiagSolution )
@@ -290,6 +287,29 @@ QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFlowCharacteristicsPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimFlowCharacteristicsPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
{
// Ensure a case is selected if one is available
RimProject* proj = nullptr;
this->firstAncestorOrThisOfType(proj);
if (proj)
{
std::vector<RimEclipseResultCase*> cases;
proj->descendantsIncludingThisOfType(cases);
RimEclipseResultCase* defaultCase = nullptr;
for (RimEclipseResultCase* c : cases)
{
if (c->defaultFlowDiagSolution())
{
if (!defaultCase) defaultCase = c; // Select first
}
}
if (!m_case() && defaultCase)
{
m_case = defaultCase;
m_flowDiagSolution = m_case->defaultFlowDiagSolution();
}
}
}
{ {
caf::PdmUiGroup* timeStepsGroup = uiOrdering.addNewGroup("Time Steps"); caf::PdmUiGroup* timeStepsGroup = uiOrdering.addNewGroup("Time Steps");