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

#5147 RimSummaryCase::m_summaryHeaderFilename -> PdmField<caf::FilePath>

Browse Source
This commit is contained in:
Jacob Støren
2019-12-10 16:12:21 +01:00
parent a9d089df6d
commit 18cf59530f
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
View File

@@ -56,7 +56,7 @@ RimFileSummaryCase::~RimFileSummaryCase() {}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimFileSummaryCase::summaryHeaderFilename() const QString RimFileSummaryCase::summaryHeaderFilename() const
{ {
return m_summaryHeaderFilename(); return m_summaryHeaderFilename().path();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -74,8 +74,8 @@ QString RimFileSummaryCase::caseName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFileSummaryCase::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) void RimFileSummaryCase::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{ {
m_summaryHeaderFilename = // m_summaryHeaderFilename =
RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr ); // RimTools::relocateFile( m_summaryHeaderFilename().path(), newProjectPath, oldProjectPath, nullptr, nullptr );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
View File

@@ -115,7 +115,7 @@ RimEclipseCase* RimGridSummaryCase::associatedEclipseCase()
if ( eclCase ) if ( eclCase )
{ {
QString sumHeaderFileName = summaryHeaderFilenameFromEclipseCase( eclCase ); QString sumHeaderFileName = summaryHeaderFilenameFromEclipseCase( eclCase );
if ( sumHeaderFileName == m_summaryHeaderFilename ) if ( sumHeaderFileName == m_summaryHeaderFilename().path() )
{ {
m_eclipseCase = eclCase; m_eclipseCase = eclCase;
this->updateAutoShortName(); this->updateAutoShortName();
@@ -135,7 +135,7 @@ RimEclipseCase* RimGridSummaryCase::associatedEclipseCase()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimGridSummaryCase::summaryHeaderFilename() const QString RimGridSummaryCase::summaryHeaderFilename() const
{ {
if ( !m_eclipseCase() ) return m_summaryHeaderFilename(); if ( !m_eclipseCase() ) return m_summaryHeaderFilename().path();
return summaryHeaderFilenameFromEclipseCase( m_eclipseCase() ); return summaryHeaderFilenameFromEclipseCase( m_eclipseCase() );
} }

4
ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
View File

@@ -68,8 +68,8 @@ QString RimObservedSummaryData::caseName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimObservedSummaryData::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) void RimObservedSummaryData::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{ {
m_summaryHeaderFilename = // m_summaryHeaderFilename =
RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr ); // RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@@ -62,7 +62,7 @@ RimSummaryCase::~RimSummaryCase() {}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimSummaryCase::summaryHeaderFilename() const QString RimSummaryCase::summaryHeaderFilename() const
{ {
return m_summaryHeaderFilename(); return m_summaryHeaderFilename().path();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

9
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@@ -20,6 +20,7 @@
#include "RiaEclipseUnitTools.h" #include "RiaEclipseUnitTools.h"
#include "RigCaseRealizationParameters.h" #include "RigCaseRealizationParameters.h"
#include "cafFilePath.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
@@ -81,10 +82,10 @@ protected:
const QVariant& newValue ) override; const QVariant& newValue ) override;
void updateTreeItemName(); void updateTreeItemName();
caf::PdmField<QString> m_shortName; caf::PdmField<QString> m_shortName;
caf::PdmField<bool> m_useAutoShortName; caf::PdmField<bool> m_useAutoShortName;
caf::PdmField<QString> m_summaryHeaderFilename; caf::PdmField<caf::FilePath> m_summaryHeaderFilename;
bool m_isObservedData; bool m_isObservedData;
std::shared_ptr<RigCaseRealizationParameters> m_crlParameters; std::shared_ptr<RigCaseRealizationParameters> m_crlParameters;