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

#5317 Add separate results definition objects for Reservoir Surfaces

Browse Source
This commit is contained in:
Jacob Støren 2020-01-14 13:55:18 +01:00
parent e05f9320d7
commit cf74891952
6 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1739,6 +1739,8 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
uiTreeOrdering.add( cellEdgeResult() ); uiTreeOrdering.add( cellEdgeResult() );
uiTreeOrdering.add( faultResultSettings() ); uiTreeOrdering.add( faultResultSettings() );
uiTreeOrdering.add( &m_intersectionResultDefCollection ); uiTreeOrdering.add( &m_intersectionResultDefCollection );
uiTreeOrdering.add( &m_surfaceResultDefCollection );
uiTreeOrdering.add( wellCollection() ); uiTreeOrdering.add( wellCollection() );
uiTreeOrdering.add( &m_wellMeasurementCollection ); uiTreeOrdering.add( &m_wellMeasurementCollection );

1
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -914,6 +914,7 @@ void RimGeoMechView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
uiTreeOrdering.add( cellResult() ); uiTreeOrdering.add( cellResult() );
uiTreeOrdering.add( m_tensorResults() ); uiTreeOrdering.add( m_tensorResults() );
uiTreeOrdering.add( &m_intersectionResultDefCollection ); uiTreeOrdering.add( &m_intersectionResultDefCollection );
uiTreeOrdering.add( &m_surfaceResultDefCollection );
uiTreeOrdering.add( &m_wellMeasurementCollection ); uiTreeOrdering.add( &m_wellMeasurementCollection );
uiTreeOrdering.add( m_intersectionCollection() ); uiTreeOrdering.add( m_intersectionCollection() );

17
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@ -87,6 +87,15 @@ RimGridView::RimGridView()
m_intersectionResultDefCollection.uiCapability()->setUiTreeHidden( true ); m_intersectionResultDefCollection.uiCapability()->setUiTreeHidden( true );
m_intersectionResultDefCollection = new RimIntersectionResultsDefinitionCollection; m_intersectionResultDefCollection = new RimIntersectionResultsDefinitionCollection;
CAF_PDM_InitFieldNoDefault( &m_surfaceResultDefCollection,
"ReservoirSurfaceResultDefColl",
"Separate Surface Results",
"",
"",
"" );
m_surfaceResultDefCollection.uiCapability()->setUiTreeHidden( true );
m_surfaceResultDefCollection = new RimIntersectionResultsDefinitionCollection;
CAF_PDM_InitFieldNoDefault( &m_gridCollection, "GridCollection", "GridCollection", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_gridCollection, "GridCollection", "GridCollection", "", "", "" );
m_gridCollection.uiCapability()->setUiHidden( true ); m_gridCollection.uiCapability()->setUiHidden( true );
m_gridCollection = new RimGridCollection(); m_gridCollection = new RimGridCollection();
@ -208,6 +217,14 @@ RimIntersectionResultsDefinitionCollection* RimGridView::separateIntersectionRes
return m_intersectionResultDefCollection; return m_intersectionResultDefCollection;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionResultsDefinitionCollection* RimGridView::separateSurfaceResultsCollection() const
{
return m_surfaceResultDefCollection;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimGridView.h
View File

@ -50,6 +50,7 @@ public:
RimIntersectionCollection* intersectionCollection() const; RimIntersectionCollection* intersectionCollection() const;
RimSurfaceInViewCollection* surfaceInViewCollection() const; RimSurfaceInViewCollection* surfaceInViewCollection() const;
RimIntersectionResultsDefinitionCollection* separateIntersectionResultsCollection() const; RimIntersectionResultsDefinitionCollection* separateIntersectionResultsCollection() const;
RimIntersectionResultsDefinitionCollection* separateSurfaceResultsCollection() const;
RimAnnotationInViewCollection* annotationCollection() const; RimAnnotationInViewCollection* annotationCollection() const;
RimWellMeasurementInViewCollection* measurementCollection() const; RimWellMeasurementInViewCollection* measurementCollection() const;
@ -96,6 +97,7 @@ protected:
caf::PdmChildField<RimIntersectionCollection*> m_intersectionCollection; caf::PdmChildField<RimIntersectionCollection*> m_intersectionCollection;
caf::PdmChildField<RimIntersectionResultsDefinitionCollection*> m_intersectionResultDefCollection; caf::PdmChildField<RimIntersectionResultsDefinitionCollection*> m_intersectionResultDefCollection;
caf::PdmChildField<RimIntersectionResultsDefinitionCollection*> m_surfaceResultDefCollection;
caf::PdmChildField<Rim3dOverlayInfoConfig*> m_overlayInfoConfig; caf::PdmChildField<Rim3dOverlayInfoConfig*> m_overlayInfoConfig;
caf::PdmChildField<RimCellRangeFilterCollection*> m_rangeFilterCollection; caf::PdmChildField<RimCellRangeFilterCollection*> m_rangeFilterCollection;

5
ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp
View File

@ -61,11 +61,6 @@ QString RimSurfaceInView::name() const
return ""; return "";
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSurfaceInView::loadDataAndUpdate() {}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.h
View File

@ -36,8 +36,6 @@ public:
RimSurfaceInView(); RimSurfaceInView();
~RimSurfaceInView() override; ~RimSurfaceInView() override;
void loadDataAndUpdate();
QString name() const; QString name() const;
RimSurface* surface() const; RimSurface* surface() const;
void setSurface( RimSurface* surf ); void setSurface( RimSurface* surf );