tempo-plotter Changeset - fbe70e32bc1a · protofusion repositories

Changeset - fbe70e32bc1a

Parent rev.

Child rev.

[Not reviewed]

scrollbar-exp

0 1 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-16 08:26:42
hy@ozderya.net

fix wrong view size, y axis scroll is broken

1 file changed with 3 insertions and 2 deletions:

src/scrollzoomer.cpp

0 comments (0 inline, 0 general)

src/scrollzoomer.cpp

➞

Show inline comments

@@ @@ -37,103 +37,104 @@ public: @@
 ScrollZoomer::ScrollZoomer( QWidget *canvas ):
     QwtPlotZoomer( canvas ),
     d_cornerWidget( NULL ),
     d_hScrollData( NULL ),
     d_vScrollData( NULL ),
     d_inZoom( false )
+{
     xMin = 0.;
     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;
+}
 ScrollZoomer::~ScrollZoomer()
+{
     delete d_cornerWidget;
     delete d_vScrollData;
     delete d_hScrollData;
+}
 void ScrollZoomer::setXLimits(double min, double max)
+{
     xMin = min;
     xMax = max;
     setZoomBase();
     // TODO: should we update zoom base here?
+}
 void ScrollZoomer::setHViewSize(double size)
+{
     hViewSize = size;
+}
 void ScrollZoomer::setZoomBase(bool doReplot)
+{
     QwtPlotZoomer::setZoomBase(doReplot);
     auto zb = zoomBase();
     auto zs = zoomStack();
     zb.setRight(xMax);
     if ((xMax - xMin) < hViewSize)
+    {
-        zb.setWidth(xMax - xMin);
+        zb.setLeft(xMin);
+    }
     else
+    {
-        zb.setWidth(hViewSize);
+        zb.setLeft(xMax-hViewSize);
+    }
     zs[0] = zb;
     setZoomStack(zs);
+}
 void ScrollZoomer::rescale()
+{
     QwtScaleWidget *xScale = plot()->axisWidget( xAxis() );
     QwtScaleWidget *yScale = plot()->axisWidget( yAxis() );
     if ( zoomRectIndex() <= 0 )
+    {
         if ( d_inZoom )
+        {
             xScale->setMinBorderDist( 0, 0 );
             yScale->setMinBorderDist( 0, 0 );
             QwtPlotLayout *layout = plot()->plotLayout();
             for ( int axis = 0; axis < QwtPlot::axisCnt; axis++ )
                 layout->setAlignCanvasToScale( axis, d_alignCanvasToScales[ axis ] );
             d_inZoom = false;
+        }
+    }
     else
+    {
         if ( !d_inZoom )
+        {
             /*
              We set a minimum border distance.
              Otherwise the canvas size changes when scrolling,
              between situations where the major ticks are at
              the canvas borders (requiring extra space for the label)
              and situations where all labels can be painted below/top
              or left/right of the canvas.
              */
             int start, end;
             xScale->getBorderDistHint( start, end );
             xScale->setMinBorderDist( start, end );
             yScale->getBorderDistHint( start, end );
             yScale->setMinBorderDist( start, end );
             QwtPlotLayout *layout = plot()->plotLayout();
             for ( int axis = 0; axis < QwtPlot::axisCnt; axis++ )
+            {

0 comments (0 inline, 0 general)