Index: denali.pro =================================================================== diff -u -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a -rd9a57659f19070d257e425957c1c3ec65b45fd60 --- denali.pro (.../denali.pro) (revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a) +++ denali.pro (.../denali.pro) (revision d9a57659f19070d257e425957c1c3ec65b45fd60) @@ -264,6 +264,7 @@ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ + sources/view/VGeneralEvent.h \ sources/device/DeviceView.h \ \ # ---------- Views - POST sources/view/dg/data/post/VDGPOSTData.h \ @@ -518,6 +519,7 @@ sources/view/VTreatmentCreate.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPowerOff.cpp \ + sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ \ # ---------- Views - POST sources/view/dg/data/post/VDGPOSTData.cpp \ Index: denali.pro.user =================================================================== diff -u -rfd1b031dd0c66addaa751f5d69dfef46bdfc6b7a -rd9a57659f19070d257e425957c1c3ec65b45fd60 --- denali.pro.user (.../denali.pro.user) (revision fd1b031dd0c66addaa751f5d69dfef46bdfc6b7a) +++ denali.pro.user (.../denali.pro.user) (revision d9a57659f19070d257e425957c1c3ec65b45fd60) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/main.qml =================================================================== diff -u -r4884b4cb65e55661249c78901b5e0b724cb21b36 -rd9a57659f19070d257e425957c1c3ec65b45fd60 --- sources/gui/qml/main.qml (.../main.qml) (revision 4884b4cb65e55661249c78901b5e0b724cb21b36) +++ sources/gui/qml/main.qml (.../main.qml) (revision d9a57659f19070d257e425957c1c3ec65b45fd60) @@ -22,6 +22,7 @@ import Gui.Actions 0.1 // View classes +import VGeneralEvent 0.1 import VHDAccelerometer 0.1 import VHDSyringePump 0.1 import VHDBloodLeak 0.1 @@ -151,6 +152,13 @@ } + VGeneralEvent { id: vGeneralEvent } + VHDAccelerometer { id: vHDAccelerometer } + VHDSyringePump { id: vHDSyringePump } + VHDAirBubble { id: vHDAirBubble } + VHDBloodLeak { id: vHDBloodLeak } + VHDAirTrap { id: vHDAirTrap } + VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } @@ -159,11 +167,6 @@ VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } - VHDAccelerometer { id: vHDAccelerometer } - VHDSyringePump { id: vHDSyringePump } - VHDAirBubble { id: vHDAirBubble } - VHDBloodLeak { id: vHDBloodLeak } - VHDAirTrap { id: vHDAirTrap } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters }