Rename RimRftAddress to RimDataSourceForRftPlt

ApplicationCode/ProjectDataModel/Flow/CMakeLists_files.cmake

@@ -15,7 +15,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellAllocationPlotLegend.h
 ${CEE_CURRENT_LIST_DIR}RimFlowCharacteristicsPlot.h
 ${CEE_CURRENT_LIST_DIR}RimWellRftPlot.h
 ${CEE_CURRENT_LIST_DIR}RimWellPltPlot.h
-${CEE_CURRENT_LIST_DIR}RimRftAddress.h
+${CEE_CURRENT_LIST_DIR}RimDataSourceForRftPlt.h
 ${CEE_CURRENT_LIST_DIR}RimWellPlotTools.h
 )
 
@@ -30,7 +30,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellAllocationPlotLegend.cpp
 ${CEE_CURRENT_LIST_DIR}RimFlowCharacteristicsPlot.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellRftPlot.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPltPlot.cpp
-${CEE_CURRENT_LIST_DIR}RimRftAddress.cpp
+${CEE_CURRENT_LIST_DIR}RimDataSourceForRftPlt.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPlotTools.cpp
 )
 

ApplicationCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimRftAddress.h"
+#include "RimDataSourceForRftPlt.h"
 #include "RimEclipseCase.h"
 #include "RimWellLogFile.h"
 
@@ -41,12 +41,12 @@ namespace caf
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-CAF_PDM_SOURCE_INIT(RimRftAddress, "RftAddress");
+CAF_PDM_SOURCE_INIT(RimDataSourceForRftPlt, "RftAddress");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimRftAddress::RimRftAddress()
+RimDataSourceForRftPlt::RimDataSourceForRftPlt()
 {
     InitPdmObject();
 }
@@ -54,7 +54,7 @@ RimRftAddress::RimRftAddress()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimRftAddress::RimRftAddress(const RifDataSourceForRftPlt& addr)
+RimDataSourceForRftPlt::RimDataSourceForRftPlt(const RifDataSourceForRftPlt& addr)
 {
     InitPdmObject();
     setAddress(addr);
@@ -63,7 +63,7 @@ RimRftAddress::RimRftAddress(const RifDataSourceForRftPlt& addr)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimRftAddress::setAddress(const RifDataSourceForRftPlt& address)
+void RimDataSourceForRftPlt::setAddress(const RifDataSourceForRftPlt& address)
 {
     m_sourceType = address.sourceType();
     m_eclCase = address.eclCase();
@@ -73,7 +73,7 @@ void RimRftAddress::setAddress(const RifDataSourceForRftPlt& address)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RifDataSourceForRftPlt RimRftAddress::address() const
+RifDataSourceForRftPlt RimDataSourceForRftPlt::address() const
 {
     return m_eclCase() != nullptr ?
         RifDataSourceForRftPlt(m_sourceType(), m_eclCase()) :
@@ -83,7 +83,7 @@ RifDataSourceForRftPlt RimRftAddress::address() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimRftAddress::InitPdmObject()
+void RimDataSourceForRftPlt::InitPdmObject()
 {
     CAF_PDM_InitFieldNoDefault(&m_sourceType, "SourceType", "SourceType", "", "", "");
     CAF_PDM_InitFieldNoDefault(&m_eclCase, "EclipseCase", "EclipseCase", "", "", "");
@@ -93,7 +93,7 @@ void RimRftAddress::InitPdmObject()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimRftAddress& RimRftAddress::operator=(const RimRftAddress& other)
+RimDataSourceForRftPlt& RimDataSourceForRftPlt::operator=(const RimDataSourceForRftPlt& other)
 {
     m_sourceType = other.m_sourceType();
     m_eclCase = other.m_eclCase();

ApplicationCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.h

@@ -42,18 +42,18 @@ class RimEclipseCase;
 ///  
 ///  
 //==================================================================================================
-class RimRftAddress : public caf::PdmObject
+class RimDataSourceForRftPlt : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 
 public:
-    RimRftAddress();
-    RimRftAddress(const RifDataSourceForRftPlt& addr);
+    RimDataSourceForRftPlt();
+    RimDataSourceForRftPlt(const RifDataSourceForRftPlt& addr);
 
     void setAddress(const RifDataSourceForRftPlt& address);
     RifDataSourceForRftPlt address() const;
 
-    RimRftAddress& operator=(const RimRftAddress& other);
+    RimDataSourceForRftPlt& operator=(const RimDataSourceForRftPlt& other);
 
 private:
     void InitPdmObject();

ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp

@@ -1259,7 +1259,7 @@ void RimWellPltPlot::setupBeforeSave()
 void RimWellPltPlot::initAfterLoad()
 {
     std::set<RifDataSourceForRftPlt> selectedSources;
-    for (RimRftAddress* addr : m_selectedSourcesForIo)
+    for (RimDataSourceForRftPlt* addr : m_selectedSourcesForIo)
     {
         if (addr->address().sourceType() == RifDataSourceForRftPlt::OBSERVED)
         {
@@ -1281,7 +1281,7 @@ void RimWellPltPlot::syncSourcesIoFieldFromGuiField()
     m_selectedSourcesForIo.clear();
     for (const RifDataSourceForRftPlt& addr : selectedSourcesAndTimeSteps())
     {
-        m_selectedSourcesForIo.push_back(new RimRftAddress(addr));
+        m_selectedSourcesForIo.push_back(new RimDataSourceForRftPlt(addr));
     }
 }
 

ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h

@@ -20,7 +20,7 @@
 #include "RimViewWindow.h"
 #include "RigFlowDiagResultAddress.h"
 
-#include "RimRftAddress.h"
+#include "RimDataSourceForRftPlt.h"
 #include "RifDataSourceForRftPltQMetaType.h"
 #include "RimPlotCurve.h"
 #include "RimWellPlotTools.h"
@@ -148,7 +148,7 @@ private:
     caf::PdmField<QString>                          m_wellPathName;
 
     caf::PdmField<std::vector<RifDataSourceForRftPlt>>   m_selectedSources;
-    caf::PdmChildArrayField<RimRftAddress*>         m_selectedSourcesForIo;
+    caf::PdmChildArrayField<RimDataSourceForRftPlt*>         m_selectedSourcesForIo;
 
     caf::PdmField<std::vector<QDateTime>>           m_selectedTimeSteps;