From ca3bb02c57bca14053ba0749564fbcdbea4be7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Fri, 26 Jan 2018 15:52:59 +0100 Subject: [PATCH] #2356 grid statistics dialog. Display of Mobile Volume Weighted Mean controlled by info box property --- ApplicationCode/Commands/RicGridStatisticsDialog.cpp | 2 +- ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp | 6 +++--- ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ApplicationCode/Commands/RicGridStatisticsDialog.cpp b/ApplicationCode/Commands/RicGridStatisticsDialog.cpp index 88f9a7edd4..4264105495 100644 --- a/ApplicationCode/Commands/RicGridStatisticsDialog.cpp +++ b/ApplicationCode/Commands/RicGridStatisticsDialog.cpp @@ -142,7 +142,7 @@ void RicGridStatisticsDialog::setInfoText(RimView* view) QString text; text = overlayInfo->timeStepText(); text += overlayInfo->caseInfoText(); - text += overlayInfo->resultInfoText(overlayInfo->histogramData(), true); + text += overlayInfo->resultInfoText(overlayInfo->histogramData()); m_textEdit->setText(text); adjustTextEditHeightToContent(); } diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 3f1cbfafe3..311c249987 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -204,12 +204,12 @@ QString Rim3dOverlayInfoConfig::caseInfoText() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, bool showVolumeWeightedMean) +QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData) { auto eclipseView = dynamic_cast(m_viewDef.p()); auto geoMechView = dynamic_cast(m_viewDef.p()); - if (eclipseView) return resultInfoText(histData, eclipseView, showVolumeWeightedMean); + if (eclipseView) return resultInfoText(histData, eclipseView, showVolumeWeightedMean()); if (geoMechView) return resultInfoText(histData, geoMechView); return ""; } @@ -755,7 +755,7 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) if (showResultInfo()) { - infoText += resultInfoText(histData, showVolumeWeightedMean()); + infoText += resultInfoText(histData); } if (!infoText.isEmpty()) diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h index 302a6e4eb5..66c81a2421 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h @@ -74,7 +74,7 @@ public: HistogramData histogramData(); QString timeStepText(); QString caseInfoText(); - QString resultInfoText(const HistogramData& histData, bool showVolumeWeightedMean); + QString resultInfoText(const HistogramData& histData); void showStatisticsInfoDialog(bool raise = true); QImage statisticsDialogScreenShotImage();