OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2268 Summary plot. Fix missing Switch Axis command

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-12-15 09:19:11 +01:00
parent 029e0811be
commit 3034fdd289
2 changed files with 62 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveSwitchAxisFeature.cpp
View File

@ -18,12 +18,12 @@
#include "RicSummaryCurveSwitchAxisFeature.h" #include "RicSummaryCurveSwitchAxisFeature.h"
#include "RimAsciiDataCurve.h"
#include "RimGridTimeHistoryCurve.h" #include "RimGridTimeHistoryCurve.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "cafSelectionManager.h" #include "cafSelectionManagerTools.h"
#include <QAction> #include <QAction>
@ -35,10 +35,13 @@ CAF_CMD_SOURCE_INIT(RicSummaryCurveSwitchAxisFeature, "RicSummaryCurveSwitchAxis
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicSummaryCurveSwitchAxisFeature::isCommandEnabled() bool RicSummaryCurveSwitchAxisFeature::isCommandEnabled()
{ {
std::vector<RimGridTimeHistoryCurve*> gridTimeHistoryCurves; std::vector<RimSummaryCurve*> summaryCurves;
std::vector<RimAsciiDataCurve*> asciiDataCurves;
std::vector<RimGridTimeHistoryCurve*> gridTimeHistoryCurves;
RicSummaryCurveSwitchAxisFeature::extractSelectedCurveFiltersAndSoloCurves(&gridTimeHistoryCurves); RicSummaryCurveSwitchAxisFeature::extractSelectedCurves(&summaryCurves, &asciiDataCurves, &gridTimeHistoryCurves);
return (gridTimeHistoryCurves.size());
return summaryCurves.size() || asciiDataCurves.size() || gridTimeHistoryCurves.size();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -46,46 +49,53 @@ bool RicSummaryCurveSwitchAxisFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveSwitchAxisFeature::onActionTriggered(bool isChecked) void RicSummaryCurveSwitchAxisFeature::onActionTriggered(bool isChecked)
{ {
std::vector<RimGridTimeHistoryCurve*> gridTimeHistoryCurves; std::vector<RimSummaryCurve*> summaryCurves;
std::vector<RimAsciiDataCurve*> asciiDataCurves;
std::vector<RimGridTimeHistoryCurve*> gridTimeHistoryCurves;
RicSummaryCurveSwitchAxisFeature::extractSelectedCurveFiltersAndSoloCurves(&gridTimeHistoryCurves); RicSummaryCurveSwitchAxisFeature::extractSelectedCurves(&summaryCurves, &asciiDataCurves, &gridTimeHistoryCurves);
//for (RimSummaryCurveFilter* summaryCurveFilter: selectedCurveFilters) for (RimSummaryCurve* summaryCurve : summaryCurves)
//{ {
// RiaDefines::PlotAxis plotAxis = summaryCurveFilter->associatedPlotAxis(); RiaDefines::PlotAxis plotAxis = summaryCurve->axisY();
// if ( plotAxis == RiaDefines::PLOT_AXIS_LEFT ) if ( plotAxis == RiaDefines::PLOT_AXIS_LEFT )
// { {
// summaryCurveFilter->setPlotAxis(RiaDefines::PLOT_AXIS_RIGHT); summaryCurve->setLeftOrRightAxisY(RiaDefines::PLOT_AXIS_RIGHT);
// } }
// else else
// { {
// summaryCurveFilter->setPlotAxis(RiaDefines::PLOT_AXIS_LEFT); summaryCurve->setLeftOrRightAxisY(RiaDefines::PLOT_AXIS_LEFT);
// } }
// summaryCurveFilter->updateConnectedEditors(); summaryCurve->updateQwtPlotAxis();
//} summaryCurve->updateConnectedEditors();
//for (RimSummaryCurve* summaryCurve : selectedSoloCurves) RimSummaryPlot* plot = nullptr;
//{ summaryCurve->firstAncestorOrThisOfType(plot);
// RiaDefines::PlotAxis plotAxis = summaryCurve->axisY(); if ( plot ) plot->updateAxes();
}
// if ( plotAxis == RiaDefines::PLOT_AXIS_LEFT ) for (RimAsciiDataCurve* asciiCurve : asciiDataCurves)
// { {
// summaryCurve->setLeftOrRightAxisY(RiaDefines::PLOT_AXIS_RIGHT); RiaDefines::PlotAxis plotAxis = asciiCurve->yAxis();
// }
// else
// {
// summaryCurve->setLeftOrRightAxisY(RiaDefines::PLOT_AXIS_LEFT);
// }
// summaryCurve->updateQwtPlotAxis(); if (plotAxis == RiaDefines::PLOT_AXIS_LEFT)
// summaryCurve->updateConnectedEditors(); {
asciiCurve->setYAxis(RiaDefines::PLOT_AXIS_RIGHT);
}
else
{
asciiCurve->setYAxis(RiaDefines::PLOT_AXIS_LEFT);
}
// RimSummaryPlot* plot = nullptr; asciiCurve->updateQwtPlotAxis();
// summaryCurve->firstAncestorOrThisOfType(plot); asciiCurve->updateConnectedEditors();
// if ( plot ) plot->updateAxes();
//} RimSummaryPlot* plot = nullptr;
asciiCurve->firstAncestorOrThisOfType(plot);
if (plot) plot->updateAxes();
}
for (RimGridTimeHistoryCurve* timeHistoryCurve : gridTimeHistoryCurves) for (RimGridTimeHistoryCurve* timeHistoryCurve : gridTimeHistoryCurves)
{ {
@ -119,33 +129,17 @@ void RicSummaryCurveSwitchAxisFeature::setupActionLook(QAction* actionToSetup)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Solo curves means selected curves that does not have a selected curve filter as parent /// Solo curves means selected curves that does not have a selected curve filter as parent
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveSwitchAxisFeature::extractSelectedCurveFiltersAndSoloCurves(std::vector<RimGridTimeHistoryCurve*>* gridTimeHistoryCurves) void RicSummaryCurveSwitchAxisFeature::extractSelectedCurves(std::vector<RimSummaryCurve*>* summaryCurves,
std::vector<RimAsciiDataCurve*>* asciiDataCurves,
std::vector<RimGridTimeHistoryCurve*>* gridTimeHistoryCurves)
{ {
//selectedSoloCurves->clear(); summaryCurves->clear();
//{ asciiDataCurves->clear();
// std::vector<RimSummaryCurve*> selection; gridTimeHistoryCurves->clear();
// caf::SelectionManager::instance()->objectsByType(&selection);
// for (RimSummaryCurve* curve : selection)
// {
// RimSummaryCurveFilter* parentCurveFilter = nullptr;
// curve->firstAncestorOrThisOfType(parentCurveFilter);
// if (!parentCurveFilter)
// {
// selectedSoloCurves->insert(curve);
// }
// }
//}
//selectedCurveFilters->clear(); *summaryCurves = caf::selectedObjectsByType<RimSummaryCurve*>();
//{
// std::vector<RimSummaryCurveFilter*> selection;
// caf::SelectionManager::instance()->objectsByType(&selection);
// for (RimSummaryCurveFilter* curveFilter : selection)
// {
// selectedCurveFilters->insert(curveFilter);
// }
//}
// Read out all time history curves directly from selection manager *asciiDataCurves = caf::selectedObjectsByType<RimAsciiDataCurve*>();
caf::SelectionManager::instance()->objectsByType(gridTimeHistoryCurves);
*gridTimeHistoryCurves = caf::selectedObjectsByType<RimGridTimeHistoryCurve*>();
} }

5
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveSwitchAxisFeature.h
View File

@ -22,6 +22,7 @@
#include <set> #include <set>
class RimAsciiDataCurve;
class RimSummaryCurve; class RimSummaryCurve;
class RimSummaryCurveFilter; class RimSummaryCurveFilter;
class RimGridTimeHistoryCurve; class RimGridTimeHistoryCurve;
@ -40,5 +41,7 @@ protected:
virtual void setupActionLook( QAction* actionToSetup ) override; virtual void setupActionLook( QAction* actionToSetup ) override;
private: private:
static void extractSelectedCurveFiltersAndSoloCurves(std::vector<RimGridTimeHistoryCurve*>* gridTimeHistoryCurves); static void extractSelectedCurves(std::vector<RimSummaryCurve*>* summaryCurves,
std::vector<RimAsciiDataCurve*>* asciiDataCurves,
std::vector<RimGridTimeHistoryCurve*>* gridTimeHistoryCurves);
}; };