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

Don't show bottom border if only one page need to print.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-04-15 12:10:35 +03:00
parent d7d1c0b78a
commit 8bfc9d1ca3
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/vlayout/vposter.cpp
View File

@ -153,9 +153,13 @@ QImage VPoster::Cut(int i, int j, const QImage &image) const
if (not image.rect().contains(copyRect)) if (not image.rect().contains(copyRect))
{ {
// Create full page with white background
QImage fullPage(copyRect.size(), image.format()); QImage fullPage(copyRect.size(), image.format());
fullPage.fill(Qt::white); fullPage.fill(Qt::white);
// Real size that we can copy from image.
// Because in areas beyond the image, pixels are set to 0 by copy() method.
// For 32-bit RGB images, this means black.
copyRect = image.rect().intersected(copyRect); copyRect = image.rect().intersected(copyRect);
QPainter painter(&fullPage); QPainter painter(&fullPage);
@ -197,13 +201,16 @@ QImage VPoster::Borders(int rows, int colomns, int i, int j, QImage &image, int
painter.drawImage(QPoint(image.rect().width()-allowence, 0), QImage("://scissors_horizontal.png")); painter.drawImage(QPoint(image.rect().width()-allowence, 0), QImage("://scissors_horizontal.png"));
} }
// Bottom border (mandatory) if (rows*colomns > 1)
painter.drawLine(QLine(0, image.rect().height()-allowence, { // Don't show bottom border if only one page need
image.rect().width(), image.rect().height()-allowence)); // Bottom border (mandatory)
if (i == rows-1) painter.drawLine(QLine(0, image.rect().height()-allowence,
{ image.rect().width(), image.rect().height()-allowence));
painter.drawImage(QPoint(image.rect().width()-allowence, image.rect().height()-allowence), if (i == rows-1)
QImage("://scissors_horizontal.png")); {
painter.drawImage(QPoint(image.rect().width()-allowence, image.rect().height()-allowence),
QImage("://scissors_horizontal.png"));
}
} }
// Labels // Labels
@ -225,7 +232,9 @@ QImage VPoster::Borders(int rows, int colomns, int i, int j, QImage &image, int
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QRect VPoster::PageRect() const QRect VPoster::PageRect() const
{ {
// Because the Point unit is defined to be 1/72th of an inch
// we can't use method pageRect(QPrinter::Point). Our dpi different can be different.
// We convert value yourself to pixels.
const QRectF rect = printer->pageRect(QPrinter::Millimeter); const QRectF rect = printer->pageRect(QPrinter::Millimeter);
QRect pageRect(qFloor(ToPixel(rect.x())), qFloor(ToPixel(rect.y())), qFloor(ToPixel(rect.width())), QRect pageRect(qFloor(ToPixel(rect.x())), qFloor(ToPixel(rect.y())), qFloor(ToPixel(rect.width())),
qFloor(ToPixel(rect.height()))); qFloor(ToPixel(rect.height())));