Fixes for crashes after reducing number of axis

CeetronSolutions · Jan 3, 2024 · 293ba9b · 293ba9b
1 parent d948bfa
commit 293ba9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/qwt_plot_axis.cpp b/src/qwt_plot_axis.cpp
@@ -770,14 +770,14 @@ void QwtPlot::updateAxes()
         {
             const QRectF rect = item->boundingRect();
 
-            if ( rect.width() >= 0.0 )
+            if ( isAxisValid( item->xAxis()) && rect.width() >= 0.0 )
             {
                 const QwtAxisId xAxis = item->xAxis();
                 boundingIntervals[ xAxis.pos ][ xAxis.id ] |=
                     QwtInterval( rect.left(), rect.right() );
             }
 
-            if ( rect.height() >= 0.0 )
+            if ( isAxisValid( item->yAxis()) && rect.height() >= 0.0 )
             {
                 const QwtAxisId yAxis = item->yAxis();
                 boundingIntervals[ yAxis.pos ][ yAxis.id ] |=
@@ -831,7 +831,8 @@ void QwtPlot::updateAxes()
     for ( it = itmList.begin(); it != itmList.end(); ++it )
     {
         QwtPlotItem* item = *it;
-        if ( item->testItemInterest( QwtPlotItem::ScaleInterest ) )
+        if ( item->testItemInterest( QwtPlotItem::ScaleInterest ) &&
+             isAxisValid( item->xAxis() ) && isAxisValid( item->yAxis() ) )
         {
             item->updateScaleDiv( axisScaleDiv( item->xAxis() ),
                 axisScaleDiv( item->yAxis() ) );

diff --git a/src/qwt_plot_curve.cpp b/src/qwt_plot_curve.cpp
@@ -1055,6 +1055,9 @@ int QwtPlotCurve::closestPoint( const QPointF& pos, double* dist ) const
     if ( plot() == NULL || numSamples <= 0 )
         return -1;
 
+    if ( !plot()->isAxisValid( xAxis() ) || !plot()->isAxisValid( yAxis() ) )
+        return -1;
+
     const QwtSeriesData< QPointF >* series = data();
 
     const QwtScaleMap xMap = plot()->canvasMap( xAxis() );