Index: sources/gui/qml/main.qml =================================================================== diff -u -rac23b968f565c2beeb153ca2d554b8f868634512 -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 --- sources/gui/qml/main.qml (.../main.qml) (revision ac23b968f565c2beeb153ca2d554b8f868634512) +++ sources/gui/qml/main.qml (.../main.qml) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) @@ -42,6 +42,8 @@ import VPostTreatmentStates 0.1 import VDisinfectStates 0.1 +// Treatment - Common +import VTreatmentVitals 0.1 // In-Treatment - Data import VTreatmentBloodFlow 0.1 import VTreatmentDialysateFlow 0.1 @@ -129,44 +131,8 @@ VDisinfectStates { id: vDisinfectStates } VTreatmentBloodFlow { id: vTreatmentBloodFlow } - Item /*VTreatmentVitals*/ /* Test View */ { id: vTreatmentVitals - property int systolic : 0 - property int systolicMin : 60 - property int systolicMax : 250 - property int diastolic : 0 - property int diastolicMin : 40 - property int diastolicMax : 200 - property int heartRate : 0 - property int heartRateMin : 40 - property int heartRateMax : 180 - property int interval : vTreatmentCreate.bloodPressureMeasureInterval - property string lastRead : "none" - property string notificationText: - qsTr("Interval:") + " " + (interval ? (interval + qsTr("min")):qsTr("off")) - + " , " - + qsTr("Last Read:") + " " + lastRead - - signal didTimeout() - - Timer { id: _timer - interval: vTreatmentVitals.interval * 60000 // to minuts - onTriggered: vTreatmentVitals.didTimeout() - } - onIntervalChanged: if (interval) _timer.start() - - function doConfirm(vSystolic, vDiastolic, vHeartReate) { - let currentDateTime = new Date() - systolic = vSystolic - diastolic = vDiastolic - heartRate = vHeartReate - lastRead = currentDateTime.toLocaleString(Qt.locale(), "yyyy/MMM/dd , HH:mm") - console.debug(vSystolic, vDiastolic, vHeartReate) - } - - function doRead(vSystolic, vDiastolic, vHeartReate) { - // simulated BLE read - doConfirm(vSystolic, vDiastolic, vHeartReate) - } + VTreatmentVitals { id: vTreatmentVitals + interval : vTreatmentCreate.bloodPressureMeasureInterval } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow }