diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp index 65942e400e..fc89cd18b1 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp @@ -177,6 +177,15 @@ void Rim2dIntersectionView::update3dInfo() RimEclipseView * eclView = nullptr; m_intersection->firstAncestorOrThisOfType(eclView); + if (eclView && !eclView->overlayInfoConfig()->isActive()) + { + m_viewer->showInfoText(false); + m_viewer->showHistogram(false); + m_viewer->showAnimationProgress(false); + + m_viewer->update(); + return; + } if (eclView && eclView->overlayInfoConfig()->showCaseInfo()) { overlayInfoText += "--" + ownerCase()->caseUserDescription() + "--"; diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index f437ed6f78..d6b1aaff5c 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -232,7 +232,7 @@ QImage Rim3dOverlayInfoConfig::statisticsDialogScreenShotImage() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool Rim3dOverlayInfoConfig::showAnimProgress() +bool Rim3dOverlayInfoConfig::showAnimProgress() const { return m_showAnimProgress; } @@ -240,7 +240,7 @@ bool Rim3dOverlayInfoConfig::showAnimProgress() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool Rim3dOverlayInfoConfig::showCaseInfo() +bool Rim3dOverlayInfoConfig::showCaseInfo() const { return m_showCaseInfo; } @@ -248,11 +248,19 @@ bool Rim3dOverlayInfoConfig::showCaseInfo() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool Rim3dOverlayInfoConfig::showResultInfo() +bool Rim3dOverlayInfoConfig::showResultInfo() const { return m_showResultInfo; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool Rim3dOverlayInfoConfig::isActive() const +{ + return m_active; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -687,6 +695,7 @@ void Rim3dOverlayInfoConfig::update3DInfo() m_viewDef->viewer()->showHistogram(false); m_viewDef->viewer()->showAnimationProgress(false); + update3DInfoIn2dViews(); return; } @@ -722,15 +731,7 @@ void Rim3dOverlayInfoConfig::update3DInfo() m_gridStatisticsDialog->updateFromRimView(geoMechView); } - RimCase* rimCase; - firstAncestorOrThisOfType(rimCase); - if (rimCase) - { - for (Rim2dIntersectionView* view : rimCase->intersectionViewCollection()->views()) - { - view->update3dInfo(); - } - } + update3DInfoIn2dViews(); } //-------------------------------------------------------------------------------------------------- @@ -870,6 +871,22 @@ void Rim3dOverlayInfoConfig::updateGeoMech3DInfo(RimGeoMechView * geoMechView) } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void Rim3dOverlayInfoConfig::update3DInfoIn2dViews() const +{ + RimCase* rimCase; + firstAncestorOrThisOfType(rimCase); + if (rimCase) + { + for (Rim2dIntersectionView* view : rimCase->intersectionViewCollection()->views()) + { + view->update3dInfo(); + } + } +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h index 9938a05558..9a55f603fd 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h @@ -79,9 +79,10 @@ public: void showStatisticsInfoDialog(bool raise = true); QImage statisticsDialogScreenShotImage(); - bool showAnimProgress(); - bool showCaseInfo(); - bool showResultInfo(); + bool showAnimProgress() const; + bool showCaseInfo() const; + bool showResultInfo() const; + bool isActive() const; enum StatisticsTimeRangeType { @@ -105,6 +106,8 @@ private: void updateEclipse3DInfo(RimEclipseView * reservoirView); void updateGeoMech3DInfo(RimGeoMechView * geoMechView); + void update3DInfoIn2dViews() const; + QString timeStepText(RimEclipseView* eclipseView); QString timeStepText(RimGeoMechView* geoMechView); HistogramData histogramData(RimEclipseView* eclipseView);