Each time when set paper size first try to find predefined template size. This

will help user undertand what paper size is setted now.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-11-09 14:29:37 +02:00
parent 9327da7a2c
commit e7e177898c
2 changed files with 53 additions and 3 deletions

View File

@ -45,7 +45,6 @@
#include <QProcess> #include <QProcess>
#include <QToolButton> #include <QToolButton>
#include <QtSvg> #include <QtSvg>
#include <QPrinter>
#include <QPrintPreviewDialog> #include <QPrintPreviewDialog>
#include <QPrintDialog> #include <QPrintDialog>
#include <QPrinterInfo> #include <QPrinterInfo>
@ -853,8 +852,16 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, bool prepareForPrin
if (not isTiled && papers.size() > 0) if (not isTiled && papers.size() > 0)
{ {
printer->setPaperSize ( QSizeF(FromPixel(paperSize.width(), Unit::Mm), const QSizeF size = QSizeF(FromPixel(paperSize.width(), Unit::Mm), FromPixel(paperSize.height(), Unit::Mm));
FromPixel(paperSize.height(), Unit::Mm)), QPrinter::Millimeter ); const QPrinter::PageSize pSZ = FindTemplate(size);
if (pSZ == QPrinter::Custom)
{
printer->setPaperSize (size, QPrinter::Millimeter );
}
else
{
printer->setPaperSize (pSZ);
}
} }
{ {
@ -894,6 +901,47 @@ bool MainWindowsNoGUI::IsLayoutGrayscale() const
return true; return true;
} }
//---------------------------------------------------------------------------------------------------------------------
QPrinter::PaperSize MainWindowsNoGUI::FindTemplate(const QSizeF &size) const
{
if (size == QSizeF(841, 1189))
{
return QPrinter::A0;
}
if (size == QSizeF(594, 841))
{
return QPrinter::A1;
}
if (size == QSizeF(420, 594))
{
return QPrinter::A2;
}
if (size == QSizeF(297, 420))
{
return QPrinter::A3;
}
if (size == QSizeF(210, 297))
{
return QPrinter::A4;
}
if (size == QSizeF(215.9, 355.6))
{
return QPrinter::Legal;
}
if (size == QSizeF(215.9, 279.4))
{
return QPrinter::Letter;
}
return QPrinter::Custom;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool MainWindowsNoGUI::isPagesUniform() const bool MainWindowsNoGUI::isPagesUniform() const
{ {

View File

@ -30,6 +30,7 @@
#define MAINWINDOWSNOGUI_H #define MAINWINDOWSNOGUI_H
#include <QMainWindow> #include <QMainWindow>
#include <QPrinter>
#include "../vpatterndb/vdetail.h" #include "../vpatterndb/vdetail.h"
#include "../vlayout/vlayoutdetail.h" #include "../vlayout/vlayoutdetail.h"
@ -123,6 +124,7 @@ private:
void SetPrinterSettings(QPrinter *printer, bool prepareForPrinting = true); void SetPrinterSettings(QPrinter *printer, bool prepareForPrinting = true);
bool IsLayoutGrayscale() const; bool IsLayoutGrayscale() const;
QPrinter::PaperSize FindTemplate(const QSizeF &size) const;
bool isPagesUniform() const; bool isPagesUniform() const;
QString FileName() const; QString FileName() const;