From 89b4279da231ec1cd1b840f11aa4f4ff6eb3bab4 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 8 Mar 2019 14:52:43 +0100 Subject: [PATCH] #4186 Dual Porosity Model : Show dual porosity text in label and text in 3D view --- .../ProjectDataModel/Rim3dOverlayInfoConfig.cpp | 8 ++++++++ .../ProjectDataModel/RimEclipseResultDefinition.h | 5 +++-- ApplicationCode/ProjectDataModel/RimEclipseView.cpp | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index f71b8f6a46..a444091781 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -696,6 +696,14 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, { infoText += QString("%1
").arg(diffResString); } + + if (eclipseView->cellResult()->hasDualPorFractureResult()) + { + QString porosityModelText = caf::AppEnum::uiText(eclipseView->cellResult()->porosityModel()); + + infoText += QString("Dual Porosity Type: %1
").arg(porosityModelText); + } + infoText += QString("
Statistics: ") + timeRangeText + " and " + m_statisticsCellRange().uiText(); infoText += QString("" "" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index 9a3ca569de..dd72a0d3c6 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -122,6 +122,9 @@ public: void setDiffResultOptionsEnabled(bool enabled); void setLabelsOnTop(bool labelsOnTop); + + bool hasDualPorFractureResult(); + protected: virtual void updateLegendCategorySettings() {}; @@ -180,8 +183,6 @@ private: private: void assignFlowSolutionFromCase(); - bool hasDualPorFractureResult(); - QString flowDiagResUiText(bool shortLabel, int maxTracerStringLength = std::numeric_limits::max()) const; QList calcOptionsForVariableUiFieldStandard(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 3bac70bac4..fb2dc975e9 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1236,6 +1236,13 @@ void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString title += QString("\n%1").arg(resultColors->diffResultUiShortName()); } + if (resultColors->hasDualPorFractureResult()) + { + QString porosityModelText = caf::AppEnum::uiText(resultColors->porosityModel()); + + title += QString("\nDual Por : %1").arg(porosityModelText); + } + resultColors->legendConfig()->setTitle(title); m_viewer->addColorLegendToBottomLeftCorner(resultColors->legendConfig()->titledOverlayFrame()); }
Min P90 Mean P10 Max Sum