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

#5147 RimStimPlanFractureTemplate::m_stimPlanFileName -> FilePath

Browse Source
This commit is contained in:
Jacob Støren 2019-12-11 08:30:32 +01:00
parent eb421db040
commit 7f1ccc0169
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@ -69,7 +69,7 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", ""); CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
CAF_PDM_InitField(&m_stimPlanFileName, "StimPlanFileName", QString(""), "File Name", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_stimPlanFileName, "StimPlanFileName", "File Name", "", "", "");
m_stimPlanFileName.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName()); m_stimPlanFileName.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth", "", "", ""); CAF_PDM_InitField(&m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth", "", "", "");
@ -171,9 +171,9 @@ void RimStimPlanFractureTemplate::setFileName( const QString& fileName )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const QString& RimStimPlanFractureTemplate::fileName() QString RimStimPlanFractureTemplate::fileName()
{ {
return m_stimPlanFileName(); return m_stimPlanFileName().path();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -182,7 +182,7 @@ const QString& RimStimPlanFractureTemplate::fileName()
void RimStimPlanFractureTemplate::updateFilePathsFromProjectPath( const QString& newProjectPath, void RimStimPlanFractureTemplate::updateFilePathsFromProjectPath( const QString& newProjectPath,
const QString& oldProjectPath ) const QString& oldProjectPath )
{ {
m_stimPlanFileName = RimTools::relocateFile( m_stimPlanFileName(), newProjectPath, oldProjectPath, nullptr, nullptr ); // m_stimPlanFileName = RimTools::relocateFile( m_stimPlanFileName(), newProjectPath, oldProjectPath, nullptr, nullptr );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -253,7 +253,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
if ( m_readError ) return; if ( m_readError ) return;
m_stimPlanFractureDefinitionData = RifStimPlanXmlReader::readStimPlanXMLFile( m_stimPlanFileName(), m_stimPlanFractureDefinitionData = RifStimPlanXmlReader::readStimPlanXMLFile( m_stimPlanFileName().path(),
m_conductivityScaleFactor(), m_conductivityScaleFactor(),
m_halfLengthScaleFactor(), m_halfLengthScaleFactor(),
m_heightScaleFactor(), m_heightScaleFactor(),

6
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@ -56,8 +56,8 @@ public:
void loadDataAndUpdate() override; void loadDataAndUpdate() override;
void setDefaultsBasedOnXMLfile(); void setDefaultsBasedOnXMLfile();
void setFileName( const QString& fileName ); void setFileName( const QString& fileName );
const QString& fileName(); QString fileName();
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ); void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath );
@ -130,7 +130,7 @@ private:
caf::PdmField<double> m_wellPathDepthAtFracture; caf::PdmField<double> m_wellPathDepthAtFracture;
caf::PdmField<QString> m_borderPolygonResultName; caf::PdmField<QString> m_borderPolygonResultName;
caf::PdmField<QString> m_stimPlanFileName; caf::PdmField<caf::FilePath> m_stimPlanFileName;
cvf::ref<RigStimPlanFractureDefinition> m_stimPlanFractureDefinitionData; cvf::ref<RigStimPlanFractureDefinition> m_stimPlanFractureDefinitionData;
cvf::ref<RigFractureGrid> m_fractureGrid; cvf::ref<RigFractureGrid> m_fractureGrid;
bool m_readError; bool m_readError;