Merge branch 'master' of https://gitlab.demlabs.net/cellframe/cellframe-dashboard

.gitlab-ci.yml

+#before_build:
+    
+
 stages:
     - prepare
     - build
     - test
+    - deploy
 
 variables:
     GIT_SUBMODULE_STRATEGY: normal
 
-cellframe-dashboard-schedule:
+# Prepare
+#
+#
+
+cellframe-dashboard-test:
+    stage: build
+    tags:
+     - cellframe-dashboard
+    except:
+     - merge_request
+     - develop
+     - master
+     - /^pubtest.*$/
+     - /^release.*$/
+    script: ~/production/integration/gitlab-CI/build_test_handler.sh cellframe-dashboard
+
+#cellframe-dashboard-merge-request-windows:
+#    stage: build
+#    tags:
+#     - cellframe-dashboard
+#    only: [merge_requests]
+#    except:
+#      variables:
+#        - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
+#    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard windows
+
+cellframe-dashboard-merge-request-linux:
     stage: build
     tags:
-    - cellframe-dashboard
+     - cellframe-dashboard
+    only: [merge_requests]
+    except:
+      variables:
+        - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
+        - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "/^release.*$/"
+    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard linux
+
+#cellframe-dashboard-merge-request-mac:
+#    stage: build
+#    tags:
+#     - cellframe-dashboard
+#    only: [merge_requests]
+#    except:
+#      variables:
+#        - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
+#    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard mac
+
+#cellframe-dashboard-merge-request-android:
+#    stage: build
+#    tags:
+#     - cellframe-dashboard
+#    only: [merge_requests]
+#    except:
+#      variables:
+#        - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
+#    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard android
+
+cellframe-dashboard-schedule:
+    stage: build
+    tags: 
+     - cellframe-dashboard
+    only:
+     - schedules
     script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard
+
+cellframe-dashboard_linux:
+    stage: build
+    tags:
+     - cellframe-dashboard
+    only:
+     - master
+     - /^release.*$/
+     - /^pubtest.*$/
+    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard linux
+
+#cellframe-dashboard_mac:
+#    stage: build
+#    tags:
+#     - cellframe-dashboard
+#    only:
+#     - master
+#     - /^release.*$/
+#     - /^pubtest.*$/
+#     - develop
+#    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard mac
+
+#cellframe-dashboard_android:
+#    stage: build
+#    tags:
+#     - cellframe-dashboard
+#    only:
+#     - master
+#     - /^release.*$/
+#     - /^pubtest.*$/
+#    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard android
+
+#cellframe-dashboard_windows:
+#    stage: build
+#    tags:
+#     - cellframe-dashboard
+#    only:
+#     - /^pubtest.*$/
+#     - /^release.*$/
+#    except:
+#     - master
+#    script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard windows
+
+# Test
+# run unit-tests
+
+# Deploy
+# cp to builds folder

CellFrameDashboardGUI/CellFrameDashboardGUI.pro

@@ -69,7 +69,9 @@ OTHER_FILES += libdap-qt-ui-qml \
 SOURCES += \
     $$PWD/main.cpp \
     $$PWD/DapServiceController.cpp \
-    DapApplication.cpp
+    DapApplication.cpp \
+    quickcontrols/qrcodequickitem.cpp \
+    thirdPartyLibs/QRCodeGenerator/QRCodeGenerator.cpp
 
 RESOURCES += $$PWD/qml.qrc
 
@@ -80,7 +82,9 @@ else: unix:!android: target.path = /opt/cellframe-dashboard/bin
 
 HEADERS += \
     $$PWD/DapServiceController.h \
-    DapApplication.h
+    DapApplication.h \
+    quickcontrols/qrcodequickitem.h \
+    thirdPartyLibs/QRCodeGenerator/QRCodeGenerator.h
 
 include (../dap-ui-sdk/qml/libdap-qt-ui-qml.pri)
 include (../dap-ui-sdk/core/libdap-qt.pri)

CellFrameDashboardGUI/DapApplication.cpp

@@ -3,6 +3,7 @@
 #include <DapLogMessage.h>
 #include <QIcon>
 #include <QClipboard>
+#include "quickcontrols/qrcodequickitem.h"
 
 DapApplication::DapApplication(int &argc, char **argv)
     :QApplication(argc, argv)
@@ -68,6 +69,7 @@ void DapApplication::registerQmlTypes()
     qmlRegisterType<DapLogMessage>("Demlabs", 1, 0, "DapLogMessage");
     qmlRegisterType<DapWallet>("Demlabs", 1, 0, "DapWallet");
     qmlRegisterType<DapWalletToken>("Demlabs", 1, 0, "DapWalletToken");
+    qmlRegisterType<QrCodeQuickItem>("Demlabs", 1, 0, "QrCodeQuickItem");
     qRegisterMetaType<DapWallet>();
     qRegisterMetaType<DapWalletToken>();
 }

