diff --git a/ChangeLog.txt b/ChangeLog.txt index 60ed48280..a643c01fe 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -13,6 +13,7 @@ - [#938] Dialog Seam Allowance doesn't block user from saving broken formula. - [#939] Calling Formula Wizard through property explorer doesn't refresh formula. - [#937] Wrong symmetrical seam corners on pieces. +- [#942] Save Layout mode ignores paper format for tiled PDF. # Version 0.6.1 October 23, 2018 - [#885] Regression. Broken support for multi size measurements. diff --git a/src/app/valentina/dialogs/vabstractlayoutdialog.cpp b/src/app/valentina/dialogs/vabstractlayoutdialog.cpp index 81cb00f9d..b769629dd 100644 --- a/src/app/valentina/dialogs/vabstractlayoutdialog.cpp +++ b/src/app/valentina/dialogs/vabstractlayoutdialog.cpp @@ -81,7 +81,7 @@ void VAbstractLayoutDialog::InitTemplates(QComboBox *comboBoxTemplates) } //--------------------------------------------------------------------------------------------------------------------- -QSizeF VAbstractLayoutDialog::GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit) const +QSizeF VAbstractLayoutDialog::GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit) { qreal width = 0; qreal height = 0; @@ -155,7 +155,7 @@ QSizeF VAbstractLayoutDialog::GetTemplateSize(const PaperSizeTemplate &tmpl, con } //--------------------------------------------------------------------------------------------------------------------- -QSizeF VAbstractLayoutDialog::RoundTemplateSize(qreal width, qreal height, Unit unit) const +QSizeF VAbstractLayoutDialog::RoundTemplateSize(qreal width, qreal height, Unit unit) { qreal w = 0; qreal h = 0; diff --git a/src/app/valentina/dialogs/vabstractlayoutdialog.h b/src/app/valentina/dialogs/vabstractlayoutdialog.h index 287222420..d989c0f29 100644 --- a/src/app/valentina/dialogs/vabstractlayoutdialog.h +++ b/src/app/valentina/dialogs/vabstractlayoutdialog.h @@ -56,13 +56,14 @@ public: explicit VAbstractLayoutDialog(QWidget *parent = nullptr); + static QSizeF GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit); + protected: typedef QStringList FormatsVector; const static FormatsVector pageFormatNames; typedef int VIndexType; - QSizeF GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit) const; - QSizeF RoundTemplateSize(qreal width, qreal height, Unit unit) const; + static QSizeF RoundTemplateSize(qreal width, qreal height, Unit unit); void InitTemplates(QComboBox *comboBoxTemplates); private: diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index 06301cf90..7fcb2bbd0 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -1342,6 +1342,14 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr printer->setPaperSize (pSZ); } } + else + { + if (not m_dialogSaveLayout.isNull()) + { + VAbstractLayoutDialog::PaperSizeTemplate tiledFormat = m_dialogSaveLayout->GetTiledPageFormat(); + printer->setPaperSize (m_dialogSaveLayout->GetTemplateSize(tiledFormat, Unit::Mm), QPrinter::Millimeter); + } + } printer->setFullPage(ignorePrinterFields);