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

#6549 Fix case.replace from interactively opened project

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-09-23 09:49:42 +02:00
parent af84ae7432
commit 75f507e2ef
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp
View File

@@ -63,13 +63,17 @@ QString RicfSingleCaseReplace::filePath() const
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicfSingleCaseReplace::execute()
{
QString lastProjectPath = RicfCommandFileExecutor::instance()->getLastProjectPath();
if ( lastProjectPath.isNull() )
QString projectPath = RimProject::current()->fileName();
if ( projectPath.isEmpty() )
{
QString errMsg( "replaceCase: 'openProject' must be called before 'replaceCase' to specify project file to "
"replace case in." );
RiaLogging::error( errMsg );
return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, errMsg );
QString lastProjectPath = RicfCommandFileExecutor::instance()->getLastProjectPath();
if ( lastProjectPath.isNull() )
{
QString errMsg( "replaceCase: The project must be saved as a file before calling 'replaceCase'." );
RiaLogging::error( errMsg );
return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, errMsg );
}
projectPath = lastProjectPath;
}
cvf::ref<RiaProjectModifier> projectModifier = new RiaProjectModifier;
@@ -91,7 +95,7 @@ caf::PdmScriptResponse RicfSingleCaseReplace::execute()
projectModifier->setReplaceCase( m_caseId(), filePath );
}
if ( !RiaApplication::instance()->loadProject( lastProjectPath,
if ( !RiaApplication::instance()->loadProject( projectPath,
RiaApplication::ProjectLoadAction::PLA_NONE,
projectModifier.p() ) )
{