From 928626d6beb45764e3f34a6f28240b3acfc41829 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Jul 2019 10:10:41 +0300 Subject: [PATCH] Change starting shift value. It must be small enough to cover shape of long pieces. --HG-- branch : develop --- src/libs/vlayout/vbank.cpp | 16 ---------------- src/libs/vlayout/vbank.h | 1 - src/libs/vlayout/vlayoutgenerator.cpp | 2 +- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/libs/vlayout/vbank.cpp b/src/libs/vlayout/vbank.cpp index a8112f517..e4cc2b40b 100644 --- a/src/libs/vlayout/vbank.cpp +++ b/src/libs/vlayout/vbank.cpp @@ -665,22 +665,6 @@ bool VBank::ArrangedDetail(QMap> &container, int i) return false; } -//--------------------------------------------------------------------------------------------------------------------- -qreal VBank::DetailsBiggestEdge() const -{ - qreal edge = 0; - for(auto &piece : details) - { - const qreal pieceEdge = piece.BiggestEdge(); - if (pieceEdge > edge) - { - edge = pieceEdge; - } - } - - return edge; -} - //--------------------------------------------------------------------------------------------------------------------- bool VBank::IsRotationNeeded() const { diff --git a/src/libs/vlayout/vbank.h b/src/libs/vlayout/vbank.h index 75c678bba..d82f726fb 100644 --- a/src/libs/vlayout/vbank.h +++ b/src/libs/vlayout/vbank.h @@ -77,7 +77,6 @@ public: int ArrangedCount() const; qreal GetBiggestDiagonal() const; - qreal DetailsBiggestEdge() const; bool IsRotationNeeded() const; diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index 372f66bd4..b2b2301f8 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -127,7 +127,7 @@ void VLayoutGenerator::Generate(const QElapsedTimer &timer, qint64 timeout, Layo { if (bank->PrepareDetails()) { - SetShift(bank->DetailsBiggestEdge() + 1); + SetShift(ToPixel(1, Unit::Cm)); } else {