CellFrameDashboardGUI/quickcontrols/qrcodequickitem.cpp

+#include "qrcodequickitem.h"
+#include "thirdPartyLibs/QRCodeGenerator/QRCodeGenerator.h"
+#include <QPainter>
+
+QrCodeQuickItem::QrCodeQuickItem(QQuickItem *parent) :
+    QQuickPaintedItem(parent),
+    m_qrEncode(new CQR_Encode),
+    m_successfulEncoding(false),
+    m_encodeImageSize(0)
+{
+
+}
+
+QrCodeQuickItem::~QrCodeQuickItem()
+{
+    delete m_qrEncode;
+}
+
+const QByteArray &QrCodeQuickItem::data() const
+{
+    return m_data;
+}
+
+void QrCodeQuickItem::setData(const QByteArray &data)
+{
+    if (m_data != data) {
+        m_data = data;
+        createQRImage();
+        update();
+        emit dataChanged();
+    }
+}
+
+bool QrCodeQuickItem::saveToFile(const QString &fileName, int width, int height) const
+{
+    if (!m_successfulEncoding) {
+        qWarning("QrCodeQuickItem::saveToFile: QR code not generated");
+        return false;
+    }
+
+    QImage img(scaledQRImage(QSize(width, height)));
+    if (!img.save(fileName)) {
+        qWarning("QrCodeQuickItem::saveToFile: Save image error");
+        return false;
+    }
+
+    return true;
+}
+
+void QrCodeQuickItem::paint(QPainter *painter)
+{
+    if (!m_successfulEncoding)
+        return;
+
+    QSize size(width(), height());
+    if (m_encodeImageScaled.isNull() || m_encodeImageScaledItemSize != size) {
+        m_encodeImageScaled = scaledQRImage(size);
+        m_encodeImageScaledItemSize = size;
+    }
+
+    painter->drawImage(QPoint((width() - m_encodeImageScaled.width()) / 2, (height() - m_encodeImageScaled.height()) / 2), m_encodeImageScaled);
+}
+
+void QrCodeQuickItem::createQRImage()
+{
+    int levelIndex = 1;
+    int versionIndex = 0;
+    bool bExtent = true;
+    int maskIndex = -1;
+
+    m_successfulEncoding = m_qrEncode->EncodeData(levelIndex, versionIndex, bExtent, maskIndex, m_data.data());
+    if (m_successfulEncoding) {
+        int qrImageSize = m_qrEncode->m_nSymbleSize;
+
+        m_encodeImageSize = qrImageSize + (QR_MARGIN * 2);
+        m_encodeImage = QImage(m_encodeImageSize, m_encodeImageSize, QImage::Format_Mono);
+        m_encodeImage.fill(1);
+
+        for (int i = 0; i < qrImageSize; i++) {
+            for (int j = 0; j < qrImageSize; j++) {
+                if (m_qrEncode->m_byModuleData[i][j]) {
+                    m_encodeImage.setPixel(i + QR_MARGIN, j + QR_MARGIN, 0);
+                }
+            }
+        }
+    } else {
+        qWarning("QrCodeQuickItem::setData: EncodeData error");
+        m_encodeImageSize = 0;
+        m_encodeImage = QImage();
+    }
+
+    m_encodeImageScaled = QImage();
+    m_encodeImageScaledItemSize = QSize();
+}
+
+QImage QrCodeQuickItem::scaledQRImage(const QSize &size) const
+{
+    if (!m_successfulEncoding)
+        return QImage();
+    int scaleSize = m_encodeImageSize * (std::min(size.width(), size.height()) / m_encodeImageSize);
+    return m_encodeImage.scaled(scaleSize, scaleSize);
+}

CellFrameDashboardGUI/quickcontrols/qrcodequickitem.h

+#ifndef QRCODEQUICKITEM_H
+#define QRCODEQUICKITEM_H
+
+#include <QQuickPaintedItem>
+#include <QImage>
+
+class CQR_Encode;
+
+class QrCodeQuickItem : public QQuickPaintedItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QByteArray data READ data WRITE setData NOTIFY dataChanged)
+public:
+    explicit QrCodeQuickItem(QQuickItem *parent = nullptr);
+    ~QrCodeQuickItem() override;
+
+    const QByteArray &data() const;
+    void setData(const QByteArray &data);
+
+    Q_INVOKABLE bool saveToFile(const QString &fileName, int width, int height) const;
+
+    void paint(QPainter *painter) override;
+
+signals:
+    void dataChanged();
+
+private:
+    void createQRImage();
+    QImage scaledQRImage(const QSize &size) const;
+
+private:
+    CQR_Encode *m_qrEncode;
+    QByteArray m_data;
+    bool m_successfulEncoding;
+    int m_encodeImageSize;
+    QImage m_encodeImage;
+    QImage m_encodeImageScaled;
+    QSize m_encodeImageScaledItemSize;
+};
+
+#endif // QRCODEQUICKITEM_H

