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

Summary Plot: Add support for multiple plot axis.

Browse Source
This commit is contained in:
Kristian Bendiksen
2022-01-19 09:50:28 +01:00
committed by Magne Sjaastad
parent a3ad9d2c1e
commit e92e2e8764
54 changed files with 1222 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryCurveSwitchAxisFeature.cpp
View File

@@ -56,15 +56,15 @@ void RicSummaryCurveSwitchAxisFeature::onActionTriggered( bool isChecked )
for ( RimSummaryCurve* summaryCurve : summaryCurves )
{
RiaDefines::PlotAxis plotAxis = summaryCurve->axisY();
RiaDefines::PlotAxis plotAxis = summaryCurve->axisY().axis();
if ( plotAxis == RiaDefines::PlotAxis::PLOT_AXIS_LEFT )
{
summaryCurve->setLeftOrRightAxisY( RiaDefines::PlotAxis::PLOT_AXIS_RIGHT );
summaryCurve->setLeftOrRightAxisY( RiuPlotAxis( RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) );
}
else
{
summaryCurve->setLeftOrRightAxisY( RiaDefines::PlotAxis::PLOT_AXIS_LEFT );
summaryCurve->setLeftOrRightAxisY( RiuPlotAxis( RiaDefines::PlotAxis::PLOT_AXIS_LEFT ) );
}
summaryCurve->updatePlotAxis();
@@ -77,9 +77,9 @@ void RicSummaryCurveSwitchAxisFeature::onActionTriggered( bool isChecked )
for ( RimAsciiDataCurve* asciiCurve : asciiDataCurves )
{
RiaDefines::PlotAxis plotAxis = asciiCurve->yAxis();
RiuPlotAxis plotAxis = asciiCurve->yAxis();
if ( plotAxis == RiaDefines::PlotAxis::PLOT_AXIS_LEFT )
if ( plotAxis.axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT )
{
asciiCurve->setYAxis( RiaDefines::PlotAxis::PLOT_AXIS_RIGHT );
}
@@ -98,9 +98,9 @@ void RicSummaryCurveSwitchAxisFeature::onActionTriggered( bool isChecked )
for ( RimGridTimeHistoryCurve* timeHistoryCurve : gridTimeHistoryCurves )
{
RiaDefines::PlotAxis plotAxis = timeHistoryCurve->yAxis();
RiuPlotAxis plotAxis = timeHistoryCurve->yAxis();
if ( plotAxis == RiaDefines::PlotAxis::PLOT_AXIS_LEFT )
if ( plotAxis.axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT )
{
timeHistoryCurve->setYAxis( RiaDefines::PlotAxis::PLOT_AXIS_RIGHT );
}

3
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@@ -713,7 +713,8 @@ void RicSummaryPlotEditorUi::copyCurveAndAddToPlot( const RimSummaryCurve* curve
curveCopy->setCurveVisibility( true );
}
plot->addCurveNoUpdate( curveCopy );
plot->addCurveNoUpdate( curveCopy, false );
curveCopy->setLeftOrRightAxisY( curve->axisY() );
// The curve creator is not a descendant of the project, and need to be set manually
curveCopy->setSummaryCaseY( curve->summaryCaseY() );