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

Allow relative paths in replace case

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-07-18 08:50:58 +02:00
parent bbc8750d8f
commit 7a2b9926a0
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp
View File

@@ -26,6 +26,9 @@
#include "RimProject.h"
#include <QDir>
#include <QFileInfo>
CAF_PDM_SOURCE_INIT(RicfSingleCaseReplace, "replaceCase");
//--------------------------------------------------------------------------------------------------
@@ -69,13 +72,21 @@ RicfCommandResponse RicfSingleCaseReplace::execute()
cvf::ref<RiaProjectModifier> projectModifier = new RiaProjectModifier;
QString filePath = m_newGridFile();
QFileInfo casePathInfo(filePath);
if (!casePathInfo.exists())
{
QDir startDir(RiaApplication::instance()->startDir());
filePath = startDir.absoluteFilePath(m_newGridFile());
}
if (m_caseId() < 0)
{
projectModifier->setReplaceCaseFirstOccurrence(m_newGridFile());
}
else
{
projectModifier->setReplaceCase(m_caseId(), m_newGridFile());
projectModifier->setReplaceCase(m_caseId(), );
}
if (!RiaApplication::instance()->loadProject(lastProjectPath, RiaApplication::PLA_NONE, projectModifier.p()))
@@ -128,8 +139,15 @@ RicfCommandResponse RicfMultiCaseReplace::execute()
cvf::ref<RiaProjectModifier> projectModifier = new RiaProjectModifier;
for (const auto& a : m_caseIdToGridFileNameMap)
{
const auto caseId = a.first;
const auto filePath = a.second;
const int caseId = a.first;
QString filePath = a.second;
QFileInfo casePathInfo(filePath);
if (!casePathInfo.exists())
{
QDir startDir(RiaApplication::instance()->startDir());
filePath = startDir.absoluteFilePath(filePath);
}
if (caseId < 0)
{
projectModifier->setReplaceCaseFirstOccurrence(filePath);