From 92e4fd462d95a02b8517531d3e6fced251c5b3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 17 Nov 2016 17:37:56 +0100 Subject: [PATCH] Made new summary curve (filter) possible to start on siblings --- .../SummaryPlotCommands/RicNewSummaryCurveFeature.cpp | 8 +++++--- .../RicNewSummaryCurveFilterFeature.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp index 718b98989d..778129da2c 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp @@ -101,7 +101,9 @@ void RicNewSummaryCurveFeature::setupActionLook(QAction* actionToSetup) //-------------------------------------------------------------------------------------------------- RimSummaryPlot* RicNewSummaryCurveFeature::selectedSummaryPlot() const { - std::vector selection; - caf::SelectionManager::instance()->objectsByType(&selection); - return selection.size() > 0 ? selection[0] : NULL; + caf::PdmObject* selObj = dynamic_cast(caf::SelectionManager::instance()->selectedItem()); + RimSummaryPlot * sumPlot; + selObj->firstAncestorOrThisOfType(sumPlot); + + return sumPlot; } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFilterFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFilterFeature.cpp index f28f2de0a1..993895ca19 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFilterFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFilterFeature.cpp @@ -91,7 +91,9 @@ void RicNewSummaryCurveFilterFeature::setupActionLook(QAction* actionToSetup) //-------------------------------------------------------------------------------------------------- RimSummaryPlot* RicNewSummaryCurveFilterFeature::selectedSummaryPlot() const { - std::vector selection; - caf::SelectionManager::instance()->objectsByType(&selection); - return selection.size() > 0 ? selection[0] : NULL; + caf::PdmObject* selObj = dynamic_cast(caf::SelectionManager::instance()->selectedItem()); + RimSummaryPlot * sumPlot; + selObj->firstAncestorOrThisOfType(sumPlot); + + return sumPlot; }