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

#7308 Project file: Avoid storing Eclipse Faults file list

Browse Source
This commit is contained in:
Magne Sjaastad 2021-06-10 15:12:50 +02:00
parent fc8823d62f
commit 5d701dd12a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -106,8 +106,9 @@ RimEclipseCase::RimEclipseCase()
CAF_PDM_InitField( &m_flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", "" ); CAF_PDM_InitField( &m_flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", "" );
CAF_PDM_InitField( &m_flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", "" ); CAF_PDM_InitField( &m_flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_filesContainingFaults, "CachedFileNamesContainingFaults", "", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_filesContainingFaults_OBSOLETE, "CachedFileNamesContainingFaults", "", "", "", "" );
m_filesContainingFaults.uiCapability()->setUiHidden( true ); m_filesContainingFaults_OBSOLETE.uiCapability()->setUiHidden( true );
m_filesContainingFaults_OBSOLETE.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault( &m_contourMapCollection, "ContourMaps", "2d Contour Maps", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_contourMapCollection, "ContourMaps", "2d Contour Maps", "", "", "" );
m_contourMapCollection = new RimEclipseContourMapViewCollection; m_contourMapCollection = new RimEclipseContourMapViewCollection;
@ -877,7 +878,7 @@ std::vector<QString> RimEclipseCase::filesContainingFaults() const
{ {
std::vector<QString> stdPathList; std::vector<QString> stdPathList;
for ( auto& filePath : m_filesContainingFaults() ) for ( auto& filePath : m_filesContainingFaults_OBSOLETE() )
{ {
stdPathList.push_back( filePath.path() ); stdPathList.push_back( filePath.path() );
} }
@ -896,7 +897,7 @@ void RimEclipseCase::setFilesContainingFaults( const std::vector<QString>& pathS
filePaths.push_back( pathString ); filePaths.push_back( pathString );
} }
m_filesContainingFaults = filePaths; m_filesContainingFaults_OBSOLETE = filePaths;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/ProjectDataModel/RimEclipseCase.h
View File

@ -142,7 +142,6 @@ protected:
caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection; caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
private: private:
caf::PdmField<std::vector<caf::FilePath>> m_filesContainingFaults;
caf::PdmField<bool> m_releaseResultMemory; caf::PdmField<bool> m_releaseResultMemory;
caf::PdmChildField<RimEclipseContourMapViewCollection*> m_contourMapCollection; caf::PdmChildField<RimEclipseContourMapViewCollection*> m_contourMapCollection;
@ -153,4 +152,8 @@ private:
caf::PdmChildField<RimReservoirCellResultsStorage*> m_matrixModelResults; caf::PdmChildField<RimReservoirCellResultsStorage*> m_matrixModelResults;
caf::PdmChildField<RimReservoirCellResultsStorage*> m_fractureModelResults; caf::PdmChildField<RimReservoirCellResultsStorage*> m_fractureModelResults;
// To be removed as the caching of file names causes issues when using the project file as template
// https://github.com/OPM/ResInsight/issues/7308
caf::PdmField<std::vector<caf::FilePath>> m_filesContainingFaults_OBSOLETE;
}; };