The scaned picture is enabled as an alternative view of the card

belohoub · Apr 11, 2024 · b76c481 · b76c481
1 parent 7a7854d
commit b76c481
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 237 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -9,7 +9,6 @@ set(ubcards_SRCS
   qrcodereader.cpp
   qrcodegenerator.cpp
   qrcodeimageprovider.cpp
-  historymodel.cpp
   filehelper.cpp
   cardstorage.cpp
   cardstoragemodel.cpp

diff --git a/app/cardstorage.cpp b/app/cardstorage.cpp
@@ -46,16 +46,36 @@ CardStorage::CardStorage(QObject *parent) :
 
     m_storageModel = new CardStorageModel(this);
 
+    /* No image */
+    m_image = QImage();
+    m_imageID = "";
+
     /* TODO add signals/slots */
 
 }
 
+/**
+ * Prepare an image to save image
+ * 
+ * When ID is empty string, image for the ID is NOT updated
+ * 
+ */
+void CardStorage::updateImage(const QString &id, const QImage &image) {
+    m_image = image;
+    m_imageID = id;
+}
+
 void CardStorage::updateCard(const QString &id, const QString &text, const QString &type, const QString &name, const QString &category) {
     if (!m_storageModel->setCardById(id, text, type, name, category)) {
         /* In case of invalid ID, insert a new card */
-        QString newId = m_storageModel->add(text, type, name, category, QImage());
+        QString newId = m_storageModel->add(text, type, name, category, m_image);
     }
 
+    /* No image - the Image has been already used */
+    m_image = QImage();
+    m_imageID = "";
+
+
     /* emit signal with added ID */
     emit cardUpdated();
 }

diff --git a/app/cardstorage.h b/app/cardstorage.h
@@ -40,6 +40,7 @@ class CardStorage : public QObject, public QQuickImageProvider
     CardStorageModel* storage() const;
 
     Q_INVOKABLE void updateCard(const QString &id, const QString &text, const QString &type, const QString &name, const QString &category);
+    Q_INVOKABLE void updateImage(const QString &id, const QImage &image);
 
 public slots:
 
@@ -52,6 +53,9 @@ private slots:
     QQuickWindow *m_mainWindow;
 
     CardStorageModel *m_storageModel;
+
+    QImage m_image;
+    QString m_imageID;
 };
 
 

diff --git a/app/cardstoragemodel.cpp b/app/cardstoragemodel.cpp
@@ -41,10 +41,10 @@ int CardStorageModel::rowCount(const QModelIndex &parent) const
     return m_settings.value("all").toStringList().count();
 }
 
