OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-30 00:50:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2365 Replace PdmField<QString> with PdmField<caf::FilePath> for file path fields

Browse Source 
Convert 11 file/directory path fields from QString to caf::FilePath across
ProjectDataModel classes for type safety and consistent path handling.

Fields converted: RimCalcScript::absoluteFileName,
RimScriptCollection::directory, RimBinaryExportSettings::fileName,
RimExportInputSettings::fileName, RimFractureExportSettings::fileName,
RimReservoirCellResultsStorage::m_resultCacheFileName,
RimProcess::m_workDir, RimWellIASettings::m_baseDir,
RimPlotTemplateFileItem::m_absoluteFileName,
RimWellMeasurement::m_filePath, RimFileWellPath::m_filePath.
This commit is contained in:
Kristian Bendiksen committed 2026-03-31 08:46:52 +02:00
1 parent 394bc6c3df
commit cbbcbb650c
28 files changed
+87 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.cpp
+4 -4
View File
@@ -94,7 +94,7 @@ void RicExecuteScriptFeature::executeScript( RimCalcScript* calcScript )
QString octavePath = app->octavePath();
if ( !octavePath.isEmpty() )
{
QStringList arguments = RimCalcScript::createCommandLineArguments( calcScript->absoluteFileName() );
QStringList arguments = RimCalcScript::createCommandLineArguments( calcScript->absoluteFileName().path() );
RiaApplication::instance()->launchProcess( octavePath, arguments, app->octaveProcessEnvironment() );
}
}
@@ -103,7 +103,7 @@ void RicExecuteScriptFeature::executeScript( RimCalcScript* calcScript )
QString pythonPath = app->pythonPath();
if ( !pythonPath.isEmpty() )
{
QStringList arguments = RimCalcScript::createCommandLineArguments( calcScript->absoluteFileName() );
QStringList arguments = RimCalcScript::createCommandLineArguments( calcScript->absoluteFileName().path() );
QProcessEnvironment penv = app->pythonProcessEnvironment();
RiuProcessMonitor* processMonitor = RiuMainWindow::instance()->processMonitor();
@@ -136,10 +136,10 @@ void RicExecuteScriptFeature::executeScript( RimCalcScript* calcScript )
}
}
if ( !calcScript->absoluteFileName().isEmpty() )
if ( !calcScript->absoluteFileName().path().isEmpty() )
{
QSettings settings;
settings.setValue( RicExecuteLastUsedScriptFeature::lastUsedScriptPathKey(), calcScript->absoluteFileName() );
settings.setValue( RicExecuteLastUsedScriptFeature::lastUsedScriptPathKey(), calcScript->absoluteFileName().path() );
auto cmdFeature = caf::CmdFeatureManager::instance()->getCommandFeature( "RicExecuteLastUsedScriptFeature" );
cmdFeature->action(); // Retrieve the action to update the looks