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) Result colors now updated on "Visible cells"-overridden Eclipse cases

Browse Source
This commit is contained in:
Jacob Støren 2015-09-21 09:10:50 +02:00
parent 2604e01ddc
commit 22d033669d
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -581,7 +581,11 @@ void RimEclipseView::updateCurrentTimeStep()
geometriesToRecolor.push_back(RANGE_FILTERED);
geometriesToRecolor.push_back(RANGE_FILTERED_WELL_CELLS);
}
else
else if (this->controllingViewLink() && this->controllingViewLink()->syncVisibleCells())
{
geometriesToRecolor.push_back(OVERRIDDEN_CELL_VISIBILITY);
}
else
{
geometriesToRecolor.push_back(ACTIVE);
geometriesToRecolor.push_back(ALL_WELL_CELLS);
@ -1310,8 +1314,11 @@ void RimEclipseView::updateFaultForcedVisibility()
std::vector<RivCellSetEnum> RimEclipseView::visibleFaultGeometryTypes() const
{
std::vector<RivCellSetEnum> faultParts;
if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
if (this->controllingViewLink() && this->controllingViewLink()->syncVisibleCells())
{
faultParts.push_back(OVERRIDDEN_CELL_VISIBILITY);
}
else if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
{
faultParts.push_back(PROPERTY_FILTERED);
faultParts.push_back(PROPERTY_FILTERED_WELL_CELLS);

2
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -743,7 +743,7 @@ RimViewLinker* RimView::viewLinkerWithMyDepViews()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewLink* RimView::controllingViewLink()
RimViewLink* RimView::controllingViewLink() const
{
RimViewLink* viewLink = NULL;
std::vector<caf::PdmObjectHandle*> reffingObjs;

2
ApplicationCode/ProjectDataModel/RimView.h
View File

@ -127,7 +127,7 @@ public:
void scheduleCreateDisplayModelAndRedraw();
void createDisplayModelAndRedraw();
RimViewLink* controllingViewLink();
RimViewLink* controllingViewLink() const;
cvf::ref<cvf::UByteArray> currentTotalCellVisibility();
public: