mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-29 16:40:20 -05:00
#2365 Replace PdmField<QString> with PdmField<caf::FilePath> for file path fields
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:
1 parent
394bc6c3df
commit
cbbcbb650c
28 files changed
+87
-77
No files matched your search
@@ -49,7 +49,7 @@ bool RicNewPythonScriptFeature::isCommandEnabled() const
|
||||
{
|
||||
std::vector<RimScriptCollection*> calcScriptCollections = RicScriptFeatureImpl::selectedScriptCollections();
|
||||
if ( calcScriptCollections.empty() ) return false;
|
||||
return !calcScriptCollections.front()->directory().isEmpty();
|
||||
return !calcScriptCollections.front()->directory().path().isEmpty();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -67,13 +67,13 @@ void RicNewPythonScriptFeature::onActionTriggered( bool isChecked )
|
||||
|
||||
if ( calcScript )
|
||||
{
|
||||
QFileInfo existingScriptFileInfo( calcScript->absoluteFileName() );
|
||||
QFileInfo existingScriptFileInfo( calcScript->absoluteFileName().path() );
|
||||
fullPathNewScript = existingScriptFileInfo.absolutePath();
|
||||
scriptColl = calcScript->firstAncestorOrThisOfTypeAsserted<RimScriptCollection>();
|
||||
}
|
||||
else if ( scriptColl )
|
||||
{
|
||||
fullPathNewScript = scriptColl->directory();
|
||||
fullPathNewScript = scriptColl->directory().path();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user