tempo-plotter Changeset - d09252498ce0 · protofusion repositories

Changeset - d09252498ce0

Parent rev.

Child rev.

[Not reviewed]

scrollbar-exp

0 2 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-16 09:06:32
hy@ozderya.net

don't move the x axis when moving vertical scroll

problem happens when x-axis is out of limit, extended zoom selection with rectangle tool

2 files changed with 14 insertions and 6 deletions:

src/scrollzoomer.cpp

src/scrollzoomer.h

0 comments (0 inline, 0 general)

src/scrollzoomer.cpp

➞

Show inline comments

@@ @@ -46,24 +46,25 @@ ScrollZoomer::ScrollZoomer( QWidget *can @@
     xMax = 10000.;
     hViewSize = 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;
     vscrollmove = false;
+}
 ScrollZoomer::~ScrollZoomer()
+{
     delete d_cornerWidget;
     delete d_vScrollData;
     delete d_hScrollData;
+}
 void ScrollZoomer::setXLimits(double min, double max)
+{
     xMin = min;
@@ @@ -141,42 +142,46 @@ void ScrollZoomer::rescale() @@
                 d_alignCanvasToScales[axis] =
                     layout->alignCanvasToScale( axis );
+            }
             layout->setAlignCanvasToScales( false );
             d_inZoom = true;
+        }
+    }
     // NOTE: Below snippet 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 disrupted.
     // that auto-scale isn't disrupted. Also we don't want to jump around in
     // x-axis when moving vertical scroll.
+    {
         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 );
             if (!vscrollmove)
+            {
                 double x1 = rect.left();
                 double x2 = rect.right();
                 if ( !plt->axisScaleDiv( xAxis() ).isIncreasing() )
                     qSwap( x1, x2 );
             plt->setAxisScale( xAxis(), 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 );
+            }
@@ @@ -535,25 +540,27 @@ 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
+    {
         vscrollmove = true;
         moveTo( QPointF( zoomRect().left(), min ) );
         vscrollmove = false;
+    }
     Q_EMIT zoomed( zoomRect() );
+}
 int ScrollZoomer::oppositeAxis( int axis ) const
+{
     switch( axis )
+    {
         case QwtPlot::xBottom:
             return QwtPlot::xTop;
         case QwtPlot::xTop:

src/scrollzoomer.h

➞

Show inline comments

@@ @@ -73,15 +73,16 @@ private: @@
     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;
     bool vscrollmove;
 };
 #endif

0 comments (0 inline, 0 general)