rotate captured image

Author: saeugetier

qml/content/CameraRenderer.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 import QtQuick.Layouts
 import BackgroundFilter
+import CaptureProcessor
 
 Item {
    id: renderer
@@ -41,6 +42,29 @@ Item {
                          }
                       }
 
+   CaptureProcessor
+   {
+      id: captureProcessor
+
+      rotation: applicationSettings.cameraOrientation
+
+      onCaptureSaved: fileName =>
+                      {
+
+                         if(backgroundFilterEnabled)
+                         {
+                            console.log("Process file: " + fileName)
+                            backgroundFilter.processCapture(fileName)
+                         }
+                         else
+                         {
+                            renderer.state = "preview"
+                            savedPhoto("file:" + fileName)
+                            console.log("Saved: " + fileName)
+                         }
+                      }
+   }
+
    CaptureSession {
 
       camera: Camera {
@@ -60,25 +84,25 @@ Item {
       imageCapture: ImageCapture {
          id: imageCapture
 
-         onImageSaved: (_, fileName) => {
-
-                          if(backgroundFilterEnabled)
-                          {
-                             console.log("Process file: " + fileName)
-                             backgroundFilter.processCapture(fileName)
-                          }
-                          else
+         onImageCaptured:
                           {
-                             renderer.state = "preview"
-                             savedPhoto("file:" + fileName)
-                             console.log("Saved: " + fileName)
+                             whiteOverlay.state = "released"
+                             renderer.state = "store"
+                             console.log("Captured")
+
+                             console.log(applicationSettings.foldername.toString())
+                             var path = applicationSettings.foldername.toString()
+                             if(backgroundFilterEnabled)
+                             {
+                                path = path + "/raw"
+                             }
+                             path = path.replace(/^(file:\/{2})/, "")
+                             var cleanPath = decodeURIComponent(path)
+                             console.log(cleanPath)
+
+                             captureProcessor.saveCapture(preview, cleanPath + "/Pict_" + new Date().toLocaleString(
+                                                             locale, "dd_MM_yyyy_hh_mm_ss") + ".jpg")
                           }
-                       }
-         onImageCaptured: {
-            whiteOverlay.state = "released"
-            renderer.state = "store"
-            console.log("Captured")
-         }
          onErrorOccurred: {
             renderer.state = "preview"
             failed()
@@ -120,14 +144,15 @@ Item {
       videoSink: output.videoSink
       background: backgroundImage
 
-      onCaptureProcessingFinished: {
-         console.log("Capture processing finished")
-         if (backgroundFilterEnabled) {
-            renderer.state = "preview"
-            savedPhoto("file:" + fileName)
-            console.log("Saved: " + fileName)
-         }
-      }
+      onCaptureProcessingFinished: fileName =>
+                                   {
+                                      console.log("Capture processing finished")
+                                      if (backgroundFilterEnabled) {
+                                         renderer.state = "preview"
+                                         savedPhoto("file:" + fileName)
+                                         console.log("Saved: " + fileName)
+                                      }
+                                   }
    }
 
    Connections {
@@ -221,28 +246,17 @@ Item {
    function takePhoto() {
       if (cameraSession.imageCapture.readyForCapture) {
          state = "snapshot"
-         console.log(applicationSettings.foldername.toString())
-         var path = applicationSettings.foldername.toString()
-         if(backgroundFilterEnabled)
-         {
-            path = path + "/raw"
-         }
-         path = path.replace(/^(file:\/{2})/, "")
-         var cleanPath = decodeURIComponent(path)
-         console.log(cleanPath)
-         cameraSession.imageCapture.captureToFile(
-                  cleanPath + "/Pict_" + new Date().toLocaleString(
-                     locale, "dd_MM_yyyy_hh_mm_ss") + ".jpg")
+         cameraSession.imageCapture.capture()
       } else {
          renderer.state = "preview"
          failed()
       }
    }
 
    BusyIndicator {
-       id: busyIndicator
-       anchors.centerIn: parent
-       visible: false
+      id: busyIndicator
+      anchors.centerIn: parent
+      visible: false
    }
 
    states: [

qtbooth.pro

@@ -10,6 +10,7 @@ CONFIG += c++17 qml_debug
 }
 
 SOURCES += src/collageiconmodel.cpp \
+    src/captureprocessor.cpp \
     src/collageimagemodel.cpp \
     src/collagemodelfactory.cpp \
     src/fakeprinter.cpp \
@@ -57,6 +58,7 @@ INCLUDEPATH += src/ \
 HEADERS += \
     src/abstractprinter.h \
     src/call_once.h \
+    src/captureprocessor.h \
     src/collageiconmodel.h \
     src/collageimagemodel.h \
     src/collagemodelfactory.h \

src/captureprocessor.cpp

@@ -0,0 +1,45 @@
+#include "captureprocessor.h"
+#include <QDebug>
+
+CaptureProcessor::CaptureProcessor(QObject *parent)
+    : QObject{parent}
+{}
+
+int CaptureProcessor::getRotation() const
+{
+    return mRotation;
+}
+
+void CaptureProcessor::setRotation(int rotation)
+{
+    if (rotation < 0 || rotation >= 360) {
+        qWarning() << "Invalid rotation value. Must be between 0 and 359.";
+        return;
+    }
+
+    if(rotation % 90)
+    {
+        qWarning() << "Rotation value should be a multiple of 90 degrees. Adjusting to nearest valid value.";
+        rotation = (rotation / 90) * 90; // Adjust to nearest multiple of 90
+    }
+
+    mRotation = rotation;
+}
+
+void CaptureProcessor::saveCapture(QImage preview, const QString &filePath)
+{
+    if (preview.isNull() || filePath.isEmpty()) {
+        qWarning() << "Invalid image or file path.";
+        return;
+    }
+
+    QTransform transform;
+    transform.rotate(mRotation);
+    QImage rotated = preview.transformed(transform);
+
+    if (rotated.save(filePath)) {
+        emit captureSaved(filePath);
+    } else {
+        qWarning() << "Failed to save capture to" << filePath;
+    }
+}

src/captureprocessor.h

@@ -0,0 +1,25 @@
+#ifndef CAPTUREPROCESSOR_H
+#define CAPTUREPROCESSOR_H
+
+#include <QObject>
+#include <QImage>
+
+class CaptureProcessor : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int rotation READ getRotation WRITE setRotation)
+public:
+    explicit CaptureProcessor(QObject *parent = nullptr);
+    int getRotation() const;
+    void setRotation(int rotation);
+
+public slots:
+    void saveCapture(QImage preview, const QString &filePath);
+
+signals:
+    void captureSaved(QString filePath);
+protected:
+    int mRotation;
+};
+
+#endif // CAPTUREPROCESSOR_H

src/main.cpp

@@ -7,6 +7,7 @@
 #include <QQmlContext>
 #include <QTranslator>
 #include "translationhelper.h"
+#include "captureprocessor.h"
 #include "fakeprinter.h"
 #include "selphyprinter.h"
 #include "printerfactory.h"
@@ -124,6 +125,8 @@ int main(int argc, char *argv[])
 
     qmlRegisterType<System>("System", 1, 0, "System");
 
+    qmlRegisterType<CaptureProcessor>("CaptureProcessor", 1, 0, "CaptureProcessor");
+
     qmlRegisterInterface<AbstractPrinter>("AbstractPrinter", 1);
     qmlRegisterUncreatableType<AbstractPrinter>("Printer", 1, 0, "Printer", "Printer can only be created via PrinterFactory");
     qmlRegisterType<PrinterFactory>("Printer", 1, 0, "PrinterFactory");