Index: sources/gui/qml/main.qml =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/main.qml (.../main.qml) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/gui/qml/main.qml (.../main.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -25,35 +25,8 @@ // This needs to be moved into the TreatmentFlows.qml import VHDTreatmentStates 0.1 import VTreatmentRanges 0.1 -import VTreatmentBloodFlow 0.1 -import VTreatmentDialysateFlow 0.1 -import VTreatmentPressureOcclusion 0.1 -import VTreatmentUltrafiltration 0.1 -import VTreatmentTime 0.1 -import VAlarmStatus 0.1 -import VPowerOff 0.1 -import VHDOperationMode 0.1 -import VTreatmentRinseback 0.1 -import VTreatmentRecirculate 0.1 -import VTreatmentBloodPrime 0.1 -import VHDAccelerometer 0.1 - -import VDGDrainPump 0.1 -import VDGHeaters 0.1 -import VDGLoadCellReadings 0.1 -import VDGOperationMode 0.1 -import VDGPressures 0.1 -import VDGROPump 0.1 -import VDGReservoir 0.1 -import VDGTemperatures 0.1 -import VDGValvesStates 0.1 -import VPriming 0.1 -import VTreatmentBegin 0.1 -import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 -import VTreatmentAdjustmentDuration 0.1 -import VTreatmentAdjustmentFlows 0.1 import VTreatmentAdjustmentUltrafiltrationState 0.1 import VTreatmentAdjustmentUltrafiltrationInit 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 @@ -66,6 +39,38 @@ import VTreatmentAdjustmentEnd 0.1 import VTreatmentAdjustmentVersions 0.1 +import VTreatmentBloodFlow 0.1; +import VTreatmentDialysateFlow 0.1; +import VTreatmentPressureOcclusion 0.1; +import VTreatmentUltrafiltration 0.1; +import VTreatmentTime 0.1; +import VAlarmStatus 0.1; +import VPowerOff 0.1; +import VHDOperationMode 0.1; +import VTreatmentRinseback 0.1 +import VTreatmentRecirculate 0.1 +import VTreatmentBloodPrime 0.1 +import VHDAccelerometer 0.1 + +import VTreatmentAdjustmentDuration 0.1; +import VTreatmentAdjustmentFlows 0.1; + +import VTreatmentCreate 0.1; +import VBluetooth 0.1; +import VDGDrainPump 0.1; +import VDGHeaters 0.1; +import VDGLoadCellReadings 0.1; +import VDGOperationMode 0.1; +import VDGPressures 0.1; +import VDGROPump 0.1; +import VDGReservoir 0.1; +import VDGTemperatures 0.1; +import VDGValvesStates 0.1; +import VPriming 0.1; +import VTreatmentBegin 0.1; +import VVitals 0.1; +import VAlert 0.1; + // Qml imports import "qrc:/globals" import "qrc:/pages" @@ -125,9 +130,12 @@ VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } + VBluetooth { id: vBluetooth } VPriming { id: vPriming } VTreatmentBegin { id: vTreatmentBegin } VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit } + VVitals { id: vVitals } + VAlert { id: vAlert } VHDTreatmentStates { id: vHDTreatmentStates } @@ -182,16 +190,19 @@ _alarmListDialog.visible = false _alarmBar .visible = true } + function alarmMaximize() { _alarmDialog .visible = true _alarmListDialog.visible = false _alarmBar .visible = false } + function alarmList() { _alarmDialog .visible = false _alarmListDialog.visible = true _alarmBar .visible = false } + function alarmHide() { _alarmDialog .visible = false _alarmListDialog.visible = false @@ -286,6 +297,10 @@ visible: true // ! _GuiView.sdIsReady || _GuiView.sdIsReadOnly } + Alert { id: _alert } + VitalsEntry { id: _vitalsEntry } + Keyboard { id: _keyboard } + Connections { target: vPowerOff onPoweroffTriggered: { switch (vpoweroff) { @@ -341,4 +356,11 @@ onDidAlarmEmpty: alarmHide() } + + Connections { + target: vVitals + onDidManualEntryRequest: { + _vitalsEntry.open() + } + } }