diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp index 823c21d0..2f426a46 100644 --- a/src/adaptors/UBExportFullPDF.cpp +++ b/src/adaptors/UBExportFullPDF.cpp @@ -211,7 +211,8 @@ bool UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS // If the PDF was scaled when added to the scene (e.g if it was loaded from a document with a different DPI // than the current one), it should also be scaled here. qreal currentDpi = (UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY()) / 2; - qreal pdfScale = qreal(UBSettings::pageDpi)/currentDpi; + qreal documentDpi = pDocumentProxy->pageDpi(); + qreal pdfScale = documentDpi != 0 ? documentDpi/currentDpi : 1; TransformationDescription pdfTransform(xPdfOffset, yPdfOffset, scaleFactor * pdfScale, 0); TransformationDescription annotationTransform(xAnnotationsOffset, yAnnotationsOffset, 1, 0); diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 733a9e49..9e0cbd92 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -334,7 +334,7 @@ QUuid UBSvgSubsetAdaptor::sceneUuid(UBDocumentProxy* proxy, const int pageIndex) UBGraphicsScene* UBSvgSubsetAdaptor::loadScene(UBDocumentProxy* proxy, const QByteArray& pArray) { UBSvgSubsetReader reader(proxy, UBTextTools::cleanHtmlCData(QString(pArray)).toUtf8()); - return reader.loadScene(); + return reader.loadScene(proxy); } UBSvgSubsetAdaptor::UBSvgSubsetReader::UBSvgSubsetReader(UBDocumentProxy* pProxy, const QByteArray& pXmlData) @@ -347,7 +347,7 @@ UBSvgSubsetAdaptor::UBSvgSubsetReader::UBSvgSubsetReader(UBDocumentProxy* pProxy } -UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() +UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene(UBDocumentProxy* proxy) { qDebug() << "loadScene() : starting reading..."; QTime time; @@ -435,9 +435,9 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() QStringRef pageDpi = mXmlReader.attributes().value("pageDpi"); if (!pageDpi.isNull()) - UBSettings::pageDpi = pageDpi.toInt(); + proxy->setPageDpi(pageDpi.toInt()); else - UBSettings::pageDpi = (UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY())/2; + proxy->setPageDpi((UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY())/2); bool darkBackground = false; bool crossedBackground = false; @@ -769,7 +769,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() QDesktopWidget* desktop = UBApplication::desktop(); qreal currentDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; qDebug() << "currentDpi (" << desktop->physicalDpiX() << " + " << desktop->physicalDpiY() << ")/2 = " << currentDpi; - qreal pdfScale = qreal(UBSettings::pageDpi)/currentDpi; + qreal pdfScale = qreal(proxy->pageDpi())/currentDpi; qDebug() << "pdfScale " << pdfScale; pdfItem->setScale(pdfScale); pdfItem->setFlag(QGraphicsItem::ItemIsMovable, true); @@ -829,7 +829,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() { QDesktopWidget* desktop = UBApplication::desktop(); qreal currentDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; - qreal textSizeMultiplier = qreal(UBSettings::pageDpi)/currentDpi; + qreal textSizeMultiplier = qreal(proxy->pageDpi())/currentDpi; //textDelegate->scaleTextSize(textSizeMultiplier); } @@ -1013,7 +1013,7 @@ QGraphicsItem *UBSvgSubsetAdaptor::UBSvgSubsetReader::readElementFromGroup() void UBSvgSubsetAdaptor::persistScene(UBDocumentProxy* proxy, UBGraphicsScene* pScene, const int pageIndex) { UBSvgSubsetWriter writer(proxy, pScene, pageIndex); - writer.persistScene(pageIndex); + writer.persistScene(proxy, pageIndex); } @@ -1027,7 +1027,7 @@ UBSvgSubsetAdaptor::UBSvgSubsetWriter::UBSvgSubsetWriter(UBDocumentProxy* proxy, } -void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement() +void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement(UBDocumentProxy* proxy) { mXmlWriter.writeStartElement("svg"); @@ -1053,10 +1053,11 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement() QDesktopWidget* desktop = UBApplication::desktop(); - if (UBSettings::pageDpi == 0) - UBSettings::pageDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; + if (proxy->pageDpi() == 0) + proxy->setPageDpi((desktop->physicalDpiX() + desktop->physicalDpiY()) / 2); + + mXmlWriter.writeAttribute("pageDpi", QString::number(proxy->pageDpi())); - mXmlWriter.writeAttribute("pageDpi", QString::number(UBSettings::pageDpi)); mXmlWriter.writeStartElement("rect"); mXmlWriter.writeAttribute("fill", mScene->isDarkBackground() ? "black" : "white"); @@ -1068,7 +1069,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement() mXmlWriter.writeEndElement(); } -bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) +bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(UBDocumentProxy* proxy, int pageIndex) { Q_UNUSED(pageIndex); @@ -1089,7 +1090,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) mXmlWriter.writeNamespace(UBSettings::uniboardDocumentNamespaceUri, "ub"); mXmlWriter.writeNamespace(nsXHtml, "xhtml"); - writeSvgElement(); + writeSvgElement(proxy); // Get the items from the scene QList items = mScene->items(); diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index e081e6a4..48e3b1d7 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -114,7 +114,7 @@ class UBSvgSubsetAdaptor virtual ~UBSvgSubsetReader(){} - UBGraphicsScene* loadScene(); + UBGraphicsScene* loadScene(UBDocumentProxy *proxy); private: @@ -180,7 +180,7 @@ class UBSvgSubsetAdaptor UBSvgSubsetWriter(UBDocumentProxy* proxy, UBGraphicsScene* pScene, const int pageIndex); - bool persistScene(int pageIndex); + bool persistScene(UBDocumentProxy *proxy, int pageIndex); virtual ~UBSvgSubsetWriter(){} @@ -249,7 +249,7 @@ class UBSvgSubsetAdaptor void protractorToSvg(UBGraphicsProtractor *item); void cacheToSvg(UBGraphicsCache* item); void triangleToSvg(UBGraphicsTriangle *item); - void writeSvgElement(); + void writeSvgElement(UBDocumentProxy *proxy); private: diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 7943066f..c344908a 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -112,8 +112,6 @@ const int UBSettings::longClickInterval = 1200; const qreal UBSettings::minScreenRatio = 1.33; // 800/600 or 1024/768 -int UBSettings::pageDpi = 0; - QStringList UBSettings::bitmapFileExtensions; QStringList UBSettings::vectoFileExtensions; QStringList UBSettings::imageFileExtensions; @@ -274,8 +272,6 @@ void UBSettings::init() pageSize = new UBSetting(this, "Board", "DefaultPageSize", documentSizes.value(DocumentSizeRatio::Ratio4_3)); - pageDpi = (UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY())/ 2; - QStringList penLightBackgroundColors; penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#FFDD00" << "#C87400" << "#800040" << "#008080" << "#5F2D0A" << "#FFFFFF"; boardPenLightBackgroundColors = new UBColorListSetting(this, "Board", "PenLightBackgroundColors", penLightBackgroundColors, 1.0); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 7b676e96..9d04f0dc 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -232,8 +232,6 @@ class UBSettings : public QObject static QString appPingMessage; - static int pageDpi; - UBSetting* productWebUrl; QString softwareHomeUrl; diff --git a/src/document/UBDocumentProxy.cpp b/src/document/UBDocumentProxy.cpp index cd5847d3..f90e6286 100644 --- a/src/document/UBDocumentProxy.cpp +++ b/src/document/UBDocumentProxy.cpp @@ -41,6 +41,7 @@ UBDocumentProxy::UBDocumentProxy() : mPageCount(0) + , mPageDpi(0) { init(); } @@ -48,6 +49,7 @@ UBDocumentProxy::UBDocumentProxy() UBDocumentProxy::UBDocumentProxy(const QString& pPersistancePath) : mPageCount(0) + , mPageDpi(0) { init(); setPersistencePath(pPersistancePath); @@ -98,6 +100,15 @@ void UBDocumentProxy::setPageCount(int pPageCount) mPageCount = pPageCount; } +int UBDocumentProxy::pageDpi() +{ + return mPageDpi; +} + +void UBDocumentProxy::setPageDpi(int dpi) +{ + mPageDpi = dpi; +} int UBDocumentProxy::incPageCount() { diff --git a/src/document/UBDocumentProxy.h b/src/document/UBDocumentProxy.h index bb9d7794..3012b6a3 100644 --- a/src/document/UBDocumentProxy.h +++ b/src/document/UBDocumentProxy.h @@ -79,6 +79,9 @@ class UBDocumentProxy : public QObject int pageCount(); + int pageDpi(); + void setPageDpi(int dpi); + protected: void setPageCount(int pPageCount); int incPageCount(); @@ -96,6 +99,8 @@ class UBDocumentProxy : public QObject int mPageCount; + int mPageDpi; + }; inline bool operator==(const UBDocumentProxy &proxy1, const UBDocumentProxy &proxy2)