tempo-plotter Changeset - 092cfd95f0ce · protofusion repositories

Changeset - 092cfd95f0ce

Parent rev.

Child rev.

[Not reviewed]

scrollbar-exp

0 2 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-13 12:09:25
hy@ozderya.net

retain y axis autoscale when moving horizontal scrollbar

2 files changed with 43 insertions and 1 deletions:

src/scrollzoomer.cpp

src/scrollzoomer.h

0 comments (0 inline, 0 general)

src/scrollzoomer.cpp

➞

Show inline comments

@@ @@ -45,24 +45,25 @@ ScrollZoomer::ScrollZoomer( QWidget *can @@
     d_limits = QRectF(0, -10, 10000, 20);
     xMin = 0.;
     xMax = 10000.;
     for ( int axis = 0; axis < QwtPlot::axisCnt; axis++ )
         d_alignCanvasToScales[ axis ] = false;
     if ( !canvas )
         return;
     d_hScrollData = new ScrollData;
     d_vScrollData = new ScrollData;
     hscrollmove = false;
+}
 ScrollZoomer::~ScrollZoomer()
+{
     delete d_cornerWidget;
     delete d_vScrollData;
     delete d_hScrollData;
+}
 void ScrollZoomer::rescale()
+{
     qDebug() << "rescale";
@@ @@ -109,25 +110,59 @@ void ScrollZoomer::rescale() @@
             for ( int axis = 0; axis < QwtPlot::axisCnt; axis++ )
+            {
                 d_alignCanvasToScales[axis] =
                     layout->alignCanvasToScale( axis );
+            }
             layout->setAlignCanvasToScales( false );
             d_inZoom = true;
+        }
+    }
     QwtPlotZoomer::rescale();
     // NOTE: Below snipped is copied from QwtPlotZoomer::rescale() just so that
     // we can refrain from updating y axis when moving horizontal scrollbar, so
     // that auto-scale isn't distrupted.
+    {
         QwtPlot *plt = plot();
         if ( !plt )
             return;
         const QRectF &rect = zoomStack()[zoomRectIndex()];
         if ( rect != scaleRect() )
+        {
             const bool doReplot = plt->autoReplot();
             plt->setAutoReplot( false );
             double x1 = rect.left();
             double x2 = rect.right();
             if ( !plt->axisScaleDiv( xAxis() ).isIncreasing() )
                 qSwap( x1, x2 );
             plt->setAxisScale( xAxis(), x1, x2 );
             if (!hscrollmove)
+            {
                 double y1 = rect.top();
                 double y2 = rect.bottom();
                 if ( !plt->axisScaleDiv( yAxis() ).isIncreasing() )
                     qSwap( y1, y2 );
                 plt->setAxisScale( yAxis(), y1, y2 );
                 plt->setAutoReplot( doReplot );
+            }
             plt->replot();
+        }
+    }
     updateScrollBars();
+}
 ScrollBar *ScrollZoomer::scrollBar( Qt::Orientation orientation )
+{
     ScrollBar *&sb = ( orientation == Qt::Vertical )
         ? d_vScrollData->scrollBar : d_hScrollData->scrollBar;
     if ( sb == NULL )
+    {
         sb = new ScrollBar( orientation, canvas() );
         sb->hide();
@@ @@ -469,27 +504,33 @@ void ScrollZoomer::layoutScrollBars( con @@
                 vdim, hdim );
             d_cornerWidget->setGeometry( cornerRect );
+        }
+    }
+}
 void ScrollZoomer::scrollBarMoved(
     Qt::Orientation o, double min, double max )
+{
     Q_UNUSED( max );
     if ( o == Qt::Horizontal )
+    {
         hscrollmove = true;
         moveTo( QPointF( min, zoomRect().top() ) );
         hscrollmove = false;
+    }
     else
+    {
         moveTo( QPointF( zoomRect().left(), min ) );
+    }
     Q_EMIT zoomed( zoomRect() );
+}
 int ScrollZoomer::oppositeAxis( int axis ) const
+{
     switch( axis )
+    {
         case QwtPlot::xBottom:
             return QwtPlot::xTop;
         case QwtPlot::xTop:
             return QwtPlot::xBottom;

src/scrollzoomer.h

➞

Show inline comments

@@ @@ -70,15 +70,16 @@ private: @@
     double xMin, xMax;
     bool needScrollBar( Qt::Orientation ) const;
     int oppositeAxis( int ) const;
     QWidget *d_cornerWidget;
     ScrollData *d_hScrollData;
     ScrollData *d_vScrollData;
     bool d_inZoom;
     bool d_alignCanvasToScales[ QwtPlot::axisCnt ];
     bool hscrollmove;
 };
 #endif

0 comments (0 inline, 0 general)