From 3b231a0bb6468fb2970c5a6d5461ba64f2d38b04 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 11 Dec 2020 19:21:40 +0100
Subject: [PATCH] #7107 Ensemble curves : Remove obsolete update signals

---
 .../RimCustomObjectiveFunctionCollection.cpp  | 17 +++++++++++------
 .../RimCustomObjectiveFunctionCollection.h    |  9 ++++-----
 .../Summary/RimEnsembleCurveSet.cpp           | 19 +------------------
 .../Summary/RimEnsembleCurveSet.h             |  4 +---
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp b/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp
index 9939260aeb..c782de6794 100644
--- a/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp
@@ -28,10 +28,7 @@ CAF_PDM_SOURCE_INIT( RimCustomObjectiveFunctionCollection, "RimCustomObjectiveFu
 ///
 //--------------------------------------------------------------------------------------------------
 RimCustomObjectiveFunctionCollection::RimCustomObjectiveFunctionCollection()
-    : objectiveFunctionAdded( this )
-    , objectiveFunctionChanged( this )
-    , objectiveFunctionAboutToBeDeleted( this )
-    , objectiveFunctionDeleted( this )
+    : objectiveFunctionChanged( this )
 {
     CAF_PDM_InitObject( "Custom Objective Functions", ":/ObjectiveFunctionCollection.svg", "", "" );
 
@@ -45,7 +42,6 @@ RimCustomObjectiveFunction* RimCustomObjectiveFunctionCollection::addObjectiveFu
 {
     auto newFunction = new RimCustomObjectiveFunction();
     m_objectiveFunctions.push_back( newFunction );
-    objectiveFunctionAdded.send( newFunction );
     return newFunction;
 }
 
@@ -54,7 +50,7 @@ RimCustomObjectiveFunction* RimCustomObjectiveFunctionCollection::addObjectiveFu
 //--------------------------------------------------------------------------------------------------
 void RimCustomObjectiveFunctionCollection::onObjectiveFunctionChanged( RimCustomObjectiveFunction* objectiveFunction )
 {
-    objectiveFunctionChanged.send( objectiveFunction );
+    objectiveFunctionChanged.send();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -77,3 +73,12 @@ void RimCustomObjectiveFunctionCollection::defineUiTreeOrdering( caf::PdmUiTreeO
     }
     uiTreeOrdering.skipRemainingChildren( true );
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimCustomObjectiveFunctionCollection::onChildDeleted( caf::PdmChildArrayFieldHandle*      childArray,
+                                                           std::vector<caf::PdmObjectHandle*>& referringObjects )
+{
+    objectiveFunctionChanged.send();
+}
diff --git a/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.h b/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.h
index fb57ea6a0e..564b3152a7 100644
--- a/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.h
@@ -35,10 +35,7 @@ class RimCustomObjectiveFunctionCollection : public caf::PdmObject
     CAF_PDM_HEADER_INIT;
 
 public:
-    caf::Signal<RimCustomObjectiveFunction*> objectiveFunctionAdded;
-    caf::Signal<RimCustomObjectiveFunction*> objectiveFunctionChanged;
-    caf::Signal<RimCustomObjectiveFunction*> objectiveFunctionAboutToBeDeleted;
-    caf::Signal<>                            objectiveFunctionDeleted;
+    caf::Signal<> objectiveFunctionChanged;
 
 public:
     RimCustomObjectiveFunctionCollection();
@@ -48,7 +45,9 @@ public:
     std::vector<RimCustomObjectiveFunction*> objectiveFunctions() const;
 
 private:
-    void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /* = "" */ ) override;
+    void onChildDeleted( caf::PdmChildArrayFieldHandle*      childArray,
+                         std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
+    void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
 
 private:
     caf::PdmChildArrayField<RimCustomObjectiveFunction*> m_objectiveFunctions;
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
index 92d97a96ab..99f58bf3a2 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
@@ -198,8 +198,6 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
                                 "" );
     m_customObjectiveFunctions = new RimCustomObjectiveFunctionCollection();
     m_customObjectiveFunctions->objectiveFunctionChanged.connect( this, &RimEnsembleCurveSet::onObjectiveFunctionChanged );
-    m_customObjectiveFunctions->objectiveFunctionAboutToBeDeleted
-        .connect( this, &RimEnsembleCurveSet::onObjectiveFunctionAboutToBeDeleted );
 
     CAF_PDM_InitFieldNoDefault( &m_statistics, "Statistics", "Statistics", "", "", "" );
     m_statistics = new RimEnsembleStatistics();
@@ -914,27 +912,12 @@ void RimEnsembleCurveSet::updateMaxMinAndDefaultValues()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimEnsembleCurveSet::onObjectiveFunctionChanged( const caf::SignalEmitter*   emitter,
-                                                      RimCustomObjectiveFunction* objectiveFunction )
+void RimEnsembleCurveSet::onObjectiveFunctionChanged( const caf::SignalEmitter* emitter )
 {
     updateCurveColors();
     updateFilterLegend();
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimEnsembleCurveSet::onObjectiveFunctionAboutToBeDeleted( const caf::SignalEmitter*   emitter,
-                                                               RimCustomObjectiveFunction* objectiveFunction )
-{
-    if ( objectiveFunction == m_customObjectiveFunction )
-    {
-        m_customObjectiveFunction = nullptr;
-    }
-    updateCurveColors();
-    updateFilterLegend();
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
index abfeb66480..ed633a8488 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
@@ -183,9 +183,7 @@ private:
     void updateTimeAnnotations();
     void updateAddressesUiField();
 
-    void onObjectiveFunctionChanged( const caf::SignalEmitter* emitter, RimCustomObjectiveFunction* objectiveFunction );
-    void onObjectiveFunctionAboutToBeDeleted( const caf::SignalEmitter*   emitter,
-                                              RimCustomObjectiveFunction* objectiveFunction );
+    void onObjectiveFunctionChanged( const caf::SignalEmitter* emitter );
 
 private:
     caf::PdmField<bool>                       m_showCurves;