From 863757219ccf67bde5fec1fc357e649c075626f6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sun, 25 Feb 2024 09:02:21 +0100 Subject: [PATCH] Rename --- .../FileInterface/RifMultipleSummaryReaders.cpp | 8 ++++---- .../FileInterface/RifMultipleSummaryReaders.h | 2 +- .../FileInterface/RifSummaryReaderInterface.cpp | 2 +- .../FileInterface/RifSummaryReaderInterface.h | 2 +- .../RimSummaryCalculationCollection.cpp | 4 ++-- .../Summary/RimCalculatedSummaryCurveReader.cpp | 2 +- .../Summary/RimCalculatedSummaryCurveReader.h | 2 +- .../Summary/RimSummaryCaseCollection.cpp | 13 +++---------- .../Summary/RimSummaryCaseCollection.h | 7 ++----- 9 files changed, 16 insertions(+), 26 deletions(-) diff --git a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp index b05bc0f927c..98df37a642b 100644 --- a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp +++ b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp @@ -36,7 +36,7 @@ void RifMultipleSummaryReaders::addReader( RifSummaryReaderInterface* reader ) m_readers.push_back( reader ); - rebuildMetaData(); + buildMetaData(); } //-------------------------------------------------------------------------------------------------- @@ -45,7 +45,7 @@ void RifMultipleSummaryReaders::addReader( RifSummaryReaderInterface* reader ) void RifMultipleSummaryReaders::removeReader( RifSummaryReaderInterface* reader ) { m_readers.erase( reader ); - rebuildMetaData(); + buildMetaData(); } //-------------------------------------------------------------------------------------------------- @@ -100,7 +100,7 @@ RiaDefines::EclipseUnitSystem RifMultipleSummaryReaders::unitSystem() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifMultipleSummaryReaders::rebuildMetaData() +void RifMultipleSummaryReaders::buildMetaData() { m_allErrorAddresses.clear(); m_allResultAddresses.clear(); @@ -109,7 +109,7 @@ void RifMultipleSummaryReaders::rebuildMetaData() { // TODO: hack. Find a better way to rebuild calculated summary meta data. auto calcReader = dynamic_cast( reader.p() ); - if ( calcReader ) calcReader->rebuildMetaData(); + if ( calcReader ) calcReader->buildMetaData(); { auto resultAddresses = reader->allResultAddresses(); diff --git a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h index 41b82dc4265..996fa4e66ad 100644 --- a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h +++ b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h @@ -40,7 +40,7 @@ class RifMultipleSummaryReaders : public RifSummaryReaderInterface std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; RiaDefines::EclipseUnitSystem unitSystem() const override; - void rebuildMetaData() override; + void buildMetaData() override; private: cvf::Collection m_readers; diff --git a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp index 1cbf835f225..01ee289adbb 100644 --- a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp +++ b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp @@ -52,7 +52,7 @@ RifEclipseSummaryAddress RifSummaryReaderInterface::errorAddress( const RifEclip //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifSummaryReaderInterface::rebuildMetaData() +void RifSummaryReaderInterface::buildMetaData() { } diff --git a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h index 970ead77e3c..efdd2973c6e 100644 --- a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h +++ b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h @@ -51,7 +51,7 @@ class RifSummaryReaderInterface : public cvf::Object virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0; virtual RiaDefines::EclipseUnitSystem unitSystem() const = 0; - virtual void rebuildMetaData(); + virtual void buildMetaData(); protected: std::set m_allResultAddresses; // Result and error addresses diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp index 3d8be32f7c6..f2de3ba4447 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp @@ -60,7 +60,7 @@ void RimSummaryCalculationCollection::updateDataDependingOnCalculations() if ( auto reader = summaryCase->summaryReader() ) { - reader->rebuildMetaData(); + reader->buildMetaData(); summaryCase->onCalculationUpdated(); } } @@ -73,7 +73,7 @@ void RimSummaryCalculationCollection::updateDataDependingOnCalculations() if ( auto reader = obs->summaryReader() ) { - reader->rebuildMetaData(); + reader->buildMetaData(); obs->onCalculationUpdated(); } } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp index e0da1ecc653..22f0a32fcad 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp @@ -81,7 +81,7 @@ std::string RifCalculatedSummaryCurveReader::unitName( const RifEclipseSummaryAd //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifCalculatedSummaryCurveReader::rebuildMetaData() +void RifCalculatedSummaryCurveReader::buildMetaData() { m_allResultAddresses.clear(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h index 8846c34f227..5eb786d75a9 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h @@ -39,7 +39,7 @@ class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface std::pair> values( const RifEclipseSummaryAddress& resultAddress ) const override; std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override; - void rebuildMetaData() override; + void buildMetaData() override; RiaDefines::EclipseUnitSystem unitSystem() const override; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index b9a5d3544a4..6e5fc541e7c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -22,30 +22,23 @@ #include "RiaFieldHandleTools.h" #include "RiaLogging.h" #include "RiaStatisticsTools.h" -#include "RiaStdStringTools.h" #include "RiaSummaryAddressAnalyzer.h" -#include "RiaWeightedMeanCalculator.h" - -#include "RicfCommandObject.h" #include "RifReaderRftInterface.h" #include "RifSummaryReaderInterface.h" -#include "RimAnalysisPlotDataEntry.h" #include "RimDerivedEnsembleCaseCollection.h" #include "RimEnsembleCurveSet.h" #include "RimProject.h" #include "RimSummaryAddressCollection.h" -#include "RimSummaryCalculationCollection.h" #include "RimSummaryCase.h" #include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiTreeOrdering.h" -#include #include -#include #include CAF_PDM_SOURCE_INIT( RimSummaryCaseCollection, "SummaryCaseSubCollection" ); @@ -284,7 +277,7 @@ void RimSummaryCaseCollection::setAsEnsemble( bool isEnsemble ) calculateEnsembleParametersIntersectionHash(); } - refreshMetaData(); + buildMetaData(); } } @@ -1155,7 +1148,7 @@ void RimSummaryCaseCollection::buildChildNodes() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryCaseCollection::refreshMetaData() +void RimSummaryCaseCollection::buildMetaData() { clearChildNodes(); buildChildNodes(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h index 5e56a574d65..b2798c954ec 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h @@ -19,20 +19,17 @@ #pragma once #include "RiaDefines.h" + #include "RifEclipseSummaryAddress.h" #include "RigEnsembleParameter.h" -#include "RimObjectiveFunction.h" - #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" #include "cafPdmField.h" #include "cafPdmObject.h" #include "cafPdmProxyValueField.h" -#include "cvfObject.h" - #include #include @@ -103,7 +100,6 @@ class RimSummaryCaseCollection : public caf::PdmObject RiaDefines::EclipseUnitSystem unitSystem() const; - void refreshMetaData(); void onCalculationUpdated(); void updateReferringCurveSets(); @@ -128,6 +124,7 @@ class RimSummaryCaseCollection : public caf::PdmObject void onCaseNameChanged( const SignalEmitter* emitter ); + void buildMetaData(); void buildChildNodes(); void clearChildNodes();