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

#8660 Axis range: If water cut is assigned, use 0..1 as axis value range

Browse Source
This commit is contained in:
Magne Sjaastad 2022-03-11 15:02:13 +01:00
parent 5b819b7635
commit e435e28e7d
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaRegressionTestRunner.h" #include "RiaRegressionTestRunner.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryAddressAnalyzer.h" #include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
@ -216,8 +217,11 @@ void RimSummaryPlot::updateAxes()
updateTimeAxis( timeAxisProperties() ); updateTimeAxis( timeAxisProperties() );
} }
if ( plotWidget() )
{
plotWidget()->updateAxes(); plotWidget()->updateAxes();
plotWidget()->scheduleReplot(); plotWidget()->scheduleReplot();
}
updateZoomInParentPlot(); updateZoomInParentPlot();
} }
@ -858,6 +862,11 @@ void RimSummaryPlot::updateZoomForAxis( RiuPlotAxis plotAxis )
plotWidget()->setAxisScale( yAxisProps->plotAxisType(), min, max ); plotWidget()->setAxisScale( yAxisProps->plotAxisType(), min, max );
} }
else if ( plotAxis.axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ||
plotAxis.axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT && isOnlyWaterCutCurvesVisible( plotAxis ) )
{
plotWidget()->setAxisScale( yAxisProps->plotAxisType(), 0.0, 1.0 );
}
else else
{ {
plotWidget()->setAxisAutoScale( yAxisProps->plotAxisType(), true ); plotWidget()->setAxisAutoScale( yAxisProps->plotAxisType(), true );
@ -873,6 +882,23 @@ void RimSummaryPlot::updateZoomForAxis( RiuPlotAxis plotAxis )
plotWidget()->setAxisInverted( yAxisProps->plotAxisType(), yAxisProps->isAxisInverted() ); plotWidget()->setAxisInverted( yAxisProps->plotAxisType(), yAxisProps->isAxisInverted() );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryPlot::isOnlyWaterCutCurvesVisible( RiuPlotAxis plotAxis )
{
size_t waterCutCurveCount = 0;
auto curves = visibleSummaryCurvesForAxis( plotAxis );
for ( auto c : curves )
{
auto quantityName = c->summaryAddressY().quantityName();
if ( RiaStdStringTools::endsWith( quantityName, "WCT" ) ) waterCutCurveCount++;
}
return ( waterCutCurveCount == curves.size() );
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@ -280,6 +280,8 @@ private:
int handleSummaryCaseDrop( RimSummaryCase* summaryCase ); int handleSummaryCaseDrop( RimSummaryCase* summaryCase );
int handleAddressCollectionDrop( RimSummaryAddressCollection* addrColl ); int handleAddressCollectionDrop( RimSummaryAddressCollection* addrColl );
bool isOnlyWaterCutCurvesVisible( RiuPlotAxis plotAxis );
private: private:
#ifdef USE_QTCHARTS #ifdef USE_QTCHARTS
caf::PdmField<bool> m_useQtChartsPlot; caf::PdmField<bool> m_useQtChartsPlot;