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

Remove obsolete source stepping code

Browse Source 
After merging the cross plot with the summary plot, the sources stepping can be simplified. Remove obsolete sources stepping code, to prepare for other source stepping issues.
This commit is contained in:
Magne Sjaastad
2023-11-01 08:15:21 +01:00
parent 4f25fb4463
commit 12f24af154
14 changed files with 53 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@@ -65,24 +65,9 @@ RimSummaryCurveCollection::RimSummaryCurveCollection()
CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "" );
m_ySourceStepping = new RimSummaryPlotSourceStepping;
m_ySourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::Y_AXIS );
m_ySourceStepping.uiCapability()->setUiTreeHidden( true );
m_ySourceStepping.uiCapability()->setUiTreeChildrenHidden( true );
m_ySourceStepping.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault( &m_xSourceStepping, "XSourceStepping", "" );
m_xSourceStepping = new RimSummaryPlotSourceStepping;
m_xSourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::X_AXIS );
m_xSourceStepping.uiCapability()->setUiTreeHidden( true );
m_xSourceStepping.uiCapability()->setUiTreeChildrenHidden( true );
m_xSourceStepping.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault( &m_unionSourceStepping, "UnionSourceStepping", "" );
m_unionSourceStepping = new RimSummaryPlotSourceStepping;
m_unionSourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS );
m_unionSourceStepping.uiCapability()->setUiTreeHidden( true );
m_unionSourceStepping.uiCapability()->setUiTreeChildrenHidden( true );
m_unionSourceStepping.xmlCapability()->disableIO();
}
//--------------------------------------------------------------------------------------------------
@@ -255,70 +240,6 @@ std::vector<RimSummaryCurve*> RimSummaryCurveCollection::curves() const
return m_curves.childrenByType();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCurve*> RimSummaryCurveCollection::curvesForSourceStepping( RimSummaryDataSourceStepping::Axis steppingType ) const
{
std::vector<RimSummaryCurve*> stepCurves;
if ( m_curveForSourceStepping )
{
stepCurves.push_back( m_curveForSourceStepping );
{
// Add corresponding history/summary curve with or without H
const std::string historyIdentifier = "H";
std::string vectorName;
if ( steppingType == RimSummaryDataSourceStepping::Axis::X_AXIS )
{
vectorName = m_curveForSourceStepping->summaryAddressX().vectorName();
}
else if ( steppingType == RimSummaryDataSourceStepping::Axis::Y_AXIS )
{
vectorName = m_curveForSourceStepping->summaryAddressY().vectorName();
}
std::string candidateName;
if ( RiaStdStringTools::endsWith( vectorName, historyIdentifier ) )
{
candidateName = vectorName.substr( 0, vectorName.size() - 1 );
}
else
{
candidateName = vectorName + historyIdentifier;
}
for ( const auto& c : curves() )
{
if ( steppingType == RimSummaryDataSourceStepping::Axis::X_AXIS )
{
if ( c->summaryCaseX() == m_curveForSourceStepping->summaryCaseX() && c->summaryAddressX().vectorName() == candidateName )
{
stepCurves.push_back( c );
}
}
else if ( steppingType == RimSummaryDataSourceStepping::Axis::Y_AXIS )
{
if ( c->summaryCaseY() == m_curveForSourceStepping->summaryCaseY() && c->summaryAddressY().vectorName() == candidateName )
{
stepCurves.push_back( c );
}
}
}
}
}
else
{
stepCurves = curves();
}
return stepCurves;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -425,22 +346,9 @@ RimSummaryCurve* RimSummaryCurveCollection::curveForSourceStepping() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlotSourceStepping* RimSummaryCurveCollection::sourceSteppingObject( RimSummaryDataSourceStepping::Axis sourceSteppingType ) const
RimSummaryPlotSourceStepping* RimSummaryCurveCollection::sourceSteppingObject() const
{
if ( sourceSteppingType == RimSummaryDataSourceStepping::Axis::X_AXIS )
{
return m_xSourceStepping();
}
else if ( sourceSteppingType == RimSummaryDataSourceStepping::Axis::Y_AXIS )
{
return m_ySourceStepping();
}
if ( sourceSteppingType == RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS )
{
return m_unionSourceStepping();
}
return nullptr;
return m_ySourceStepping();
}
//--------------------------------------------------------------------------------------------------