mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Custom size printing has been changed

Browse Source
This commit is contained in:
Arin Alexander 2019-08-29 22:17:34 +03:00
parent 6af025471b
commit 872a2219e0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/lrpageitemdesignintf.cpp
View File

@ -681,8 +681,8 @@ QSizeF PageItemDesignIntf::getRectByPageSize(const PageSize& size)
printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFormat(QPrinter::PdfFormat);
printer.setOrientation((QPrinter::Orientation)pageOrientation()); printer.setOrientation((QPrinter::Orientation)pageOrientation());
printer.setPaperSize((QPrinter::PageSize)size); printer.setPaperSize((QPrinter::PageSize)size);
return QSizeF(printer.paperSize(QPrinter::Millimeter).width() * 10, return QSizeF(printer.paperSize(QPrinter::Millimeter).width() * LimeReport::Const::mmFACTOR,
printer.paperSize(QPrinter::Millimeter).height() * 10); printer.paperSize(QPrinter::Millimeter).height() * LimeReport::Const::mmFACTOR);
} }
else { else {

7
limereport/lrreportengine.cpp
View File

@ -1812,7 +1812,6 @@ bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page)
renderPage.render(m_painter, m_printer->pageRect(), currentPrintingRect); renderPage.render(m_painter, m_printer->pageRect(), currentPrintingRect);
currentPrintingRect.adjust(printerPageRect.size().width(), 0, printerPageRect.size().width(), 0); currentPrintingRect.adjust(printerPageRect.size().width(), 0, printerPageRect.size().width(), 0);
curWidth += printerPageRect.size().width(); curWidth += printerPageRect.size().width();
} }
pageHeight -= printerPageRect.size().height(); pageHeight -= printerPageRect.size().height();
curHeight += printerPageRect.size().height(); curHeight += printerPageRect.size().height();
@ -1822,7 +1821,10 @@ bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page)
} }
} else { } else {
renderPage.render(m_painter); QRectF source = page->geometry();
QSizeF inchSize = source.size() / (100 * 2.54);
QRectF target = QRectF(QPoint(0,0), inchSize * m_printer->resolution());
renderPage.render(m_painter, target, source);
} }
page->setPos(backupPagePos); page->setPos(backupPagePos);
return true; return true;
@ -1843,6 +1845,7 @@ void PrintProcessor::initPrinter(PageItemDesignIntf* page)
m_printer->setPaperSize(pageSize,QPrinter::Millimeter); m_printer->setPaperSize(pageSize,QPrinter::Millimeter);
} else { } else {
m_printer->setFullPage(page->fullPage()); m_printer->setFullPage(page->fullPage());
m_printer->setPageMargins(0,0,0,0, QPrinter::Millimeter);
m_printer->setOrientation(static_cast<QPrinter::Orientation>(page->pageOrientation())); m_printer->setOrientation(static_cast<QPrinter::Orientation>(page->pageOrientation()));
if (page->pageSize()==PageItemDesignIntf::Custom){ if (page->pageSize()==PageItemDesignIntf::Custom){
QSizeF pageSize = (page->pageOrientation()==PageItemDesignIntf::Landscape)? QSizeF pageSize = (page->pageOrientation()==PageItemDesignIntf::Landscape)?