OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 23:23:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4285 Octave : Rename to absoluteFileName

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-04 21:18:20 +02:00
parent b8ff8a2de8
commit fd774bec39
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ void RicEditScriptFeature::onActionTriggered(bool isChecked)
if (!scriptEditor.isEmpty())
{
QStringList arguments;
arguments << calcScript->absolutePath;
arguments << calcScript->absoluteFileName;
QProcess* myProcess = new QProcess(this);
myProcess->start(scriptEditor, arguments);

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

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

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

@ -63,7 +63,7 @@ void RicNewScriptFeature::onActionTriggered(bool isChecked)
if (calcScript)
{
QFileInfo existingScriptFileInfo(calcScript->absolutePath());
QFileInfo existingScriptFileInfo(calcScript->absoluteFileName());
fullPathNewScript = existingScriptFileInfo.absolutePath();
}
else if (scriptColl)

4
ApplicationCode/ProjectDataModel/RimCalcScript.cpp
View File

@ -32,11 +32,11 @@ RimCalcScript::RimCalcScript()
{
CAF_PDM_InitObject("CalcScript", ":/OctaveScriptFile16x16.png", "Calc Script", "");
CAF_PDM_InitField(&absolutePath, "AbsolutePath", QString(), "Location", "", "", "");
CAF_PDM_InitField(&absoluteFileName, "AbsolutePath", QString(), "Location", "", "", "");
CAF_PDM_InitField(&content, "Content", QString(), "Directory", "", "", "");
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&content);
absolutePath.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
absoluteFileName.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimCalcScript.h
View File

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

2
ApplicationCode/ProjectDataModel/RimCommandObject.cpp
View File

@ -165,7 +165,7 @@ void RimCommandFactory::createCommandObjects(const caf::PdmObjectGroup& selected
{
RimCalcScript* calcScript = dynamic_cast<RimCalcScript*>(pdmObject);
QFile file(calcScript->absolutePath);
QFile file(calcScript->absoluteFileName);
if (file.open(QIODevice::ReadOnly | QIODevice::Text))
{
QTextStream in(&file);

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -1058,10 +1058,10 @@ void RimContextCommandBuilder::appendScriptItems(caf::CmdFeatureMenuBuilder& men
for (size_t i = 0; i < scriptCollection->calcScripts.size(); i++)
{
RimCalcScript* calcScript = scriptCollection->calcScripts[i];
QFileInfo fi(calcScript->absolutePath());
QFileInfo fi(calcScript->absoluteFileName());
QString menuText = fi.baseName();
menuBuilder.addCmdFeatureWithUserData("RicExecuteScriptForCasesFeature", menuText, QVariant(calcScript->absolutePath()));
menuBuilder.addCmdFeatureWithUserData("RicExecuteScriptForCasesFeature", menuText, QVariant(calcScript->absoluteFileName()));
}
for (size_t i = 0; i < scriptCollection->subDirectories.size(); i++)

2
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@ -92,7 +92,7 @@ void RimScriptCollection::readContentFromDisc()
if (caf::Utils::fileExists(fileName))
{
RimCalcScript* calcScript = new RimCalcScript;
calcScript->absolutePath = fileName;
calcScript->absoluteFileName = fileName;
QFileInfo fi(fileName);
calcScript->setUiName(fi.baseName());