From 9cfd2ff3cf10b4ea7ae7e3a28960ae9023da99f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Tue, 23 Jan 2018 14:30:58 +0100 Subject: [PATCH] #2358 fracture. When clicking on an ellipse fracture, display info in result into panel --- .../ModelVisualization/RivWellFracturePartMgr.cpp | 2 +- ApplicationCode/UserInterface/RiuViewerCommands.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp index 43eba41d94..2110fa8ed9 100644 --- a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp @@ -258,7 +258,7 @@ const QString RivWellFracturePartMgr::resultInfoText(const RimEclipseView& activ RimStimPlanFractureTemplate* stimPlanTemplate = dynamic_cast(m_rimFracture->fractureTemplate()); if (ellipseFractureTemplate) { - text.append("Result value: "); + text.append("Result value: CONDUCTIVITY "); text.append(QString::number(ellipseFractureTemplate->conductivity()) + "\n"); } diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 05ba6697b4..5f6ea36501 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -55,6 +55,9 @@ #include "RimTernaryLegendConfig.h" #include "RimViewController.h" #include "RimWellPath.h" +#include "RimPerforationInterval.h" +#include "RimStimPlanFractureTemplate.h" +#include "RimEllipseFractureTemplate.h" #include "RiuMainWindow.h" #include "RiuSelectionManager.h" @@ -88,8 +91,6 @@ #include #include #include -#include "RimPerforationInterval.h" -#include "RimStimPlanFractureTemplate.h" @@ -497,7 +498,8 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM RimFracture* fracture = dynamic_cast(rivObjectSourceInfo->object()); RimStimPlanFractureTemplate* stimPlanTempl = fracture ? dynamic_cast(fracture->fractureTemplate()) : nullptr; - if (stimPlanTempl) + RimEllipseFractureTemplate* ellipseTempl = fracture ? dynamic_cast(fracture->fractureTemplate()) : nullptr; + if (stimPlanTempl || ellipseTempl) { // Set fracture resultInfo text QString resultInfoText;