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

#4285 Octave : Move creation of command line arguments to RimCalcScript

Browse Source
This commit is contained in:
Magne Sjaastad
2019-04-04 21:37:22 +02:00
parent fd774bec39
commit 7af16ce24c
5 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.cpp
View File

@@ -59,15 +59,7 @@ void RicExecuteScriptFeature::onActionTriggered(bool isChecked)
QString octavePath = app->octavePath();
if (!octavePath.isEmpty())
{
// TODO: Must rename RimCalcScript::absolutePath to absoluteFileName, as the code below is confusing
// absolutePath() is a function in QFileInfo
QFileInfo fi(calcScript->absoluteFileName());
QString octaveFunctionSearchPath = fi.absolutePath();
QStringList arguments = app->octaveArguments();
arguments.append("--path");
arguments << octaveFunctionSearchPath;
arguments << calcScript->absoluteFileName();
QStringList arguments = RimCalcScript::createCommandLineArguments(calcScript->absoluteFileName());
RiaApplication::instance()->launchProcess(octavePath, arguments);
}

16
ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp
View File

@@ -19,8 +19,11 @@
#include "RicExecuteScriptForCasesFeature.h"
#include "RimCase.h"
#include "RiaApplication.h"
#include "RimCase.h"
#include "RimCalcScript.h"
#include "RiuMainWindow.h"
#include "cafSelectionManager.h"
@@ -62,16 +65,7 @@ void RicExecuteScriptForCasesFeature::onActionTriggered(bool isChecked)
QString octavePath = app->octavePath();
if (!octavePath.isEmpty())
{
// TODO: Must rename RimCalcScript::absolutePath to absoluteFileName, as the code below is confusing
// absolutePath() is a function in QFileInfo
QFileInfo fi(scriptAbsolutePath);
QString octaveFunctionSearchPath = fi.absolutePath();
QStringList arguments = app->octaveArguments();
arguments.append("--path");
arguments << octaveFunctionSearchPath;
arguments << scriptAbsolutePath;
QStringList arguments = RimCalcScript::createCommandLineArguments(scriptAbsolutePath);
std::vector<RimCase*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);