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

Merge branch 'develop' into 83-export-drawing

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-12-22 13:19:40 +02:00
parent 03ec38f2c3
commit 8405ff3c6d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/valentina/mainwindowsnogui.cpp
View File

@ -852,8 +852,9 @@ void MainWindowsNoGUI::PrintPages(QPrinter *printer)
// Get printer rect acording to our dpi. // Get printer rect acording to our dpi.
const QRectF printerPageRect(0, 0, ToPixel(printer->pageRect(QPrinter::Millimeter).width(), Unit::Mm), const QRectF printerPageRect(0, 0, ToPixel(printer->pageRect(QPrinter::Millimeter).width(), Unit::Mm),
ToPixel(printer->pageRect(QPrinter::Millimeter).height(), Unit::Mm)); ToPixel(printer->pageRect(QPrinter::Millimeter).height(), Unit::Mm));
const double xscale = printer->pageRect().width() / printerPageRect.width(); const QRect pageRect = printer->pageLayout().paintRectPixels(printer->resolution());
const double yscale = printer->pageRect().height() / printerPageRect.height(); const double xscale = pageRect.width() / printerPageRect.width();
const double yscale = pageRect.height() / printerPageRect.height();
QPainter painter; QPainter painter;
if (not painter.begin(printer)) if (not painter.begin(printer))
@ -1251,7 +1252,7 @@ void MainWindowsNoGUI::PdfTiledFile(const QString &name)
SetPrinterSettings(&printer, PrintType::PrintPDF); SetPrinterSettings(&printer, PrintType::PrintPDF);
// Call IsPagesFit after setting a printer settings and check if pages is not bigger than printer's paper size // Call IsPagesFit after setting a printer settings and check if pages is not bigger than printer's paper size
if (not isTiled && not IsPagesFit(printer.paperRect().size())) if (not isTiled && not IsPagesFit(printer.pageLayout().paintRectPixels(printer.resolution()).size()))
{ {
qWarning()<<tr("Pages will be cropped because they do not fit printer paper size."); qWarning()<<tr("Pages will be cropped because they do not fit printer paper size.");
} }
@ -1408,7 +1409,7 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr
printer->setCreator(QGuiApplication::applicationDisplayName()+QChar(QChar::Space)+ printer->setCreator(QGuiApplication::applicationDisplayName()+QChar(QChar::Space)+
QCoreApplication::applicationVersion()); QCoreApplication::applicationVersion());
printer->setOrientation(isLayoutPortrait ? QPrinter::Portrait : QPrinter::Landscape); printer->setPageOrientation(isLayoutPortrait ? QPageLayout::Portrait : QPageLayout::Landscape);
if (not isTiled) if (not isTiled)
{ {