Index: sources/gui/qml/main.qml =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5 --- sources/gui/qml/main.qml (.../main.qml) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/gui/qml/main.qml (.../main.qml) (revision d2035a8728794afeefaa244bf8d1597926d945f5) @@ -30,15 +30,23 @@ import VTreatmentTime 0.1; import VAlarmStatus 0.1; import VPowerOff 0.1; +import VHDOperationMode 0.1; import VTreatmentAdjustmentDuration 0.1; import VTreatmentAdjustmentFlows 0.1; import VTreatmentAdjustmentUltrafiltrationState 0.1; import VTreatmentAdjustmentUltrafiltrationEdit 0.1; import VTreatmentAdjustmentUltrafiltrationConfirm 0.1; -import VLoadCellReadings 0.1; -import VTemperatureSensors 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; // Qml imports import "qrc:/globals" @@ -60,13 +68,14 @@ onDidActionReceive: { //console.debug(vAction, vData) switch(vAction) { - case GuiActions.PowerOffBroadcast: + case GuiActions.ID_ShuttingDown: _autoHideInfo.showDialog( qsTr("System is shutting down"), 5000 // if any error happens and shutdown is not successful then after 5 seconds dialog hides. ) break; } + } } @@ -94,15 +103,23 @@ _alarm_dialog.visible = false; } } - VPowerOff { id: vPowerOff } + VPowerOff { id: vPowerOff } + VHDOperationMode { id: vHDOperationMode } VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } - VLoadCellReadings { id: vLoadCellReadings } - VTemperatureSensors { id: vTemperatureSensors } + VDGDrainPump { id: vDGDrainPump } + VDGHeaters { id: vDGHeaters } + VDGLoadCellReadings { id: vDGLoadCellReadings } + VDGOperationMode { id: vDGOperationMode } + VDGPressures { id: vDGPressures } + VDGROPump { id: vDGROPump } + VDGReservoir { id: vDGReservoir } + VDGTemperatures { id: vDGTemperatures } + VDGValvesStates { id: vDGValvesStates } VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } @@ -137,10 +154,10 @@ PowerOff { id: _powerOffDialog onAccepted: { - _GuiView.doActionTransmit(GuiActions.PowerOff, GuiActions.Accepted) + _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Accepted) } onRejected: { - _GuiView.doActionTransmit(GuiActions.PowerOff, GuiActions.Rejected) + _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Rejected) } }