From 4ae9182fc60bbb2545a7814af7242f44284b88e2 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Mon, 8 Apr 2013 08:44:33 +0200
Subject: [PATCH] Extract path from document file name in RimProject p4#: 21160

---
 ApplicationCode/ProjectDataModel/RimProject.cpp    |  9 +++++++++
 ApplicationCode/ProjectDataModel/RimProject.h      |  8 ++++----
 ApplicationCode/ProjectDataModel/RimResultCase.cpp | 14 ++------------
 ApplicationCode/ProjectDataModel/RimResultCase.h   |  2 --
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp
index a939da0784..a4aa5cb6dc 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -231,3 +231,12 @@ void RimProject::insertCaseInCaseGroup(RimIdenticalGridCaseGroup* caseGroup, Rim
     caseGroup->addCase(rimReservoir);
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RimProject::projectPath() const
+{
+    QFileInfo fileInfo(fileName());
+    return fileInfo.path();
+}
+
diff --git a/ApplicationCode/ProjectDataModel/RimProject.h b/ApplicationCode/ProjectDataModel/RimProject.h
index 084e92dff2..63744f1532 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.h
+++ b/ApplicationCode/ProjectDataModel/RimProject.h
@@ -34,12 +34,11 @@ class RimProject : public caf::PdmDocument
      CAF_PDM_HEADER_INIT;
 
 public:
-    caf::PdmPointersField<RimCase*>                reservoirs;
+    caf::PdmPointersField<RimCase*>                     reservoirs;
     caf::PdmPointersField<RimIdenticalGridCaseGroup*>   caseGroups;
     caf::PdmField<RimScriptCollection*>                 scriptCollection;
 
     void setUserScriptPath(const QString& path);
-    //void updateProjectScriptPath();
 
     QString projectFileVersionString() const;
 
@@ -52,6 +51,8 @@ public:
 
     void moveEclipseCaseIntoCaseGroup(RimCase* rimReservoir);
     void removeCaseFromAllGroups(RimCase* rimReservoir);
+
+    QString projectPath() const;
     
 private:
     RigMainGrid* registerCaseInGridCollection(RigCaseData* rigEclipseCase);
@@ -63,6 +64,5 @@ protected:
 
 private:
     caf::PdmField<QString>      m_projectFileVersionString;
-
-    cvf::ref<RigGridManager> m_gridCollection;
+    cvf::ref<RigGridManager>    m_gridCollection;
 };
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
index 41aa4bedd7..a8df1bc64c 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
@@ -292,13 +292,13 @@ void RimResultCase::initAfterRead()
             return;
         }
 
-        QString projPath = projectPath();
+        QString projPath = RiaApplication::instance()->project()->projectPath();
 
         candidate = QDir::fromNativeSeparators(projPath + QDir::separator() + caseName + ".EGRID");
         if (QFile::exists(candidate))
         {
             caseFileName = candidate;
-            caseDirectory = projectPath;
+            caseDirectory = projPath;
             return;
         }
 
@@ -312,13 +312,3 @@ void RimResultCase::initAfterRead()
     }
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QString RimResultCase::projectPath() const
-{
-    QString projectFileName = RiaApplication::instance()->project()->fileName();
-    QFileInfo fileInfo(projectFileName);
-    return fileInfo.path();
-}
-
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.h b/ApplicationCode/ProjectDataModel/RimResultCase.h
index 1037d230fd..a666df6b8c 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.h
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.h
@@ -55,7 +55,5 @@ protected:
     virtual void                initAfterRead();
 
 private:
-    QString                     projectPath() const;
-
     cvf::ref<RifReaderInterface> createMockModel(QString modelName);
 };