medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change paper sizes to QSizeF

Browse source
This commit is contained in:
Anton Thomasson 2021-07-31 12:52:33 +02:00
parent b5b15236f8
commit ebdfa9e4ee
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/convertworker.cpp
View file

@ -193,9 +193,9 @@ try {
qDebug() << "Unsupported paper size" << PaperSize; qDebug() << "Unsupported paper size" << PaperSize;
throw ConvertFailedException(tr("Unsupported paper size")); throw ConvertFailedException(tr("Unsupported paper size"));
} }
QPair<float,float> wh = PaperSizes[PaperSize]; QSizeF size = PaperSizes[PaperSize];
quint32 Width = qRound(wh.first/25.4*HwResX); quint32 Width = qRound(size.width()/25.4*HwResX);
quint32 Height = qRound(wh.second/25.4*HwResY); quint32 Height = qRound(size.height()/25.4*HwResY);
qDebug() << "Size is" << Width << "x" << Height; qDebug() << "Size is" << Width << "x" << Height;
@ -228,7 +228,7 @@ try {
tmpPdfFile.open(); tmpPdfFile.open();
QPdfWriter pdfWriter(tmpPdfFile.fileName()); QPdfWriter pdfWriter(tmpPdfFile.fileName());
pdfWriter.setCreator("SeaPrint " SEAPRINT_VERSION); pdfWriter.setCreator("SeaPrint " SEAPRINT_VERSION);
QPageSize pageSize(QSizeF {wh.first, wh.second}, QPageSize::Millimeter); QPageSize pageSize(size, QPageSize::Millimeter);
pdfWriter.setPageSize(pageSize); pdfWriter.setPageSize(pageSize);
pdfWriter.setResolution(HwResX); pdfWriter.setResolution(HwResX);
QPainter painter(&pdfWriter); QPainter painter(&pdfWriter);
@ -452,7 +452,7 @@ try {
qDebug() << "Unsupported paper size" << PaperSize; qDebug() << "Unsupported paper size" << PaperSize;
throw ConvertFailedException(tr("Unsupported paper size")); throw ConvertFailedException(tr("Unsupported paper size"));
} }
QPair<float,float> wh = PaperSizes[PaperSize]; QSizeF size = PaperSizes[PaperSize];
QFile inFile(filename); QFile inFile(filename);
if(!inFile.open(QIODevice::ReadOnly)) if(!inFile.open(QIODevice::ReadOnly))
@ -467,7 +467,7 @@ try {
QPdfWriter pdfWriter(tmpPdfFile.fileName()); QPdfWriter pdfWriter(tmpPdfFile.fileName());
pdfWriter.setCreator("SeaPrint " SEAPRINT_VERSION); pdfWriter.setCreator("SeaPrint " SEAPRINT_VERSION);
QPageSize pageSize(QSizeF {wh.first, wh.second}, QPageSize::Millimeter); QPageSize pageSize(size, QPageSize::Millimeter);
pdfWriter.setPageSize(pageSize); pdfWriter.setPageSize(pageSize);
pdfWriter.setResolution(resolution); pdfWriter.setResolution(resolution);

4
src/ippprinter.cpp
View file

@ -521,8 +521,8 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
return; return;
} }
int x = PaperSizes[PaperSize].first*100; int x = PaperSizes[PaperSize].width()*100;
int y = PaperSizes[PaperSize].second*100; int y = PaperSizes[PaperSize].height()*100;
QJsonObject Dimensions = QJsonObject Dimensions =
{{"tag", IppMsg::BeginCollection}, {{"tag", IppMsg::BeginCollection},

4
src/papersizes.h
View file

@ -1,9 +1,9 @@
#ifndef PAPERSIZES_H #ifndef PAPERSIZES_H
#define PAPERSIZES_H #define PAPERSIZES_H
#include <QMap> #include <QMap>
#include <QPair> #include <QSizeF>
static QMap<QString, QPair<float,float>> PaperSizes = static QMap<QString, QSizeF> PaperSizes =
{{"asme_f_28x40in", {711.20, 1016.00}}, {{"asme_f_28x40in", {711.20, 1016.00}},
{"iso_2a0_1189x1682mm", {1189.00, 1682.00}}, {"iso_2a0_1189x1682mm", {1189.00, 1682.00}},
{"iso_a0_841x1189mm", {841.00, 1189.00}}, {"iso_a0_841x1189mm", {841.00, 1189.00}},