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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/Application/CMakeLists_files.cmake
View File

@ -13,7 +13,6 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesOsdu.h
${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesSumo.h
${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.h
${CMAKE_CURRENT_LIST_DIR}/RiaCurveSetDefinition.h
${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.h
${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.h
@ -34,12 +33,10 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaPlotCollectionScheduler.h
${CMAKE_CURRENT_LIST_DIR}/RiaScheduler.h
${CMAKE_CURRENT_LIST_DIR}/RiaSeismicDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaLasDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaOsduDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaCloudDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaWellFlowDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveAddress.h
${CMAKE_CURRENT_LIST_DIR}/RiaQuickAccessScheduler.h
)
@ -58,7 +55,6 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesOsdu.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesSumo.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaCurveSetDefinition.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.cpp
@ -78,13 +74,11 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaDateTimeDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaPlotCollectionScheduler.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaScheduler.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSeismicDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaLasDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaOsduDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaCloudDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWellFlowDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveAddress.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaQuickAccessScheduler.cpp
)

2
ApplicationLibCode/Application/RiaGuiApplication.cpp
View File

@ -35,9 +35,9 @@
#include "RiaProjectModifier.h"
#include "RiaRegressionTestRunner.h"
#include "RiaSocketServer.h"
#include "RiaSummaryTools.h"
#include "RiaVersionInfo.h"
#include "RiaViewRedrawScheduler.h"
#include "Summary/RiaSummaryTools.h"
#include "ExportCommands/RicSnapshotAllPlotsToFileFeature.h"
#include "ExportCommands/RicSnapshotAllViewsToFileFeature.h"

6
ApplicationLibCode/Application/Tools/CMakeLists_files.cmake
View File

@ -12,11 +12,9 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTest.h
${CMAKE_CURRENT_LIST_DIR}/RiaImportEclipseCaseTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaQDateTimeTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaWellNameComparer.h
${CMAKE_CURRENT_LIST_DIR}/RiaStdStringTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaInterpolationTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressAnalyzer.h
${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.h
@ -48,7 +46,6 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.h
${CMAKE_CURRENT_LIST_DIR}/RiaVec3Tools.h
${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryStringTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaNetworkTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaOpenMPTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaNumericalTools.h
@ -72,11 +69,9 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTest.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaImportEclipseCaseTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaQDateTimeTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWellNameComparer.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaStdStringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaInterpolationTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressAnalyzer.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.cpp
@ -101,7 +96,6 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaVec3Tools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryStringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaNetworkTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaOpenMPTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaNumericalTools.cpp

2
ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.cpp
View File

@ -19,8 +19,8 @@
#include "RiaEnsembleNameTools.h"
#include "RiaFilePathTools.h"
#include "RiaSummaryDefines.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryDefines.h"
#include "RimCaseDisplayNameTools.h"
#include "RimProject.h"

2
ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.h
View File

@ -23,7 +23,7 @@
#include <map>
#include <vector>
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
class RimSummaryCase;

23
ApplicationLibCode/Application/Tools/Summary/CMakeLists_files.cmake Normal file
View File

@ -0,0 +1,23 @@
set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressAnalyzer.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressModifier.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveAddress.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryStringTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.h
)
set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressAnalyzer.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressModifier.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveAddress.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryStringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.cpp
)
list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})

4
ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryAddressAnalyzer.cpp
View File

@ -16,10 +16,10 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"

2
ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryAddressAnalyzer.h
View File

@ -18,8 +18,8 @@
#pragma once
#include "RiaSummaryCurveAddress.h"
#include "RifEclipseSummaryAddress.h"
#include "Summary/RiaSummaryCurveAddress.h"
#include <set>
#include <string>

