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

Move summary tools into separate folder

Browse Source
This commit is contained in:
Magne Sjaastad
2024-10-21 14:40:25 +02:00
parent 95b2f2bbd1
commit df091336e0
126 changed files with 198 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@@ -44,7 +44,6 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RimSummaryMultiPlotCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotControls.h
${CMAKE_CURRENT_LIST_DIR}/RimEnsembleCurveInfoTextProvider.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryAddressModifier.h
${CMAKE_CURRENT_LIST_DIR}/RimRftCase.h
${CMAKE_CURRENT_LIST_DIR}/RimCsvSummaryCase.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryTable.h
@@ -103,7 +102,6 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimSummaryMultiPlotCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotControls.cpp
${CMAKE_CURRENT_LIST_DIR}/RimEnsembleCurveInfoTextProvider.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryAddressModifier.cpp
${CMAKE_CURRENT_LIST_DIR}/RimRftCase.cpp
${CMAKE_CURRENT_LIST_DIR}/RimCsvSummaryCase.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryTable.cpp

2
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCrossPlotStatisticsCase.cpp
View File

@@ -19,8 +19,8 @@
#include "RimEnsembleCrossPlotStatisticsCase.h"
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddressDefines.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
View File

@@ -20,7 +20,7 @@
#include "RiaCurveDataTools.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimCustomObjectiveFunction.h"
#include "RimCustomObjectiveFunctionCollection.h"

4
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -23,9 +23,9 @@
#include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaResultNames.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaTimeTTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimSummaryCalculationCollection.h"
#include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"

4
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -24,8 +24,8 @@
#include "RiaDateTimeDefines.h"
#include "RiaPlotDefines.h"
#include "RiaSummaryCurveAddress.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryCurveAddress.h"
#include "Summary/RiaSummaryDefines.h"
#include "RimEnsembleCrossPlotStatisticsCase.h"
#include "RimEnsembleCurveSetColorManager.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
View File

@@ -19,8 +19,8 @@
#include "RimEnsembleStatisticsCase.h"
#include "RiaCurveMerger.h"
#include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h"
#include "Summary/RiaSummaryTools.h"
#include "RigStatisticsMath.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
View File

@@ -18,7 +18,7 @@
#include "RimGridSummaryCase.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicfCommandObject.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimRftCase.cpp
View File

@@ -18,7 +18,7 @@
#include "RimRftCase.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimSummaryCase.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
View File

@@ -18,7 +18,7 @@
#include "RimSummaryAddress.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include <QRegularExpression>

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
View File

@@ -18,7 +18,7 @@
#include "RimSummaryAddressCollection.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include "RifEclipseSummaryAddress.h"

250
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.cpp
View File

