From fdd3625bc21a2c8d29f8c6e7557beaa813ca181f Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 30 Apr 2020 08:18:18 +0200 Subject: [PATCH] #5852 3D view: Avoid more work than required --- .../ProjectDataModel/RimSimWellInViewCollection.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp index 0e7fd32cec..9c4c00f647 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -505,8 +505,8 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch setDefaultSourceCaseForWellDisks(); } - if ( &isActive == changedField || &m_showWellLabel == changedField || &m_showWellCells == changedField || - &m_showWellCellFence == changedField || &wellCellFenceType == changedField ) + if ( &isActive == changedField || &m_showWellCells == changedField || &m_showWellCellFence == changedField || + &wellCellFenceType == changedField || &showWellsIntersectingVisibleCells == changedField ) { m_reservoirView->scheduleGeometryRegen( VISIBLE_WELL_CELLS ); m_reservoirView->scheduleCreateDisplayModelAndRedraw(); @@ -519,7 +519,7 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch &m_wellDiskPropertyConfigType == changedField || &m_wellDiskshowLabelsBackground == changedField || &m_wellDiskShowQuantityLabels == changedField || &m_wellDiskSummaryCase == changedField || &m_wellDiskScaleFactor == changedField || &wellDiskColor == changedField || - &m_showWellDisks == changedField ) + &m_showWellDisks == changedField || &m_showWellLabel == changedField ) { m_reservoirView->updateDisplayModelForCurrentTimeStepAndRedraw(); } @@ -540,12 +540,6 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch for ( RimSimWellInView* w : wells ) w->schedule2dIntersectionViewUpdate(); } - else if ( &showWellsIntersectingVisibleCells == changedField ) - { - m_reservoirView->scheduleGeometryRegen( VISIBLE_WELL_CELLS ); - m_reservoirView->scheduleSimWellGeometryRegen(); - m_reservoirView->scheduleCreateDisplayModelAndRedraw(); - } } if ( &m_wellPipeColors == changedField || &m_defaultWellPipeColor == changedField )