diff options
| author | xiphon <xiphon@protonmail.com> | 2020-07-16 17:13:42 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2020-07-16 17:30:00 +0000 |
| commit | 352da92229fc30b6494c46e7a3e7d9ed80521bb5 (patch) | |
| tree | 92e8cdd6d6d915ed2501a0726484bd19d333bad0 /src/QR-Code-scanner/QrCodeScanner.cpp | |
| parent | c137a6ea36040aee20366933935805eff67ae3f8 (diff) | |
| download | monzero-gui-352da92229fc30b6494c46e7a3e7d9ed80521bb5.tar.gz monzero-gui-352da92229fc30b6494c46e7a3e7d9ed80521bb5.tar.xz monzero-gui-352da92229fc30b6494c46e7a3e7d9ed80521bb5.zip | |
QrCodeScanner: use parse_uri_to_object to parse scanned codes
Diffstat (limited to 'src/QR-Code-scanner/QrCodeScanner.cpp')
| -rw-r--r-- | src/QR-Code-scanner/QrCodeScanner.cpp | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/QR-Code-scanner/QrCodeScanner.cpp b/src/QR-Code-scanner/QrCodeScanner.cpp index 1a1c57b8..55e396fe 100644 --- a/src/QR-Code-scanner/QrCodeScanner.cpp +++ b/src/QR-Code-scanner/QrCodeScanner.cpp @@ -40,7 +40,7 @@ QrCodeScanner::QrCodeScanner(QObject *parent) m_probe = new QVideoProbe(this); m_thread = new QrScanThread(this); m_thread->start(); - QObject::connect(m_thread, SIGNAL(decoded(int,QString)), this, SLOT(processCode(int,QString))); + QObject::connect(m_thread, SIGNAL(decoded(int, QString)), this, SIGNAL(decoded(int, QString))); QObject::connect(m_thread, SIGNAL(notifyError(const QString &, bool)), this, SIGNAL(notifyError(const QString &, bool))); connect(m_probe, SIGNAL(videoFrameProbed(QVideoFrame)), this, SLOT(processFrame(QVideoFrame))); } @@ -48,37 +48,6 @@ void QrCodeScanner::setSource(QCamera *camera) { m_probe->setSource(camera); } -void QrCodeScanner::processCode(int type, const QString &data) -{ - if (! m_enabled) return; - qDebug() << "decoded - type: " << type << " data: " << data; - QString address, payment_id, tx_description, recipient_name, error; - QVector<QString> unknown_parameters; - uint64_t amount(0); - if( ! WalletManager::instance()->parse_uri(data, address, payment_id, amount, tx_description, recipient_name, unknown_parameters, error) ) - { - qDebug() << "Failed to parse_uri : " << error; - emit notifyError(error); - return; - } - QVariantMap parsed_unknown_parameters; - if(unknown_parameters.size() > 0) - { - qDebug() << "unknown parameters " << unknown_parameters; - foreach(const QString &item, unknown_parameters ) - { - QStringList parsed_item = item.split("="); - if(parsed_item.size() == 2) { - parsed_unknown_parameters.insert(parsed_item[0], parsed_item[1]); - } - } - emit notifyError(error, true); - } - qDebug() << "Parsed URI : " << address << " " << payment_id << " " << amount << " " << tx_description << " " << recipient_name << " " << error; - QString s_amount = WalletManager::displayAmount(amount); - qDebug() << "Amount passed " << s_amount ; - emit decoded(address, payment_id, s_amount, tx_description, recipient_name, parsed_unknown_parameters); -} void QrCodeScanner::processFrame(QVideoFrame frame) { if(frame.isValid()){ |
