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

Improve fault reactivation file names (#11005)

Browse Source 
Use model name in exported file name.
Add model name to include file names.
This commit is contained in:
jonjenssen
2024-01-05 08:43:40 +01:00
committed by GitHub
parent 544e6974e7
commit daae1e6e05
9 changed files with 107 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.cpp
View File

@@ -19,6 +19,7 @@
#include "RimFaultReactivationModel.h"
#include "RiaApplication.h"
#include "RiaFilePathTools.h"
#include "RiaPreferences.h"
#include "RiaPreferencesGeoMech.h"
#include "RiaQDateTimeTools.h"
@@ -625,8 +626,8 @@ QStringList RimFaultReactivationModel::commandParameters() const
QStringList retlist;
retlist << baseDir();
retlist << inputFilename();
retlist << outputOdbFilename();
retlist << QString::fromStdString( inputFilename() );
retlist << QString::fromStdString( outputOdbFilename() );
return retlist;
}
@@ -634,45 +635,42 @@ QStringList RimFaultReactivationModel::commandParameters() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimFaultReactivationModel::outputOdbFilename() const
std::string RimFaultReactivationModel::outputOdbFilename() const
{
QDir directory( baseDir() );
return directory.absoluteFilePath( baseFilename() + ".odb" );
return baseFilePath() + ".odb";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimFaultReactivationModel::inputFilename() const
std::string RimFaultReactivationModel::inputFilename() const
{
QDir directory( baseDir() );
return directory.absoluteFilePath( baseFilename() + ".inp" );
return baseFilePath() + ".inp";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimFaultReactivationModel::settingsFilename() const
std::string RimFaultReactivationModel::settingsFilename() const
{
QDir directory( baseDir() );
return directory.absoluteFilePath( baseFilename() + ".settings.json" );
return baseFilePath() + ".settings.json";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimFaultReactivationModel::baseFilename() const
std::string RimFaultReactivationModel::baseFilename() const
{
QString tmp = m_userDescription();
return RiaFilePathTools::makeSuitableAsFileName( m_userDescription().toStdString() );
}
if ( tmp.isEmpty() ) return "faultReactivation";
tmp.replace( ' ', '_' );
tmp.replace( '/', '_' );
tmp.replace( '\\', '_' );
tmp.replace( ':', '_' );
return tmp;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RimFaultReactivationModel::baseFilePath() const
{
QDir directory( baseDir() );
return directory.absoluteFilePath( QString::fromStdString( baseFilename() ) ).toStdString();
}
//--------------------------------------------------------------------------------------------------

9
ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationModel.h
View File

@@ -110,9 +110,10 @@ public:
QStringList commandParameters() const;
QString outputOdbFilename() const;
QString inputFilename() const;
QString settingsFilename() const;
std::string outputOdbFilename() const;
std::string inputFilename() const;
std::string settingsFilename() const;
std::string baseFilePath() const;
void updateTimeSteps();
@@ -137,7 +138,7 @@ protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
QString baseFilename() const;
std::string baseFilename() const;
private:
std::shared_ptr<RicPolylineTargetsPickEventHandler> m_pickTargetsEventHandler;