OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#791) Update well path filename if project file is relocated

Browse Source
This commit is contained in:
Magne Sjaastad
2016-06-29 16:09:27 +02:00
parent 124585b96a
commit e730e5bf9f
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -390,7 +390,7 @@ void RimProject::setProjectFileNameAndUpdateDependencies(const QString& fileName
{ {
RimOilField* oilField = oilFields[oilFieldIdx]; RimOilField* oilField = oilFields[oilFieldIdx];
if (oilField == NULL || oilField->wellPathCollection == NULL) continue; if (oilField == NULL || oilField->wellPathCollection == NULL) continue;
oilField->wellPathCollection->updateFilePathsFromProjectPath(); oilField->wellPathCollection->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath);
} }
wellPathImport->updateFilePaths(); wellPathImport->updateFilePaths();

17
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -365,13 +365,20 @@ bool RimWellPath::isStoredInCache()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellPath::updateFilePathsFromProjectPath() void RimWellPath::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath)
{ {
QString newCacheFileName = getCacheFileName(); if (isStoredInCache())
if (QFile::exists(newCacheFileName))
{ {
filepath = newCacheFileName; QString newCacheFileName = getCacheFileName();
if (QFile::exists(newCacheFileName))
{
filepath = newCacheFileName;
}
}
else
{
filepath = RimTools::relocateFile(filepath(), newProjectPath, oldProjectPath, NULL, NULL);
} }
} }

2
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -73,7 +73,7 @@ public:
RivWellPathPartMgr* partMgr(); RivWellPathPartMgr* partMgr();
bool readWellPathFile(QString * errorMessage, RifWellPathAsciiFileReader* asciiReader); bool readWellPathFile(QString * errorMessage, RifWellPathAsciiFileReader* asciiReader);
void updateFilePathsFromProjectPath(); void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);

4
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -310,11 +310,11 @@ void RimWellPathCollection::scheduleGeometryRegenAndRedrawViews()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellPathCollection::updateFilePathsFromProjectPath() void RimWellPathCollection::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath)
{ {
for (size_t wellPathIdx = 0; wellPathIdx < wellPaths.size(); wellPathIdx++) for (size_t wellPathIdx = 0; wellPathIdx < wellPaths.size(); wellPathIdx++)
{ {
wellPaths[wellPathIdx]->updateFilePathsFromProjectPath(); wellPaths[wellPathIdx]->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath);
} }
} }

2
ApplicationCode/ProjectDataModel/RimWellPathCollection.h
View File

@@ -91,7 +91,7 @@ public:
void scheduleGeometryRegenAndRedrawViews(); void scheduleGeometryRegenAndRedrawViews();
void updateFilePathsFromProjectPath(); void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
protected: protected:
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ); virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );