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 RimEclipseResultCase::m_sourSimFileName ->FilePath

Browse Source
This commit is contained in:
Jacob Støren 2019-12-13 10:27:38 +01:00
parent b7db416652
commit 0bd9ef925a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -94,7 +94,7 @@ RimEclipseResultCase::RimEclipseResultCase()
m_flipYAxis.xmlCapability()->setIOWritable( true ); m_flipYAxis.xmlCapability()->setIOWritable( true );
// flipYAxis.uiCapability()->setUiHidden(true); // flipYAxis.uiCapability()->setUiHidden(true);
CAF_PDM_InitField( &m_sourSimFileName, "SourSimFileName", QString(), "SourSim File Name", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_sourSimFileName, "SourSimFileName", "SourSim File Name", "", "", "" );
m_sourSimFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_sourSimFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
#ifndef USE_HDF5 #ifndef USE_HDF5
m_sourSimFileName.uiCapability()->setUiHidden( true ); m_sourSimFileName.uiCapability()->setUiHidden( true );
@ -225,10 +225,10 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter
m_flowDiagSolutions.push_back( new RimFlowDiagSolution() ); m_flowDiagSolutions.push_back( new RimFlowDiagSolution() );
} }
if ( !m_sourSimFileName().isEmpty() ) if ( !m_sourSimFileName().path().isEmpty() )
{ {
RifReaderEclipseOutput* outReader = dynamic_cast<RifReaderEclipseOutput*>( readerInterface.p() ); RifReaderEclipseOutput* outReader = dynamic_cast<RifReaderEclipseOutput*>( readerInterface.p() );
outReader->setHdf5FileName( m_sourSimFileName() ); outReader->setHdf5FileName( m_sourSimFileName().path() );
} }
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
@ -323,7 +323,7 @@ void RimEclipseResultCase::loadAndUpdateSourSimData()
{ {
if ( !results( RiaDefines::MATRIX_MODEL ) ) return; if ( !results( RiaDefines::MATRIX_MODEL ) ) return;
results( RiaDefines::MATRIX_MODEL )->setHdf5Filename( m_sourSimFileName ); results( RiaDefines::MATRIX_MODEL )->setHdf5Filename( m_sourSimFileName().path() );
if ( !hasSourSimFile() ) if ( !hasSourSimFile() )
{ {
@ -587,7 +587,7 @@ void RimEclipseResultCase::setSourSimFileName( const QString& fileName )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimEclipseResultCase::hasSourSimFile() bool RimEclipseResultCase::hasSourSimFile()
{ {
return !m_sourSimFileName().isEmpty(); return !m_sourSimFileName().path().isEmpty();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@ -102,7 +102,7 @@ private:
caf::PdmField<caf::FilePath> caseFileName; caf::PdmField<caf::FilePath> caseFileName;
caf::PdmProxyValueField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem; caf::PdmProxyValueField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem;
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions; caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<QString> m_sourSimFileName; caf::PdmField<caf::FilePath> m_sourSimFileName;
// Obsolete field // Obsolete field
caf::PdmField<QString> caseDirectory; caf::PdmField<QString> caseDirectory;