Update text for curve names and plot titles when source data changes

* Update titles after dropping vectors into plot * Do not replace _Name variables * Make sure signals are wired when opening a project file * Add auto name field and set default on * Remove includes from header files
2025-02-25 18:55:39 -06:00 · 2022-12-09 08:46:36 +01:00 · 2022-12-09 08:46:36 +01:00 · 5ec32f8613
commit 5ec32f8613
parent c83210701c
35 changed files with 109 additions and 22 deletions
--- a/ApplicationLibCode/Application/RiaApplication.cpp
+++ b/ApplicationLibCode/Application/RiaApplication.cpp
@ -674,6 +674,7 @@ bool RiaApplication::loadProject( const QString&      projectFileName,
        sumMainCollection->updateAutoShortName();
        for ( auto sumCaseGroup : sumMainCollection->summaryCaseCollections() )
        {
+            sumCaseGroup->ensureNameIsUpdated();
            sumCaseGroup->loadDataAndUpdate();
        }

--- a/ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.cpp
+++ b/ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.cpp
@ -29,6 +29,8 @@
 #include "RimEnsembleCurveSet.h"
 #include "RimSummaryAddressCollection.h"
 #include "RimSummaryAddressModifier.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryMultiPlot.h"
 #include "RimSummaryMultiPlotCollection.h"
@ -112,6 +114,8 @@ void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot* s
        }
        info.incrementProgress();
    }
+
+    summaryMultiPlot->updatePlotTitles();
 }

 //--------------------------------------------------------------------------------------------------
--- a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp
+++ b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp
@ -32,6 +32,8 @@
 #include "RimEnsembleCurveSetCollection.h"
 #include "RimProject.h"
 #include "RimSummaryAddress.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryMultiPlot.h"
 #include "RimSummaryPlot.h"
--- a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
+++ b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
@ -36,6 +36,7 @@
 #include "RimMainPlotCollection.h"
 #include "RimSummaryAddressCollection.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryMultiPlot.h"
 #include "RimSummaryMultiPlotCollection.h"
--- a/ApplicationLibCode/Commands/RicCloseSummaryCaseFeature.cpp
+++ b/ApplicationLibCode/Commands/RicCloseSummaryCaseFeature.cpp
@ -77,6 +77,7 @@ void RicCloseSummaryCaseFeature::deleteSummaryCases( std::vector<RimSummaryCase*
    for ( auto plot : plotsToUpdate )
    {
        plot->updateConnectedEditors();
+        plot->updatePlots();
    }

    summaryCaseMainCollection->updateAllRequiredEditors();
--- a/ApplicationLibCode/Commands/RicReplaceSummaryCaseFeature.cpp
+++ b/ApplicationLibCode/Commands/RicReplaceSummaryCaseFeature.cpp
@ -139,6 +139,7 @@ void RicReplaceSummaryCaseFeature::onActionTriggered( bool isChecked )

            summaryPlot->loadDataAndUpdate();
        }
+        multiPlot->updatePlotTitles();
    }

    RimSummaryCrossPlotCollection* summaryCrossPlotColl = RiaSummaryTools::summaryCrossPlotCollection();
--- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
+++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
@ -32,6 +32,7 @@
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveAppearanceCalculator.h"
--- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteSummaryCurveFeature.cpp
+++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteSummaryCurveFeature.cpp
@ -68,7 +68,7 @@ RimSummaryCurve* RicPasteSummaryCurveFeature::copyCurveAndAddToPlot( RimSummaryC
    summaryPlot->firstAncestorOrThisOfType( summaryMultiPlot );
    if ( summaryMultiPlot )
    {
-        summaryMultiPlot->updatePlotWindowTitle();
+        summaryMultiPlot->updatePlotTitles();
    }
    else
    {
--- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h
@ -20,7 +20,6 @@

 #include "RimPlot.h"
 #include "RimPlotDataFilterItem.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimTimeStepFilter.h"

 #include "RigEnsembleParameter.h"
@ -38,6 +37,7 @@ class RimPlotAxisPropertiesInterface;
 class RimPlotAxisProperties;
 class RimPlotDataFilterCollection;
 class RiaSummaryCurveDefinition;
+class RimSummaryCase;

 //==================================================================================================
 ///
--- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
@ -24,6 +24,7 @@
 #include "RimPlotDataFilterCollection.h"
 #include "RimProject.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"

 CAF_PDM_SOURCE_INIT( RimAnalysisPlotCollection, "AnalysisPlotCollection" );

--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
@ -17,9 +17,11 @@
 /////////////////////////////////////////////////////////////////////////////////

 #include "RimWellRftEnsembleCurveSet.h"
+
 #include "RimEnsembleCurveSetColorManager.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimWellRftPlot.h"

 #include "RiuQwtPlotWidget.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.h
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.h
@ -19,7 +19,6 @@
 #pragma once

 #include "RimEnsembleCurveSetColorManager.h"
-#include "RimSummaryCaseCollection.h"

 #include "RigEnsembleParameter.h"

@ -32,6 +31,7 @@
 #include <QPointer>

 class RiuCvfOverlayItemWidget;
+class RimSummaryCaseCollection;

 class RimWellRftEnsembleCurveSet : public caf::PdmObject
 {
--- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp
@ -42,6 +42,7 @@
 #include "RimPlotAxisAnnotation.h"
 #include "RimPlotWindow.h"
 #include "RimProject.h"
+#include "RimSummaryCase.h"
 #include "RimWellAllocationPlot.h"
 #include "RimWellLogCurve.h"
 #include "RimWellLogCurveCommonDataSource.h"
--- a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp
@ -370,7 +370,7 @@ void RimMultiPlot::updateSubPlotNames()
 //--------------------------------------------------------------------------------------------------
 /// Empty default implementation
 //--------------------------------------------------------------------------------------------------
-void RimMultiPlot::updatePlotWindowTitle()
+void RimMultiPlot::updatePlotTitles()
 {
 }

@ -559,7 +559,7 @@ QString RimMultiPlot::asciiDataForPlotExport() const
 void RimMultiPlot::onPlotAdditionOrRemoval()
 {
    updateSubPlotNames();
-    updatePlotWindowTitle();
+    updatePlotTitles();
    applyPlotWindowTitleToWidgets();
    updateAllRequiredEditors();
    updateLayout();
@ -683,7 +683,7 @@ void RimMultiPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, co
    }
    else if ( changedField == &m_showPlotWindowTitle || changedField == &m_plotWindowTitle )
    {
-        updatePlotWindowTitle();
+        updatePlotTitles();
        applyPlotWindowTitleToWidgets();
    }
    else if ( changedField == &m_subTitleFontSize )
@ -805,7 +805,7 @@ void RimMultiPlot::onLoadDataAndUpdate()
    m_showPlotLegends      = false;

    updateMdiWindowVisibility();
-    updatePlotWindowTitle();
+    updatePlotTitles();
    applyPlotWindowTitleToWidgets();
    updatePlots();
    updateLayout();
--- a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.h
@ -77,7 +77,7 @@ public:

    void         deleteAllPlots() override;
    void         updatePlots();
-    virtual void updatePlotWindowTitle();
+    virtual void updatePlotTitles();

    size_t plotCount() const override;
    size_t plotIndex( const RimPlot* plot ) const;
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
@ -28,6 +28,7 @@
 #include "RimObjectiveFunctionTools.h"
 #include "RimSummaryAddress.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"

 #include "RiuSummaryVectorSelectionDialog.h"

--- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
@ -27,9 +27,6 @@

 #include "RimEnsembleCurveSetColorManager.h"
 #include "RimEnsembleCurveSetInterface.h"
-#include "RimObjectiveFunction.h"
-#include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimTimeStepFilter.h"

 #include "RigEnsembleParameter.h"
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.cpp
@ -19,12 +19,15 @@
 #include "RimEnsembleCurveSetColorManager.h"

 #include "RiaColorTables.h"
+
 #include "RimCustomObjectiveFunction.h"
 #include "RimEnsembleCurveSet.h"
 #include "RimEnsembleCurveSetCollection.h"
 #include "RimObjectiveFunction.h"
-
 #include "RimRegularLegendConfig.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
+
 #include "cvfScalarMapper.h"

 //--------------------------------------------------------------------------------------------------
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.h
@ -21,7 +21,6 @@
 #include "RiaDefines.h"

 #include "RimRegularLegendConfig.h"
-#include "RimSummaryCaseCollection.h"

 #include "RigEnsembleParameter.h"

@ -33,6 +32,9 @@ class RimEnsembleCurveSet;
 class RimEnsembleCurveSetCollection;
 class RimCustomObjectiveFunction;
 class RimObjectiveFunction;
+class RimSummaryCase;
+class RifEclipseSummaryAddress;
+class ObjectiveFunctionTimeConfig;

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
@ -25,6 +25,7 @@
 #include "RigStatisticsMath.h"

 #include "RimEnsembleCurveSet.h"
+#include "RimSummaryCaseCollection.h"

 #include <limits>
 #include <set>
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
@ -18,6 +18,7 @@

 #include "RimSummaryCaseCollection.h"

+#include "RiaEnsembleNameTools.h"
 #include "RiaFieldHandleTools.h"
 #include "RiaLogging.h"
 #include "RiaStatisticsTools.h"
@ -115,6 +116,7 @@ RimSummaryCaseCollection::RimSummaryCaseCollection()
    m_cases.uiCapability()->setUiTreeHidden( true );

    CAF_PDM_InitScriptableField( &m_name, "SummaryCollectionName", QString( "Group" ), "Name" );
+    CAF_PDM_InitScriptableField( &m_autoName, "CreateAutoName", true, "Auto Name" );

    CAF_PDM_InitScriptableFieldNoDefault( &m_nameAndItemCount, "NameCount", "Name" );
    m_nameAndItemCount.registerGetMethod( this, &RimSummaryCaseCollection::nameAndItemCount );
@ -246,6 +248,28 @@ QString RimSummaryCaseCollection::name() const
    return m_name;
 }

+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCaseCollection::ensureNameIsUpdated()
+{
+    if ( m_autoName )
+    {
+        QStringList fileNames;
+        for ( const auto& summaryCase : m_cases )
+        {
+            fileNames.push_back( summaryCase->summaryHeaderFilename() );
+        }
+
+        RiaEnsembleNameTools::EnsembleGroupingMode groupingMode =
+            RiaEnsembleNameTools::EnsembleGroupingMode::FMU_FOLDER_STRUCTURE;
+
+        QString ensembleName = RiaEnsembleNameTools::findSuitableEnsembleName( fileNames, groupingMode );
+        m_name               = ensembleName;
+        caseNameChanged.send();
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@ -1036,6 +1060,11 @@ void RimSummaryCaseCollection::initAfterRead()
    }

    updateIcon();
+
+    for ( const auto& summaryCase : m_cases )
+    {
+        summaryCase->nameChanged.connect( this, &RimSummaryCaseCollection::onCaseNameChanged );
+    }
 }

 //--------------------------------------------------------------------------------------------------
@ -1049,6 +1078,14 @@ void RimSummaryCaseCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
    {
        updateIcon();
    }
+    if ( changedField == &m_autoName )
+    {
+        ensureNameIsUpdated();
+    }
+    if ( changedField == &m_name )
+    {
+        caseNameChanged.send();
+    }
 }

 //--------------------------------------------------------------------------------------------------
@ -1064,7 +1101,9 @@ void RimSummaryCaseCollection::onCaseNameChanged( const SignalEmitter* emitter )
 //--------------------------------------------------------------------------------------------------
 void RimSummaryCaseCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
+    uiOrdering.add( &m_autoName );
    uiOrdering.add( &m_name );
+    m_name.uiCapability()->setUiReadOnly( m_autoName() );
    if ( m_isEnsemble() )
    {
        uiOrdering.add( &m_ensembleId );
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
@ -67,6 +67,7 @@ public:

    void    setName( const QString& name );
    QString name() const;
+    void    ensureNameIsUpdated();

    bool                                       isEnsemble() const;
    void                                       setAsEnsemble( bool isEnsemble );
@ -145,6 +146,7 @@ protected:

 private:
    caf::PdmField<QString>                           m_name;
+    caf::PdmField<bool>                              m_autoName;
    caf::PdmProxyValueField<QString>                 m_nameAndItemCount;
    caf::PdmField<bool>                              m_isEnsemble;
    caf::PdmChildField<RimSummaryAddressCollection*> m_dataVectorFolders;
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
@ -424,6 +424,22 @@ void RimSummaryCaseMainCollection::loadAllSummaryCaseData()
    RimSummaryCaseMainCollection::loadSummaryCaseData( sumCases );
 }

+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCaseMainCollection::initAfterRead()
+{
+    for ( auto sumCase : topLevelSummaryCases() )
+    {
+        sumCase->nameChanged.connect( this, &RimSummaryCaseMainCollection::onCaseNameChanged );
+    }
+
+    for ( auto caseCollection : summaryCaseCollections() )
+    {
+        caseCollection->caseNameChanged.connect( this, &RimSummaryCaseMainCollection::onCaseNameChanged );
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
@ -79,6 +79,8 @@ public:
    void onProjectBeingSaved();

 private:
+    void initAfterRead() override;
+
    static void loadSummaryCaseData( std::vector<RimSummaryCase*> summaryCases );
    static void loadFileSummaryCaseData( std::vector<RimFileSummaryCase*> fileSummaryCases );
    static void reassignSummaryCurves( const RimGridSummaryCase* fromGridCase, RimFileSummaryCase* toFileCase );
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
@ -526,7 +526,7 @@ void RimSummaryMultiPlot::defineEditorAttribute( const caf::PdmFieldHandle* fiel
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryMultiPlot::updatePlotWindowTitle()
+void RimSummaryMultiPlot::updatePlotTitles()
 {
    if ( m_autoPlotTitle )
    {
@ -727,7 +727,7 @@ void RimSummaryMultiPlot::initAfterRead()
 void RimSummaryMultiPlot::onLoadDataAndUpdate()
 {
    RimMultiPlot::onLoadDataAndUpdate();
-    updatePlotWindowTitle();
+    updatePlotTitles();

    analyzePlotsAndAdjustAppearanceSettings();
 }
@ -1344,7 +1344,7 @@ std::pair<int, int> RimSummaryMultiPlot::gridLayoutInfoForSubPlot( RimSummaryPlo
 //--------------------------------------------------------------------------------------------------
 void RimSummaryMultiPlot::onSubPlotChanged( const caf::SignalEmitter* emitter )
 {
-    updatePlotWindowTitle();
+    updatePlotTitles();
    applyPlotWindowTitleToWidgets();
 }

--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h
@ -79,7 +79,7 @@ public:

    void removePlotNoUpdate( RimPlot* plot ) override;
    void updateAfterPlotRemove() override;
-    void updatePlotWindowTitle() override;
+    void updatePlotTitles() override;

    std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar() override;

--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlotCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlotCollection.cpp
@ -188,5 +188,7 @@ void RimSummaryMultiPlotCollection::updateSummaryNameHasChanged()
        {
            plot->updateCaseNameHasChanged();
        }
+
+        multiPlot->updatePlotTitles();
    }
 }
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
@ -51,6 +51,7 @@
 #include "RimSummaryAddress.h"
 #include "RimSummaryAddressCollection.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveCollection.h"
 #include "RimSummaryCurvesData.h"
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
@ -30,6 +30,7 @@
 #include "RimProject.h"
 #include "RimSummaryAddressModifier.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCrossPlot.h"
 #include "RimSummaryCurve.h"
@ -517,7 +518,7 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle*
        if ( summaryMultiPlot )
        {
            summaryMultiPlot->updatePlots();
-            summaryMultiPlot->updatePlotWindowTitle();
+            summaryMultiPlot->updatePlotTitles();

            if ( isAutoZoomAllowed ) summaryMultiPlot->zoomAllYAxes();

--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp
@ -29,6 +29,8 @@
 #include "RimFileSurface.h"
 #include "RimMainPlotCollection.h"
 #include "RimProject.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSurface.h"
 #include "RimSurfaceCollection.h"

--- a/ApplicationLibCode/ProjectDataModel/Tools/RiaVariableMapper.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Tools/RiaVariableMapper.cpp
@ -219,7 +219,7 @@ void RiaVariableMapper::replaceVariablesInValues()
    {
        for ( const auto& [otherVariableName, otherVariableValue] : m_newVariableToValueMap )
        {
-            if ( otherVariableName != variableName )
+            if ( otherVariableName != variableName && !otherVariableName.contains( postfixName() ) )
            {
                variableValue.replace( otherVariableValue, otherVariableName );
            }
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
@ -36,6 +36,8 @@
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimWellLogCurve.h"
 #include "RimWellLogFile.h"
 #include "RimWellLogFileChannel.h"
--- a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp
@ -25,6 +25,7 @@
 #include "RiaTextStringTools.h"

 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryPlot.h"
 #include "RimSummaryPlotCollection.h"

--- a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.h
+++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.h
@ -18,9 +18,6 @@

 #pragma once

-#include "RimSummaryCaseCollection.h"
-#include "RimSummaryPlotCollection.h"
-
 #include "cafPdmField.h"
 #include "cafPdmObjectHandle.h"
 #include "cafPdmObjectMethod.h"
@ -33,6 +30,7 @@

 class RimSummaryCase;
 class RimSummaryPlotCollection;
+class RimSummaryCaseCollection;

 //==================================================================================================
 ///
--- a/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
+++ b/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
@ -22,6 +22,8 @@

 #include "RimEnsembleCurveSet.h"
 #include "RimPlot.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryPlot.h"