AaronFiore/electrum
1
0
Fork 0
Code Activity

QRParser now a type, not a context property

Browse Source
This commit is contained in:
Sander van Grieken
2022-03-30 18:01:16 +02:00
parent 3942745270
commit d1623c5ed3
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
electrum/gui/qml/components/QRScan.qml
View File

@@ -2,6 +2,8 @@ import QtQuick 2.12
import QtQuick.Controls 2.0
import QtMultimedia 5.6
import org.electrum 1.0
Item {
id: scanner
@@ -71,19 +73,19 @@ Item {
}
Connections {
target: QR
target: qr
function onDataChanged() {
console.log(QR.data)
console.log(qr.data)
scanner.active = false
scanner.scanData = QR.data
scanner.scanData = qr.data
still.source = scanner.url
var sx = still.width/still.sourceSize.width
var sy = still.height/still.sourceSize.height
r.createObject(scanner, {cx: QR.points[0].x * sx, cy: QR.points[0].y * sy, color: 'yellow'})
r.createObject(scanner, {cx: QR.points[1].x * sx, cy: QR.points[1].y * sy, color: 'yellow'})
r.createObject(scanner, {cx: QR.points[2].x * sx, cy: QR.points[2].y * sy, color: 'yellow'})
r.createObject(scanner, {cx: QR.points[3].x * sx, cy: QR.points[3].y * sy, color: 'yellow'})
r.createObject(scanner, {cx: qr.points[0].x * sx, cy: qr.points[0].y * sy, color: 'yellow'})
r.createObject(scanner, {cx: qr.points[1].x * sx, cy: qr.points[1].y * sy, color: 'yellow'})
r.createObject(scanner, {cx: qr.points[2].x * sx, cy: qr.points[2].y * sy, color: 'yellow'})
r.createObject(scanner, {cx: qr.points[3].x * sx, cy: qr.points[3].y * sy, color: 'yellow'})
foundAnimation.start()
}
@@ -123,12 +125,12 @@ Item {
repeat: true
running: scanner.active
onTriggered: {
if (QR.busy)
if (qr.busy)
return
vo.grabToImage(function(result) {
if (result.image !== undefined) {
scanner.url = result.url
QR.scanImage(result.image)
qr.scanImage(result.image)
} else {
console.log('image grab returned null')
}
@@ -136,6 +138,10 @@ Item {
}
}
QRParser {
id: qr
}
Component.onCompleted: {
console.log('Scan page initialized')
QtMultimedia.availableCameras.forEach(function(item) {