Merge pull request #141 from saeugetier/feature/140-get-rid-of-hard-c…

…oded-print-size

Feature/140 get rid of hard coded print size

XmlData.xml

@@ -6,6 +6,7 @@
         <icon>SingleNoPrint.svg</icon>
         <background>WhiteBackground.png</background>
         <foreground>ExampleForeground.png</foreground>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.0" y="0.0"/><size width="1.0" height="1.0"/></image>
         </images>
@@ -14,6 +15,7 @@
         <name>Single Image</name>
         <icon>Single.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.0" y="0.0"/><size width="1.0" height="1.0"/></image>
         </images>
@@ -22,6 +24,7 @@
         <name>Two Images</name>
         <icon>Double.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image>
                 <position x="0.0" y="0.0"/><size width="0.5" height="1.0"/>
@@ -38,6 +41,7 @@
         <name>Four Images</name>
         <icon>Four.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.0" y="0.0"/><size width="0.5" height="0.5"/></image>
             <image><position x="0.5" y="0.0"/><size width="0.5" height="0.5"/></image>
@@ -49,6 +53,7 @@
         <name>Four Images with Background</name>
         <icon>FourStars.svg</icon>
         <background>StarsBackground.jpg</background>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.05" y="0.05"/><size width="0.4" height="0.4"/></image>
             <image><position x="0.55" y="0.05"/><size width="0.4" height="0.4"/></image>
@@ -60,6 +65,7 @@
         <name>Four Images Border</name>
         <icon>FourBorder.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image>
                 <position x="0.0" y="0.0"/><size width="0.5" height="0.5"/>

qml/CollageMenu.qml

@@ -13,8 +13,8 @@ CollageMenuForm {
     signal exit
 
     printButton.enabled: !printer.busy
-    property real printerHeight : printer.getPrintSize().height
-    property real printerWidth : printer.getPrintSize().width
+    property real printerHeight : form.collageImage.imageModel.collagePixelSize.height
+    property real printerWidth : form.collageImage.imageModel.collagePixelSize.width
     printerRatio:  printerHeight / printerWidth
 
     nextButton.onClicked:
@@ -33,8 +33,9 @@ CollageMenuForm {
         var cleanPath = decodeURIComponent(path);
         console.log(cleanPath)
         var filename = cleanPath + "/collage/Coll_"+ new Date().toLocaleString(locale, "dd_MM_yyyy_hh_mm_ss") + ".png"
-        collageRenderer.saveImage(filename, printer.getPrintSize())
-        console.log("Collage rendered")
+        collageRenderer.saveImage(filename, form.collageImage.imageModel.collagePixelSize)
+        console.log("Collage rendered width: " + Number(form.collageImage.imageModel.collagePixelSize.width).toString()
+                    + " height: " + form.collageImage.imageModel.collagePixelSize.height)
     }
 
     collageRenderer.onSavingChanged:

src/abstractprinter.h

@@ -18,7 +18,6 @@ class AbstractPrinter : public QObject
     Q_PROPERTY(bool busy READ busy NOTIFY busyChanged)
 public:
     explicit AbstractPrinter(QObject *parent = nullptr) : QObject(parent) {};
-    Q_INVOKABLE virtual QSize getPrintSize() = 0;
     Q_INVOKABLE virtual bool printerOnline() = 0;
     virtual bool busy() = 0;
 signals:

src/collageimagemodel.cpp

@@ -37,6 +37,12 @@ bool CollageImageModel::parseXml(const QDomNode& node)
         mLine = element.lineNumber();
         return false;
     }
+    else
+    {
+        mErrorMsg = "at least one background nodes required";
+        mLine = element.lineNumber();
+        return false;
+    }
 
     QDomNodeList foregroundNode = element.elementsByTagName("foreground");
     if(foregroundNode.count() == 1)
@@ -50,6 +56,44 @@ bool CollageImageModel::parseXml(const QDomNode& node)
         return false;
     }
 
+    QDomElement sizeElement = element.firstChildElement("size");
+    if(sizeElement.isElement())
+    {
+        if(sizeElement.hasAttributes() && sizeElement.toElement().hasAttribute("width") && sizeElement.toElement().hasAttribute("height"))
+        {
+            bool ok;
+            QString x = sizeElement.toElement().attribute("width");
+            mPixelSize.setWidth(x.toInt(&ok));
+            if(!ok)
+            {
+                mErrorMsg = "size 'width' must be defined as float";
+                mLine = sizeElement.lineNumber();
+                return false;
+            }
+
+            QString y = sizeElement.toElement().attribute("height");
+            mPixelSize.setHeight(y.toInt(&ok));
+            if(!ok)
+            {
+                mErrorMsg = "size 'height' must be defined as float";
+                mLine = sizeElement.lineNumber();
+                return false;
+            }
+        }
+        else
+        {
+            mErrorMsg = "size must be defined be 'width' and 'height' attributes";
+            mLine = sizeElement.lineNumber();
+            return false;
+        }
+    }
+    else
+    {
+        mErrorMsg = "at least one size nodes required";
+        mLine = element.lineNumber();
+        return false;
+    }
+
     QDomNodeList imagesNode = element.elementsByTagName("images");
     if(imagesNode.length() != 1)
     {
@@ -231,6 +275,11 @@ bool CollageImageModel::collageFull()
         return false;
 }
 
