From 960e6833c4cebd3b04058149432cefe2780884ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 28 Mar 2017 23:30:01 +0200 Subject: [PATCH] #1321 Made zoom all and snapshot work --- ApplicationCode/Application/RiaApplication.cpp | 8 ++++++++ .../SummaryPlotCommands/RicViewZoomAllFeature.cpp | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index db0a1f2086..4c8ca5fe5c 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -49,6 +49,7 @@ #include "RimEclipseWellCollection.h" #include "RimFaultCollection.h" #include "RimFormationNamesCollection.h" +#include "RimFlowCharacteristicsPlot.h" #include "RimGeoMechCase.h" #include "RimGeoMechCellColors.h" #include "RimGeoMechModels.h" @@ -83,6 +84,7 @@ #include "RiuViewer.h" #include "RiuWellLogPlot.h" #include "RiuWellAllocationPlot.h" +#include "RiuFlowCharacteristicsPlot.h" #include "RicImportSummaryCaseFeature.h" #include "RicSnapshotViewToClipboardFeature.h" @@ -1648,6 +1650,12 @@ RimViewWindow* RiaApplication::activeViewWindow() { viewWindow = wellAllocationPlot->ownerPlotDefinition(); } + + RiuFlowCharacteristicsPlot* flowCharacteristicsPlot = dynamic_cast(subwindows.back()->widget()); + if (flowCharacteristicsPlot) + { + viewWindow = flowCharacteristicsPlot->ownerPlotDefinition(); + } } } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp index 2459c54cd8..f65a863ae6 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp @@ -35,6 +35,8 @@ #include #include #include +#include "RiuFlowCharacteristicsPlot.h" +#include "RimFlowCharacteristicsPlot.h" CAF_CMD_SOURCE_INIT(RicViewZoomAllFeature, "RicViewZoomAllFeature"); @@ -100,6 +102,18 @@ void RicViewZoomAllFeature::onActionTriggered(bool isChecked) return; } } + + { + RiuFlowCharacteristicsPlot* flowCharPlot = dynamic_cast(subwindows.back()->widget()); + if (flowCharPlot) + { + RimFlowCharacteristicsPlot* viewWindow = flowCharPlot->ownerPlotDefinition(); + viewWindow->zoomAll(); + flowCharPlot->update(); + + return; + } + } } } }