aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #637. Max scene size too small to fit all objects.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-06-16 15:03:24 +03:00
parent b0f867499c
commit acd960ecee
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -3,6 +3,7 @@
- [#681] Enhance feature: Dashed line options for curves, arcs, etc. - [#681] Enhance feature: Dashed line options for curves, arcs, etc.
- [#684] Proposal: Add option to only show outer edges on detail. - [#684] Proposal: Add option to only show outer edges on detail.
- [#244] New feature: Adjust line and point thickness and label size. - [#244] New feature: Adjust line and point thickness and label size.
- [#637] Max scene size too small to fit all objects.
# Version 0.5.1 # Version 0.5.1
- [#683] Tool Seam allowance's dialog is off screen on small resolutions. - [#683] Tool Seam allowance's dialog is off screen on small resolutions.

15
src/libs/vwidgets/vmaingraphicsview.cpp
View File

@ -55,7 +55,7 @@
const int GraphicsViewZoom::duration = 300; const int GraphicsViewZoom::duration = 300;
const int GraphicsViewZoom::updateInterval = 40; const int GraphicsViewZoom::updateInterval = 40;
const qreal maxSceneSize = ((50 * 100.0) / 25.4) * PrintDPI; // 50 meters in pixels const qreal maxSceneSize = ((20.0 * 1000.0) / 25.4) * PrintDPI; // 20 meters in pixels
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
GraphicsViewZoom::GraphicsViewZoom(QGraphicsView* view) GraphicsViewZoom::GraphicsViewZoom(QGraphicsView* view)
@ -88,8 +88,9 @@ void GraphicsViewZoom::gentle_zoom(double factor)
// We need to check current scale factor because in Windows we have an error when we zoom in or zoom out to much. // We need to check current scale factor because in Windows we have an error when we zoom in or zoom out to much.
// See issue #532: Unexpected error occurs when zoom out image. // See issue #532: Unexpected error occurs when zoom out image.
// factor > 1 for zoomIn and factor < 1 for zoomOut. // factor > 1 for zoomIn and factor < 1 for zoomOut.
if ((_view->transform().m11() < VMainGraphicsView::MaxScale() && factor > 1) || const qreal m11 = _view->transform().m11();
(_view->transform().m11() > VMainGraphicsView::MinScale() && factor < 1))
if ((factor > 1 && m11 <= VMainGraphicsView::MaxScale()) || (factor < 1 && m11 >= VMainGraphicsView::MinScale()))
{ {
_view->scale(factor, factor); _view->scale(factor, factor);
if (factor < 1) if (factor < 1)
@ -361,7 +362,7 @@ void VMainGraphicsView::ZoomIn()
{ {
// We need to check current scale factor because in Windows we have an error when we zoom in or zoom out to much. // We need to check current scale factor because in Windows we have an error when we zoom in or zoom out to much.
// See issue #532: Unexpected error occurs when zoom out image. // See issue #532: Unexpected error occurs when zoom out image.
if (this->transform().m11() < MaxScale()) if (this->transform().m11() <= MaxScale())
{ {
scale(1.1, 1.1); scale(1.1, 1.1);
VMainGraphicsView::NewSceneRect(this->scene(), this); VMainGraphicsView::NewSceneRect(this->scene(), this);
@ -373,7 +374,7 @@ void VMainGraphicsView::ZoomOut()
{ {
// We need to check current scale factor because in Windows we have an error when we zoom in or zoom out to much. // We need to check current scale factor because in Windows we have an error when we zoom in or zoom out to much.
// See issue #532: Unexpected error occurs when zoom out image. // See issue #532: Unexpected error occurs when zoom out image.
if (this->transform().m11() > MinScale()) if (this->transform().m11() >= MinScale())
{ {
scale(1.0/1.1, 1.0/1.1); scale(1.0/1.1, 1.0/1.1);
VMainGraphicsView::NewSceneRect(this->scene(), this); VMainGraphicsView::NewSceneRect(this->scene(), this);
@ -514,7 +515,7 @@ void VMainGraphicsView::mouseReleaseEvent(QMouseEvent *event)
qreal VMainGraphicsView::MinScale() qreal VMainGraphicsView::MinScale()
{ {
const QRect screenRect = QApplication::desktop()->availableGeometry(); const QRect screenRect = QApplication::desktop()->availableGeometry();
const qreal screenSize = qMax(screenRect.width(), screenRect.height()); const qreal screenSize = qMin(screenRect.width(), screenRect.height());
return screenSize / maxSceneSize; return screenSize / maxSceneSize;
} }
@ -523,7 +524,7 @@ qreal VMainGraphicsView::MinScale()
qreal VMainGraphicsView::MaxScale() qreal VMainGraphicsView::MaxScale()
{ {
const QRect screenRect = QApplication::desktop()->availableGeometry(); const QRect screenRect = QApplication::desktop()->availableGeometry();
const qreal screenSize = qMax(screenRect.width(), screenRect.height()); const qreal screenSize = qMin(screenRect.width(), screenRect.height());
return maxSceneSize / screenSize; return maxSceneSize / screenSize;
} }