+QSize CollageImageModel::collagePixelSize() const
+{
+    return mPixelSize;
+}
+
 bool CollageImageModel::nextImageIsEffectSelectable()
 {
     if(!collageFull())

src/collageimagemodel.h

@@ -52,10 +52,11 @@ class CollageImage : public QObject, public ModelParser
 class CollageImageModel : public QAbstractListModel, public ModelParser
 {
     Q_OBJECT
-    Q_PROPERTY(QUrl backgroundImage READ backgroundImage NOTIFY backgroundImageChanged)
-    Q_PROPERTY(QUrl foregroundImage READ foregroundImage NOTIFY foregroundImageChanged)
-    Q_PROPERTY(int countImagePathSet READ countImagePathSet NOTIFY countImagePatchSetChanged)
+    Q_PROPERTY(QUrl backgroundImage READ backgroundImage)
+    Q_PROPERTY(QUrl foregroundImage READ foregroundImage)
+    Q_PROPERTY(int countImagePathSet READ countImagePathSet)
     Q_PROPERTY(bool collageFull READ collageFull NOTIFY collageFullChanged)
+    Q_PROPERTY(QSize collagePixelSize READ collagePixelSize)
 public:
     enum ImageRoles {
         ImagePathRole = Qt::UserRole + 1,
@@ -81,16 +82,15 @@ class CollageImageModel : public QAbstractListModel, public ModelParser
     Q_INVOKABLE bool collageFull();
     Q_INVOKABLE bool nextImageIsEffectSelectable();
     Q_INVOKABLE QString nextImageEffectPreset();
+    Q_INVOKABLE QSize collagePixelSize() const;
     int countImagePathSet() const;
 signals:
-    void backgroundImageChanged(const QUrl &image);
-    void foregroundImageChanged(const QUrl &image);
-    void countImagePatchSetChanged(const int &count);
     void collageFullChanged(bool full);
 protected:
     QList<CollageImage*> mImages;
     QUrl mBackgroundImage;
     QUrl mForegroundImage;
+    QSize mPixelSize;
 };
 
 #endif // COLLAGEIMAGEMODEL_H

src/fakeprinter.cpp

@@ -6,11 +6,6 @@ FakePrinter::FakePrinter(QObject *parent) : AbstractPrinter(parent)
     QObject::connect(&mBusyTimer, SIGNAL(timeout()), this, SLOT(busyTimeout()));
 };
 
-QSize FakePrinter::getPrintSize()
-{
-    return QSize(3570,2380); //hard coded pixel size
-}
-
 bool FakePrinter::printerOnline()
 {
     return true;

src/fakeprinter.h

@@ -10,7 +10,6 @@ class FakePrinter : public AbstractPrinter, public PrinterList<FakePrinter>
     Q_OBJECT
     Q_INTERFACES(AbstractPrinter)
 public:
-    QSize getPrintSize() override;
     bool printerOnline() override;
     bool busy() override;
     int printImage(const QString &filename, int copyCount) override;

src/main.cpp

@@ -75,7 +75,14 @@ void redirectDebugMessages(QtMsgType type, const QMessageLogContext & context, c
     QTextStream ts(&outFile);
     ts << datetime << txt << context.file << str << endl;
 
-    std::cout << datetime.toStdString() <<  " - " << txt.toStdString() << " - " << context.file << "(" << context.line << ") - " << str.toStdString() << std::endl;
+    if(context.file != nullptr && context.line != 0)
+    {
+        std::cout << datetime.toStdString() <<  " - " << txt.toStdString() << " - " << context.file << "(" << context.line << ") - " << str.toStdString() << std::endl;
+    }
+    else
+    {
+        std::cout << datetime.toStdString() <<  " - " << txt.toStdString() << " - " << str.toStdString() << std::endl;
+    }
 
     //close fd
     outFile.close();

src/noprinter.cpp

@@ -1,10 +1,5 @@
 #include "noprinter.h"
 
-QSize NoPrinter::getPrintSize()
-{
-    return QSize(3570,2380); //hard coded pixel size
-}
-
 bool NoPrinter::printerOnline()
 {
     return false;

src/noprinter.h

@@ -9,7 +9,6 @@ class NoPrinter : public AbstractPrinter, public PrinterList<NoPrinter>
     Q_OBJECT
     Q_INTERFACES(AbstractPrinter)
 public:
-    QSize getPrintSize() override;
     bool printerOnline() override;
     bool busy() override;
     int printImage(const QString &filename, int copyCount) override;

src/selphyprinter.cpp

@@ -41,12 +41,6 @@ bool SelphyPrinter::printerOnline()
     }
 }
 
-
-QSize SelphyPrinter::getPrintSize()
-{
-    return QSize(3570,2380); //hard coded pixel size
-}
-
 int SelphyPrinter::printImage(const QString &filename, int copyCount)
 {
     if(mIp.length() > 0)

src/selphyprinter.h

@@ -10,7 +10,6 @@ class SelphyPrinter : public AbstractPrinter, public PrinterList<SelphyPrinter>
     Q_OBJECT
     Q_INTERFACES(AbstractPrinter)
 public:
-    Q_INVOKABLE QSize getPrintSize();
     Q_INVOKABLE bool printerOnline();
     bool busy();
 public slots:

src/standardprinter.cpp

@@ -3,11 +3,6 @@
 #include <QDebug>
 #include <QPainter>
 
-QSize StandardPrinter::getPrintSize()
-{
-    return QSize(3570,2380); //hard coded pixel size @TODO
-}
-
 bool StandardPrinter::printerOnline()
 {
     return true; //cannot determine online state @TODO

src/standardprinter.h

@@ -11,7 +11,6 @@ class StandardPrinter : public AbstractPrinter, public PrinterList<StandardPrint
     Q_OBJECT
     Q_INTERFACES(AbstractPrinter)
 public:
-    QSize getPrintSize() override;
     bool printerOnline() override;
     bool busy() override;
     int printImage(const QString &filename, int copyCount) override;