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

#5656 Fix display of well disks in contour map

Browse Source 
The summary reader would not be set if the property editor had not been
shown (i.e. defineUiOrdering had not been done) before the first draw.
This commit is contained in:
Kristian Bendiksen 2020-04-06 11:54:09 +02:00 committed by Magne Sjaastad
parent 0c9223e965
commit 67864399fe
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1894,6 +1894,8 @@ bool RimEclipseView::isTimeStepDependentDataVisible() const
if ( this->hasVisibleTimeStepDependent3dWellLogCurves() ) return true; if ( this->hasVisibleTimeStepDependent3dWellLogCurves() ) return true;
if ( this->wellPathCollection() && this->wellCollection()->isWellDisksVisible() ) return true;
return false; return false;
} }

11
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@ -489,9 +489,16 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch
if ( m_reservoirView ) if ( m_reservoirView )
{ {
if ( !m_wellDiskSummaryCase() )
{
setDefaultSourceCaseForWellDisks();
}
if ( &isActive == changedField || &m_showWellLabel == changedField || &m_showWellCells == changedField || if ( &isActive == changedField || &m_showWellLabel == changedField || &m_showWellCells == changedField ||
&m_showWellCellFence == changedField || &wellCellFenceType == changedField ) &m_showWellCellFence == changedField || &wellCellFenceType == changedField )
{ {
RimWellDiskConfig wellDiskConfig = getActiveWellDiskConfig();
updateWellDisks( wellDiskConfig );
m_reservoirView->scheduleGeometryRegen( VISIBLE_WELL_CELLS ); m_reservoirView->scheduleGeometryRegen( VISIBLE_WELL_CELLS );
m_reservoirView->scheduleCreateDisplayModelAndRedraw(); m_reservoirView->scheduleCreateDisplayModelAndRedraw();
} }
@ -502,14 +509,14 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch
else if ( &m_wellDiskQuantity == changedField || &m_wellDiskPropertyType == changedField || else if ( &m_wellDiskQuantity == changedField || &m_wellDiskPropertyType == changedField ||
&m_wellDiskPropertyConfigType == changedField || &m_wellDiskshowLabelsBackground == changedField || &m_wellDiskPropertyConfigType == changedField || &m_wellDiskshowLabelsBackground == changedField ||
&m_wellDiskShowQuantityLabels == changedField || &m_wellDiskSummaryCase == changedField || &m_wellDiskShowQuantityLabels == changedField || &m_wellDiskSummaryCase == changedField ||
&m_wellDiskScaleFactor == changedField ) &m_wellDiskScaleFactor == changedField || &m_showWellDisks == changedField )
{ {
RimWellDiskConfig wellDiskConfig = getActiveWellDiskConfig(); RimWellDiskConfig wellDiskConfig = getActiveWellDiskConfig();
updateWellDisks( wellDiskConfig ); updateWellDisks( wellDiskConfig );
m_reservoirView->updateDisplayModelForCurrentTimeStepAndRedraw(); m_reservoirView->updateDisplayModelForCurrentTimeStepAndRedraw();
} }
else if ( &spheresScaleFactor == changedField || &m_showWellSpheres == changedField || else if ( &spheresScaleFactor == changedField || &m_showWellSpheres == changedField ||
&m_showWellDisks == changedField || &showConnectionStatusColors == changedField ) &showConnectionStatusColors == changedField )
{ {
m_reservoirView->scheduleSimWellGeometryRegen(); m_reservoirView->scheduleSimWellGeometryRegen();
m_reservoirView->scheduleCreateDisplayModelAndRedraw(); m_reservoirView->scheduleCreateDisplayModelAndRedraw();