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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/CommandFileInterface/RicfRunOctaveScript.cpp
View File

@ -22,6 +22,8 @@
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RimCalcScript.h"
#include <QFileInfo>
CAF_PDM_SOURCE_INIT(RicfRunOctaveScript, "runOctaveScript");
@ -41,11 +43,8 @@ RicfRunOctaveScript::RicfRunOctaveScript()
void RicfRunOctaveScript::execute()
{
QString octavePath = RiaApplication::instance()->octavePath();
QFileInfo scriptFileInfo(m_path());
QStringList processArguments;
processArguments << "--path" << scriptFileInfo.absolutePath();
processArguments << scriptFileInfo.absoluteFilePath();
QStringList processArguments = RimCalcScript::createCommandLineArguments(m_path());
bool ok;
if (m_caseIds().empty())

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);

22
ApplicationCode/ProjectDataModel/RimCalcScript.cpp
View File

@ -18,11 +18,14 @@
#include "RimCalcScript.h"
#include "RiaApplication.h"
#include "RiaFieldHandleTools.h"
#include "cafPdmField.h"
#include "cafPdmUiFilePathEditor.h"
#include <QFileInfo>
CAF_PDM_SOURCE_INIT(RimCalcScript, "CalcScript");
//--------------------------------------------------------------------------------------------------
@ -43,3 +46,22 @@ RimCalcScript::RimCalcScript()
///
//--------------------------------------------------------------------------------------------------
RimCalcScript::~RimCalcScript() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RimCalcScript::createCommandLineArguments(const QString& absoluteFileName)
{
QFileInfo fi(absoluteFileName);
QString octaveFunctionSearchPath = fi.absolutePath();
auto app = RiaApplication::instance();
QStringList arguments = app->octaveArguments();
arguments.append("--path");
arguments << octaveFunctionSearchPath;
arguments << absoluteFileName;
return arguments;
}

2
ApplicationCode/ProjectDataModel/RimCalcScript.h
View File

@ -33,6 +33,8 @@ public:
RimCalcScript();
~RimCalcScript() override;
static QStringList createCommandLineArguments(const QString& absoluteFileName);
caf::PdmField<QString> absoluteFileName;
caf::PdmField<QString> content; // TODO: Obsolete field, can be deleted on next project file revision.
};