mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: update deviceData default from qml

Browse source 
remove setting default in qml to C++

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-06-09 16:46:19 +02:00 • committed by Dirk Hohndel
parent 682e1b63f5
commit 807571a588
2 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/downloadfromdcthread.cpp
View file

@ -212,6 +212,11 @@ DCDeviceData::DCDeviceData(QObject *parent) : QObject(parent)
data.download_table = nullptr; data.download_table = nullptr;
data.diveid = 0; data.diveid = 0;
data.deviceid = 0; data.deviceid = 0;
data.bluetooth_mode = true;
data.force_download = false;
data.create_new_trip = false;
data.libdc_dump = false;
data.libdc_log = false;
if (m_instance) { if (m_instance) {
qDebug() << "already have an instance of DCDevieData"; qDebug() << "already have an instance of DCDevieData";
return; return;

27
mobile-widgets/qml/DownloadFromDiveComputer.qml
View file

@ -23,18 +23,6 @@ Kirigami.Page {
DCDownloadThread { DCDownloadThread {
id: downloadThread id: downloadThread
deviceData.vendor : comboVendor.currentText
deviceData.product : comboProduct.currentText
deviceData.devName : comboConnection.currentText
//TODO: Make this the default on the C++
deviceData.bluetoothMode : true
deviceData.forceDownload : false
deviceData.createNewTrip : false
deviceData.deviceId : 0
deviceData.diveId : 0
deviceData.saveDump : false
deviceData.saveLog : true
onFinished : { onFinished : {
importModel.repopulate() importModel.repopulate()
@ -164,10 +152,10 @@ Kirigami.Page {
btAddr = /\{?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\}/; btAddr = /\{?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\}/;
if (btAddr.test(currentText)) if (btAddr.test(currentText))
downloadThread.deviceData.bluetoothMode = true downloadThread.manager.DC_bluetoothMode = true
else else
downloadThread.deviceData.bluetoothMode = false downloadThread.manager.DC_bluetoothMode = false
downloadThread.deviceData.devName = comboConnection.currentText downloadThread.manager.DC_devName = comboConnection.currentText
} }
} }
} }
@ -198,9 +186,9 @@ Kirigami.Page {
onClicked: { onClicked: {
text = qsTr("Retry") text = qsTr("Retry")
// strip any BT Name from the address // strip any BT Name from the address
var devName = downloadThread.deviceData.devName var devName = downloadThread.manager.devName
downloadThread.deviceData.devName = devName.replace(/^(.*) /, "") downloadThread.manager.devName = devName.replace(/^(.*) /, "")
manager.appendTextToLog("DCDownloadThread started for " + downloadThread.deviceData.product + " on "+ downloadThread.deviceData.devName) manager.appendTextToLog("DCDownloadThread started for " + downloadThread.manager.product + " on "+ downloadThread.manager.devName)
progressBar.visible = true progressBar.visible = true
downloadThread.start() downloadThread.start()
} }
@ -309,6 +297,9 @@ Kirigami.Page {
comboVendor.currentIndex = downloadThread.data().getDetectedVendorIndex() comboVendor.currentIndex = downloadThread.data().getDetectedVendorIndex()
comboProduct.currentIndex = downloadThread.data().getDetectedProductIndex(comboVendor.currentText) comboProduct.currentIndex = downloadThread.data().getDetectedProductIndex(comboVendor.currentText)
comboDevice.currentIndex = downloadThread.data().getMatchingAddress(comboVendor.currentText, comboProduct.currentText) comboDevice.currentIndex = downloadThread.data().getMatchingAddress(comboVendor.currentText, comboProduct.currentText)
manager.DC_vendor = comboVendor.currentText
manager.DC_product = comboProduct.currentText
manager.DC_devName = comboConnection.currentText
} }
} }
} }