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

#8522 Summary Plot: Prune unused axes after move or delete

Browse Source
This commit is contained in:
Kristian Bendiksen 2022-02-21 11:32:26 +01:00
parent 1a1acfa006
commit 10cb2d7d0b
9 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp
View File

@ -95,8 +95,15 @@ RimPlotAxisProperties::RimPlotAxisProperties()
m_annotations.uiCapability()->setUiTreeHidden( true );
updateOptionSensitivity();
}
setDeletable( true );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimPlotAxisProperties::isDeletable() const
{
// The default axes (which have index 0) are not deletable
return m_plotAxisIndex != 0;
}
//--------------------------------------------------------------------------------------------------

3
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h
View File

@ -77,6 +77,9 @@ public:
bool isAxisInverted() const override;
void setAxisInverted( bool inverted );
bool isDeletable() const override;
std::vector<RimPlotAxisAnnotation*> annotations() const override;
void appendAnnotation( RimPlotAxisAnnotation* annotation ) override;
void removeAllAnnotations() override;

6
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -753,6 +753,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
updatePlotAxis();
plot->updateAxes();
plot->updateAll();
updateTextInPlot = true;
}
@ -2099,6 +2100,11 @@ void RimEnsembleCurveSet::setAxisY( RiuPlotAxis plotAxis )
RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfTypeAsserted( plot );
m_plotAxisProperties = plot->axisPropertiesForPlotAxis( plotAxis );
for ( RimSummaryCurve* curve : curves() )
{
curve->setLeftOrRightAxisY( axisY() );
}
}
//--------------------------------------------------------------------------------------------------

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

