diff --git a/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp b/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp index 393dc47139..a2c7307aac 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp @@ -638,30 +638,6 @@ RiaEclipseUnitTools::UnitSystem RifReaderEclipseSummary::unitSystem() const return m_unitSystem; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderEclipseSummary::markForCachePurge( const RifEclipseSummaryAddress& address ) -{ - m_valuesCache->markAddressForPurge( address ); -} - -#if 0 -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderEclipseSummary::populateVectorFromStringList(stringlist_type* stringList, std::vector* strings) -{ - assert(stringList && strings); - - for (int i = 0; i < stringlist_get_size(stringList); i++) - { - strings->push_back(stringlist_iget(stringList, i)); - } -} - -#endif - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -688,7 +664,6 @@ void RifReaderEclipseSummary::ValuesCache::insertValues( const RifEclipseSummary const std::vector& values ) { m_cachedValues[address] = values; - m_purgeList.erase( address ); } //-------------------------------------------------------------------------------------------------- @@ -702,23 +677,3 @@ const std::vector& RifReaderEclipseSummary::ValuesCache::getValues( cons } return EMPTY_VECTOR; } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderEclipseSummary::ValuesCache::markAddressForPurge( const RifEclipseSummaryAddress& address ) -{ - m_purgeList.insert( address ); -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderEclipseSummary::ValuesCache::purgeData() -{ - for ( const auto& purgeAddr : m_purgeList ) - { - m_cachedValues.erase( purgeAddr ); - } - m_purgeList.clear(); -} diff --git a/ApplicationCode/FileInterface/RifReaderEclipseSummary.h b/ApplicationCode/FileInterface/RifReaderEclipseSummary.h index 63b0c0979f..e101ef4377 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseSummary.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseSummary.h @@ -78,8 +78,6 @@ public: RiaEclipseUnitTools::UnitSystem unitSystem() const override; QStringList warnings() const { return m_warnings; } - void markForCachePurge( const RifEclipseSummaryAddress& address ) override; - static std::string differenceIdentifier() { return "_DIFF"; } static const std::string historyIdentifier() { return "H"; } @@ -119,13 +117,9 @@ private: void insertValues( const RifEclipseSummaryAddress& address, const std::vector& values ); const std::vector& getValues( const RifEclipseSummaryAddress& address ) const; - void markAddressForPurge( const RifEclipseSummaryAddress& address ); private: - void purgeData(); - std::map> m_cachedValues; - std::set m_purgeList; }; std::unique_ptr m_valuesCache; diff --git a/ApplicationCode/FileInterface/RifSummaryReaderInterface.h b/ApplicationCode/FileInterface/RifSummaryReaderInterface.h index 09fa1e0336..84a6ce5d53 100644 --- a/ApplicationCode/FileInterface/RifSummaryReaderInterface.h +++ b/ApplicationCode/FileInterface/RifSummaryReaderInterface.h @@ -51,8 +51,6 @@ public: virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0; virtual RiaEclipseUnitTools::UnitSystem unitSystem() const = 0; - virtual void markForCachePurge( const RifEclipseSummaryAddress& address ) {} - protected: std::set m_allResultAddresses; // Result and error addresses std::set m_allErrorAddresses; // Error addresses diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index f231e66e78..b4542a73da 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -383,7 +383,6 @@ void RimEnsembleCurveSet::deleteCurve( RimSummaryCurve* curve ) if ( curve ) { m_curves.removeChildObject( curve ); - curve->markCachedDataForPurge(); delete curve; } } @@ -1808,17 +1807,6 @@ void RimEnsembleCurveSet::showCurves( bool show ) m_showCurves = show; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimEnsembleCurveSet::markCachedDataForPurge() -{ - for ( const auto& curve : m_curves ) - { - curve->markCachedDataForPurge(); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h index ed633a8488..cb0d3c333b 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h @@ -126,8 +126,6 @@ public: RimEnsembleCurveSet* clone() const; void showCurves( bool show ); - void markCachedDataForPurge(); - void updateAllTextInPlot(); std::vector variationSortedEnsembleParameters() const; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp index 9dee9d641b..a996a3ddf9 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp @@ -193,7 +193,6 @@ void RimEnsembleCurveSetCollection::deleteCurveSets( const std::vectormarkCachedDataForPurge(); delete curveSet; } } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 760ad1c31f..e7d99114cc 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -971,15 +971,6 @@ void RimSummaryCurve::setCurveAppearanceFromCaseType() } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimSummaryCurve::markCachedDataForPurge() -{ - auto reader = valuesSummaryReaderY(); - if ( reader ) reader->markForCachePurge( m_yValuesSummaryAddress->address() ); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h index 2f44d84211..808a9334b9 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h @@ -91,8 +91,6 @@ public: QString curveExportDescription( const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress() ) const override; void setCurveAppearanceFromCaseType(); - void markCachedDataForPurge(); - void setAsTopZWithinCategory( bool enable ); void setZIndexFromCurveInfo(); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp index 80ac95d7e5..af17f5a603 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp @@ -206,7 +206,6 @@ void RimSummaryCurveCollection::deleteCurve( RimSummaryCurve* curve ) removeCurve( curve ); if ( curve ) { - curve->markCachedDataForPurge(); delete curve; } }