Changeset - 39b23673b4d1
Parent rev.
Child rev.
[Not reviewed]
scrollbar-exp
0 3 0
Hasan Yavuz ÖZDERYA - 8 years ago 2017-04-26 14:43:52
hy@ozderya.net
simplify scrollzoomer, only the x axis needs extra limits

Note: at this point auto-scale is broken, when X scroll is used it disables the
auto-scale on Y axis as well
3 files changed with 25 insertions and 28 deletions:
src/plot.cpp
6
6
src/scrollzoomer.cpp
16
22
src/scrollzoomer.h
3
0 comments (0 inline, 0 general)
src/plot.cpp
➞
Show inline comments
 
@@ -42,7 +42,7 @@ Plot::Plot(QWidget* parent) :
 

			




	
	
	
		
 
    QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);

			




	
	
	
		
 

			




	
	
	
		
 
    zoomer.setZoomBase(QRectF(0,-1,2,500));

			




	
	
	
		
 
    zoomer.setZoomBase();

			




	
	
	
		
 
    grid.attach(this);

			




	
	
	
		
 
    legend.attach(this);

			




	
	
	
		
 

			




	
	
		
 
@@ -101,14 +101,14 @@ void Plot::setXAxis(double xMin, double 

			




	
	
	
		
 
    zoomer.zoom(0); // unzoom

			




	
	
	
		
 

			




	
	
	
		
 
    // set axis

			




	
	
	
		
 
    setAxisScale(QwtPlot::xBottom, xMin, xMax);

			




	
	
	
		
 
    // setAxisScale(QwtPlot::xBottom, xMin, xMax);

			




	
	
	
		
 
    replot(); // Note: if we don't replot here scale at startup isn't set correctly

			




	
	
	
		
 

			




	
	
	
		
 
    // reset zoom base

			




	
	
	
		
 
    auto base = zoomer.zoomBase();

			




	
	
	
		
 
    base.setLeft(xMin);

			




	
	
	
		
 
    base.setRight(xMax);

			




	
	
	
		
 
    zoomer.setZoomBase(base);

			




	
	
	
		
 
    // auto base = zoomer.zoomBase();

			




	
	
	
		
 
    // base.setLeft(xMin);

			




	
	
	
		
 
    // base.setRight(xMax);

			




	
	
	
		
 
    // zoomer.setZoomBase(base);

			




	
	
	
		
 

			




	
	
	
		
 
    onXScaleChanged();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/scrollzoomer.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,6 +43,8 @@ ScrollZoomer::ScrollZoomer( QWidget *can

			




	
	
	
		
 
    d_inZoom( false )

			




	
	
	
		
 
{

			




	
	
	
		
 
    d_limits = QRectF(0, -10, 10000, 20);

			




	
	
	
		
 
    xMin = 0.;

			




	
	
	
		
 
    xMax = 10000.;

			




	
	
	
		
 

			




	
	
	
		
 
    for ( int axis = 0; axis < QwtPlot::axisCnt; axis++ )

			




	
	
	
		
 
        d_alignCanvasToScales[ axis ] = false;

			




	
	
		
 
@@ -274,20 +276,16 @@ bool ScrollZoomer::needScrollBar( Qt::Or

			




	
	
	
		
 
    if ( orientation == Qt::Horizontal )

			




	
	
	
		
 
    {

			




	
	
	
		
 
        mode = d_hScrollData->mode;

			




	
	
	
		
 
        // baseMin = zoomBase().left();

			




	
	
	
		
 
        // baseMax = zoomBase().right();

			




	
	
	
		
 
        baseMin = d_limits.left();

			




	
	
	
		
 
        baseMax = d_limits.right();

			




	
	
	
		
 
        baseMin = xMin;

			




	
	
	
		
 
        baseMax = xMax;

			




	
	
	
		
 
        zoomMin = zoomRect().left();

			




	
	
	
		
 
        zoomMax = zoomRect().right();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        mode = d_vScrollData->mode;

			




	
	
	
		
 
        // baseMin = zoomBase().top();

			




	
	
	
		
 
        // baseMax = zoomBase().bottom();

			




	
	
	
		
 
        baseMin = d_limits.top();

			




	
	
	
		
 
        baseMax = d_limits.bottom();

			




	
	
	
		
 
        baseMin = zoomBase().top();

			




	
	
	
		
 
        baseMax = zoomBase().bottom();

			




	
	
	
		
 
        zoomMin = zoomRect().top();

			




	
	
	
		
 
        zoomMax = zoomRect().bottom();

			




	
	
	
		
 
    }

			




	
	
		
 
@@ -338,8 +336,7 @@ void ScrollZoomer::updateScrollBars()

			




	
	
	
		
 
        ScrollBar *sb = scrollBar( Qt::Horizontal );

			




	
	
	
		
 
        sb->setPalette( plot()->palette() );

			




	
	
	
		
 
        sb->setInverted( !plot()->axisScaleDiv( xAxis ).isIncreasing() );

			




	
	
	
		
 
        // sb->setBase( zoomBase().left(), zoomBase().right() );

			




	
	
	
		
 
        sb->setBase( d_limits.left(), d_limits.right() );

			




	
	
	
		
 
        sb->setBase( xMin, xMax );

			




	
	
	
		
 
        sb->moveSlider( zoomRect().left(), zoomRect().right() );

			




	
	
	
		
 
        qDebug() << "moveSlider" << zoomRect().left() << zoomRect().right();

			




	
	
	
		
 

			




	
	
		
 
@@ -366,7 +363,7 @@ void ScrollZoomer::updateScrollBars()

			




	
	
	
		
 
        ScrollBar *sb = scrollBar( Qt::Vertical );

			




	
	
	
		
 
        sb->setPalette( plot()->palette() );

			




	
	
	
		
 
        sb->setInverted( plot()->axisScaleDiv( yAxis ).isIncreasing() );

			




	
	
	
		
 
        sb->setBase( d_limits.top(), d_limits.bottom() );

			




	
	
	
		
 
        sb->setBase( zoomRect().top(), zoomRect().bottom() );

			




	
	
	
		
 
        sb->moveSlider( zoomRect().top(), zoomRect().bottom() );

			




	
	
	
		
 

			




	
	
	
		
 
        if ( !sb->isVisibleTo( canvas() ) )

			




	
	
		
 
@@ -515,23 +512,20 @@ void ScrollZoomer::moveTo( const QPointF

			




	
	
	
		
 
    double x = pos.x();

			




	
	
	
		
 
    double y = pos.y();

			




	
	
	
		
 

			




	
	
	
		
 
    if ( x < d_limits.left() )

			




	
	
	
		
 
        x = d_limits.left();

			




	
	
	
		
 
    if ( x > d_limits.right() - zoomRect().width() )

			




	
	
	
		
 
        x = d_limits.right() - zoomRect().width();

			




	
	
	
		
 
    if ( x < xMin )

			




	
	
	
		
 
        x = xMin;

			




	
	
	
		
 
    if ( x > xMax - zoomRect().width() )

			




	
	
	
		
 
        x = xMax - zoomRect().width();

			




	
	
	
		
 

			




	
	
	
		
 
    if ( y < d_limits.top() )

			




	
	
	
		
 
        y = d_limits.top();

			




	
	
	
		
 
    if ( y > d_limits.bottom() - zoomRect().height() )

			




	
	
	
		
 
        y = d_limits.bottom() - zoomRect().height();

			




	
	
	
		
 

			




	
	
	
		
 
    qDebug() << "x,y: "<<x<<y;

			




	
	
	
		
 
    if ( y < zoomBase().top() )

			




	
	
	
		
 
        y = zoomBase().top();

			




	
	
	
		
 
    if ( y > zoomBase().bottom() - zoomRect().height() )

			




	
	
	
		
 
        y = zoomBase().bottom() - zoomRect().height();

			




	
	
	
		
 

			




	
	
	
		
 
    if ( x != zoomRect().left() || y != zoomRect().top() )

			




	
	
	
		
 
    {

			




	
	
	
		
 
        auto zs = zoomStack();

			




	
	
	
		
 
        zs[zoomRectIndex()].moveTo( x, y );

			




	
	
	
		
 
        // d_data->zoomStack[d_data->zoomRectIndex].moveTo( x, y );

			




	
	
	
		
 
        setZoomStack(zs, zoomRectIndex());

			




	
	
	
		
 
        rescale();

			




	
	
	
		
 
    }

			




        

    


    
    

    

        

                

                    src/scrollzoomer.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,6 +45,8 @@ public:

			




	
	
	
		
 
    ScrollBarPosition hScrollBarPosition() const;

			




	
	
	
		
 
    ScrollBarPosition vScrollBarPosition() const;

			




	
	
	
		
 

			




	
	
	
		
 
    void setXLimits(double min, double max);

			




	
	
	
		
 

			




	
	
	
		
 
    QWidget* cornerWidget() const;

			




	
	
	
		
 
    virtual void setCornerWidget( QWidget * );

			




	
	
	
		
 

			




	
	
		
 
@@ -65,6 +67,7 @@ private Q_SLOTS:

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    QRectF d_limits;

			




	
	
	
		
 
    double xMin, xMax;

			




	
	
	
		
 

			




	
	
	
		
 
    bool needScrollBar( Qt::Orientation ) const;

			




	
	
	
		
 
    int oppositeAxis( int ) const;

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support