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

(#395) Added sync of Eclipse property filters

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-27 15:45:22 +02:00
parent eaa5cc90a8
commit 81ce665883
8 changed files with 163 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -101,9 +101,9 @@ RimEclipseView::RimEclipseView()
m_rangeFilterCollection = new RimCellRangeFilterCollection();
m_rangeFilterCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "");
propertyFilterCollection = new RimEclipsePropertyFilterCollection();
propertyFilterCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "");
m_propertyFilterCollection = new RimEclipsePropertyFilterCollection();
m_propertyFilterCollection.uiCapability()->setUiHidden(true);
// Visualization fields
CAF_PDM_InitField(&showMainGrid, "ShowMainGrid", true, "Show Main Grid", "", "", "");
@@ -134,7 +134,7 @@ RimEclipseView::~RimEclipseView()
delete this->cellEdgeResult();
delete m_rangeFilterCollection;
delete propertyFilterCollection();
delete m_propertyFilterCollection;
delete wellCollection();
delete faultCollection();
@@ -237,7 +237,7 @@ void RimEclipseView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
scheduleCreateDisplayModelAndRedraw();
}
else if (changedField == &propertyFilterCollection)
else if (changedField == &m_propertyFilterCollection)
{
m_reservoirGridPartManager->scheduleGeometryRegen(PROPERTY_FILTERED);
@@ -678,7 +678,7 @@ void RimEclipseView::loadDataAndUpdate()
updateViewerWidget();
this->propertyFilterCollection()->loadAndInitializePropertyFilters();
this->m_propertyFilterCollection()->loadAndInitializePropertyFilters();
this->faultCollection()->setReservoirView(this);
this->faultCollection()->syncronizeFaults();
@@ -1496,3 +1496,41 @@ void RimEclipseView::addWellPathsToScene(cvf::Scene* scene,
scene->addModel(wellPathModelBasicList.p());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilterCollection* RimEclipseView::propertyFilterCollection()
{
if (m_overridePropertyFilterCollection)
{
return m_overridePropertyFilterCollection;
}
else
{
return m_propertyFilterCollection;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimEclipsePropertyFilterCollection* RimEclipseView::propertyFilterCollection() const
{
if (m_overridePropertyFilterCollection)
{
return m_overridePropertyFilterCollection;
}
else
{
return m_propertyFilterCollection;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseView::setOverridePropertyFilterCollection(RimEclipsePropertyFilterCollection* pfc)
{
m_overridePropertyFilterCollection = pfc;
}