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

Fix bug in option Unite pages. Correcting offset.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-07-24 18:07:17 +03:00
parent 503e31aee0
commit 1bd74c7b35
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/vlayout/vlayoutgenerator.cpp
View File

@ -438,9 +438,10 @@ void VLayoutGenerator::GatherPages()
for (int i = 0; i < papers.size(); ++i) for (int i = 0; i < papers.size(); ++i)
{ {
const QRectF rec = papers.at(i).DetailsBoundingRect();
if (IsPortrait()) if (IsPortrait())
{ {
int paperHeight = qRound(papers.at(i).DetailsBoundingRect().height()); int paperHeight = qRound(rec.y() + rec.height());
if (i != papers.size()-1) if (i != papers.size()-1)
{ {
@ -462,7 +463,7 @@ void VLayoutGenerator::GatherPages()
} }
else else
{ {
int paperWidth = qRound(papers.at(i).DetailsBoundingRect().width()); int paperWidth = qRound(rec.x() + rec.width());
if (i != papers.size()-1) if (i != papers.size()-1)
{ {
@ -523,7 +524,8 @@ void VLayoutGenerator::UnitePages()
int paperHeight = 0; int paperHeight = 0;
if (autoCrop) if (autoCrop)
{ {
paperHeight = qCeil(papers.at(i).DetailsBoundingRect().height()); const QRectF rec = papers.at(i).DetailsBoundingRect();
paperHeight = qRound(rec.y() + rec.height());
} }
else else
{ {
@ -555,7 +557,8 @@ void VLayoutGenerator::UnitePages()
int paperWidth = 0; int paperWidth = 0;
if (autoCrop) if (autoCrop)
{ {
paperWidth = qCeil(papers.at(i).DetailsBoundingRect().width()); const QRectF rec = papers.at(i).DetailsBoundingRect();
paperWidth = qRound(rec.x() + rec.width());
} }
else else
{ {
@ -587,8 +590,8 @@ void VLayoutGenerator::UnitePages()
QVector<VLayoutPaper> nPapers; QVector<VLayoutPaper> nPapers;
for (int i = 0; i < nDetails.size(); ++i) for (int i = 0; i < nDetails.size(); ++i)
{ {
const int height = IsPortrait() ? qCeil(papersLength.at(i)) : PageHeight(); const int height = IsPortrait() ? qRound(papersLength.at(i)+accuracyPointOnLine*4) : PageHeight();
const int width = IsPortrait() ? PageWidth() : qCeil(papersLength.at(i)); const int width = IsPortrait() ? PageWidth() : qRound(papersLength.at(i)+accuracyPointOnLine*4);
VLayoutPaper paper(height, width, bank->GetLayoutWidth()); VLayoutPaper paper(height, width, bank->GetLayoutWidth());
paper.SetShift(shift); paper.SetShift(shift);