Extract path from document file name in RimProject

p4#: 21160

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();
+}
+

ApplicationCode/ProjectDataModel/RimProject.h

@@ -39,7 +39,6 @@ public:
     caf::PdmField<RimScriptCollection*>                 scriptCollection;
 
     void setUserScriptPath(const QString& path);
-    //void updateProjectScriptPath();
 
     QString projectFileVersionString() const;
 
@@ -53,6 +52,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;
 };

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();
-}
-

ApplicationCode/ProjectDataModel/RimResultCase.h

@@ -55,7 +55,5 @@ protected:
     virtual void                initAfterRead();
 
 private:
-    QString                     projectPath() const;
-
     cvf::ref<RifReaderInterface> createMockModel(QString modelName);
 };