diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp index c671587ca1..aa02639474 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp @@ -662,7 +662,7 @@ std::set RicSummaryCurveCreator::findPossibleSummaryAd for (RimSummaryCase* currCase : selectedCases) { - RifReaderEclipseSummary* reader = nullptr; + RifSummaryReaderInterface* reader = nullptr; if (currCase && currCase->caseData()) reader = currCase->caseData()->summaryReader(); if (reader) { @@ -846,7 +846,7 @@ void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection() std::set addrUnion; for (RimSummaryCase* currCase : m_selectedCases) { - RifReaderEclipseSummary* reader = nullptr; + RifSummaryReaderInterface* reader = nullptr; if (currCase && currCase->caseData()) reader = currCase->caseData()->summaryReader(); if (reader) { @@ -969,7 +969,7 @@ std::set RicSummaryCurveCreator::getAllSummaryWellNames() proj->allSummaryCases(cases); for (RimSummaryCase* rimCase : cases) { - RifReaderEclipseSummary* reader = nullptr; + RifSummaryReaderInterface* reader = nullptr; if (rimCase && rimCase->caseData()) { reader = rimCase->caseData()->summaryReader(); diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp b/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp index f9d1d9b549..5c97624863 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp @@ -128,7 +128,7 @@ std::vector RifEclipseSummaryTools::findSummaryDataFiles(const std: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseSummaryTools::dumpMetaData(RifReaderEclipseSummary* readerEclipseSummary) +void RifEclipseSummaryTools::dumpMetaData(RifSummaryReaderInterface* readerEclipseSummary) { std::vector addresses = readerEclipseSummary->allResultAddresses(); diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryTools.h b/ApplicationCode/FileInterface/RifEclipseSummaryTools.h index 48c2b759d8..c3a22986c1 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryTools.h +++ b/ApplicationCode/FileInterface/RifEclipseSummaryTools.h @@ -23,7 +23,7 @@ #include #include -class RifReaderEclipseSummary; +class RifSummaryReaderInterface; //================================================================================================== // @@ -38,7 +38,7 @@ public: static void findSummaryFiles(const std::string& inputFile, std::string* headerFile, std::vector* dataFiles); static bool hasSummaryFiles(const std::string& gridFileName); - static void dumpMetaData(RifReaderEclipseSummary* readerEclipseSummary); + static void dumpMetaData(RifSummaryReaderInterface* readerEclipseSummary); private: static void findSummaryHeaderFileInfo(const std::string& inputFile, std::string* headerFile, std::string* path, std::string* base, bool* isFormatted); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 88587b5887..475c104c59 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -231,7 +231,7 @@ void RimSummaryCurve::setSummaryAddress(const RifEclipseSummaryAddress& address) //-------------------------------------------------------------------------------------------------- std::string RimSummaryCurve::unitName() { - RifReaderEclipseSummary* reader = summaryReader(); + RifSummaryReaderInterface* reader = summaryReader(); if (reader) return reader->unitName(this->summaryAddress()); return ""; } @@ -243,7 +243,7 @@ std::vector RimSummaryCurve::yValues() const { std::vector values; - RifReaderEclipseSummary* reader = summaryReader(); + RifSummaryReaderInterface* reader = summaryReader(); if ( !reader ) return values; @@ -259,7 +259,7 @@ std::vector RimSummaryCurve::yValues() const const std::vector& RimSummaryCurve::timeSteps() const { static std::vector emptyVector; - RifReaderEclipseSummary* reader = summaryReader(); + RifSummaryReaderInterface* reader = summaryReader(); if ( !reader ) return emptyVector; @@ -312,7 +312,7 @@ QList RimSummaryCurve::calculateValueOptions(const caf:: { if(m_summaryCase) { - RifReaderEclipseSummary* reader = summaryReader(); + RifSummaryReaderInterface* reader = summaryReader(); int addressCount = 0; if(reader) { @@ -370,7 +370,7 @@ void RimSummaryCurve::onLoadDataAndUpdate() m_selectedVariableDisplayField = QString::fromStdString(m_curveVariable->address().uiText()); - RifReaderEclipseSummary* reader = summaryReader(); + RifSummaryReaderInterface* reader = summaryReader(); if (reader) { const std::vector allAddresses = reader->allResultAddresses(); @@ -545,7 +545,7 @@ void RimSummaryCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifReaderEclipseSummary* RimSummaryCurve::summaryReader() const +RifSummaryReaderInterface* RimSummaryCurve::summaryReader() const { if (!m_summaryCase()) return nullptr; @@ -569,7 +569,7 @@ bool RimSummaryCurve::curveData(std::vector* timeSteps, std::vector* timeSteps, std::vector* values) const; void calculateCurveInterpolationFromAddress(); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp index 541eb1c1de..e26a891426 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp @@ -363,7 +363,7 @@ void RimSummaryCurveFilter::syncCurvesFromUiSelection() { if (!currentCase || !currentCase->caseData() || !currentCase->caseData()->summaryReader()) continue; - RifReaderEclipseSummary* reader = currentCase->caseData()->summaryReader(); + RifSummaryReaderInterface* reader = currentCase->caseData()->summaryReader(); for(const RifEclipseSummaryAddress& addr: m_uiFilterResultMultiSelection.v()) { @@ -526,7 +526,7 @@ void RimSummaryCurveFilter::createSetOfCasesAndResultAdresses( { if (!currentCase || !currentCase->caseData() || !currentCase->caseData()->summaryReader()) continue; - RifReaderEclipseSummary* reader = currentCase->caseData()->summaryReader(); + RifSummaryReaderInterface* reader = currentCase->caseData()->summaryReader(); const std::vector allAddresses = reader->allResultAddresses(); int addressCount = static_cast(allAddresses.size()); @@ -674,7 +674,7 @@ std::set RimSummaryCurveFilter::findPossibleSummaryAdd for(RimSummaryCase* currCase: m_selectedSummaryCases) { - RifReaderEclipseSummary* reader = nullptr; + RifSummaryReaderInterface* reader = nullptr; if(currCase && currCase->caseData()) reader = currCase->caseData()->summaryReader(); if(reader) @@ -725,7 +725,7 @@ std::set RimSummaryCurveFilter::getAllSummaryWellNames() proj->allSummaryCases(cases); for (RimSummaryCase* rimCase : cases) { - RifReaderEclipseSummary* reader = nullptr; + RifSummaryReaderInterface* reader = nullptr; if (rimCase && rimCase->caseData()) { reader = rimCase->caseData()->summaryReader(); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp index 212d1d8213..6ed76bbe12 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp @@ -20,6 +20,7 @@ #include "RifEclipseSummaryTools.h" #include "RifReaderEclipseSummary.h" +#include "RifSummaryReaderInterface.h" #include "RimEclipseResultCase.h" #include "RimSummaryPlot.h" @@ -62,7 +63,7 @@ RimSummaryPlotCollection::~RimSummaryPlotCollection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifReaderEclipseSummary* RimSummaryPlotCollection::getOrCreateSummaryFileReader(const QString& eclipseCaseFilePathBasename) +RifSummaryReaderInterface* RimSummaryPlotCollection::getOrCreateSummaryFileReader(const QString& eclipseCaseFilePathBasename) { auto it = m_summaryFileReaders.find(eclipseCaseFilePathBasename); if (it != m_summaryFileReaders.end()) @@ -78,7 +79,7 @@ RifReaderEclipseSummary* RimSummaryPlotCollection::getOrCreateSummaryFileReader( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifReaderEclipseSummary* RimSummaryPlotCollection::getOrCreateSummaryFileReader(const RimEclipseResultCase* eclipseCase) +RifSummaryReaderInterface* RimSummaryPlotCollection::getOrCreateSummaryFileReader(const RimEclipseResultCase* eclipseCase) { if (!eclipseCase) return NULL; @@ -93,7 +94,7 @@ RifReaderEclipseSummary* RimSummaryPlotCollection::getOrCreateSummaryFileReader( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifReaderEclipseSummary* RimSummaryPlotCollection::createSummaryFileReader(const QString& eclipseCaseFilePathBasename) +RifSummaryReaderInterface* RimSummaryPlotCollection::createSummaryFileReader(const QString& eclipseCaseFilePathBasename) { std::string headerFile; bool isFormatted = false; @@ -105,7 +106,7 @@ RifReaderEclipseSummary* RimSummaryPlotCollection::createSummaryFileReader(const if (!dataFiles.size()) return nullptr; - RifReaderEclipseSummary* reader = new RifReaderEclipseSummary; + RifSummaryReaderInterface* reader = new RifReaderEclipseSummary; if (!reader->open(headerFile, dataFiles)) { delete reader; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h index 49bfaa5f22..5116b97ae4 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h @@ -28,6 +28,7 @@ class RimSummaryPlot; class RicDropEnabledMainWindow; class RifReaderEclipseSummary; +class RifSummaryReaderInterface; class RimEclipseResultCase; //================================================================================================== @@ -41,7 +42,7 @@ public: RimSummaryPlotCollection(); virtual ~RimSummaryPlotCollection(); - RifReaderEclipseSummary* getOrCreateSummaryFileReader(const RimEclipseResultCase* eclipseCase); + RifSummaryReaderInterface* getOrCreateSummaryFileReader(const RimEclipseResultCase* eclipseCase); caf::PdmChildArrayField summaryPlots; @@ -50,10 +51,10 @@ public: void summaryPlotItemInfos(QList* optionInfos) const; private: - RifReaderEclipseSummary* createSummaryFileReader(const QString& eclipseCaseFilePathBasename); - RifReaderEclipseSummary* getOrCreateSummaryFileReader(const QString& eclipseCaseFilePathBasename); + RifSummaryReaderInterface* createSummaryFileReader(const QString& eclipseCaseFilePathBasename); + RifSummaryReaderInterface* getOrCreateSummaryFileReader(const QString& eclipseCaseFilePathBasename); private: // Map from path to case to summary file reader objects - std::map m_summaryFileReaders; + std::map m_summaryFileReaders; }; diff --git a/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.cpp index 54b9d8e2b7..f8bfdf2bc4 100644 --- a/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.cpp @@ -61,7 +61,7 @@ void RigSummaryCaseData::openOrReloadCase(const QString& summaryHeaderFileName) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifReaderEclipseSummary* RigSummaryCaseData::summaryReader() +RifSummaryReaderInterface* RigSummaryCaseData::summaryReader() { return m_summaryFileReader.p(); } diff --git a/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.h b/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.h index 8ae057bad4..ec45bcbd73 100644 --- a/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigSummaryCaseData.h @@ -22,7 +22,7 @@ #include "cvfObject.h" class QString; -class RifReaderEclipseSummary; +class RifSummaryReaderInterface; class RigSummaryCaseData: public cvf::Object { @@ -32,8 +32,8 @@ public: void openOrReloadCase(const QString& summaryHeaderFileName); - RifReaderEclipseSummary* summaryReader(); + RifSummaryReaderInterface* summaryReader(); private: - cvf::ref m_summaryFileReader; + cvf::ref m_summaryFileReader; };