jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorganize image zoom functions. New zoomToFactor function is available from SubWindowHandle.

Browse Source
This commit is contained in:
Luis Lucas
2015-01-17 23:55:42 +00:00
parent e8da7df02d
commit 083f38e8bf
8 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/VideoSubWindow.cpp
+20 -8
View File
@@ -83,7 +83,7 @@ VideoSubWindow::VideoSubWindow( QWidget * parent, Bool isModule ) :
// Create a new interface to show images
m_cViewArea = new ViewArea( this );
connect( m_cViewArea, SIGNAL( zoomFactorChanged( double , QPoint) ), this, SLOT( processZoomChanged(double, QPoint) ) );
connect( m_cViewArea, SIGNAL( zoomFactorChanged( double , QPoint) ), this, SLOT( processZoomChange(double, QPoint) ) );
connect( m_cViewArea, SIGNAL( moveScroll( QPoint ) ), this, SLOT( adjustScrollBarByOffset(QPoint) ) );
connect( m_cViewArea, SIGNAL( selectionChanged( QRect ) ), this, SLOT( updateSelectedArea( QRect ) ) );
@@ -339,9 +339,10 @@ Void VideoSubWindow::stop()
Void VideoSubWindow::normalSize()
{
Double scaleFactor = 1.0;
m_cViewArea->setZoomFactor( scaleFactor );
updateLastScrollValue();
Double factor = 1.0;
Double curFactor = getScaleFactor() ;
if( factor != curFactor )
m_cViewArea->scaleZoomFactor( factor/curFactor, QPoint() );
}
Void VideoSubWindow::zoomToFit()
@@ -350,10 +351,18 @@ Void VideoSubWindow::zoomToFit()
scaleView( getScrollSize() );
}
Void VideoSubWindow::zoomToFactor(Double factor)
{
Double curFactor;
curFactor = getScaleFactor() ;
if( factor != curFactor )
m_cViewArea->scaleZoomFactor( factor/curFactor, QPoint() );
}
Void VideoSubWindow::scaleView( Double scale )
{
Q_ASSERT( m_cViewArea->image() );
m_cViewArea->zoomChangeEvent( scale, QPoint() );
m_cViewArea->scaleZoomFactor( scale, QPoint() );
}
Void VideoSubWindow::scaleView( const QSize & size )
@@ -369,16 +378,19 @@ Void VideoSubWindow::scaleView( const QSize & size )
// Calc the zoom factor
Double wfactor = 1;
Double hfactor = 1;
Double factor;
wfactor = ( Double )newSize.width() / imgViewSize.width();
hfactor = ( Double )newSize.height() / imgViewSize.height();
if( wfactor < hfactor )
m_cViewArea->setZoomFactor( wfactor );
factor = wfactor;
else
m_cViewArea->setZoomFactor( hfactor );
factor = hfactor;
updateLastScrollValue();
Double curFactor = getScaleFactor() ;
if( factor != curFactor )
m_cViewArea->scaleZoomFactor( factor/curFactor, QPoint() );
}