From 660d68a4d13f4f8c9b9625a8c15a8898978cc505 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Wed, 27 Nov 2019 21:37:27 +0100 Subject: [PATCH] #5125 Update well measurement colors on legend changes in 3d views. --- ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp | 2 +- ApplicationCode/ProjectDataModel/RimGeoMechView.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp index c48e8426d4..a3070c09a8 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp @@ -815,7 +815,6 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel( cvf::ModelBasicList* appendFishboneSubsPartsToModel( model, displayCoordTransform, characteristicCellSize ); appendImportedFishbonesToModel( model, displayCoordTransform, characteristicCellSize ); appendWellPathAttributesToModel( model, displayCoordTransform, characteristicCellSize ); - appendWellMeasurementsToModel( model, displayCoordTransform, characteristicCellSize ); RimGridView* gridView = dynamic_cast( m_rimView.p() ); if ( !gridView ) return; @@ -880,6 +879,7 @@ void RivWellPathPartMgr::appendDynamicGeometryPartsToModel( cvf::ModelBasicList* appendPerforationsToModel( model, timeStepIndex, displayCoordTransform, characteristicCellSize, false ); appendVirtualTransmissibilitiesToModel( model, timeStepIndex, displayCoordTransform, characteristicCellSize ); + appendWellMeasurementsToModel( model, displayCoordTransform, characteristicCellSize ); RimGridView* gridView = dynamic_cast( m_rimView.p() ); if ( !gridView ) return; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp index 3f2f7dbc2c..a7c0f92540 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp @@ -587,6 +587,8 @@ std::vector RimGeoMechView::legendConfigs() const absLegendConfigs.push_back( sepInterResDef->regularLegendConfig() ); } + absLegendConfigs.push_back( m_wellMeasurementCollection->legendConfig() ); + return absLegendConfigs; } @@ -715,6 +717,11 @@ bool RimGeoMechView::isTimeStepDependentDataVisible() const { return true; } + if ( m_wellMeasurementCollection->isChecked() ) + { + return true; + } + return false; }