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

Use integer precision for zoom percentage value. This fixes alignment of zoommed pixels between two tiled images.

Browse Source
This commit is contained in:
Luis Lucas committed 2015-02-22 22:50:03 +00:00
1 parent 59df69ce63
commit b176f98f0e
2 files changed
+16 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/ViewArea.cpp
+15 -9
View File
@@ -114,7 +114,18 @@ Double ViewArea::scaleZoomFactor( Double scale, QPoint center, QSize minimumSize
Double maxZoom = 100.0;
Double minZoom = 0.01; //( 1.0 / m_pixmap.width() );
Double new_scale = 1.0;
Double zoomFactor = m_zoomFactor * scale;
if( ( m_zoomFactor == minZoom ) && ( scale < 1 ) )
return new_scale;
if( ( m_zoomFactor == maxZoom ) && ( scale > 1 ) )
return new_scale;
Double zoomFactor = m_zoomFactor * scale * 100.0;
zoomFactor=round(zoomFactor);
zoomFactor=zoomFactor/100.0;
scale = zoomFactor/m_zoomFactor;
if(!minimumSize.isNull())
{
@@ -140,18 +151,13 @@ Double ViewArea::scaleZoomFactor( Double scale, QPoint center, QSize minimumSize
else
scale = hfactor;
zoomFactor = zoomFactor * scale;
zoomFactor = zoomFactor * scale * 100.0;
zoomFactor=round(zoomFactor);
zoomFactor=zoomFactor/100.0;
scale = zoomFactor/m_zoomFactor;
}
}
if( ( m_zoomFactor == minZoom ) && ( scale < 1 ) )
return new_scale;
if( ( m_zoomFactor == maxZoom ) && ( scale > 1 ) )
return new_scale;
new_scale = scale;
if( zoomFactor < minZoom )