From 18cf59530f97471c9278eb6672c31fd17c600238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronsolutions.com>
Date: Tue, 10 Dec 2019 16:12:21 +0100
Subject: [PATCH] #5147 RimSummaryCase::m_summaryHeaderFilename ->
 PdmField<caf::FilePath>

---
 .../ProjectDataModel/Summary/RimFileSummaryCase.cpp      | 6 +++---
 .../ProjectDataModel/Summary/RimGridSummaryCase.cpp      | 4 ++--
 .../ProjectDataModel/Summary/RimObservedSummaryData.cpp  | 4 ++--
 .../ProjectDataModel/Summary/RimSummaryCase.cpp          | 2 +-
 .../ProjectDataModel/Summary/RimSummaryCase.h            | 9 +++++----
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
index 67671726bf..9c2921fa0f 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
@@ -56,7 +56,7 @@ RimFileSummaryCase::~RimFileSummaryCase() {}
 //--------------------------------------------------------------------------------------------------
 QString RimFileSummaryCase::summaryHeaderFilename() const
 {
-    return m_summaryHeaderFilename();
+    return m_summaryHeaderFilename().path();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -74,8 +74,8 @@ QString RimFileSummaryCase::caseName() const
 //--------------------------------------------------------------------------------------------------
 void RimFileSummaryCase::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
 {
-    m_summaryHeaderFilename =
-        RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
+    //  m_summaryHeaderFilename =
+    //      RimTools::relocateFile( m_summaryHeaderFilename().path(), newProjectPath, oldProjectPath, nullptr, nullptr );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
index c5f5eac66e..e147d2dda5 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
@@ -115,7 +115,7 @@ RimEclipseCase* RimGridSummaryCase::associatedEclipseCase()
             if ( eclCase )
             {
                 QString sumHeaderFileName = summaryHeaderFilenameFromEclipseCase( eclCase );
-                if ( sumHeaderFileName == m_summaryHeaderFilename )
+                if ( sumHeaderFileName == m_summaryHeaderFilename().path() )
                 {
                     m_eclipseCase = eclCase;
                     this->updateAutoShortName();
@@ -135,7 +135,7 @@ RimEclipseCase* RimGridSummaryCase::associatedEclipseCase()
 //--------------------------------------------------------------------------------------------------
 QString RimGridSummaryCase::summaryHeaderFilename() const
 {
-    if ( !m_eclipseCase() ) return m_summaryHeaderFilename();
+    if ( !m_eclipseCase() ) return m_summaryHeaderFilename().path();
 
     return summaryHeaderFilenameFromEclipseCase( m_eclipseCase() );
 }
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp b/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
index eddfad1697..c593c1c4c5 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
@@ -68,8 +68,8 @@ QString RimObservedSummaryData::caseName() const
 //--------------------------------------------------------------------------------------------------
 void RimObservedSummaryData::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
 {
-    m_summaryHeaderFilename =
-        RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
+    // m_summaryHeaderFilename =
+    //    RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
index 764617e10b..d9bf66e234 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
@@ -62,7 +62,7 @@ RimSummaryCase::~RimSummaryCase() {}
 //--------------------------------------------------------------------------------------------------
 QString RimSummaryCase::summaryHeaderFilename() const
 {
-    return m_summaryHeaderFilename();
+    return m_summaryHeaderFilename().path();
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
index 2214cee0ee..87e46a3c8c 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
@@ -20,6 +20,7 @@
 #include "RiaEclipseUnitTools.h"
 #include "RigCaseRealizationParameters.h"
 
+#include "cafFilePath.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
@@ -81,10 +82,10 @@ protected:
                            const QVariant&            newValue ) override;
     void updateTreeItemName();
 
-    caf::PdmField<QString> m_shortName;
-    caf::PdmField<bool>    m_useAutoShortName;
-    caf::PdmField<QString> m_summaryHeaderFilename;
-    bool                   m_isObservedData;
+    caf::PdmField<QString>       m_shortName;
+    caf::PdmField<bool>          m_useAutoShortName;
+    caf::PdmField<caf::FilePath> m_summaryHeaderFilename;
+    bool                         m_isObservedData;
 
     std::shared_ptr<RigCaseRealizationParameters> m_crlParameters;