mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#5147 RimSummaryCase::m_summaryHeaderFilename -> PdmField<caf::FilePath>
This commit is contained in:
parent
a9d089df6d
commit
18cf59530f
@ -56,7 +56,7 @@ RimFileSummaryCase::~RimFileSummaryCase() {}
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
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 )
|
||||
{
|
||||
m_summaryHeaderFilename =
|
||||
RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
|
||||
// m_summaryHeaderFilename =
|
||||
// RimTools::relocateFile( m_summaryHeaderFilename().path(), newProjectPath, oldProjectPath, nullptr, nullptr );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@ -115,7 +115,7 @@ RimEclipseCase* RimGridSummaryCase::associatedEclipseCase()
|
||||
if ( eclCase )
|
||||
{
|
||||
QString sumHeaderFileName = summaryHeaderFilenameFromEclipseCase( eclCase );
|
||||
if ( sumHeaderFileName == m_summaryHeaderFilename )
|
||||
if ( sumHeaderFileName == m_summaryHeaderFilename().path() )
|
||||
{
|
||||
m_eclipseCase = eclCase;
|
||||
this->updateAutoShortName();
|
||||
@ -135,7 +135,7 @@ RimEclipseCase* RimGridSummaryCase::associatedEclipseCase()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimGridSummaryCase::summaryHeaderFilename() const
|
||||
{
|
||||
if ( !m_eclipseCase() ) return m_summaryHeaderFilename();
|
||||
if ( !m_eclipseCase() ) return m_summaryHeaderFilename().path();
|
||||
|
||||
return summaryHeaderFilenameFromEclipseCase( m_eclipseCase() );
|
||||
}
|
||||
|
@ -68,8 +68,8 @@ QString RimObservedSummaryData::caseName() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimObservedSummaryData::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
|
||||
{
|
||||
m_summaryHeaderFilename =
|
||||
RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
|
||||
// m_summaryHeaderFilename =
|
||||
// RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@ -62,7 +62,7 @@ RimSummaryCase::~RimSummaryCase() {}
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimSummaryCase::summaryHeaderFilename() const
|
||||
{
|
||||
return m_summaryHeaderFilename();
|
||||
return m_summaryHeaderFilename().path();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@ -20,6 +20,7 @@
|
||||
#include "RiaEclipseUnitTools.h"
|
||||
#include "RigCaseRealizationParameters.h"
|
||||
|
||||
#include "cafFilePath.h"
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObject.h"
|
||||
|
||||
@ -81,10 +82,10 @@ protected:
|
||||
const QVariant& newValue ) override;
|
||||
void updateTreeItemName();
|
||||
|
||||
caf::PdmField<QString> m_shortName;
|
||||
caf::PdmField<bool> m_useAutoShortName;
|
||||
caf::PdmField<QString> m_summaryHeaderFilename;
|
||||
bool m_isObservedData;
|
||||
caf::PdmField<QString> m_shortName;
|
||||
caf::PdmField<bool> m_useAutoShortName;
|
||||
caf::PdmField<caf::FilePath> m_summaryHeaderFilename;
|
||||
bool m_isObservedData;
|
||||
|
||||
std::shared_ptr<RigCaseRealizationParameters> m_crlParameters;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user