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

Fix max and min zoom factor. Main window zoom buttons are always enabled.

Browse Source
This commit is contained in:
Luis Lucas
2014-03-23 19:30:43 +00:00
parent fc00a73144
commit 15382e8a6e
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/SubWindowHandle.cpp
+6 -8
View File
@@ -54,8 +54,6 @@ SubWindowHandle::SubWindowHandle( QWidget * parent ) :
m_cWindowName = QString( " " );
m_bIsPlaying = true;
m_dScaleFactor = 1;
}
SubWindowHandle::~SubWindowHandle()
@@ -245,8 +243,8 @@ Void SubWindowHandle::stopEvent()
Void SubWindowHandle::normalSize()
{
m_dScaleFactor = 1.0;
m_cViewArea->setZoomFactor( m_dScaleFactor );
Double scaleFactor = 1.0;
m_cViewArea->setZoomFactor( scaleFactor );
}
Void SubWindowHandle::zoomToFit()
@@ -264,9 +262,10 @@ Void SubWindowHandle::zoomToFit()
Void SubWindowHandle::scaleView( Double factor )
{
Q_ASSERT( m_cViewArea->image() );
m_dScaleFactor *= factor;
m_cViewArea->setZoomFactor( m_dScaleFactor );
adjustScrollBar( m_dScaleFactor );
Double scaleFactor = m_cViewArea->getZoomFactor();
scaleFactor *= factor;
m_cViewArea->setZoomFactor( scaleFactor );
adjustScrollBar( scaleFactor );
}
Void SubWindowHandle::scaleView( Int width, Int height )
@@ -283,7 +282,6 @@ Void SubWindowHandle::scaleView( const QSize & size )
// Calc the zoom factor
Double wfactor = 1;
Double hfactor = 1;
m_dScaleFactor = 1;
wfactor = ( Double )newSize.width() / imgViewSize.width();
hfactor = ( Double )newSize.height() / imgViewSize.height();