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

Rename and simplified control of fault visibility

Browse Source
This commit is contained in:
Magne Sjaastad 2014-06-13 07:27:00 +02:00
parent f259f21b32
commit 430f95d52a
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -101,7 +101,12 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
CVF_ASSERT(rivFaultPart.notNull()); CVF_ASSERT(rivFaultPart.notNull());
// Parts that is overridden by the grid settings // Parts that is overridden by the grid settings
bool forceDisplayOfFault = isShowingGrid; bool forceDisplayOfFault = false;
if (!m_faultCollection->showFaultsOutsideFilters())
{
forceDisplayOfFault = isShowingGrid;
}
if (m_forceVisibility) if (m_forceVisibility)
{ {
forceDisplayOfFault = true; forceDisplayOfFault = true;

30
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -615,7 +615,7 @@ void RimReservoirView::createDisplayModel()
if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters) if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters)
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultParts(); std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultGeometryTypes();
RivReservoirViewPartMgr::ReservoirGeometryCacheType faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend); RivReservoirViewPartMgr::ReservoirGeometryCacheType faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend);
@ -630,7 +630,6 @@ void RimReservoirView::createDisplayModel()
} }
updateFaultForcedVisibility(); updateFaultForcedVisibility();
} }
// Compute triangle count, Debug only // Compute triangle count, Debug only
@ -709,7 +708,7 @@ void RimReservoirView::updateCurrentTimeStep()
if (faultCollection()->showFaultsOutsideFilters) if (faultCollection()->showFaultsOutsideFilters)
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultParts(); std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultGeometryTypes();
for (size_t i = 0; i < faultGeometryTypesToAppend.size(); i++) for (size_t i = 0; i < faultGeometryTypesToAppend.size(); i++)
{ {
@ -1941,31 +1940,20 @@ void RimReservoirView::updateFaultForcedVisibility()
// As fault geometry is visible in grid visualization mode, fault geometry must be forced visible // As fault geometry is visible in grid visualization mode, fault geometry must be forced visible
// even if the fault item is disabled in project tree view // even if the fault item is disabled in project tree view
caf::FixedArray<bool, RivReservoirViewPartMgr::PROPERTY_FILTERED> forceOn; if (!faultCollection->showFaultCollection)
for (size_t i = 0; i < RivReservoirViewPartMgr::PROPERTY_FILTERED; i++)
{ {
forceOn[i] = false; m_reservoirGridPartManager->setFaultForceVisibilityForGeometryType(RivReservoirViewPartMgr::ALL_WELL_CELLS, true);
} }
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultParts = visibleFaultParts(); m_reservoirGridPartManager->setFaultForceVisibilityForGeometryType(RivReservoirViewPartMgr::RANGE_FILTERED, true);
for (size_t i = 0; i < faultParts.size(); i++) m_reservoirGridPartManager->setFaultForceVisibilityForGeometryType(RivReservoirViewPartMgr::VISIBLE_WELL_FENCE_CELLS, true);
{ m_reservoirGridPartManager->setFaultForceVisibilityForGeometryType(RivReservoirViewPartMgr::VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER, true);
forceOn[faultParts[i]];
}
for (size_t i = 0; i < RivReservoirViewPartMgr::PROPERTY_FILTERED; i++)
{
RivReservoirViewPartMgr::ReservoirGeometryCacheType cacheType = (RivReservoirViewPartMgr::ReservoirGeometryCacheType)i;
m_reservoirGridPartManager->setFaultForceVisibilityForGeometryType(cacheType, forceOn[i]);
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RimReservoirView::visibleFaultParts() const std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RimReservoirView::visibleFaultGeometryTypes() const
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultParts; std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultParts;
@ -2043,7 +2031,7 @@ std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RimReservoirVie
void RimReservoirView::updateFaultColors() void RimReservoirView::updateFaultColors()
{ {
// Update all fault geometry // Update all fault geometry
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometriesToRecolor = visibleFaultParts(); std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometriesToRecolor = visibleFaultGeometryTypes();
for (size_t i = 0; i < faultGeometriesToRecolor.size(); ++i) for (size_t i = 0; i < faultGeometriesToRecolor.size(); ++i)
{ {

2
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

@ -191,7 +191,7 @@ private:
void updateStaticCellColors(unsigned short geometryType); void updateStaticCellColors(unsigned short geometryType);
void updateLegends(); void updateLegends();
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> visibleFaultParts() const; std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> visibleFaultGeometryTypes() const;
void updateFaultForcedVisibility(); void updateFaultForcedVisibility();
void updateFaultColors(); void updateFaultColors();