OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -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
Show Stats 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 "RimProject.h"
#include <QDir>
#include <QFileInfo>
CAF_PDM_SOURCE_INIT(RicfSingleCaseReplace, "replaceCase"); CAF_PDM_SOURCE_INIT(RicfSingleCaseReplace, "replaceCase");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -69,13 +72,21 @@ RicfCommandResponse RicfSingleCaseReplace::execute()
cvf::ref<RiaProjectModifier> projectModifier = new RiaProjectModifier; 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) if (m_caseId() < 0)
{ {
projectModifier->setReplaceCaseFirstOccurrence(m_newGridFile()); projectModifier->setReplaceCaseFirstOccurrence(m_newGridFile());
} }
else else
{ {
projectModifier->setReplaceCase(m_caseId(), m_newGridFile()); projectModifier->setReplaceCase(m_caseId(), );
} }
if (!RiaApplication::instance()->loadProject(lastProjectPath, RiaApplication::PLA_NONE, projectModifier.p())) if (!RiaApplication::instance()->loadProject(lastProjectPath, RiaApplication::PLA_NONE, projectModifier.p()))
@ -128,8 +139,15 @@ RicfCommandResponse RicfMultiCaseReplace::execute()
cvf::ref<RiaProjectModifier> projectModifier = new RiaProjectModifier; cvf::ref<RiaProjectModifier> projectModifier = new RiaProjectModifier;
for (const auto& a : m_caseIdToGridFileNameMap) for (const auto& a : m_caseIdToGridFileNameMap)
{ {
const auto caseId = a.first; const int caseId = a.first;
const auto filePath = a.second; QString filePath = a.second;
QFileInfo casePathInfo(filePath);
if (!casePathInfo.exists())
{
QDir startDir(RiaApplication::instance()->startDir());
filePath = startDir.absoluteFilePath(filePath);
}
if (caseId < 0) if (caseId < 0)
{ {
projectModifier->setReplaceCaseFirstOccurrence(filePath); projectModifier->setReplaceCaseFirstOccurrence(filePath);

3
ApplicationCode/GrpcInterface/Python/rips/tests/test_cases.py
View File

@ -56,7 +56,6 @@ def test_PdmObject(rips_instance, initializeTest):
assert(case.id == 0) assert(case.id == 0)
assert(case.address() is not 0) assert(case.address() is not 0)
assert(case.classKeyword() == "EclipseCase") assert(case.classKeyword() == "EclipseCase")
assert(case.getValue('CaseFileName') == casePath)
caseId = case.getValue('CaseId') caseId = case.getValue('CaseId')
assert(caseId == case.id) assert(caseId == case.id)
@ -84,7 +83,7 @@ def test_replaceCase(rips_instance, initializeTest):
cases = rips_instance.project.cases() cases = rips_instance.project.cases()
assert(len(cases) is 1) assert(len(cases) is 1)
rips_instance.commands.replaceCase(newGridFile=os.path.abspath(casePath), caseId=case.id) rips_instance.commands.replaceCase(newGridFile=casePath, caseId=case.id)
cases = rips_instance.project.cases() cases = rips_instance.project.cases()
assert(len(cases) is 1) assert(len(cases) is 1)
case = project.case(id=0) case = project.case(id=0)