From 378da395fb95be995c94e98ea9d1a9d47cb40dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 6 Oct 2020 22:02:26 +0200 Subject: [PATCH] Fixed margins operators + print margins now in cm --- src/GUI/margins.h | 4 ++-- src/GUI/pdfexportdialog.cpp | 6 +++--- src/GUI/units.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/GUI/margins.h b/src/GUI/margins.h index 4cd99534..f16cd80c 100644 --- a/src/GUI/margins.h +++ b/src/GUI/margins.h @@ -20,13 +20,13 @@ private: qreal _left, _top, _right, _bottom; }; -inline MarginsF operator*(const MarginsF &margins, int factor) +inline MarginsF operator*(const MarginsF &margins, qreal factor) { return MarginsF(margins.left() * factor, margins.top() * factor, margins.right() * factor, margins.bottom() * factor); } -inline MarginsF operator/(const MarginsF &margins, int factor) +inline MarginsF operator/(const MarginsF &margins, qreal factor) { return MarginsF(margins.left() / factor, margins.top() / factor, margins.right() / factor, margins.bottom() / factor); diff --git a/src/GUI/pdfexportdialog.cpp b/src/GUI/pdfexportdialog.cpp index 3aee23ef..9e0b4a4d 100644 --- a/src/GUI/pdfexportdialog.cpp +++ b/src/GUI/pdfexportdialog.cpp @@ -59,10 +59,10 @@ PDFExportDialog::PDFExportDialog(PDFExport &exp, Units units, QWidget *parent) _landscape->setChecked(true); _margins = new MarginsFWidget(); - _margins->setUnits((units == Metric) ? tr("mm") : tr("in")); + _margins->setUnits((units == Metric) ? tr("cm") : tr("in")); _margins->setSingleStep(0.1); _margins->setValue((units == Metric) - ? _export.margins : _export.margins * MM2IN); + ? _export.margins * MM2CM : _export.margins * MM2IN); #ifndef Q_OS_MAC QGroupBox *pageSetupBox = new QGroupBox(tr("Page Setup")); @@ -129,7 +129,7 @@ void PDFExportDialog::accept() _export.resolution = resolution; _export.orientation = orientation; _export.margins = (_units == Imperial) - ? _margins->value() / MM2IN : _margins->value(); + ? _margins->value() / MM2IN : _margins->value() / MM2CM; QDialog::accept(); } diff --git a/src/GUI/units.h b/src/GUI/units.h index c8dfe401..b07ec02f 100644 --- a/src/GUI/units.h +++ b/src/GUI/units.h @@ -16,6 +16,7 @@ enum Units { #define MS2KN 1.943844490000 // m/s -> kn #define FT2MI 0.000189393939 // ft -> mi #define MM2IN 0.039370100000 // mm -> in +#define MM2CM 0.100000000000 // mm -> cm #define H2S 0.000277777778 // h -> s #define MIN2S 0.016666666667 // min -> s