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

(#401) WIP: First cell filtering Eclipse Geomec grid visible.

Browse Source 
Not working very well. BB matching is not good enough.
This commit is contained in:
Jacob Støren
2015-09-15 14:30:52 +02:00
parent 36bc2f8f69
commit 7a6c7149e1
6 changed files with 149 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -62,6 +62,7 @@
#include <limits.h>
#include "RimViewLinker.h"
#include "RimViewLink.h"
@@ -330,11 +331,17 @@ void RimEclipseView::createDisplayModel()
// For property filtered geometry : just set all the models as empty scenes
// updateCurrentTimeStep requests the actual parts
if (!this->propertyFilterCollection()->hasActiveFilters())
if (this->controllingViewLink() && this->controllingViewLink()->syncVisibleCells()
|| !this->propertyFilterCollection()->hasActiveFilters())
{
std::vector<RivCellSetEnum> geometryTypesToAdd;
if (this->rangeFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells())
if (this->controllingViewLink() && this->controllingViewLink()->syncVisibleCells())
{
geometryTypesToAdd.push_back(OVERRIDDEN_CELL_VISIBILITY);
}
else if (this->rangeFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells())
{
geometryTypesToAdd.push_back(RANGE_FILTERED);
geometryTypesToAdd.push_back(RANGE_FILTERED_WELL_CELLS);
@@ -716,6 +723,7 @@ void RimEclipseView::initAfterRead()
//--------------------------------------------------------------------------------------------------
void RimEclipseView::updateStaticCellColors()
{
updateStaticCellColors( OVERRIDDEN_CELL_VISIBILITY);
updateStaticCellColors( ACTIVE);
updateStaticCellColors( ALL_WELL_CELLS);
updateStaticCellColors( VISIBLE_WELL_CELLS);

1
ApplicationCode/ProjectDataModel/RimView.h
View File

@@ -126,6 +126,7 @@ public:
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) = 0;
void scheduleCreateDisplayModelAndRedraw();
void createDisplayModelAndRedraw();
RimViewLink* controllingViewLink();
cvf::ref<cvf::UByteArray> currentTotalCellVisibility();

2
ApplicationCode/ProjectDataModel/RimViewLink.cpp
View File

@@ -66,7 +66,7 @@ RimViewLink::RimViewLink(void)
CAF_PDM_InitField(&syncCellResult, "SyncCellResult", false, "Cell Result", "", "", "");
CAF_PDM_InitField(&syncVisibleCells, "SyncVisibleCells", false, "Visible Cells", "", "", "");
syncVisibleCells.uiCapability()->setUiHidden(true); // For now
//syncVisibleCells.uiCapability()->setUiHidden(true); // For now
CAF_PDM_InitField(&syncRangeFilters, "SyncRangeFilters", true, "Range Filters", "", "", "");
CAF_PDM_InitField(&syncPropertyFilters, "SyncPropertyFilters", true,"Property Filters", "", "", "");