kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 00:30:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor to more QRectF to be more compatible with QPrinter. #5

Browse Source
This commit is contained in:
Pascal Sander
2025-08-30 12:08:54 +02:00
parent 27b21b38aa
commit 84ac394d3b
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sources/print/projectprintwindow.cpp
View File

@@ -254,7 +254,7 @@ void ProjectPrintWindow::printDiagram(Diagram *diagram, bool fit_page, QPainter
auto full_page = printer->fullPage(); auto full_page = printer->fullPage();
auto diagram_rect = diagramRect(diagram, option); auto diagram_rect = QRectF(diagramRect(diagram, option));
if (fit_page) { if (fit_page) {
diagram->render(painter, QRectF(), diagram_rect, Qt::KeepAspectRatio); diagram->render(painter, QRectF(), diagram_rect, Qt::KeepAspectRatio);
} else { } else {
@@ -266,41 +266,38 @@ void ProjectPrintWindow::printDiagram(Diagram *diagram, bool fit_page, QPainter
#pragma message("@TODO remove code for QT 6 or later") #pragma message("@TODO remove code for QT 6 or later")
#endif #endif
qDebug()<<"Help code for QT 6 or later"; qDebug()<<"Help code for QT 6 or later";
auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) : printer->pageRect(QPrinter::Millimeter); auto printed_rect = full_page ? printer->paperRect(QPrinter::Millimeter) :
printer->pageRect(QPrinter::Millimeter);
#endif #endif
auto used_width = printed_rect.width(); auto used_width = printed_rect.width();
auto used_height = printed_rect.height(); auto used_height = printed_rect.height();
auto h_pages_count = horizontalPagesCount(diagram, option, full_page); auto h_pages_count = horizontalPagesCount(diagram, option, full_page);
auto v_pages_count = verticalPagesCount(diagram, option, full_page); auto v_pages_count = verticalPagesCount(diagram, option, full_page);
QVector<QVector<QRect>> page_grid; QVector<QVector<QRectF>> page_grid;
// The diagram is printed on a matrix of sheet // The diagram is printed on a matrix of sheet
// scrolls through the rows of the matrix // scrolls through the rows of the matrix
auto y_offset = 0; auto y_offset = 0;
for (auto i = 0; i < v_pages_count; ++i) for (auto i = 0; i < v_pages_count; ++i)
{ {
page_grid << QVector<QRect>(); page_grid << QVector<QRectF>();
// scrolls through the lines of sheet // scrolls through the lines of sheet
auto x_offset = 0; auto x_offset = 0;
for (auto j=0 ; j<h_pages_count ; ++j) for (auto j=0 ; j<h_pages_count ; ++j)
{ {
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove page_grid.last() << QRectF(
page_grid.last() << QRect(QPoint(x_offset, y_offset), QPoint(x_offset, y_offset),
QSize(qMin(used_width, diagram_rect.width() - x_offset), QSize(
qMin(used_width, diagram_rect.width() - x_offset),
qMin(used_height, diagram_rect.height() - y_offset))); qMin(used_height, diagram_rect.height() - y_offset)));
#else
#if TODO_LIST
#pragma message("@TODO remove code for QT 6 or later")
#endif
qDebug()<<"Help code for QT 6 or later";
#endif
x_offset += used_width; x_offset += used_width;
} }
y_offset += used_height; y_offset += used_height;
} }
// Retains only the pages to be printed // Retains only the pages to be printed
QVector<QRect> page_to_print; QVector<QRectF> page_to_print;
for (auto i=0 ; i < v_pages_count ; ++i) { for (auto i=0 ; i < v_pages_count ; ++i) {
for (int j=0 ; j < h_pages_count ; ++j) { for (int j=0 ; j < h_pages_count ; ++j) {
page_to_print << page_grid.at(i).at(j); page_to_print << page_grid.at(i).at(j);
@@ -309,10 +306,14 @@ void ProjectPrintWindow::printDiagram(Diagram *diagram, bool fit_page, QPainter
// Scrolls through the page for print // Scrolls through the page for print
bool first_ = true; bool first_ = true;
for (auto page : page_to_print) for (auto& page : page_to_print)
{ {
first_ ? first_ = false : m_printer->newPage(); first_ ? first_ = false : m_printer->newPage();
diagram->render(painter, QRect(QPoint(0,0), page.size()), page.translated(diagram_rect.topLeft()), Qt::KeepAspectRatio); diagram->render(
painter,
QRectF(QPoint(0, 0), page.size()),
page.translated(diagram_rect.topLeft()),
Qt::KeepAspectRatio);
} }
} }