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

#3677 2d Maps: Make sure property filters are handled correctly.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-13 11:51:04 +01:00
parent ea053eac2d
commit f3a353039c
4 changed files with 85 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ApplicationCode/ProjectDataModel/RimContourMapView.cpp
View File

@@ -175,7 +175,7 @@ void RimContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrder
uiTreeOrdering.add(wellCollection());
uiTreeOrdering.add(faultCollection());
uiTreeOrdering.add(m_rangeFilterCollection());
uiTreeOrdering.add(nonOverridePropertyFilterCollection());
uiTreeOrdering.add(nativePropertyFilterCollection());
uiTreeOrdering.skipRemainingChildren();
}
@@ -185,15 +185,32 @@ void RimContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrder
//--------------------------------------------------------------------------------------------------
void RimContourMapView::updateCurrentTimeStep()
{
static_cast<RimEclipsePropertyFilterCollection*>(nativePropertyFilterCollection())->updateFromCurrentTimeStep();
this->updateVisibleGeometriesAndCellColors();
if (m_contourMapProjection->isChecked())
{
m_contourMapProjection->generateResults();
}
static_cast<RimEclipsePropertyFilterCollection*>(nonOverridePropertyFilterCollection())->updateFromCurrentTimeStep();
updateLegends(); // To make sure the scalar mappers are set up correctly
appendWellsAndFracturesToModel();
appendContourMapProjectionToModel();
if (m_overlayInfoConfig->isActive())
{
m_overlayInfoConfig()->update3DInfo();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimContourMapView::appendContourMapProjectionToModel()
{
if (m_viewer && m_contourMapProjection->isChecked())
{
cvf::Scene* frameScene = m_viewer->frame(m_currentTimeStep);
@@ -210,10 +227,6 @@ void RimContourMapView::updateCurrentTimeStep()
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();
frameScene->addModel(contourMapProjectionModelBasicList.p());
if (m_overlayInfoConfig->isActive())
{
m_overlayInfoConfig()->update3DInfo();
}
}
}
@@ -302,3 +315,17 @@ caf::PdmFieldHandle* RimContourMapView::userDescriptionField()
{
return m_nameConfig()->nameField();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RivCellSetEnum> RimContourMapView::allVisibleFaultGeometryTypes() const
{
std::set<RivCellSetEnum> faultGeoTypes;
// Normal eclipse views always shows faults for active and visible eclipse cells.
if (faultCollection()->showFaultCollection())
{
faultGeoTypes = RimEclipseView::allVisibleFaultGeometryTypes();
}
return faultGeoTypes;
}