@ -845,7 +845,7 @@ void RimSummaryPlot::updateZoomForAxis( RiuPlotAxis plotAxis )
}
double min, max;
RimPlotAxisLogRangeCalculator calc( RiaDefines::PlotAxis::PLOT_AXIS_LEFT, plotCurves );
RimPlotAxisLogRangeCalculator calc( plotAxis.axis(), plotCurves );
calc.computeAxisRange( &min, &max );
if ( yAxisProps->isAxisInverted() )
@ -2008,7 +2008,7 @@ RiuPlotWidget* RimSummaryPlot::doCreatePlotViewWidget( QWidget* mainWindowParent
for ( auto axisProperties : m_axisProperties )
{
plotWidget()->ensureAxis( axisProperties->plotAxisType() );
plotWidget()->ensureAxisIsCreated( axisProperties->plotAxisType() );
}
for ( RimGridTimeHistoryCurve* curve : m_gridTimeHistoryCurves )
@ -2482,6 +2482,13 @@ void RimSummaryPlot::onChildDeleted( caf::PdmChildArrayFieldHandle* childAr
if ( plotWidget() )
{
std::set<RiuPlotAxis> usedPlotAxis;
for ( auto axisProperties : m_axisProperties )
{
usedPlotAxis.insert( axisProperties->plotAxisType() );
}
plotWidget()->pruneAxes( usedPlotAxis );
updateAxes();
plotWidget()->scheduleReplot();
}

7
ApplicationLibCode/UserInterface/RiuPlotWidget.h
View File

@ -107,8 +107,9 @@ public:
virtual void setAxisTitleText( RiuPlotAxis axis, const QString& title ) = 0;
virtual void setAxisTitleEnabled( RiuPlotAxis axis, bool enable ) = 0;
virtual bool isMultiAxisSupported() const = 0;
virtual RiuPlotAxis createNextPlotAxis( RiaDefines::PlotAxis axis ) = 0;
virtual bool isMultiAxisSupported() const = 0;
virtual RiuPlotAxis createNextPlotAxis( RiaDefines::PlotAxis axis ) = 0;
virtual void pruneAxes( const std::set<RiuPlotAxis>& usedAxes ) = 0;
virtual void setPlotTitle( const QString& plotTitle ) = 0;
const QString& plotTitle() const;
@ -153,7 +154,7 @@ public:
virtual int axisExtent( RiuPlotAxis axis ) const = 0;
virtual void ensureAxis( RiuPlotAxis axis ) = 0;
virtual void ensureAxisIsCreated( RiuPlotAxis axis ) = 0;
QPoint dragStartPosition() const;

21
ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
View File

@ -860,7 +860,7 @@ void RiuQtChartsPlotWidget::setYAxis( RiuPlotAxis axis, QtCharts::QAbstractSerie
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQtChartsPlotWidget::ensureAxis( RiuPlotAxis axis )
void RiuQtChartsPlotWidget::ensureAxisIsCreated( RiuPlotAxis axis )
{
if ( m_axes.find( axis ) == m_axes.end() )
{
@ -874,7 +874,7 @@ void RiuQtChartsPlotWidget::ensureAxis( RiuPlotAxis axis )
void RiuQtChartsPlotWidget::setAxis( RiuPlotAxis axis, QtCharts::QAbstractSeries* series )
{
// Make sure the axis we are about to set exists.
ensureAxis( axis );
ensureAxisIsCreated( axis );
if ( qtChart()->series().contains( series ) && !series->attachedAxes().contains( plotAxis( axis ) ) )
{
@ -1111,3 +1111,20 @@ Qt::Alignment RiuQtChartsPlotWidget::mapPlotAxisToQtAlignment( RiaDefines::PlotA
if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ) return Qt::AlignLeft;
return Qt::AlignRight;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQtChartsPlotWidget::pruneAxes( const std::set<RiuPlotAxis>& usedAxes )
{
for ( auto [plotAxis, qtAxis] : m_axes )
{
if ( usedAxes.count( plotAxis ) == 0 )
{
// This axis is now unused, and can be disabled
qtAxis->setVisible( false );
m_axesEnabled[plotAxis] = false;
m_axesAutoScale[plotAxis] = false;
}
}
}

3
ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.h
View File

@ -92,6 +92,7 @@ public:
void setAxisFormat( RiuPlotAxis axis, const QString& format );
void pruneAxes( const std::set<RiuPlotAxis>& usedAxis ) override;
RiuPlotAxis createNextPlotAxis( RiaDefines::PlotAxis axis ) override;
bool isMultiAxisSupported() const override;
@ -134,7 +135,7 @@ public:
int axisExtent( RiuPlotAxis axis ) const override;
void ensureAxis( RiuPlotAxis axis ) override;
void ensureAxisIsCreated( RiuPlotAxis axis ) override;
QPoint dragStartPosition() const;

10
ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@ -1051,7 +1051,7 @@ QwtPlot* RiuQwtPlotWidget::qwtPlot() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::ensureAxis( RiuPlotAxis axis )
void RiuQwtPlotWidget::ensureAxisIsCreated( RiuPlotAxis axis )
{
}
@ -1190,3 +1190,11 @@ bool RiuQwtPlotWidget::isMultiAxisSupported() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::pruneAxes( const std::set<RiuPlotAxis>& usedAxes )
{
// Currently not supported.
}

3
ApplicationLibCode/UserInterface/RiuQwtPlotWidget.h
View File

@ -91,6 +91,7 @@ public:
void setAxisTitleText( RiuPlotAxis axis, const QString& title ) override;
void setAxisTitleEnabled( RiuPlotAxis axis, bool enable ) override;
void pruneAxes( const std::set<RiuPlotAxis>& usedAxes ) override;
RiuPlotAxis createNextPlotAxis( RiaDefines::PlotAxis axis ) override;
bool isMultiAxisSupported() const override;
@ -131,7 +132,7 @@ public:
int axisExtent( RiuPlotAxis axis ) const override;
void ensureAxis( RiuPlotAxis axis ) override;
void ensureAxisIsCreated( RiuPlotAxis axis ) override;
QPoint dragStartPosition() const;