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 : Make sure absolute absoluteFilePath() is used

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-05 19:09:41 +02:00
parent a8e14e9f9a
commit 08d4697632
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/RimCalcScript.cpp
View File

@ -50,18 +50,25 @@ RimCalcScript::~RimCalcScript() {}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QStringList RimCalcScript::createCommandLineArguments(const QString& absoluteFileName) QStringList RimCalcScript::createCommandLineArguments(const QString& absoluteFileNameScript)
{ {
QFileInfo fi(absoluteFileName); QStringList arguments;
QString octaveFunctionSearchPath = fi.absolutePath();
auto app = RiaApplication::instance(); {
auto app = RiaApplication::instance();
QStringList arguments = app->octaveArguments(); arguments = app->octaveArguments();
arguments.append("--path"); arguments.append("--path");
}
arguments << octaveFunctionSearchPath; {
arguments << absoluteFileName; QFileInfo fi(absoluteFileNameScript);
QString octaveFunctionSearchPath = fi.absolutePath();
QString absFilePath = fi.absoluteFilePath();
arguments << octaveFunctionSearchPath;
arguments << absFilePath;
}
return arguments; return arguments;
} }

2
ApplicationCode/ProjectDataModel/RimCalcScript.h
View File

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