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

#4471 Implement python script running and editor in ResInsight GUI, same as Octave.

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-07-26 14:54:54 +02:00
parent 8f464e5e23
commit 3ba962aefb
16 changed files with 200 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,12 +56,23 @@ void RicExecuteScriptFeature::onActionTriggered(bool isChecked)
RimCalcScript* calcScript = selection[0];
RiaApplication* app = RiaApplication::instance();
QString octavePath = app->octavePath();
if (!octavePath.isEmpty())
if (calcScript->scriptType() == RimCalcScript::OCTAVE)
{
QStringList arguments = RimCalcScript::createCommandLineArguments(calcScript->absoluteFileName());
RiaApplication::instance()->launchProcess(octavePath, arguments);
QString octavePath = app->octavePath();
if (!octavePath.isEmpty())
{
QStringList arguments = RimCalcScript::createCommandLineArguments(calcScript->absoluteFileName());
RiaApplication::instance()->launchProcess(octavePath, arguments, app->octaveProcessEnvironment());
}
}
else if (calcScript->scriptType() == RimCalcScript::PYTHON)
{
QString pythonPath = app->pythonPath();
if (!pythonPath.isEmpty())
{
QStringList arguments = RimCalcScript::createCommandLineArguments(calcScript->absoluteFileName());
RiaApplication::instance()->launchProcess(pythonPath, arguments, app->pythonProcessEnvironment());
}
}
}

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

@@ -80,7 +80,7 @@ void RicExecuteScriptForCasesFeature::onActionTriggered(bool isChecked)
if (caseIdsInSelection.size() > 0)
{
RiaApplication::instance()->launchProcessForMultipleCases(octavePath, arguments, caseIdsInSelection);
RiaApplication::instance()->launchProcessForMultipleCases(octavePath, arguments, caseIdsInSelection, app->octaveProcessEnvironment());
}
}
}