@@ -1,250 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2022 Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimSummaryAddressModifier.h"
#include "RiaLogging.h"
#include "RiaStdStringTools.h"
#include "RifEclipseSummaryAddress.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryCurve.h"
#include "RimSummaryPlot.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RimSummaryAddressModifier::replaceTokenForCategory( const RifEclipseSummaryAddress& sourceAdr,
const std::string& token,
RifEclipseSummaryAddressDefines::SummaryCategory contentType )
{
auto adr = sourceAdr;
if ( contentType == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL )
{
adr.setWellName( token );
}
else if ( contentType == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP )
{
adr.setGroupName( token );
}
else if ( contentType == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK )
{
adr.setNetworkName( token );
}
else if ( contentType == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION )
{
int intValue = -1;
if ( !RiaStdStringTools::toInt( token, intValue ) )
{
QString errorText = QString( "Failed to convert region text to region integer value "
"for region text : %1" )
.arg( QString::fromStdString( token ) );
RiaLogging::error( errorText );
}
else
{
adr.setRegion( intValue );
}
}
else if ( contentType == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION )
{
int intValue = -1;
if ( !RiaStdStringTools::toInt( token, intValue ) )
{
QString errorText = QString( "Failed to convert region text to region integer value "
"for region text : %1" )
.arg( QString::fromStdString( token ) );
RiaLogging::error( errorText );
}
else
{
adr.setRegion2( intValue );
}
}
else if ( contentType == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER )
{
int intValue = -1;
if ( !RiaStdStringTools::toInt( token, intValue ) )
{
QString errorText = QString( "Failed to convert aquifer text to aquifer integer value "
"for aquifer text : %1" )
.arg( QString::fromStdString( token ) );
RiaLogging::error( errorText );
}
else
{
adr.setAquiferNumber( intValue );
}
}
return adr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RiaSummaryCurveAddress> RimSummaryAddressModifier::curveAddresses( const std::vector<CurveAddressProvider>& curveAddressProviders )
{
std::vector<RiaSummaryCurveAddress> addresses;
for ( auto& provider : curveAddressProviders )
{
std::visit(
[&addresses]( auto&& arg )
{
auto curveAdr = RimSummaryAddressModifier::curveAddress( arg );
addresses.push_back( curveAdr );
},
provider );
};
return addresses;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::applyAddressesToCurveAddressProviders( const std::vector<CurveAddressProvider>& curveAddressProviders,
const std::vector<RiaSummaryCurveAddress>& addresses )
{
if ( curveAddressProviders.size() != addresses.size() ) return;
for ( size_t i = 0; i < curveAddressProviders.size(); i++ )
{
auto provider = curveAddressProviders[i];
const auto& address = addresses[i];
std::visit( [address]( auto&& arg ) { RimSummaryAddressModifier::setCurveAddress( arg, address ); }, provider );
};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryAddressModifier::CurveAddressProvider> RimSummaryAddressModifier::createAddressProviders( RimSummaryPlot* summaryPlot )
{
std::vector<CurveAddressProvider> providers;
for ( auto c : summaryPlot->allCurves() )
{
providers.push_back( c );
}
for ( auto cs : summaryPlot->curveSets() )
{
providers.push_back( cs );
}
return providers;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RifEclipseSummaryAddress> RimSummaryAddressModifier::allSummaryAddressesY( RimSummaryPlot* summaryPlot )
{
std::vector<RifEclipseSummaryAddress> addresses;
auto curveAddressProviders = createAddressProviders( summaryPlot );
for ( auto& provider : curveAddressProviders )
{
std::visit(
[&addresses]( auto&& arg )
{
auto curveAdr = RimSummaryAddressModifier::curveAddress( arg );
addresses.push_back( curveAdr.summaryAddressY() );
},
provider );
};
return addresses;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::updateAddressesByObjectName( const std::vector<CurveAddressProvider>& curveAddressProviders,
const std::string& objectName,
RimSummaryAddressCollection::CollectionContentType contentType )
{
auto category = RimSummaryAddressCollection::contentTypeToSummaryCategory( contentType );
for ( auto& provider : curveAddressProviders )
{
std::visit(
[objectName, category]( auto&& arg )
{
const auto sourceAdr = RimSummaryAddressModifier::curveAddress( arg );
const auto sourceX = sourceAdr.summaryAddressX();
const auto sourceY = sourceAdr.summaryAddressY();
const auto newAdrX = RimSummaryAddressModifier::replaceTokenForCategory( sourceX, objectName, category );
const auto newAdrY = RimSummaryAddressModifier::replaceTokenForCategory( sourceY, objectName, category );
RimSummaryAddressModifier::setCurveAddress( arg, RiaSummaryCurveAddress( newAdrX, newAdrY ) );
},
provider );
};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveAddress RimSummaryAddressModifier::curveAddress( RimEnsembleCurveSet* curveSet )
{
if ( curveSet == nullptr ) return RiaSummaryCurveAddress( RifEclipseSummaryAddress() );
return curveSet->curveAddress();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveAddress RimSummaryAddressModifier::curveAddress( RimSummaryCurve* curve )
{
if ( curve == nullptr ) return RiaSummaryCurveAddress( RifEclipseSummaryAddress() );
return curve->curveAddress();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::setCurveAddress( RimEnsembleCurveSet* curveSet, const RiaSummaryCurveAddress& curveAdr )
{
if ( curveSet )
{
curveSet->setCurveAddress( curveAdr );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::setCurveAddress( RimSummaryCurve* curve, const RiaSummaryCurveAddress& curveAdr )
{
if ( curve )
{
curve->setSummaryAddressX( curveAdr.summaryAddressX() );
curve->setSummaryAddressY( curveAdr.summaryAddressY() );
}
}

62
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.h
View File

@@ -1,62 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2022 Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RimSummaryAddressCollection.h"
#include <variant>
#include <vector>
class RimSummaryCurve;
class RimEnsembleCurveSet;
class RimSummaryPlot;
class RifEclipseSummaryAddress;
class RiaSummaryCurveAddress;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
class RimSummaryAddressModifier
{
public:
// Define a variant for summary curves and ensemble curve set. This way we can treat them as similar object without a
// common base class
using CurveAddressProvider = std::variant<RimSummaryCurve*, RimEnsembleCurveSet*>;
static std::vector<CurveAddressProvider> createAddressProviders( RimSummaryPlot* summaryPlot );
static std::vector<RiaSummaryCurveAddress> curveAddresses( const std::vector<CurveAddressProvider>& curveAddressProviders );
static void applyAddressesToCurveAddressProviders( const std::vector<CurveAddressProvider>& curveAddressProviders,
const std::vector<RiaSummaryCurveAddress>& addresses );
static std::vector<RifEclipseSummaryAddress> allSummaryAddressesY( RimSummaryPlot* summaryPlot );
static void updateAddressesByObjectName( const std::vector<CurveAddressProvider>& curveAddressProviders,
const std::string& objectName,
RimSummaryAddressCollection::CollectionContentType contentType );
static RifEclipseSummaryAddress replaceTokenForCategory( const RifEclipseSummaryAddress& sourceAdr,
const std::string& token,
RifEclipseSummaryAddressDefines::SummaryCategory contentType );
private:
static RiaSummaryCurveAddress curveAddress( RimSummaryCurve* curve );
static RiaSummaryCurveAddress curveAddress( RimEnsembleCurveSet* curveSet );
static void setCurveAddress( RimEnsembleCurveSet* curveSet, const RiaSummaryCurveAddress& curveAdr );
static void setCurveAddress( RimSummaryCurve* curve, const RiaSummaryCurveAddress& curveAdr );
};

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressSelector.cpp
View File

@@ -19,8 +19,8 @@
#include "RimSummaryAddressSelector.h"
#include "RiaResultNames.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryTools.h"
#include "RifSummaryReaderInterface.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -21,7 +21,7 @@
#include "RiaEclipseFileNameTools.h"
#include "RiaLogging.h"
#include "RiaPreferencesSummary.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifCaseRealizationParametersReader.h"
#include "RifEclipseSummaryTools.h"

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -26,9 +26,9 @@
#include "RiaPreferencesSummary.h"
#include "RiaQDateTimeTools.h"
#include "RiaResultNames.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryDefines.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryDefines.h"
#include "Summary/RiaSummaryTools.h"
#include "RimEclipseResultCase.h"
#include "RimEnsembleCurveSet.h"

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@@ -26,8 +26,8 @@
#include "RiaDateTimeDefines.h"
#include "RiaDefines.h"
#include "RiaSummaryCurveAddress.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryCurveAddress.h"
#include "Summary/RiaSummaryDefines.h"
#include "RifEclipseSummaryAddressDefines.h"
#include "RifEclipseSummaryAddressQMetaType.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp
View File

@@ -21,7 +21,7 @@
#include "RiaColorTables.h"
#include "RiaColorTools.h"
#include "RiaPreferencesSummary.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RiuQwtPlotCurve.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h
View File

@@ -18,8 +18,8 @@
#pragma once
#include "RiaSummaryDefines.h"
#include "RimSummaryPlotSourceStepping.h"
#include "Summary/RiaSummaryDefines.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmChildField.h"

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurvesData.cpp
View File

@@ -19,9 +19,9 @@
#include "RimSummaryCurvesData.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryTools.h"
#include "RimAsciiDataCurve.h"
#include "RimGridTimeHistoryCurve.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDataSourceStepping.cpp
View File

@@ -18,7 +18,7 @@
#include "RimSummaryDataSourceStepping.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include "cafAppEnum.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDeclineCurve.cpp
View File

@@ -19,8 +19,8 @@
#include "RimSummaryDeclineCurve.h"
#include "RiaQDateTimeTools.h"
#include "RiaSummaryTools.h"
#include "RiaTimeTTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RigDeclineCurveCalculator.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsemble.cpp
View File

@@ -22,7 +22,7 @@
#include "RiaFieldHandleTools.h"
#include "RiaLogging.h"
#include "RiaStatisticsTools.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "RifSummaryReaderInterface.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsembleTools.cpp
View File

@@ -18,7 +18,7 @@
#include "RimSummaryEnsembleTools.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifReaderRftInterface.h"
#include "RifSummaryReaderInterface.h"

16
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
View File

@@ -21,8 +21,9 @@
#include "RiaApplication.h"
#include "RiaNumericalTools.h"
#include "RiaPlotDefines.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryStringTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryAddressModifier.h"
#include "Summary/RiaSummaryStringTools.h"
#include "PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.h"
#include "PlotBuilderCommands/RicAppendSummaryPlotsForSummaryAddressesFeature.h"
@@ -42,7 +43,6 @@
#include "RimPlotAxisProperties.h"
#include "RimSummaryAddress.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryAddressModifier.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
@@ -791,7 +791,7 @@ void RimSummaryMultiPlot::setDefaultRangeAggregationSteppingDimension()
for ( auto p : summaryPlots() )
{
auto addresses = RimSummaryAddressModifier::allSummaryAddressesY( p );
auto addresses = RiaSummaryAddressModifier::allSummaryAddressesY( p );
analyzer.appendAddresses( addresses );
}
@@ -1261,7 +1261,7 @@ void RimSummaryMultiPlot::analyzePlotsAndAdjustAppearanceSettings()
for ( auto p : summaryPlots() )
{
auto addresses = RimSummaryAddressModifier::allSummaryAddressesY( p );
auto addresses = RiaSummaryAddressModifier::allSummaryAddressesY( p );
analyzer.appendAddresses( addresses );
}
@@ -1545,15 +1545,15 @@ void RimSummaryMultiPlot::appendSubPlotByStepping( int direction )
{
std::vector<RiaSummaryCurveAddress> newCurveAdrs;
auto curveAddressProviders = RimSummaryAddressModifier::createAddressProviders( newPlot );
for ( const auto& adr : RimSummaryAddressModifier::curveAddresses( curveAddressProviders ) )
auto curveAddressProviders = RiaSummaryAddressModifier::createAddressProviders( newPlot );
for ( const auto& adr : RiaSummaryAddressModifier::curveAddresses( curveAddressProviders ) )
{
const auto adrX = m_sourceStepping()->stepAddress( adr.summaryAddressX(), direction );
const auto adrY = m_sourceStepping()->stepAddress( adr.summaryAddressY(), direction );
newCurveAdrs.push_back( RiaSummaryCurveAddress( adrX, adrY ) );
}
RimSummaryAddressModifier::applyAddressesToCurveAddressProviders( curveAddressProviders, newCurveAdrs );
RiaSummaryAddressModifier::applyAddressesToCurveAddressProviders( curveAddressProviders, newCurveAdrs );
}
}

17
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -21,29 +21,21 @@
#include "RiaColorTables.h"
#include "RiaColorTools.h"
#include "RiaDefines.h"
#include "RiaFieldHandleTools.h"
#include "RiaLogging.h"
#include "RiaPlotDefines.h"
#include "RiaPreferences.h"
#include "RiaPreferencesSummary.h"
#include "RiaRegressionTestRunner.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryDefines.h"
#include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryDefines.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddressDefines.h"
#include "RifReaderEclipseSummary.h"
#include "RicfCommandObject.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
#include "PlotTemplates/RimPlotTemplateFileItem.h"
#include "PlotTemplates/RimPlotTemplateFolderItem.h"
#include "RimAsciiDataCurve.h"
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"
@@ -70,7 +62,6 @@
#include "RiuQwtPlotCurve.h"
#include "RiuQwtPlotItem.h"
#include "RiuSummaryQwtPlot.h"
#include "RiuTreeViewEventFilter.h"
#ifdef USE_QTCHARTS
#include "RiuSummaryQtChartsPlot.h"
@@ -79,7 +70,7 @@
#include "cvfColor3.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmObjectScriptingCapability.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafSelectionManager.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
View File

@@ -20,7 +20,7 @@
#include "RiaDefines.h"
#include "RiaNumberFormat.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RifSummaryReaderInterface.h"

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotManager.cpp
View File

@@ -20,9 +20,9 @@
#include "RiaStdStringTools.h"
#include "RiaStringListSerializer.h"
#include "RiaSummaryStringTools.h"
#include "RiaSummaryTools.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryStringTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifReaderEclipseSummary.h"
#include "RifSummaryReaderInterface.h"

1
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryPlotNameHelper.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RifEclipseSummaryAddress.h"
#include "RimObjectiveFunctionTools.h"

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.h
View File

@@ -19,6 +19,7 @@
#pragma once
#include "RimSummaryNameHelper.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "cafPdmPointer.h"
@@ -31,7 +32,6 @@
class RimSummaryCurve;
class RimSummaryCase;
class RimSummaryEnsemble;
class RiaSummaryAddressAnalyzer;
class RifEclipseSummaryAddress;
class RiaSummaryCurveAddress;

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@@ -21,14 +21,14 @@
#include "RiaEnsembleNameTools.h"
#include "RiaGuiApplication.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryAddressModifier.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimDataSourceSteppingTools.h"
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RimProject.h"
#include "RimSummaryAddressModifier.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
@@ -1473,7 +1473,7 @@ std::vector<RimPlot*> RimSummaryPlotSourceStepping::plotsMatchingStepSettings( s
}
else
{
auto addresses = RimSummaryAddressModifier::allSummaryAddressesY( plot );
auto addresses = RiaSummaryAddressModifier::allSummaryAddressesY( plot );
for ( const auto& a : addresses )
{

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp
View File

@@ -21,8 +21,8 @@
#include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h"
#include "Summary/RiaSummaryTools.h"
#include "RifSummaryReaderInterface.h"

4
ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryEnsembleSumo.cpp
View File

@@ -20,9 +20,9 @@
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaSummaryDefines.h"
#include "RiaSummaryTools.h"
#include "RiaTimeTTools.h"
#include "Summary/RiaSummaryDefines.h"
#include "Summary/RiaSummaryTools.h"
#include "RifArrowTools.h"
#include "RifByteArrayArrowRandomAccessFile.h"