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

#3624 Guard use of m_viewer in Rim2dEclipseView

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-11-05 09:56:03 +01:00
parent 8545fe5d7f
commit ccea48bc25
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp
View File

@ -137,10 +137,10 @@ void Rim2dEclipseView::updateCurrentTimeStep()
RimEclipseView::updateCurrentTimeStep(); RimEclipseView::updateCurrentTimeStep();
cvf::Scene* frameScene = m_viewer->frame(m_currentTimeStep); if (m_viewer && m_2dGridProjection->isChecked())
if (m_2dGridProjection->isChecked())
{ {
cvf::Scene* frameScene = m_viewer->frame(m_currentTimeStep);
cvf::String name = "Grid2dProjection"; cvf::String name = "Grid2dProjection";
this->removeModelByName(frameScene, name); this->removeModelByName(frameScene, name);
@ -163,17 +163,17 @@ void Rim2dEclipseView::updateLegends()
if (m_viewer) if (m_viewer)
{ {
m_viewer->removeAllColorLegends(); m_viewer->removeAllColorLegends();
}
if (m_2dGridProjection && m_2dGridProjection->isChecked()) if (m_2dGridProjection && m_2dGridProjection->isChecked())
{
RimRegularLegendConfig* projectionLegend = m_2dGridProjection->legendConfig();
if (projectionLegend)
{ {
m_2dGridProjection->updateLegend(); RimRegularLegendConfig* projectionLegend = m_2dGridProjection->legendConfig();
if (projectionLegend->showLegend()) if (projectionLegend)
{ {
m_viewer->addColorLegendToBottomLeftCorner(projectionLegend->titledOverlayFrame()); m_2dGridProjection->updateLegend();
if (projectionLegend->showLegend())
{
m_viewer->addColorLegendToBottomLeftCorner(projectionLegend->titledOverlayFrame());
}
} }
} }
} }
@ -184,9 +184,12 @@ void Rim2dEclipseView::updateLegends()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void Rim2dEclipseView::updateViewWidgetAfterCreation() void Rim2dEclipseView::updateViewWidgetAfterCreation()
{ {
m_viewer->showAxisCross(false); if (m_viewer)
m_viewer->showEdgeTickMarksXY(true, m_showAxisLines()); {
m_viewer->enableNavigationRotation(false); m_viewer->showAxisCross(false);
m_viewer->showEdgeTickMarksXY(true, m_showAxisLines());
m_viewer->enableNavigationRotation(false);
}
Rim3dView::updateViewWidgetAfterCreation(); Rim3dView::updateViewWidgetAfterCreation();
} }