OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 23:23:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Axis assignment : Use axis with same unit by default

Browse Source
This commit is contained in:
Magne Sjaastad 2022-02-24 15:13:28 +01:00
parent d5b108d2ef
commit 47a44a79df
1 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -2413,18 +2413,65 @@ std::vector<RimPlotAxisPropertiesInterface*> RimSummaryPlot::plotAxes() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlot::assignPlotAxis( RimSummaryCurve* curve ) void RimSummaryPlot::assignPlotAxis( RimSummaryCurve* destinationCurve )
{ {
enum class AxisAssignmentStrategy enum class AxisAssignmentStrategy
{ {
ALL_TO_LEFT, ALL_TO_LEFT,
ALL_TO_RIGHT, ALL_TO_RIGHT,
ALTERNATING ALTERNATING,
USE_MATCHING_UNIT
}; };
RiaDefines::PlotAxis plotAxis = RiaDefines::PlotAxis::PLOT_AXIS_LEFT; RiaDefines::PlotAxis plotAxis = RiaDefines::PlotAxis::PLOT_AXIS_LEFT;
auto strategy = AxisAssignmentStrategy::ALTERNATING; auto strategy = AxisAssignmentStrategy::USE_MATCHING_UNIT;
if ( strategy == AxisAssignmentStrategy::USE_MATCHING_UNIT )
{
auto destinationUnit = destinationCurve->unitNameY();
bool isLeftUsed = false;
bool isRightUsed = false;
for ( auto c : summaryCurves() )
{
if ( c == destinationCurve ) continue;
if ( c->axisY() == RiuPlotAxis::defaultLeft() ) isLeftUsed = true;
if ( c->axisY() == RiuPlotAxis::defaultRight() ) isRightUsed = true;
auto currentUnit = c->unitNameY();
if ( currentUnit == destinationUnit )
{
for ( RimPlotAxisPropertiesInterface* axisProperties : m_axisProperties )
{
if ( axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ||
axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT )
{
destinationCurve->setLeftOrRightAxisY( c->axisY() );
return;
}
}
}
}
if ( !isLeftUsed )
{
destinationCurve->setLeftOrRightAxisY( RiuPlotAxis::defaultLeft() );
return;
}
if ( !isRightUsed )
{
destinationCurve->setLeftOrRightAxisY( RiuPlotAxis::defaultRight() );
return;
}
strategy = AxisAssignmentStrategy::ALTERNATING;
}
if ( strategy == AxisAssignmentStrategy::ALTERNATING ) if ( strategy == AxisAssignmentStrategy::ALTERNATING )
{ {
size_t axisCountLeft = 0; size_t axisCountLeft = 0;
@ -2452,14 +2499,14 @@ void RimSummaryPlot::assignPlotAxis( RimSummaryCurve* curve )
if ( plotWidget() && plotWidget()->isMultiAxisSupported() ) if ( plotWidget() && plotWidget()->isMultiAxisSupported() )
{ {
QString axisObjectName = "New Axis"; QString axisObjectName = "New Axis";
if ( !curve->summaryAddressY().uiText().empty() ) if ( !destinationCurve->summaryAddressY().uiText().empty() )
axisObjectName = QString::fromStdString( curve->summaryAddressY().uiText() ); axisObjectName = QString::fromStdString( destinationCurve->summaryAddressY().uiText() );
newPlotAxis = plotWidget()->createNextPlotAxis( plotAxis ); newPlotAxis = plotWidget()->createNextPlotAxis( plotAxis );
addNewAxisProperties( newPlotAxis, axisObjectName ); addNewAxisProperties( newPlotAxis, axisObjectName );
} }
curve->setLeftOrRightAxisY( newPlotAxis ); destinationCurve->setLeftOrRightAxisY( newPlotAxis );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------