CellFrameDashboardGUI/thirdPartyLibs/QRCodeGenerator/QRCodeGenerator.h

+
+#if !defined(AFX_QR_ENCODE_H__AC886DF7_C0AE_4C9F_AC7A_FCDA8CB1DD37__INCLUDED_)
+#define AFX_QR_ENCODE_H__AC886DF7_C0AE_4C9F_AC7A_FCDA8CB1DD37__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+/////////////////////////////////////////////////////////////////////////////
+
+//
+#define QR_LEVEL_L	0
+#define QR_LEVEL_M	1
+#define QR_LEVEL_Q	2
+#define QR_LEVEL_H	3
+
+//
+#define QR_MODE_NUMERAL		0
+#define QR_MODE_ALPHABET	1
+#define QR_MODE_8BIT		2
+#define QR_MODE_KANJI		3
+
+// 
+#define QR_VRESION_S	0 
+#define QR_VRESION_M	1 
+#define QR_VRESION_L	2 
+
+#define MAX_ALLCODEWORD	 3706 
+#define MAX_DATACODEWORD 2956 
+#define MAX_CODEBLOCK	  153 
+#define MAX_MODULESIZE	  177 
+
+#define QR_MARGIN	4
+
+
+/////////////////////////////////////////////////////////////////////////////
+typedef struct tagRS_BLOCKINFO
+{
+	int ncRSBlock;		
+	int ncAllCodeWord;	
+	int ncDataCodeWord;	
+
+} RS_BLOCKINFO, *LPRS_BLOCKINFO;
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+typedef struct tagQR_VERSIONINFO
+{
+	int nVersionNo;	   
+	int ncAllCodeWord; 
+
+	int ncDataCodeWord[4];	
+
+	int ncAlignPoint;	
+	int nAlignPoint[6];	
+
+	RS_BLOCKINFO RS_BlockInfo1[4]; 
+	RS_BLOCKINFO RS_BlockInfo2[4]; 
+
+} QR_VERSIONINFO, *LPQR_VERSIONINFO;
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+class CQR_Encode
+{
+public:
+	CQR_Encode();
+	~CQR_Encode();
+
+public:
+	int m_nLevel;		
+	int m_nVersion;		
+	bool m_bAutoExtent;	
+	int m_nMaskingNo;	
+
+public:
+	int m_nSymbleSize;
+	unsigned char m_byModuleData[MAX_MODULESIZE][MAX_MODULESIZE]; // [x][y]
+
+private:
+	int m_ncDataCodeWordBit; 
+	unsigned char m_byDataCodeWord[MAX_DATACODEWORD]; 
+
+	int m_ncDataBlock;
+	unsigned char m_byBlockMode[MAX_DATACODEWORD];
+	int m_nBlockLength[MAX_DATACODEWORD];
+
+	int m_ncAllCodeWord; 
+	unsigned char m_byAllCodeWord[MAX_ALLCODEWORD]; 
+	unsigned char m_byRSWork[MAX_CODEBLOCK]; 
+
+public:
+	bool EncodeData(int nLevel, int nVersion, bool bAutoExtent, int nMaskingNo, char* lpsSource, int ncSource = 0);
+
+private:
+	int GetEncodeVersion(int nVersion, char* lpsSource, int ncLength);
+	bool EncodeSourceData(char* lpsSource, int ncLength, int nVerGroup);
+
+	int GetBitLength(unsigned char nMode, int ncData, int nVerGroup);
+
+	int SetBitStream(int nIndex, unsigned short wData, int ncData);
+
+	bool IsNumeralData(unsigned char c);
+	bool IsAlphabetData(unsigned char c);
+	bool IsKanjiData(unsigned char c1, unsigned char c2);
+
+	unsigned char AlphabetToBinaly(unsigned char c);
+	unsigned short KanjiToBinaly(unsigned short wc);
+
+	void GetRSCodeWord(unsigned char * lpbyRSWork, int ncDataCodeWord, int ncRSCodeWord);
+
+private:
+	void FormatModule();
+
+	void SetFunctionModule();
+	void SetFinderPattern(int x, int y);
+	void SetAlignmentPattern(int x, int y);
+	void SetVersionPattern();
+	void SetCodeWordPattern();
+	void SetMaskingPattern(int nPatternNo);
+	void SetFormatInfoPattern(int nPatternNo);
+	int CountPenalty();
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+#endif // !defined(AFX_QR_ENCODE_H__AC886DF7_C0AE_4C9F_AC7A_FCDA8CB1DD37__INCLUDED_)

dap-ui-sdk @ 52b791dd

-Subproject commit b522735cb809ea1a99f8531ce1d73e9abe75a638
+Subproject commit 52b791dd8d1c3ecc3ff89e55a9834bc3b8b9adb3

debian

-prod_build/linux/debian/essentials
\ No newline at end of file
+prod_build/linux/debian/essentials/
\ No newline at end of file

prod_build @ 4af1a502

+Subproject commit 4af1a5020273542992302211bde36f60ad6b9171