Rewrite some zoom functions. Zoom is done in the middle of the image.

This commit is contained in:
Luis Lucas committed 2014-03-24 01:44:54 +00:00
1 parent ecd98887f3
commit bd3b2cf4eb
4 files changed
+41 -22

No files matched your search

+4 -6
View File
@@ -41,7 +41,8 @@ SubWindowHandle::SubWindowHandle( QWidget * parent ) :
setWidget( m_cScrollArea ); setWidget( m_cScrollArea );
// Create a new interface to show images // Create a new interface to show images
m_cViewArea = new ViewArea( m_cScrollArea ); m_cViewArea = new ViewArea( this );
connect(m_cViewArea, SIGNAL(zoomFactorChanged(double)), this, SLOT(adjustScrollBar(double)));
// Define the cViewArea as the widget inside the scroll area // Define the cViewArea as the widget inside the scroll area
m_cScrollArea->setWidget( m_cViewArea ); m_cScrollArea->setWidget( m_cViewArea );
@@ -262,10 +263,7 @@ Void SubWindowHandle::zoomToFit()
Void SubWindowHandle::scaleView( Double factor ) Void SubWindowHandle::scaleView( Double factor )
{ {
Q_ASSERT( m_cViewArea->image() ); Q_ASSERT( m_cViewArea->image() );
Double scaleFactor = m_cViewArea->getZoomFactor(); m_cViewArea->zoomChangeEvent(factor);
scaleFactor *= factor;
m_cViewArea->setZoomFactor( scaleFactor );
adjustScrollBar( scaleFactor );
} }
Void SubWindowHandle::scaleView( Int width, Int height ) Void SubWindowHandle::scaleView( Int width, Int height )
@@ -292,7 +290,7 @@ Void SubWindowHandle::scaleView( const QSize & size )
scaleView( hfactor ); scaleView( hfactor );
} }
Void SubWindowHandle::adjustScrollBar( Double factor ) void SubWindowHandle::adjustScrollBar( double factor )
{ {
QScrollBar *scrollBar = m_cScrollArea->horizontalScrollBar(); QScrollBar *scrollBar = m_cScrollArea->horizontalScrollBar();
scrollBar->setValue( int( factor * scrollBar->value() + ( ( factor - 1 ) * scrollBar->pageStep() / 2 ) ) ); scrollBar->setValue( int( factor * scrollBar->value() + ( ( factor - 1 ) * scrollBar->pageStep() / 2 ) ) );
+4 -2
View File
@@ -59,6 +59,9 @@ private:
Bool m_bIsPlaying; Bool m_bIsPlaying;
private slots:
void adjustScrollBar( double factor );
public: public:
SubWindowHandle( QWidget * parent = 0 ); SubWindowHandle( QWidget * parent = 0 );
~SubWindowHandle(); ~SubWindowHandle();
@@ -118,8 +121,6 @@ public:
*/ */
Void scaleView( const QSize & size ); Void scaleView( const QSize & size );
Void adjustScrollBar( Double factor );
Double getScaleFactor() Double getScaleFactor()
{ {
return m_cViewArea->getZoomFactor(); return m_cViewArea->getZoomFactor();
@@ -145,6 +146,7 @@ protected:
public Q_SLOTS: public Q_SLOTS:
bool playEvent(); bool playEvent();
}; };
} // NAMESPACE } // NAMESPACE
+32 -14
View File
@@ -104,19 +104,34 @@ Double ViewArea::getZoomFactor()
// return QSize( w, h ); // return QSize( w, h );
// } // }
Void ViewArea::zoomChangeEvent(Double factor)
{
Double zoomFactor;
Double maxZoom = 10.0;
Double minZoom = ( 32.0 / m_pixmap.width() );
if( ( m_zoomFactor == minZoom ) && (factor < 1 ) )
return;
if( ( m_zoomFactor == maxZoom ) && (factor > 1 ) )
return;
zoomFactor = m_zoomFactor * factor;
if( zoomFactor < minZoom )
zoomFactor = minZoom;
if( zoomFactor > maxZoom )
zoomFactor = maxZoom;
setZoomFactor( zoomFactor );
emit zoomFactorChanged(factor);
}
void ViewArea::setZoomFactor( double f ) void ViewArea::setZoomFactor( double f )
{ {
//if( f == m_zoomFactor )
//return;
if( f < ( 32.0 / m_pixmap.width() ) )
f = 32.0 / m_pixmap.width();
if( f > 10.0 )
f = 10.0;
m_zoomFactor = f; m_zoomFactor = f;
//emit( zoomFactorChanged( m_zoomFactor ) );
updateSize(); updateSize();
update(); update();
@@ -432,12 +447,15 @@ void ViewArea::paintEvent( QPaintEvent *event )
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void ViewArea::wheelEvent( QWheelEvent *event ) void ViewArea::wheelEvent( QWheelEvent *event )
{ {
double f; Double factor;
f = m_zoomFactor + 0.001 * event->delta(); factor = 0.001 * event->delta();
if(factor>0)
setZoomFactor( f ); factor=1.25;
else
factor=0.8;
zoomChangeEvent( factor );
} }
void ViewArea::mousePressEvent( QMouseEvent *event ) void ViewArea::mousePressEvent( QMouseEvent *event )
+1
View File
@@ -105,6 +105,7 @@ public:
void setInputStream( InputStream *stream ); void setInputStream( InputStream *stream );
InputStream* getInputStream(); InputStream* getInputStream();
Void zoomChangeEvent(Double factor);
Double getZoomFactor(); Double getZoomFactor();
// QSize sizeHint() const; // QSize sizeHint() const;