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

Added support for geo mech property filters for managed views

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-27 22:54:37 +02:00
parent 81ce665883
commit 5fd81b19d8
16 changed files with 155 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
View File

@@ -18,9 +18,11 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechPropertyFilter.h"
#include "RimGeoMechView.h"
#include "RimGeoMechCellColors.h"
#include "RimManagedViewCollection.h"
#include "cvfAssert.h"
@@ -49,31 +51,17 @@ RimGeoMechPropertyFilterCollection::~RimGeoMechPropertyFilterCollection()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechPropertyFilterCollection::setReservoirView(RimGeoMechView* reservoirView)
{
m_reservoirView = reservoirView;
for (size_t i = 0; i < propertyFilters.size(); i++)
{
RimGeoMechPropertyFilter* propertyFilter = propertyFilters[i];
propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechView* RimGeoMechPropertyFilterCollection::reservoirView()
{
CVF_ASSERT(!m_reservoirView.isNull());
return m_reservoirView;
RimGeoMechView* geoMechView = NULL;
firstAnchestorOrThisOfType(geoMechView);
return geoMechView;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -81,31 +69,9 @@ void RimGeoMechPropertyFilterCollection::fieldChangedByUi(const caf::PdmFieldHan
{
this->updateUiIconFromToggleField();
((RimView*)m_reservoirView)->scheduleGeometryRegen(PROPERTY_FILTERED);
m_reservoirView->scheduleCreateDisplayModelAndRedraw();
updateDisplayModelNotifyManagedViews();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechPropertyFilter* RimGeoMechPropertyFilterCollection::createAndAppendPropertyFilter()
{
RimGeoMechPropertyFilter* propertyFilter = new RimGeoMechPropertyFilter();
propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
propertyFilter->setParentContainer(this);
propertyFilters.push_back(propertyFilter);
propertyFilter->resultDefinition->setResultAddress(m_reservoirView->cellResult()->resultAddress());
propertyFilter->resultDefinition->loadResult();
propertyFilter->setToDefaultValues();
propertyFilter->updateFilterName();
return propertyFilter;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -130,21 +96,13 @@ void RimGeoMechPropertyFilterCollection::initAfterRead()
RimGeoMechPropertyFilter* propertyFilter = propertyFilters[i];
propertyFilter->setParentContainer(this);
propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
propertyFilter->resultDefinition->setReservoirView(reservoirView());
propertyFilter->updateIconState();
}
this->updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechPropertyFilterCollection::remove(RimGeoMechPropertyFilter* propertyFilter)
{
propertyFilters.removeChildObject(propertyFilter);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -169,7 +127,6 @@ bool RimGeoMechPropertyFilterCollection::hasActiveDynamicFilters() const
return hasActiveFilters();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -177,3 +134,19 @@ caf::PdmFieldHandle* RimGeoMechPropertyFilterCollection::objectToggleField()
{
return &active;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechPropertyFilterCollection::updateDisplayModelNotifyManagedViews()
{
RimGeoMechView* view = NULL;
this->firstAnchestorOrThisOfType(view);
CVF_ASSERT(view);
view->scheduleGeometryRegen(PROPERTY_FILTERED);
view->scheduleCreateDisplayModelAndRedraw();
// Notify managed views of range filter change in master view
view->managedViewCollection()->updatePropertyFilters();
}