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

Managed views can use range filters from master view

Browse Source 
RangeFilterCollection is now a private field in RimView
This commit is contained in:
Magne Sjaastad
2015-08-27 13:44:27 +02:00
parent dc7735a67d
commit e5f0bdfaab
10 changed files with 206 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@@ -31,6 +31,7 @@
#include "RimEclipseView.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechView.h"
#include "RimManagedViewCollection.h"
#include "cafPdmUiEditorHandle.h"
@@ -59,14 +60,6 @@ RimCellRangeFilterCollection::~RimCellRangeFilterCollection()
rangeFilters.deleteAllChildObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::setReservoirView(RimView* reservoirView)
{
m_reservoirView = reservoirView;
}
//--------------------------------------------------------------------------------------------------
/// RimCellRangeFilter is using Eclipse 1-based indexing, adjust filter values before
// populating cvf::CellRangeFilter (which is 0-based)
@@ -131,7 +124,7 @@ RigMainGrid* RimCellRangeFilterCollection::mainGrid() const
RigActiveCellInfo* RimCellRangeFilterCollection::activeCellInfo() const
{
RimEclipseView* eclipseView = this->eclipseView();
if (eclipseView )
if (eclipseView)
{
return eclipseView->currentActiveCellInfo();
}
@@ -154,18 +147,16 @@ void RimCellRangeFilterCollection::updateUiUpdateDisplayModel()
{
this->updateUiIconFromToggleField();
m_reservoirView->scheduleGeometryRegen(RANGE_FILTERED);
m_reservoirView->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
m_reservoirView->scheduleCreateDisplayModelAndRedraw();
}
rimView->scheduleGeometryRegen(RANGE_FILTERED);
rimView->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimCellRangeFilterCollection::reservoirView()
{
return m_reservoirView;
rimView->scheduleCreateDisplayModelAndRedraw();
// Notify managed views of range filter change in master view
rimView->managedViewCollection()->updateRangeFilters();
}
//--------------------------------------------------------------------------------------------------
@@ -173,7 +164,7 @@ RimView* RimCellRangeFilterCollection::reservoirView()
//--------------------------------------------------------------------------------------------------
RimEclipseView* RimCellRangeFilterCollection::eclipseView() const
{
return dynamic_cast<RimEclipseView*>(m_reservoirView);
return dynamic_cast<RimEclipseView*>(baseView());
}
//--------------------------------------------------------------------------------------------------
@@ -226,7 +217,6 @@ bool RimCellRangeFilterCollection::hasActiveIncludeFilters() const
}
return false;
}
//--------------------------------------------------------------------------------------------------
@@ -303,16 +293,25 @@ QString RimCellRangeFilterCollection::gridName(int gridIndex) const
//--------------------------------------------------------------------------------------------------
RigFemPartCollection* RimCellRangeFilterCollection::femPartColl() const
{
RimGeoMechView* eclipseView = dynamic_cast<RimGeoMechView*>(m_reservoirView);
if (eclipseView &&
eclipseView->geoMechCase() &&
eclipseView->geoMechCase()->geoMechData() )
RimGeoMechView* geoView = dynamic_cast<RimGeoMechView*>(baseView());
if (geoView &&
geoView->geoMechCase() &&
geoView->geoMechCase()->geoMechData() )
{
return eclipseView->geoMechCase()->geoMechData()->femParts();
return geoView->geoMechCase()->geoMechData()->femParts();
}
return NULL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimCellRangeFilterCollection::baseView() const
{
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
return rimView;
}