Index: cppcheck.err =================================================================== diff -u -r09ebbdfde6927724e63442fcfc3e38093f75ce4a -r54aae98b72e3804008acad0bbbb7573be8e35707 --- cppcheck.err (.../cppcheck.err) (revision 09ebbdfde6927724e63442fcfc3e38093f75ce4a) +++ cppcheck.err (.../cppcheck.err) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -40,34 +40,40 @@ [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h:67] -> [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:61]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name 'stringPrefix' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h:79] -> [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:79]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name '_data' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. [sources/AlarmGenerator.cpp:68]: (style) The function 'ALARM_ID_BLE_CUFF' is never used. -[sources/view/VTreatmentCreate.cpp:891]: (style) The function 'doCancelConfirmParameters' is never used. -[sources/view/VTreatmentCreate.cpp:880]: (style) The function 'doCancelSelectingParameters' is never used. +[sources/view/VTreatmentCreate.cpp:892]: (style) The function 'doCancelConfirmParameters' is never used. +[sources/view/VTreatmentCreate.cpp:881]: (style) The function 'doCancelSelectingParameters' is never used. +[sources/view/VTreatmentBegin.cpp:48]: (style) The function 'doCheckBLE' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:93]: (style) The function 'doClearCondition' is never used. [sources/view/VTreatmentEnd.cpp:35]: (style) The function 'doEndTreatmentRequest' is never used. -[sources/view/VTreatmentCreate.cpp:437]: (style) The function 'doFinishedConfirm' is never used. +[sources/view/VTreatmentCreate.cpp:439]: (style) The function 'doFinishedConfirm' is never used. [sources/view/VTreatmentCreate.cpp:196]: (style) The function 'doFinishedCreate' is never used. -[sources/view/VTreatmentCreate.cpp:565]: (style) The function 'doFinishedPrime' is never used. -[sources/view/VTreatmentCreate.cpp:817]: (style) The function 'doGetOperatingParameterNames' is never used. -[sources/view/VTreatmentCreate.cpp:836]: (style) The function 'doGetOperatingParameterValues' is never used. -[sources/view/VTreatmentCreate.cpp:784]: (style) The function 'doGetPrescriptionParameterNames' is never used. -[sources/view/VTreatmentCreate.cpp:801]: (style) The function 'doGetPrescriptionParameterValues' is never used. +[sources/view/VTreatmentCreate.cpp:576]: (style) The function 'doFinishedPrime' is never used. +[sources/view/VBluetooth.cpp:115]: (style) The function 'doGetDevices' is never used. +[sources/view/VTreatmentCreate.cpp:818]: (style) The function 'doGetOperatingParameterNames' is never used. +[sources/view/VTreatmentCreate.cpp:837]: (style) The function 'doGetOperatingParameterValues' is never used. +[sources/view/VBluetooth.cpp:125]: (style) The function 'doGetPairedDevices' is never used. +[sources/view/VTreatmentCreate.cpp:785]: (style) The function 'doGetPrescriptionParameterNames' is never used. +[sources/view/VTreatmentCreate.cpp:802]: (style) The function 'doGetPrescriptionParameterValues' is never used. +[sources/view/VVitals.cpp:55]: (style) The function 'doManualBPMeasureEntry' is never used. [sources/view/VEventSpy.cpp:139]: (style) The function 'doMouseReset' is never used. [sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp:66]: (style) The function 'doOptionDuration' is never used. -[sources/view/VTreatmentCreate.cpp:904]: (style) The function 'doRequestPop' is never used. +[sources/view/VTreatmentCreate.cpp:905]: (style) The function 'doRequestPop' is never used. [sources/view/VTreatmentCreate.cpp:125]: (style) The function 'doResetCreateTreatment' is never used. [sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp:54]: (style) The function 'doResume' is never used. -[sources/view/VTreatmentCreate.cpp:869]: (style) The function 'doSelectParameters' is never used. +[sources/view/VTreatmentCreate.cpp:870]: (style) The function 'doSelectParameters' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:76]: (style) The function 'doSilence' is never used. -[sources/view/VTreatmentCreate.cpp:575]: (style) The function 'doStartTreatment' is never used. +[sources/view/VTreatmentBegin.cpp:72]: (style) The function 'doStartTreatment' is never used. [sources/view/VEventSpy.cpp:182]: (style) The function 'doTouchReset' is never used. +[sources/view/VVitals.cpp:42]: (style) The function 'doUpdateBPMeasureInterval' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:55]: (style) The function 'doUserActionEnd' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:65]: (style) The function 'doUserActionOk' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:35]: (style) The function 'doUserActionResume' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:45]: (style) The function 'doUserActionRinseback' is never used. [sources/utility/types.cpp:28]: (style) The function 'floatCompare' is never used. [sources/utility/types.cpp:44]: (style) The function 'getBits' is never used. +[sources/view/VBluetoothDeviceInfo.cpp:68]: (style) The function 'isConnected' is never used. +[sources/bluetooth/BLEScanner.cpp:55]: (style) The function 'onQuit' is never used. [sources/storage/FileHandler.cpp:95]: (style) The function 'read' is never used. -[sources/view/VTreatmentCreate.cpp:544]: (style) The function 'saveTreatmentRangesCSV' is never used. -[sources/view/dg/data/VDGOperationModeData.cpp:41]: (style) The function 'text' is never used. +[sources/view/VTreatmentCreate.cpp:546]: (style) The function 'saveTreatmentRangesCSV' is never used. [sources/MainTimer.cpp:116]: (style) The function 'timerEvent' is never used. (information) Cppcheck cannot find all the include files. Cppcheck can check the code without the include files found. But the results will probably be more accurate if all the include files are found. Please check your project's include directories and add all of them as include directories for Cppcheck. To see what files Cppcheck cannot find use --check-config. Index: cppcheck.log =================================================================== diff -u -r09ebbdfde6927724e63442fcfc3e38093f75ce4a -r54aae98b72e3804008acad0bbbb7573be8e35707 --- cppcheck.log (.../cppcheck.log) (revision 09ebbdfde6927724e63442fcfc3e38093f75ce4a) +++ cppcheck.log (.../cppcheck.log) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -4,484 +4,521 @@ Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking main.cpp: UNIT_TEST... -1/96 files checked 6% done +1/103 files checked 0% done Checking sources/AlarmGenerator.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -2/96 files checked 7% done +2/103 files checked 1% done Checking sources/ApplicationController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -3/96 files checked 8% done +3/103 files checked 2% done Checking sources/ApplicationPost.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -4/96 files checked 9% done +4/103 files checked 3% done Checking sources/MainTimer.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -5/96 files checked 10% done +5/103 files checked 4% done Checking sources/Threads.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -6/96 files checked 11% done +6/103 files checked 5% done +Checking sources/bluetooth/BLEScanner.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +7/103 files checked 6% done Checking sources/canbus/CanInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -7/96 files checked 12% done +8/103 files checked 7% done Checking sources/canbus/FrameInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -8/96 files checked 13% done +9/103 files checked 8% done Checking sources/canbus/MessageAcknowModel.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -9/96 files checked 14% done +10/103 files checked 9% done Checking sources/canbus/MessageBuilder.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/canbus/MessageBuilder.cpp: DISABLE_CRC... -10/96 files checked 15% done +11/103 files checked 10% done Checking sources/canbus/MessageDispatcher.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/canbus/MessageDispatcher.cpp: DEBUG_ACKBACK_HD_TO_UI... Checking sources/canbus/MessageDispatcher.cpp: DEBUG_OUT_OF_SYNC... -11/96 files checked 16% done +12/103 files checked 11% done Checking sources/canbus/MessageInterpreter.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -12/96 files checked 17% done +13/103 files checked 12% done Checking sources/gui/GuiController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -13/96 files checked 18% done +14/103 files checked 13% done Checking sources/gui/GuiGlobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -14/96 files checked 19% done +15/103 files checked 14% done Checking sources/gui/GuiView.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -15/96 files checked 20% done +16/103 files checked 15% done Checking sources/model/MAbstract.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/model/MAbstract.cpp: ROUND_FLOATS... -16/96 files checked 21% done +17/103 files checked 16% done Checking sources/model/MDGDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -17/96 files checked 22% done +18/103 files checked 17% done Checking sources/model/MEndTreatmentResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -18/96 files checked 23% done +19/103 files checked 18% done Checking sources/model/MHDDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -19/96 files checked 24% done +20/103 files checked 19% done Checking sources/model/MPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -20/96 files checked 25% done +21/103 files checked 20% done Checking sources/model/MStartTreatmentResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -21/96 files checked 26% done +22/103 files checked 21% done Checking sources/model/MTreatmentParametersResp.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -22/96 files checked 27% done +23/103 files checked 22% done Checking sources/model/dg/data/MDGDrainPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -23/96 files checked 28% done +24/103 files checked 23% done Checking sources/model/dg/data/MDGHeatersData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -24/96 files checked 29% done +25/103 files checked 24% done Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -25/96 files checked 30% done +26/103 files checked 25% done Checking sources/model/dg/data/MDGOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -26/96 files checked 31% done +27/103 files checked 26% done Checking sources/model/dg/data/MDGPressuresData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -27/96 files checked 32% done +28/103 files checked 27% done Checking sources/model/dg/data/MDGROPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -28/96 files checked 33% done +29/103 files checked 28% done Checking sources/model/dg/data/MDGReservoirData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -29/96 files checked 34% done +30/103 files checked 29% done Checking sources/model/dg/data/MDGTemperaturesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -30/96 files checked 35% done +31/103 files checked 30% done Checking sources/model/dg/data/MDGValvesStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -31/96 files checked 36% done +32/103 files checked 31% done Checking sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -32/96 files checked 37% done +33/103 files checked 32% done Checking sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -33/96 files checked 38% done +34/103 files checked 33% done Checking sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -34/96 files checked 39% done +35/103 files checked 33% done Checking sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -35/96 files checked 40% done +36/103 files checked 34% done Checking sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -36/96 files checked 41% done +37/103 files checked 35% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -37/96 files checked 42% done +38/103 files checked 36% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -38/96 files checked 43% done +39/103 files checked 37% done +Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +40/103 files checked 38% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -39/96 files checked 44% done +41/103 files checked 39% done Checking sources/model/hd/alarm/MAlarmCleared.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -40/96 files checked 45% done +42/103 files checked 40% done Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -41/96 files checked 46% done +43/103 files checked 41% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -42/96 files checked 47% done +44/103 files checked 42% done Checking sources/model/hd/alarm/MAlarmTriggered.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -43/96 files checked 48% done +45/103 files checked 43% done Checking sources/model/hd/data/MHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -44/96 files checked 49% done +46/103 files checked 44% done Checking sources/model/hd/data/MPrimingData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -45/96 files checked 50% done +47/103 files checked 45% done Checking sources/model/hd/data/MTreatmentFlowsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -46/96 files checked 50% done +48/103 files checked 46% done Checking sources/model/hd/data/MTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -47/96 files checked 51% done +49/103 files checked 47% done Checking sources/model/hd/data/MTreatmentOutletFlowData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -48/96 files checked 52% done +50/103 files checked 48% done Checking sources/model/hd/data/MTreatmentPressureOcclusionData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -49/96 files checked 53% done +51/103 files checked 49% done Checking sources/model/hd/data/MTreatmentRangesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -50/96 files checked 54% done +52/103 files checked 50% done Checking sources/model/hd/data/MTreatmentSalineData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -51/96 files checked 55% done +53/103 files checked 51% done Checking sources/model/hd/data/MTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -52/96 files checked 56% done +54/103 files checked 52% done Checking sources/model/hd/data/MTreatmentTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -53/96 files checked 57% done +55/103 files checked 53% done Checking sources/storage/DriveWatcher.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -54/96 files checked 58% done +56/103 files checked 54% done Checking sources/storage/FileHandler.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -55/96 files checked 59% done +57/103 files checked 55% done Checking sources/storage/FileSaver.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -56/96 files checked 60% done +58/103 files checked 56% done Checking sources/storage/Logger.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -57/96 files checked 61% done +59/103 files checked 57% done Checking sources/storage/StorageGlobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -58/96 files checked 62% done +Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_DESKTOP... +Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_TARGET... +60/103 files checked 58% done Checking sources/utility/crc.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -59/96 files checked 63% done +61/103 files checked 59% done Checking sources/utility/format.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -60/96 files checked 64% done +62/103 files checked 60% done Checking sources/utility/types.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -61/96 files checked 65% done +63/103 files checked 61% done +Checking sources/view/VAlert.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +64/103 files checked 62% done +Checking sources/view/VBluetooth.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +65/103 files checked 63% done +Checking sources/view/VBluetoothDeviceInfo.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +66/103 files checked 64% done Checking sources/view/VEventSpy.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/view/VEventSpy.cpp: SPY_MOUSE_EVENT... -62/96 files checked 66% done +67/103 files checked 65% done Checking sources/view/VPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -63/96 files checked 67% done +68/103 files checked 66% done Checking sources/view/VPriming.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -64/96 files checked 68% done +69/103 files checked 66% done Checking sources/view/VTreatmentBegin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -65/96 files checked 69% done +70/103 files checked 67% done Checking sources/view/VTreatmentCreate.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -66/96 files checked 70% done +71/103 files checked 68% done Checking sources/view/VTreatmentEnd.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -67/96 files checked 71% done +72/103 files checked 69% done +Checking sources/view/VVitals.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +73/103 files checked 70% done Checking sources/view/dg/data/VDGDrainPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -68/96 files checked 72% done +74/103 files checked 71% done Checking sources/view/dg/data/VDGHeatersData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -69/96 files checked 73% done +75/103 files checked 72% done Checking sources/view/dg/data/VDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -70/96 files checked 74% done +76/103 files checked 73% done Checking sources/view/dg/data/VDGOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -71/96 files checked 75% done +77/103 files checked 74% done Checking sources/view/dg/data/VDGPressuresData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -72/96 files checked 76% done +78/103 files checked 75% done Checking sources/view/dg/data/VDGROPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -73/96 files checked 77% done +79/103 files checked 76% done Checking sources/view/dg/data/VDGReservoirData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -74/96 files checked 78% done +80/103 files checked 77% done Checking sources/view/dg/data/VDGTemperaturesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -75/96 files checked 79% done +81/103 files checked 78% done Checking sources/view/dg/data/VDGValvesStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -76/96 files checked 80% done +82/103 files checked 79% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -77/96 files checked 81% done +83/103 files checked 80% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -78/96 files checked 82% done +84/103 files checked 81% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -79/96 files checked 83% done +85/103 files checked 82% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -80/96 files checked 84% done +86/103 files checked 83% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -81/96 files checked 85% done +87/103 files checked 84% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -82/96 files checked 86% done +88/103 files checked 85% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -83/96 files checked 87% done +89/103 files checked 86% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -84/96 files checked 88% done +90/103 files checked 87% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +91/103 files checked 88% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -85/96 files checked 89% done +92/103 files checked 89% done Checking sources/view/hd/alarm/VAlarmStatus.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -86/96 files checked 90% done +93/103 files checked 90% done Checking sources/view/hd/data/VHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -87/96 files checked 91% done +94/103 files checked 91% done Checking sources/view/hd/data/VHDTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -88/96 files checked 92% done +95/103 files checked 92% done Checking sources/view/hd/data/VTreatmentBloodFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -89/96 files checked 93% done +96/103 files checked 93% done Checking sources/view/hd/data/VTreatmentDialysateFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -90/96 files checked 94% done +97/103 files checked 94% done Checking sources/view/hd/data/VTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -91/96 files checked 95% done +98/103 files checked 95% done Checking sources/view/hd/data/VTreatmentPressureOcclusion.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -92/96 files checked 96% done +99/103 files checked 96% done Checking sources/view/hd/data/VTreatmentRanges.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -93/96 files checked 97% done +100/103 files checked 97% done Checking sources/view/hd/data/VTreatmentSalineData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -94/96 files checked 98% done +101/103 files checked 98% done Checking sources/view/hd/data/VTreatmentTime.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -95/96 files checked 99% done +102/103 files checked 99% done Checking sources/view/hd/data/VTreatmentUltrafiltration.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -96/96 files checked 100% done +103/103 files checked 100% done Index: denali.pro =================================================================== diff -u -r19092150c9343b729ad87be76805300417bfd68c -r54aae98b72e3804008acad0bbbb7573be8e35707 --- denali.pro (.../denali.pro) (revision 19092150c9343b729ad87be76805300417bfd68c) +++ denali.pro (.../denali.pro) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -1,4 +1,4 @@ -QT += widgets qml quick serialbus concurrent +QT += widgets qml quick serialbus concurrent bluetooth CONFIG += c++17 warn_on QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii and .s files @@ -20,6 +20,16 @@ # deprecated API to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS +linux-g++ { + message("Building for desktop") + DEFINES += BUILD_FOR_DESKTOP +} + +linux-oe-generic-g++ { + message("Building for target") + DEFINES += BUILD_FOR_TARGET +} + # You can also make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. @@ -31,6 +41,7 @@ sources/storage \ sources/gui \ sources/canbus \ + sources/bluetooth \ sources/utility \ sources/abstract \ sources/model \ @@ -76,6 +87,7 @@ sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ @@ -106,6 +118,8 @@ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ + \ # Bluetooth + sources/bluetooth/BLEScanner.h \ \ # Denali Message sources/canbus/MessageGlobals.h \ sources/canbus/MessageAcknowModel.h \ @@ -117,19 +131,24 @@ sources/gui/GuiView.h \ sources/gui/GuiController.h \ \ # ---------- Views ---------- + sources/view/VAlert.h \ + sources/view/VBluetooth.h \ + sources/view/VBluetoothDeviceInfo.h \ sources/view/VTreatmentCreate.h \ sources/view/VTreatmentEnd.h \ sources/view/VTreatmentBegin.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ sources/view/VPriming.h \ + sources/view/VVitals.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ @@ -197,6 +216,7 @@ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ @@ -227,6 +247,8 @@ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ + \ # Bluetooth + sources/bluetooth/BLEScanner.cpp \ \ # Denali Message sources/canbus/MessageAcknowModel.cpp \ sources/canbus/MessageBuilder.cpp \ @@ -237,21 +259,26 @@ sources/gui/GuiView.cpp \ sources/gui/GuiController.cpp \ \ # ---------- Views ---------- + sources/view/VAlert.cpp \ + sources/view/VBluetooth.cpp \ + sources/view/VBluetoothDeviceInfo.cpp \ sources/view/VTreatmentCreate.cpp \ sources/view/VTreatmentEnd.cpp \ sources/view/VTreatmentBegin.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPriming.cpp \ sources/view/VPowerOff.cpp \ + sources/view/VVitals.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \ Index: denali.pro.user =================================================================== diff -u -r09ebbdfde6927724e63442fcfc3e38093f75ce4a -r54aae98b72e3804008acad0bbbb7573be8e35707 --- denali.pro.user (.../denali.pro.user) (revision 09ebbdfde6927724e63442fcfc3e38093f75ce4a) +++ denali.pro.user (.../denali.pro.user) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 1 0 0 @@ -104,7 +104,7 @@ false false - true + false true @@ -1176,16 +1176,16 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - --disable-timeout --disable-unhandled-report --logOut + -l 3768 false true true false - true - false + false + true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release 1 @@ -1196,7 +1196,7 @@ Qt 5.12.5 (iMX8) Qt 5.12.5 (iMX8) {5d6458ef-f917-4aef-a092-c77bbe106149} - 0 + 1 0 0 @@ -1207,7 +1207,7 @@ qmake QtProjectManager.QMakeBuildStep - false + true false false @@ -1475,12 +1475,12 @@ 1 - denali (on Generic Linux Device (iMX8))2 + denali (on UI Test Board) RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro 1 false - -u + 3768 false true Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r4d322070769e54c059b020f18215dca88c90acd7 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4d322070769e54c059b020f18215dca88c90acd7) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -248,6 +248,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Ultrafiltration Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration adjustment volume + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) +{ + QVariantList mData; + mData += vData.volume; + onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Ultrafiltration State Adjustment Denali message. * \param vData - Data model contains treatment ultrafiltration state adjustment * \return void @@ -292,11 +305,11 @@ * \param vData - Data model contains the start treatment request information. * \return void */ -void MessageDispatcher::onAdjustment(const StartTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentStartRequestData &vData) { QVariantList mData; mData += vData.request; - onActionTransmit(GuiActionType::ID_StartTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentStartReq, mData); } /*! @@ -345,11 +358,11 @@ * \param vData - Data model contains the confirm treatment request * \return void */ -void MessageDispatcher::onAdjustment(const ConfirmTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentConfirmRequestData &vData) { QVariantList mData; mData += vData.request; - onActionTransmit(GuiActionType::ID_ConfirmTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentConfirmReq, mData); } /*! @@ -358,11 +371,11 @@ * \param vData - Data model contains the end treatment request * \return void */ -void MessageDispatcher::onAdjustment(const EndTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentEndRequestData &vData) { Q_UNUSED(vData) QVariantList mData; - onActionTransmit(GuiActionType::ID_EndTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentEndReq, mData); } @@ -432,10 +445,9 @@ mData += vData.heparinBolusVolume ; mData += vData.dialysateTemp ; - onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentCreateReq, mData); } - /*! * \brief MessageDispatcher::actionTransmit * \details This method is called by slot MessageDispatcher::onActionTransmit Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r4d322070769e54c059b020f18215dca88c90acd7 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 4d322070769e54c059b020f18215dca88c90acd7) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -232,14 +232,15 @@ case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData ); break; case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData ); break; // in-treatment - ultrafiltration - case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationInitRequestData ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData); break; // pre-Treatment - case Gui::GuiActionType::ID_StartTreatmentReq : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData ); break; - case Gui::GuiActionType::ID_ConfirmTreatmentReq : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData ); break; - case Gui::GuiActionType::ID_EndTreatmentReq : INTERPRET_RECVD_MT_MESSAGE(EndTreatmentRequestData ); break; - case Gui::GuiActionType::ID_CreateTreatmentReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData ); break; + case Gui::GuiActionType::ID_TreatmentStartReq : INTERPRET_RECEIVED_MESSAGE(TreatmentStartRequestData ); break; + case Gui::GuiActionType::ID_TreatmentConfirmReq : INTERPRET_RECEIVED_MESSAGE(TreatmentConfirmRequestData ); break; + case Gui::GuiActionType::ID_TreatmentEndReq : INTERPRET_RECVD_MT_MESSAGE(TreatmentEndRequestData ); break; + case Gui::GuiActionType::ID_TreatmentCreateReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData ); break; // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData ); break; @@ -328,22 +329,23 @@ case Gui::GuiActionType::ID_Acknow : ok = true; break; // TODO : implement notify<>() case Gui::GuiActionType::ID_PowerOff : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PowerOff ); break; case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_EVENT("HD,ShuttingDown"); break; // TODO : implement notify<>() - case Gui::GuiActionType::ID_CreateTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp ); break; + case Gui::GuiActionType::ID_TreatmentCreateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentCreateRsp ); break; // Adjustment Response Messages case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break; // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>() - case Gui::GuiActionType::ID_StartTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp ); break; - case Gui::GuiActionType::ID_EndTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_EndTreatmentRsp ); break; + case Gui::GuiActionType::ID_TreatmentStartRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStartRsp ); break; + case Gui::GuiActionType::ID_TreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentEndRsp ); break; // Alarms case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; Index: sources/gui/GuiController.cpp =================================================================== diff -u -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -316,3 +316,23 @@ AlarmStatusData data = AlarmGenerator::ALARM_ID_HD_COMM_TIMEOUT(); emit didActionReceive(data); } + +/*! + * \brief GuiController::doAlertRequest + * Handles a request to show a new alert + * \param alert - (GuiAlert) The alert information to show + */ +void GuiController::doAlertRequest(const GuiAlertRequestData &alertRequest) +{ + emit didAlertRequest(alertRequest); +} + +/*! + * \brief GuiController::doAlertResponse + * Handles a user response to an alert + * \param alertResponse - (GuiAlertResponse) the alert response + */ +void GuiController::doAlertResponse(const GuiAlertResponseData &alertResponse) +{ + emit didAlertResponse(alertResponse); +} Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -95,6 +95,7 @@ } MuteButton { id: _muteButton + objectName: "_alarmMuteButton" anchors { verticalCenter : _titleBar.verticalCenter left : _titleBar.left @@ -134,6 +135,7 @@ // 3 - No button at all for the situations that the alarm can't be resolved by user. // :: OK button and the other 3 buttons (Resume,Rinseback,End) should never come together TouchRect { id : _resumeTouchRect + objectName: "_alarmResume" visible : resumeVisible button.onPressed: resumeClicked() text.text : qsTr("RESUME") @@ -142,6 +144,7 @@ } TouchRect { id : _rinsebackTouchRect + objectName: "_alarmRinseback" visible : rinsebackVisible button.onPressed: rinsebackClicked() text.text : qsTr("RINSEBACK") @@ -150,13 +153,15 @@ } TouchRect { id : _endTouchRect + objectName: "_alarmEnd" visible : endVisible button.onPressed: endClicked() text.text : qsTr("END") width : _buttonGroup.buttonsWidth borderColor : Colors.white } TouchRect { id : _okTouchRect + objectName: "_alarmOK" visible : okVisible button.onPressed: okClicked() text.text : qsTr("OK") Index: sources/gui/qml/main.qml =================================================================== diff -u -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/gui/qml/main.qml (.../main.qml) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) +++ sources/gui/qml/main.qml (.../main.qml) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -23,31 +23,35 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the TreatmentFlows.qml -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 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 VTreatmentAdjustmentDuration 0.1 -import VTreatmentAdjustmentFlows 0.1 +import VTreatmentAdjustmentDuration 0.1; +import VTreatmentAdjustmentFlows 0.1; -import VTreatmentCreate 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 VTreatmentEnd 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 VTreatmentEnd 0.1; +import VTreatmentAdjustmentUltrafiltrationInit 0.1; +import VVitals 0.1; +import VAlert 0.1; // Qml imports import "qrc:/globals" @@ -103,9 +107,13 @@ VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } + VBluetooth { id: vBluetooth } VPriming { id: vPriming } VTreatmentBegin { id: vTreatmentBegin } VTreatmentEnd { id: vTreatmentEnd } + VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit } + VVitals { id: vVitals } + VAlert { id: vAlert } // ----- Follow the below Z order ----- // 1 - Screens @@ -272,6 +280,8 @@ } } + Alert { id: _alert } + Connections { target: vAlarmStatus onAlarm_Flag_noResumeChanged : vAlarmStatus.alarm_KeepMinimized = false onAlarm_Flag_noRinsebackChanged : vAlarmStatus.alarm_KeepMinimized = false Index: sources/model/MModel.h =================================================================== diff -u -r4d322070769e54c059b020f18215dca88c90acd7 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/model/MModel.h (.../MModel.h) (revision 4d322070769e54c059b020f18215dca88c90acd7) +++ sources/model/MModel.h (.../MModel.h) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -51,6 +51,7 @@ #include "MTreatmentAdjustRequests.h" #include "MTreatmentAdjustDurationResponse.h" #include "MTreatmentAdjustBloodDialysateResponse.h" +#include "MTreatmentAdjustUltrafiltrationInitResponse.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" @@ -214,37 +215,40 @@ REGISTER_METATYPE( PrimingData ) \ \ /* Request */ \ - REGISTER_METATYPE( StartTreatmentRequestData ) \ - REGISTER_METATYPE( ConfirmTreatmentRequestData ) \ - REGISTER_METATYPE( EndTreatmentRequestData ) \ - \ + REGISTER_METATYPE( TreatmentStartRequestData ) \ + REGISTER_METATYPE( TreatmentConfirmRequestData ) \ + REGISTER_METATYPE( TreatmentEndRequestData ) \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. REGISTER_METATYPE( AlarmClearedConditionRequestData ) \ coco end*/ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ REGISTER_METATYPE( AdjustHeparinRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ + REGISTER_METATYPE( GuiAlertRequestData ) \ /* Response */ \ - REGISTER_METATYPE( StartTreatmentResponseData ) \ - REGISTER_METATYPE( EndTreatmentResponseData ) \ + REGISTER_METATYPE( TreatmentStartResponseData ) \ + REGISTER_METATYPE( TreatmentEndResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( GuiAlertResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ - REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) \ + REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) //===============================================================================// /*! @@ -294,13 +298,14 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PrimingData ) \ /* Response */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, EndTreatmentResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStartResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ @@ -311,12 +316,13 @@ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ @@ -379,13 +385,14 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PrimingData ) \ /* Response */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( EndTreatmentResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStartResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ @@ -395,12 +402,13 @@ /* Request --------------------------------------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ @@ -416,12 +424,13 @@ /* Request ----------------------- NoEmit -------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ @@ -437,15 +446,16 @@ /* Request ----------------------- public -------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHeparinRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ @@ -488,12 +498,13 @@ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ ACTION_RECEIVE_SIGNAL( PrimingData ) \ /* Response */ \ - ACTION_RECEIVE_SIGNAL( StartTreatmentResponseData ) \ - ACTION_RECEIVE_SIGNAL( EndTreatmentResponseData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentStartResponseData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentEndResponseData ) \ \ - ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentParametersResponseData ) \ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -137,6 +137,33 @@ }; /*! + * \brief The MAdjustUltrafiltrationEditReq class + * \details The ultrafiltration volume change request model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4F00| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Initial Adjustment Request | + * + * | Payload || + * | || + * | #1:(F32) | \ref volume | + * + */ +class MAdjustUltrafiltrationInitReq : public MModel { +public: + float volume = 0; + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({volume}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustUFInit", vParameters); + } +}; + +/*! * \brief The MAdjustUltrafiltrationStateReq class * \details The ultrafiltration pause/resume request model * @@ -422,7 +449,7 @@ }; /*! - * \brief The MStartTreatmentReq class + * \brief The MTreatmentStartReq class * \details The model to request starting a treatment * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -434,7 +461,7 @@ * | #1:(U32) | \ref request | * */ -class MStartTreatmentReq : public MModel { +class MTreatmentStartReq : public MModel { public: enum Options { eSelectParams = 0, @@ -454,19 +481,19 @@ }; /*! - * \brief The MConfirmTreatmentReq class + * \brief The MTreatmentConfirmReq class * \details The model to tell HD treatment parameters have been confirmed * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 56 | 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:-----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 0x3B00| 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | * * | Payload || * | || * | #1:(U32) | \ref request | * */ -class MConfirmTreatmentReq : public MModel { +class MTreatmentConfirmReq : public MModel { public: enum Options { eCancel = 0, @@ -485,7 +512,7 @@ }; /*! - * \brief The MEndTreatmentReq class + * \brief The MTreatmentEndReq class * \details The model to request an end to treatment * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -497,7 +524,7 @@ * | N/A || * */ -class MEndTreatmentReq : public MModel { +class MTreatmentEndReq : public MModel { public: // coco begin validated : Has been validated manually. @@ -589,21 +616,21 @@ return MModel::toString("AdjustTreatmentParametersRequest", vParameters); } }; - } typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; typedef Model:: MAdjustDurationReq AdjustDurationRequestData; +typedef Model:: MAdjustUltrafiltrationInitReq AdjustUltrafiltrationInitRequestData; typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MStartTreatmentReq StartTreatmentRequestData; -typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData; -typedef Model:: MEndTreatmentReq EndTreatmentRequestData; +typedef Model:: MTreatmentStartReq TreatmentStartRequestData; +typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData; +typedef Model:: MTreatmentEndReq TreatmentEndRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r4d322070769e54c059b020f18215dca88c90acd7 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 4d322070769e54c059b020f18215dca88c90acd7) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -141,6 +141,9 @@ // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4 )); alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); + // A message has been received regardless of the alarm ID + // and the GUI should be notified about the changes has been made to the properties + // it doesn't harm the performance either since the GUI will only be notified about the changed properties. if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { emit didAlarmEmpty(); } Index: unittests/tst_models.cpp =================================================================== diff -u -r0d3114203575d6725576f8bdc8299ad772d55fd5 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -41,6 +41,7 @@ #include "MTreatmentSalineData.h" #include "MPrimingData.h" +#include "MTreatmentAdjustUltrafiltrationInitResponse.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" @@ -232,6 +233,52 @@ } } +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Adjust Ultrafiltration Init Response ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // +void tst_models::tst_MAdjustUltrafiltrationInitResponse_data () +{ + QTest::addColumn("errorIndex"); + QTest::addColumn("data"); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B")); + QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray()); + QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00")); + QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); + QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00" "01" "02")); + QTest::newRow("mReason ")<< 2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03")); + QTest::newRow("mReason ")<< 2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04")); + QTest::newRow("mReason ")<< 2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05")); + QTest::newRow("mReason ")<< 2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06")); + QTest::newRow("mVolume ")<< 3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07")); + QTest::newRow("mVolume ")<< 3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08")); + QTest::newRow("mVolume ")<< 3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09")); + QTest::newRow("mVolume ")<< 3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A")); +} + +void tst_models::tst_MAdjustUltrafiltrationInitResponse () +{ + Model::MAdjustUltrafiltrationInitResponse mData; + + QFETCH(int , errorIndex ); + QFETCH(QByteArray, data ); + + int startIndex = 0; + int index = errorIndex - 1; + bool ok = mData.fromByteArray(data, &startIndex); + Q_UNUSED(ok) +#ifdef CONSOLEOUT + qDebug() << index << errorIndex << startIndex << ok << data ; +#endif + + switch (errorIndex) { + case 0: { index = 0 ; QVERIFY ( mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; + case 1: { index = index * sizeof mData._data.mAccepted ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; + case 2: { index = index * sizeof mData._data.mReason ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; + case 3: { index = index * sizeof mData._data.mVolume ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; + default: + QVERIFY2(false, "Incorrect Test"); + break; + } +} + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Adjust Ultrafiltration State Response ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MAdjustUltrafiltrationStateResponse_data () { @@ -1469,7 +1516,43 @@ } } +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmClearedCondition ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmClearedCondition data definition ~~~~~~~~~~~~~~~~~~~~~~~~ // +void tst_models::tst_MAlarmClearedCondition_data () { + QTest::addColumn("errorIndex"); + QTest::addColumn("data"); + QTest::newRow("msg complete") << 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03")); + QTest::newRow("mAlarmID ") << 1 << QByteArray::fromHex(QByteArray()); + QTest::newRow("mAlarmID ") << 1 << QByteArray::fromHex(QByteArray("00")); + QTest::newRow("mAlarmID ") << 1 << QByteArray::fromHex(QByteArray("00" "01")); + QTest::newRow("mAlarmID ") << 1 << QByteArray::fromHex(QByteArray("00" "01" "02")); +} +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmCleared test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // +void tst_models::tst_MAlarmClearedCondition() { + Model::MAlarmClearedCondition mData; + QFETCH(int , errorIndex ); + QFETCH(QByteArray, data ); + + int startIndex = 0; + int index = errorIndex - 1; + bool ok = mData.fromByteArray(data, &startIndex); + Q_UNUSED(ok) +#ifdef CONSOLEOUT + qDebug() << index << errorIndex << startIndex << ok << data ; +#endif + + switch (errorIndex) { + case 0: { index = 0 ; QVERIFY ( mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; + case 1: { index = index * sizeof mData._data.mAlarmID; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; + default: + QVERIFY2(false, "Incorrect Test"); + break; + } +} + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentParametersResp test ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentParametersResp data definition ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MTreatmentParametersResp_data() @@ -1745,7 +1828,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MStartTreatmentResponse() { - Model::MStartTreatmentResponse mData; + Model::MTreatmentStartResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1783,7 +1866,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MEndTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MEndTreatmentResponse() { - Model::MEndTreatmentResponse mData; + Model::MTreatmentEndResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1916,15 +1999,15 @@ MessageInterpreter interpreter; QVariantList vData; QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentStartReq, vData, payload)); } void tst_models::tst_MConfirmTreatmentRequest() { MessageInterpreter interpreter; QVariantList vData; QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_ConfirmTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentConfirmReq, vData, payload)); } void tst_models::tst_MEndTreatmentRequest() @@ -1933,18 +2016,42 @@ QVariantList vData; QByteArray payload; Message msg; - msg.actionId = Gui::GuiActions::ID_EndTreatmentReq; + msg.actionId = Gui::GuiActions::ID_TreatmentEndReq; - QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); + QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload)); QVERIFY(!interpreter.interpretMessage_HD(msg,vData)); vData.append(0); - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload)); } void tst_models::tst_MAdjustmentTreatmentParametersRequest() { MessageInterpreter interpreter; QVariantList vData; QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentCreateReq, vData, payload)); } + +void tst_models::tst_MAdjustUltrafiltrationInitRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustUltrafiltrationInitReq, vData, payload)); +} + +void tst_models::tst_MAlarmUserActionRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserActionReq, vData, payload)); +} + +void tst_models::tst_MAlarmClearedConditionRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmClearedConditionReq, vData, payload)); +}