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

#5612 Saturation Pressure Plots : Remove duplicated code

Browse Source
This commit is contained in:
Magne Sjaastad
2020-02-28 11:56:07 +01:00
parent 1187a2e551
commit 0cd0c7d80d
13 changed files with 38 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@@ -37,6 +37,7 @@
#include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
#include "RimTofAccumulatedPhaseFractionsPlot.h"
#include "RimTools.h"
#include "RimTotalWellAllocationPlot.h"
#include "RimWellAllocationPlotLegend.h"
#include "RimWellFlowRateCurve.h"
@@ -700,17 +701,7 @@ QList<caf::PdmOptionItemInfo>
}
else if ( fieldNeedingOptions == &m_timeStep )
{
QStringList timeStepNames;
if ( m_case && m_case->eclipseCaseData() )
{
timeStepNames = m_case->timeStepStrings();
}
for ( int i = 0; i < timeStepNames.size(); i++ )
{
options.push_back( caf::PdmOptionItemInfo( timeStepNames[i], i ) );
}
RimTools::timeStepsForCase( m_case, &options );
if ( options.size() == 0 )
{

10
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp
View File

@@ -20,6 +20,7 @@
#include "RimEclipseResultCase.h"
#include "RimFlowDiagSolution.h"
#include "RimProject.h"
#include "RimTools.h"
#include "RigEclipseCaseData.h"
#include "RigTofWellDistributionCalculator.h"
@@ -506,14 +507,7 @@ QList<caf::PdmOptionItemInfo>
else if ( fieldNeedingOptions == &m_timeStepIndex )
{
if ( m_case && m_case->eclipseCaseData() )
{
const QStringList timeStepNames = m_case->timeStepStrings();
for ( int i = 0; i < timeStepNames.size(); i++ )
{
options.push_back( caf::PdmOptionItemInfo( timeStepNames[i], i ) );
}
}
RimTools::timeStepsForCase( m_case, &options );
if ( options.size() == 0 )
{

10
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp
View File

@@ -21,6 +21,7 @@
#include "RimFlowDiagSolution.h"
#include "RimPlot.h"
#include "RimProject.h"
#include "RimTools.h"
#include "RimWellDistributionPlot.h"
#include "RigEclipseCaseData.h"
@@ -280,14 +281,7 @@ QList<caf::PdmOptionItemInfo>
else if ( fieldNeedingOptions == &m_timeStepIndex )
{
if ( m_case && m_case->eclipseCaseData() )
{
const QStringList timeStepNames = m_case->timeStepStrings();
for ( int i = 0; i < timeStepNames.size(); i++ )
{
options.push_back( caf::PdmOptionItemInfo( timeStepNames[i], i ) );
}
}
RimTools::timeStepsForCase( m_case, &options );
if ( options.size() == 0 )
{