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

Improve tiled PDF.

Browse Source 
Don't add scissors on bottom row. Users use them as quick guide where to cut
before joining. Scissors on the bottom row force a user to lost information
about a sheet.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-08-05 10:21:04 +03:00
parent 7e1d06a9b6
commit 5aadcd067b
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -26,6 +26,7 @@
- New options to hide all/show all visibility groups. - New options to hide all/show all visibility groups.
- New feature "Hide piece's main path". - New feature "Hide piece's main path".
- Allow controlling priority selecting pieces in layout. - Allow controlling priority selecting pieces in layout.
- No scissors on tiled PDF bottom row.
# Version 0.6.2 (unreleased) # Version 0.6.2 (unreleased)
- [#903] Bug in tool Cut Spline path. - [#903] Bug in tool Cut Spline path.

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

@ -80,6 +80,8 @@ QVector<PosterData> VPoster::Calc(const QRect &imageRect, int page, PageOrientat
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QVector<QGraphicsItem *> VPoster::Borders(QGraphicsItem *parent, const PosterData &img, int sheets) const QVector<QGraphicsItem *> VPoster::Borders(QGraphicsItem *parent, const PosterData &img, int sheets) const
{ {
SCASSERT(parent != nullptr)
QVector<QGraphicsItem *> data; QVector<QGraphicsItem *> data;
QPen pen(Qt::NoBrush, 1, Qt::DashLine); QPen pen(Qt::NoBrush, 1, Qt::DashLine);
pen.setColor(Qt::black); pen.setColor(Qt::black);
@ -97,7 +99,7 @@ QVector<QGraphicsItem *> VPoster::Borders(QGraphicsItem *parent, const PosterDat
line->setLine(rec.x(), rec.y(), rec.x(), rec.y() + rec.height()); line->setLine(rec.x(), rec.y(), rec.x(), rec.y() + rec.height());
data.append(line); data.append(line);
auto *scissors = new QGraphicsPixmapItem(QPixmap("://scissors_vertical.png"), parent); auto *scissors = new QGraphicsPixmapItem(QPixmap(QStringLiteral("://scissors_vertical.png")), parent);
scissors->setPos(rec.x(), rec.y() + rec.height()-static_cast<int>(allowance)); scissors->setPos(rec.x(), rec.y() + rec.height()-static_cast<int>(allowance));
data.append(scissors); data.append(scissors);
} }
@ -118,28 +120,17 @@ QVector<QGraphicsItem *> VPoster::Borders(QGraphicsItem *parent, const PosterDat
line->setLine(rec.x(), rec.y(), rec.x() + rec.width(), rec.y()); line->setLine(rec.x(), rec.y(), rec.x() + rec.width(), rec.y());
data.append(line); data.append(line);
auto *scissors = new QGraphicsPixmapItem(QPixmap("://scissors_horizontal.png"), parent); auto *scissors = new QGraphicsPixmapItem(QPixmap(QStringLiteral("://scissors_horizontal.png")), parent);
scissors->setPos(rec.x() + rec.width()-static_cast<int>(allowance), rec.y()); scissors->setPos(rec.x() + rec.width()-static_cast<int>(allowance), rec.y());
data.append(scissors); data.append(scissors);
} }
if (img.rows*img.columns > 1) // Bottom border (mandatory)
{ // Don't show bottom border if only one page need auto *line = new QGraphicsLineItem(parent);
// Bottom border (mandatory) line->setPen(pen);
auto *line = new QGraphicsLineItem(parent); line->setLine(rec.x(), rec.y() + rec.height()-static_cast<int>(allowance),
line->setPen(pen); rec.x() + rec.width(), rec.y() + rec.height()-static_cast<int>(allowance));
line->setLine(rec.x(), rec.y() + rec.height()-static_cast<int>(allowance), data.append(line);
rec.x() + rec.width(), rec.y() + rec.height()-static_cast<int>(allowance));
data.append(line);
if (img.row == img.rows-1)
{
auto *scissors = new QGraphicsPixmapItem(QPixmap("://scissors_horizontal.png"), parent);
scissors->setPos(rec.x() + rec.width()-static_cast<int>(allowance),
rec.y() + rec.height()-static_cast<int>(allowance));
data.append(scissors);
}
}
// Labels // Labels
auto *labels = new QGraphicsTextItem(parent); auto *labels = new QGraphicsTextItem(parent);