-QVariant CardStorageModel::data(const QModelIndex &index, int role) const
+QVariant CardStorageModel::dataById(const QString &id, int role) const
 {
     QVariant ret;
-    QString id = m_settings.value("all").toStringList().at(index.row());
+
     m_settings.beginGroup(id);
     switch (role) {
     case RoleText:
@@ -63,7 +63,8 @@ QVariant CardStorageModel::data(const QModelIndex &index, int role) const
         ret = m_settings.value("category");
         break;
     case RoleImageSource:
-        ret = "image://history/" + id;
+        //ret = "image://history/" + id;
+        ret = m_storageLocation + id + ".jpg";
         break;
     case RoleTimestamp:
         ret = m_settings.value("timestamp").toDateTime().toString();
@@ -74,6 +75,13 @@ QVariant CardStorageModel::data(const QModelIndex &index, int role) const
     return ret;
 }
 
+QVariant CardStorageModel::data(const QModelIndex &index, int role) const
+{
+    QString id = m_settings.value("all").toStringList().at(index.row());
+
+    return dataById(id, role);
+}
+
 
 QHash<int, QByteArray> CardStorageModel::roleNames() const
 {

diff --git a/app/cardstoragemodel.h b/app/cardstoragemodel.h
@@ -43,6 +43,7 @@ class CardStorageModel: public QAbstractListModel, public QQuickImageProvider
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role) const override;
+    QVariant dataById(const QString &id, int role) const;
     QHash<int, QByteArray> roleNames() const override;
 
     QString add(const QString &text, const QString &type, const QString &name, const QString &category, const QImage &image);

diff --git a/app/historymodel.cpp b/app/historymodel.cpp
diff --git a/app/historymodel.h b/app/historymodel.h
diff --git a/app/main.cpp b/app/main.cpp
@@ -45,15 +45,13 @@ int main(int argc, char *argv[])
 
     FileHelper fh;
     qmlRegisterType<QRCodeGenerator>("UBcards", 0, 1, "QRCodeGenerator");
-    qmlRegisterUncreatableType<HistoryModel>("UBcards", 0, 1, "HistoryModel", "use qrCodeReader.history");
 
     CardStorage storage;
     view.engine()->rootContext()->setContextProperty("cardStorage", &storage);
     qmlRegisterUncreatableType<CardStorageModel>("UBcards", 0, 1, "CardStorageModel", "use cardStorage.model");
 
     view.engine()->addImageProvider(QStringLiteral("qrcode"), new QRCodeImageProvider);
     view.engine()->addImageProvider(QStringLiteral("reader"), &reader);
-    view.engine()->addImageProvider(QStringLiteral("history"), reader.history());
 
     view.engine()->rootContext()->setContextProperty(QStringLiteral("fileHelper"), &fh);
 

diff --git a/app/qml/encoder.js b/app/qml/encoder.js
@@ -37,7 +37,7 @@ function stringToBarcode (type, str)
 {
     switch (type)
     {
-    case undefined:
+    case undefined:case undefined:
     case 'CODE-128':
         if (/^-?\d+$/.test(str)) {
             /* Numeric-only codes are type C*/
@@ -62,6 +62,9 @@ function stringToBarcode (type, str)
 
     case 'CODE-39':
         return "*" + str.toUpperCase().replace (/[^A-Z\s\d-$%./+]/g, "") + "*";
+
+    case 'PICTURE':
+        return "";
     }
 }
 

diff --git a/app/qml/ubcards.qml b/app/qml/ubcards.qml
@@ -137,6 +137,7 @@ MainView {
         ListElement { name: "EAN-8"     ; font: "../fonts/ean13_new.ttf"   }
         ListElement { name: "I2/5"      ; font: "../fonts/I2of5_new.ttf"   }  
         ListElement { name: "QR-Code"   ; font: ""                         }  
+        ListElement { name: "PICTURE"   ; font: ""                         }  
     }
 
     Component {
@@ -208,16 +209,15 @@ MainView {
 
         onValidChanged: {
             if (qrCodeReader.valid) {
+                // A New card has been scanned
                 if (pageStack.depth > 1) {
-                  /* When existing card is modified, the editCard view is already opened, the current depth is 2 */
-                  /* First, close the old editCartd view */
+                  /* First, close the old views */
                   pageStack.pop()
-                  /* Now open the viewCard view for a modified card */
-                  pageStack.push(editPageComponent, {type: qrCodeReader.type, text: qrCodeReader.text, name: qrCodeReader.name, category: qrCodeReader.category, imageSource: qrCodeReader.imageSource, editable: false, cardID: qrCodeReader.ID});
-                } else {
-                  /* When new card is created, editCard view will be opened at depth 2, the current depth is 1 */
-                  pageStack.push(editPageComponent, {type: qrCodeReader.type, text: qrCodeReader.text, name: qrCodeReader.name, category: qrCodeReader.category, imageSource: qrCodeReader.imageSource, editable: true});  
                 }
+
+                /* Open the editCard view for a new card */
+                cardStorage.updateImage("", qrCodeReader.image);
+                pageStack.push(editPageComponent, {type: qrCodeReader.type, text: qrCodeReader.text, name: qrCodeReader.name, category: qrCodeReader.category, imageSource: qrCodeReader.imageSource, editable: true});
             }
         }
     }
@@ -949,17 +949,20 @@ MainView {
                                     }
                                 }
 
-                                /* This should be visible only if code-type generation is not available */
+                                /* This should be visible only if code-type generation is not available OR PICTURE code type is selected */
                                 Item {
                                     width: parent.width
-                                    height: (!(hasCodeFont(editPage.type))) ? cardCodeImage.height : 0
-                                    visible: !(hasCodeFont(editPage.type))
+                                    height: (editPage.type === "PICTURE") ? cardCodeImage.height : 0
+                                    visible: (editPage.type === "PICTURE")
 
                                     Image {
                                         Layout.fillWidth: true
                                         id: cardCodeImage
-                                        visible: !(hasCodeFont(editPage.type))
-                                        source: hasCodeFont(editPage.type) ? "" : editPage.imageSource
+                                        width: parent.width - units.gu(5)
+                                        anchors.margins: units.gu(5)
+                                        anchors.centerIn: parent
+                                        visible: (editPage.type === "PICTURE")
+                                        source: (editPage.type === "PICTURE") ? editPage.imageSource : ""
                                     }
                                 }