36
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryAddressModifier.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimSummaryAddressModifier.h"
#include "RiaSummaryAddressModifier.h"
#include "RiaLogging.h"
#include "RiaStdStringTools.h"
@ -30,7 +30,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RimSummaryAddressModifier::replaceTokenForCategory( const RifEclipseSummaryAddress& sourceAdr,
RifEclipseSummaryAddress RiaSummaryAddressModifier::replaceTokenForCategory( const RifEclipseSummaryAddress& sourceAdr,
const std::string& token,
RifEclipseSummaryAddressDefines::SummaryCategory contentType )
{
@ -103,7 +103,7 @@ RifEclipseSummaryAddress RimSummaryAddressModifier::replaceTokenForCategory( con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RiaSummaryCurveAddress> RimSummaryAddressModifier::curveAddresses( const std::vector<CurveAddressProvider>& curveAddressProviders )
std::vector<RiaSummaryCurveAddress> RiaSummaryAddressModifier::curveAddresses( const std::vector<CurveAddressProvider>& curveAddressProviders )
{
std::vector<RiaSummaryCurveAddress> addresses;
@ -112,7 +112,7 @@ std::vector<RiaSummaryCurveAddress> RimSummaryAddressModifier::curveAddresses( c
std::visit(
[&addresses]( auto&& arg )
{
auto curveAdr = RimSummaryAddressModifier::curveAddress( arg );
auto curveAdr = RiaSummaryAddressModifier::curveAddress( arg );
addresses.push_back( curveAdr );
},
provider );
@ -124,7 +124,7 @@ std::vector<RiaSummaryCurveAddress> RimSummaryAddressModifier::curveAddresses( c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::applyAddressesToCurveAddressProviders( const std::vector<CurveAddressProvider>& curveAddressProviders,
void RiaSummaryAddressModifier::applyAddressesToCurveAddressProviders( const std::vector<CurveAddressProvider>& curveAddressProviders,
const std::vector<RiaSummaryCurveAddress>& addresses )
{
if ( curveAddressProviders.size() != addresses.size() ) return;
@ -134,14 +134,14 @@ void RimSummaryAddressModifier::applyAddressesToCurveAddressProviders( const std
auto provider = curveAddressProviders[i];
const auto& address = addresses[i];
std::visit( [address]( auto&& arg ) { RimSummaryAddressModifier::setCurveAddress( arg, address ); }, provider );
std::visit( [address]( auto&& arg ) { RiaSummaryAddressModifier::setCurveAddress( arg, address ); }, provider );
};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryAddressModifier::CurveAddressProvider> RimSummaryAddressModifier::createAddressProviders( RimSummaryPlot* summaryPlot )
std::vector<RiaSummaryAddressModifier::CurveAddressProvider> RiaSummaryAddressModifier::createAddressProviders( RimSummaryPlot* summaryPlot )
{
std::vector<CurveAddressProvider> providers;
@ -161,7 +161,7 @@ std::vector<RimSummaryAddressModifier::CurveAddressProvider> RimSummaryAddressMo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RifEclipseSummaryAddress> RimSummaryAddressModifier::allSummaryAddressesY( RimSummaryPlot* summaryPlot )
std::vector<RifEclipseSummaryAddress> RiaSummaryAddressModifier::allSummaryAddressesY( RimSummaryPlot* summaryPlot )
{
std::vector<RifEclipseSummaryAddress> addresses;
@ -171,7 +171,7 @@ std::vector<RifEclipseSummaryAddress> RimSummaryAddressModifier::allSummaryAddre
std::visit(
[&addresses]( auto&& arg )
{
auto curveAdr = RimSummaryAddressModifier::curveAddress( arg );
auto curveAdr = RiaSummaryAddressModifier::curveAddress( arg );
addresses.push_back( curveAdr.summaryAddressY() );
},
provider );
@ -183,7 +183,7 @@ std::vector<RifEclipseSummaryAddress> RimSummaryAddressModifier::allSummaryAddre
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::updateAddressesByObjectName( const std::vector<CurveAddressProvider>& curveAddressProviders,
void RiaSummaryAddressModifier::updateAddressesByObjectName( const std::vector<CurveAddressProvider>& curveAddressProviders,
const std::string& objectName,
RimSummaryAddressCollection::CollectionContentType contentType )
{
@ -194,15 +194,15 @@ void RimSummaryAddressModifier::updateAddressesByObjectName( const std::vector<C
std::visit(
[objectName, category]( auto&& arg )
{
const auto sourceAdr = RimSummaryAddressModifier::curveAddress( arg );
const auto sourceAdr = RiaSummaryAddressModifier::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 );
const auto newAdrX = RiaSummaryAddressModifier::replaceTokenForCategory( sourceX, objectName, category );
const auto newAdrY = RiaSummaryAddressModifier::replaceTokenForCategory( sourceY, objectName, category );
RimSummaryAddressModifier::setCurveAddress( arg, RiaSummaryCurveAddress( newAdrX, newAdrY ) );
RiaSummaryAddressModifier::setCurveAddress( arg, RiaSummaryCurveAddress( newAdrX, newAdrY ) );
},
provider );
};
@ -211,7 +211,7 @@ void RimSummaryAddressModifier::updateAddressesByObjectName( const std::vector<C
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveAddress RimSummaryAddressModifier::curveAddress( RimEnsembleCurveSet* curveSet )
RiaSummaryCurveAddress RiaSummaryAddressModifier::curveAddress( RimEnsembleCurveSet* curveSet )
{
if ( curveSet == nullptr ) return RiaSummaryCurveAddress( RifEclipseSummaryAddress() );
return curveSet->curveAddress();
@ -220,7 +220,7 @@ RiaSummaryCurveAddress RimSummaryAddressModifier::curveAddress( RimEnsembleCurve
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveAddress RimSummaryAddressModifier::curveAddress( RimSummaryCurve* curve )
RiaSummaryCurveAddress RiaSummaryAddressModifier::curveAddress( RimSummaryCurve* curve )
{
if ( curve == nullptr ) return RiaSummaryCurveAddress( RifEclipseSummaryAddress() );
return curve->curveAddress();
@ -229,7 +229,7 @@ RiaSummaryCurveAddress RimSummaryAddressModifier::curveAddress( RimSummaryCurve*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::setCurveAddress( RimEnsembleCurveSet* curveSet, const RiaSummaryCurveAddress& curveAdr )
void RiaSummaryAddressModifier::setCurveAddress( RimEnsembleCurveSet* curveSet, const RiaSummaryCurveAddress& curveAdr )
{
if ( curveSet )
{
@ -240,7 +240,7 @@ void RimSummaryAddressModifier::setCurveAddress( RimEnsembleCurveSet* curveSet,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryAddressModifier::setCurveAddress( RimSummaryCurve* curve, const RiaSummaryCurveAddress& curveAdr )
void RiaSummaryAddressModifier::setCurveAddress( RimSummaryCurve* curve, const RiaSummaryCurveAddress& curveAdr )
{
if ( curve )
{

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryAddressModifier.h
View File

@ -32,7 +32,7 @@ class RiaSummaryCurveAddress;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
class RimSummaryAddressModifier
class RiaSummaryAddressModifier
{
public:
// Define a variant for summary curves and ensemble curve set. This way we can treat them as similar object without a

0
ApplicationLibCode/Application/RiaSummaryCurveAddress.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryCurveAddress.cpp
View File

0
ApplicationLibCode/Application/RiaSummaryCurveAddress.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryCurveAddress.h
View File

11
ApplicationLibCode/Application/RiaSummaryCurveDefinition.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryCurveDefinition.cpp
View File

@ -17,12 +17,13 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSummaryCurveDefinition.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryAddressModifier.h"
#include "RiaSummaryCurveAddress.h"
#include "RifSummaryReaderInterface.h"
#include "RimSummaryAddressModifier.h"
#include "RimSummaryCase.h"
#include "RimSummaryEnsemble.h"
@ -177,18 +178,18 @@ void RiaSummaryCurveDefinition::setIdentifierText( SummaryCategory category, con
if ( RifEclipseSummaryAddress::isDependentOnWellName( category ) )
{
m_summaryAddressX =
RimSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressX,
RiaSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressX,
name,
RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL );
m_summaryAddressY =
RimSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressY,
RiaSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressY,
name,
RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL );
}
else
{
m_summaryAddressX = RimSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressX, name, m_summaryAddressX.category() );
m_summaryAddressY = RimSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressY, name, m_summaryAddressY.category() );
m_summaryAddressX = RiaSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressX, name, m_summaryAddressX.category() );
m_summaryAddressY = RiaSummaryAddressModifier::replaceTokenForCategory( m_summaryAddressY, name, m_summaryAddressY.category() );
}
}

0
ApplicationLibCode/Application/RiaSummaryCurveDefinition.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryCurveDefinition.h
View File

1
ApplicationLibCode/Application/RiaSummaryDefines.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryDefines.cpp
View File

@ -17,6 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSummaryDefines.h"
#include "cafAppEnum.h"
namespace caf

0
ApplicationLibCode/Application/RiaSummaryDefines.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryDefines.h
View File

4
ApplicationLibCode/Application/Tools/RiaSummaryStringTools.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryStringTools.cpp
View File

@ -16,12 +16,12 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSummaryStringTools.h"
#include "Summary/RiaSummaryStringTools.h"
#include "RiaLogging.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryTools.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddress.h"
#include "RifReaderEclipseSummary.h"

0
ApplicationLibCode/Application/Tools/RiaSummaryStringTools.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryStringTools.h
View File

2
ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryTools.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RiaFilePathTools.h"
#include "RiaTimeHistoryCurveResampler.h"

0
ApplicationLibCode/Application/Tools/RiaSummaryTools.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryTools.h
View File

1
ApplicationLibCode/CMakeLists.txt
View File

@ -91,6 +91,7 @@ list(
Application/Tools/CMakeLists_files.cmake
Application/Tools/WellPathTools/CMakeLists_files.cmake
Application/Tools/Cloud/CMakeLists_files.cmake
Application/Tools/Summary/CMakeLists_files.cmake
ReservoirDataModel/CMakeLists_files.cmake
ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake
ReservoirDataModel/Completions/CMakeLists_files.cmake

2
ApplicationLibCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
View File

@ -23,8 +23,8 @@
#include "RiaEclipseUnitTools.h"
#include "RiaLogging.h"
#include "RiaQDateTimeTools.h"
#include "RiaSummaryTools.h"
#include "RigEclipseResultAddress.h"
#include "Summary/RiaSummaryTools.h"
#include "RimEclipseCase.h"
#include "RimEclipseResultCase.h"

2
ApplicationLibCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
View File

@ -27,7 +27,6 @@
#include "RigSimWellData.h"
#include "RiaSummaryTools.h"
#include "Rim3dView.h"
#include "RimEclipseResultCase.h"
#include "RimMainPlotCollection.h"
@ -41,6 +40,7 @@
#include "RimSummaryCurveAppearanceCalculator.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
#include "Summary/RiaSummaryTools.h"
#include "RiuPlotMainWindow.h"

16
ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.cpp
View File

@ -22,14 +22,14 @@
#include "RiaLogging.h"
#include "RiaPlotWindowRedrawScheduler.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryAddressModifier.h"
#include "Summary/RiaSummaryTools.h"
#include "RicSummaryPlotBuilder.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryAddressModifier.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
@ -106,8 +106,8 @@ void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot*
{
const auto objectName = summaryAdrCollection->name().toStdString();
auto contentType = summaryAdrCollection->contentType();
auto curveProviders = RimSummaryAddressModifier::createAddressProviders( duplicatedPlot );
RimSummaryAddressModifier::updateAddressesByObjectName( curveProviders, objectName, contentType );
auto curveProviders = RiaSummaryAddressModifier::createAddressProviders( duplicatedPlot );
RiaSummaryAddressModifier::updateAddressesByObjectName( curveProviders, objectName, contentType );
summaryMultiPlot->addPlot( duplicatedPlot );
duplicatedPlot->resolveReferencesRecursively();
@ -255,7 +255,7 @@ bool RicAppendSummaryPlotsForObjectsFeature::isSelectionCompatibleWithPlot( cons
for ( auto plot : plotsForObjectType )
{
auto addresses = RimSummaryAddressModifier::allSummaryAddressesY( plot );
auto addresses = RiaSummaryAddressModifier::allSummaryAddressesY( plot );
analyzer.appendAddresses( addresses );
}
}
@ -318,7 +318,7 @@ std::vector<RimSummaryPlot*>
RiaSummaryAddressAnalyzer myAnalyser;
for ( auto sourcePlot : sourcePlots )
{
auto addresses = RimSummaryAddressModifier::allSummaryAddressesY( sourcePlot );
auto addresses = RiaSummaryAddressModifier::allSummaryAddressesY( sourcePlot );
myAnalyser.appendAddresses( addresses );
}
@ -377,7 +377,7 @@ std::vector<RimSummaryPlot*>
}
else
{
auto addresses = RimSummaryAddressModifier::allSummaryAddressesY( sourcePlot );
auto addresses = RiaSummaryAddressModifier::allSummaryAddressesY( sourcePlot );
for ( const auto& a : addresses )
{

2
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryMultiPlotFromDataVectorFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicNewSummaryMultiPlotFromDataVectorFeature.h"
#include "RiaPreferencesSummary.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"

2
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryPlotFromDataVectorFeature.cpp
View File

@ -18,9 +18,9 @@
#include "RicNewSummaryPlotFromDataVectorFeature.h"
#include "RiaSummaryTools.h"
#include "RimSummaryAddress.h"
#include "RimSummaryPlot.h"
#include "Summary/RiaSummaryTools.h"
#include "RicSummaryPlotBuilder.h"

4
ApplicationLibCode/Commands/PlotBuilderCommands/RicSummaryPlotBuilder.cpp
View File

@ -23,8 +23,8 @@
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
#include "RiaPreferencesSummary.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddress.h"
#include "RifReaderEclipseSummary.h"

4
ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp
View File

@ -25,8 +25,8 @@
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryTools.h"
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectCaseOrEnsembleUi.cpp
View File

@ -18,7 +18,7 @@
#include "RicSelectCaseOrEnsembleUi.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimProject.h"
#include "RimSummaryCase.h"

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp
View File

@ -18,7 +18,7 @@
#include "RicSelectPlotTemplateUi.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotTemplates/RimPlotTemplateFileItem.h"
#include "PlotTemplates/RimPlotTemplateFolderItem.h"

4
ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@ -21,8 +21,8 @@
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicSelectPlotTemplateUi.h"

2
ApplicationLibCode/Commands/RicCloseObservedDataFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicCloseObservedDataFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimObservedDataCollection.h"

2
ApplicationLibCode/Commands/RicCloseSummaryCaseFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicCloseSummaryCaseFeature.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicDeleteItemFeature.h"

2
ApplicationLibCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicCreateSummaryCaseCollectionFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseMainCollection.h"

2
ApplicationLibCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicDeleteSummaryCaseCollectionFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimDerivedEnsembleCaseCollection.h"
#include "RimMainPlotCollection.h"

4
ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
View File

@ -22,9 +22,9 @@
#include "RiaEnsembleNameTools.h"
#include "RiaFilePathTools.h"
#include "RiaPreferences.h"
#include "RiaSummaryDefines.h"
#include "RiaSummaryTools.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryDefines.h"
#include "Summary/RiaSummaryTools.h"
#include "RicCreateSummaryCaseCollectionFeature.h"
#include "RicImportSummaryCasesFeature.h"

2
ApplicationLibCode/Commands/RicImportEnsembleFeature.h
View File

@ -19,7 +19,7 @@
#pragma once
#include "RiaEnsembleNameTools.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include "cafCmdFeature.h"

2
ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp
View File

@ -22,7 +22,7 @@
#include "RiaEnsembleNameTools.h"
#include "RiaFilePathTools.h"
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicImportEnsembleFeature.h"
#include "RicRecursiveFileSearchDialog.h"

2
ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicImportSummaryCasesFeature.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include "SummaryPlotCommands/RicNewSummaryCurveFeature.h"
#include "RiaGuiApplication.h"

2
ApplicationLibCode/Commands/RicImportSummaryCasesFeature.h
View File

@ -19,7 +19,7 @@
#pragma once
#include "RiaEnsembleNameTools.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include "RicRecursiveFileSearchDialog.h"
#include "cafCmdFeature.h"

2
ApplicationLibCode/Commands/RicImportSummaryGroupFeature.cpp
View File

@ -21,9 +21,9 @@
#include "RiaGuiApplication.h"
#include "RiaPreferences.h"
#include "RiaSummaryDefines.h"
#include "RicCreateSummaryCaseCollectionFeature.h"
#include "RicImportSummaryCasesFeature.h"
#include "Summary/RiaSummaryDefines.h"
#include "RifSummaryCaseRestartSelector.h"

2
ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.h
View File

@ -23,7 +23,7 @@
#include "cafPdmPointer.h"
#include "RiaEnsembleNameTools.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include <QDialog>

2
ApplicationLibCode/Commands/RicReloadSummaryCaseFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicReloadSummaryCaseFeature.h"
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimObservedDataCollection.h"
#include "RimObservedSummaryData.h"

2
ApplicationLibCode/Commands/RicReplaceCaseFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RiaEclipseFileNameTools.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicImportGeneralDataFeature.h"

2
ApplicationLibCode/Commands/RicReplaceSummaryCaseFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RiaEclipseFileNameTools.h"
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicImportGeneralDataFeature.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicCreateCrossPlotFeature.cpp
View File

@ -21,7 +21,7 @@
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RiaPreferencesSummary.h"
#include "RiaSummaryCurveAddress.h"
#include "Summary/RiaSummaryCurveAddress.h"
#include "RifEclipseSummaryAddress.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicCreateDeclineCurvesFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicCreateDeclineCurvesFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimSummaryCurve.h"
#include "RimSummaryDeclineCurve.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicCreateRegressionAnalysisCurveFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RiaColorTables.h"
#include "RiaColorTools.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryCurve.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicDuplicateSummaryCurveFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicDuplicateSummaryCurveFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicPasteSummaryCurveFeature.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicDuplicateSummaryPlotFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicDuplicateSummaryPlotFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicPasteSummaryPlotFeature.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicDuplicateSummaryTableFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicDuplicateSummaryTableFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimSummaryTable.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicEditSummaryPlotFeature.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicSummaryPlotEditorDialog.h"
#include "RicSummaryPlotEditorUi.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewDefaultSummaryPlotFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicNewDefaultSummaryPlotFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicEditSummaryPlotFeature.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicNewGridTimeHistoryCurveFeature.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RigFemResultAddress.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotCurveFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicNewSummaryCrossPlotCurveFeature.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimOilField.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp
View File

@ -21,7 +21,6 @@
#include "RiaColorTables.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimObservedDataCollection.h"
#include "RimObservedSummaryData.h"
@ -31,6 +30,7 @@
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryPlot.h"
#include "Summary/RiaSummaryTools.h"
#include "RiuPlotMainWindow.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@ -21,8 +21,8 @@
#include "RiaColorTables.h"
#include "RiaGuiApplication.h"
#include "RiaPreferencesSummary.h"
#include "RiaSummaryTools.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveFilterCollection.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryTableFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicNewSummaryTableFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimSummaryAddress.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicOpenSummaryPlotEditorFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicOpenSummaryPlotEditorFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicEditSummaryPlotFeature.h"
#include "RicNewSummaryEnsembleCurveSetFeature.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteEnsembleCurveSetFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicPasteEnsembleCurveSetFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteSummaryCurveFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicPasteSummaryCurveFeature.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteSummaryMultiPlotFeature.cpp
View File

@ -21,9 +21,9 @@
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RiaSummaryTools.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "Summary/RiaSummaryTools.h"
#include "cafPdmDefaultObjectFactory.h"
#include "cafPdmObjectGroup.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp
View File

@ -18,7 +18,7 @@
#include "RicSelectSummaryPlotUI.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.cpp
View File

@ -18,7 +18,7 @@
#include "RicSummaryCurveCalculatorUi.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimProject.h"
#include "RimSummaryCalculationCollection.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@ -21,7 +21,7 @@
#include "RiaColorTables.h"
#include "RiaCurveSetDefinition.h"
#include "RiaGuiApplication.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RiuSummaryCurveDefinitionKeywords.h"

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@ -26,8 +26,8 @@
#include "RiaImportEclipseCaseTools.h"
#include "RiaLogging.h"
#include "RiaPreferencesSummary.h"
#include "RiaSummaryStringTools.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryStringTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicCreateSummaryCaseCollectionFeature.h"

2
ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp
View File

@ -27,7 +27,7 @@
#include "RiaLogging.h"
#include "RiaPlotWindowRedrawScheduler.h"
#include "RiaRftDefines.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifReaderOpmRft.h"

2
ApplicationLibCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@ -20,8 +20,8 @@
#include "RiaFilePathTools.h"
#include "RiaStringEncodingTools.h"
#include "RiaSummaryAddressAnalyzer.h"
#include "RifSummaryReaderInterface.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "cafAppEnum.h"

2
ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.h
View File

@ -18,7 +18,7 @@
#pragma once
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include "RicSummaryCaseRestartDialog.h"

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@ -22,8 +22,8 @@
#include "RiaPlotDefines.h"
#include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RifSummaryReaderInterface.h"

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
View File

@ -18,7 +18,7 @@
#include "RimAnalysisPlotCollection.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimAnalysisPlot.h"
#include "RimPlotDataFilterCollection.h"

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.cpp
View File

@ -18,7 +18,7 @@
#include "RimAnalysisPlotDataEntry.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RifEclipseSummaryAddress.h"
#include "RimSummaryEnsemble.h"

2
ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.cpp
View File

@ -19,7 +19,7 @@
#include "RimCloudDataSourceCollection.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
View File

@ -20,7 +20,7 @@
#include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RifSummaryReaderInterface.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
View File

@ -22,7 +22,7 @@
#include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaStatisticsTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RifCsvDataTableFormatter.h"
#include "RifSummaryReaderInterface.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.h
View File

@ -21,7 +21,7 @@
#include "RimAbstractCorrelationPlot.h"
#include "RiaCurveDataTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "cafAppEnum.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.h
View File

@ -18,7 +18,7 @@
#pragma once
#include "RiaSummaryCurveDefinition.h" // use of caf::Signal requires this include
#include "Summary/RiaSummaryCurveDefinition.h" // use of caf::Signal requires this include
#include "RimAbstractCorrelationPlot.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp
View File

@ -18,7 +18,7 @@
#include "RimCorrelationPlotCollection.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimCorrelationMatrixPlot.h"
#include "RimCorrelationPlot.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
View File

@ -19,7 +19,7 @@
#include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimCorrelationMatrixPlot.h"
#include "RimCorrelationPlot.h"

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

@ -22,7 +22,7 @@
#include "RiaColorTools.h"
#include "RiaPlotDefines.h"
#include "RiaSimWellBranchTools.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifReaderEclipseRft.h"

2
ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp
View File

@ -19,7 +19,7 @@
#include "RimCustomObjectiveFunctionWeight.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "RimCustomObjectiveFunction.h"
#include "RimEnsembleCurveSet.h"

2
ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp
View File

@ -20,7 +20,7 @@
#include "RimMainPlotCollection.h"
#include "RiaPlotCollectionScheduler.h"
#include "RiaSummaryDefines.h"
#include "Summary/RiaSummaryDefines.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"

2
ApplicationLibCode/ProjectDataModel/RimReloadCaseTools.cpp
View File

@ -23,7 +23,7 @@
#include "RiaImportEclipseCaseTools.h"
#include "RiaLogging.h"
#include "RiaPreferencesGrid.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "ApplicationCommands/RicShowMainWindowFeature.h"

2
ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp
View File

@ -19,7 +19,7 @@
#include "RimSimWellInViewTools.h"
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddress.h"
#include "RifSummaryReaderInterface.h"

4
ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@ -22,8 +22,8 @@
#include "RiaCurveMerger.h"
#include "RiaLogging.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryTools.h"
#include "RifSummaryReaderInterface.h"
#include "RimDataSourceSteppingTools.h"

2
ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
View File

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

4
ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@ -19,8 +19,8 @@
#include "RimSummaryCalculationVariable.h"
#include "RiaApplication.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddressQMetaType.h"

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"

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"

Some files were not shown because too many files have changed in this diff Show More