Index: cppcheck.err =================================================================== diff -u -r59029602c59977b2354fd8fc8d2633e88baf5224 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- cppcheck.err (.../cppcheck.err) (revision 59029602c59977b2354fd8fc8d2633e88baf5224) +++ cppcheck.err (.../cppcheck.err) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -40,36 +40,42 @@ [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/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp:59]: (style) The function 'doConfirm' 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:121]: (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:131]: (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:69]: (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/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp:51]: (style) The function 'doReconnect' 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/VTreatmentAdjustmentRecirculate.cpp:67]: (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/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp:75]: (style) The function 'doTreatmentEnd' is never used. +[sources/view/VVitals.cpp:56]: (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:166]: (style) The function 'removeFiles' 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 -r59029602c59977b2354fd8fc8d2633e88baf5224 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- cppcheck.log (.../cppcheck.log) (revision 59029602c59977b2354fd8fc8d2633e88baf5224) +++ cppcheck.log (.../cppcheck.log) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -4,579 +4,606 @@ Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking main.cpp: UNIT_TEST... -1/115 files checked 5% done +1/120 files checked 0% done Checking sources/AlarmGenerator.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -2/115 files checked 6% done +2/120 files checked 1% done Checking sources/ApplicationController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -3/115 files checked 7% done +3/120 files checked 2% done Checking sources/ApplicationPost.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -4/115 files checked 8% done +4/120 files checked 3% done Checking sources/MainTimer.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -5/115 files checked 9% done +5/120 files checked 4% done Checking sources/Threads.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -6/115 files checked 9% done +6/120 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/120 files checked 5% done Checking sources/canbus/CanInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -7/115 files checked 10% done +8/120 files checked 6% done Checking sources/canbus/FrameInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -8/115 files checked 11% done +9/120 files checked 7% done Checking sources/canbus/MessageAcknowModel.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -9/115 files checked 12% done +10/120 files checked 8% 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/115 files checked 13% done +11/120 files checked 9% 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/115 files checked 14% done +12/120 files checked 10% done Checking sources/canbus/MessageInterpreter.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -12/115 files checked 14% done +13/120 files checked 10% done Checking sources/gui/GuiController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -13/115 files checked 15% done +14/120 files checked 11% done Checking sources/gui/GuiGlobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -14/115 files checked 16% done +15/120 files checked 12% done Checking sources/gui/GuiView.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -15/115 files checked 17% done +16/120 files checked 13% 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/115 files checked 18% done +17/120 files checked 14% done Checking sources/model/MDGDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -17/115 files checked 19% done +18/120 files checked 15% done Checking sources/model/MHDDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -18/115 files checked 19% done +19/120 files checked 15% done Checking sources/model/MPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -19/115 files checked 20% done +20/120 files checked 16% done Checking sources/model/MStartTreatmentResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -20/115 files checked 21% done +21/120 files checked 17% done Checking sources/model/MTreatmentParametersResp.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -21/115 files checked 22% done +22/120 files checked 18% done Checking sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -22/115 files checked 23% done +23/120 files checked 19% done Checking sources/model/dg/data/MDGAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -23/115 files checked 23% done +24/120 files checked 20% done Checking sources/model/dg/data/MDGDrainPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -24/115 files checked 24% done +25/120 files checked 20% done Checking sources/model/dg/data/MDGHeatersData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -25/115 files checked 25% done +26/120 files checked 21% done Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -26/115 files checked 26% done +27/120 files checked 22% done Checking sources/model/dg/data/MDGOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -27/115 files checked 27% done +28/120 files checked 23% done Checking sources/model/dg/data/MDGPressuresData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -28/115 files checked 28% done +29/120 files checked 24% done Checking sources/model/dg/data/MDGROPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -29/115 files checked 28% done +30/120 files checked 25% done Checking sources/model/dg/data/MDGReservoirData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -30/115 files checked 29% done +31/120 files checked 25% done Checking sources/model/dg/data/MDGTemperaturesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -31/115 files checked 30% done +32/120 files checked 26% done Checking sources/model/dg/data/MDGValvesStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -32/115 files checked 31% done +33/120 files checked 27% done Checking sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -33/115 files checked 32% done +34/120 files checked 28% done Checking sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -34/115 files checked 33% done +35/120 files checked 29% done Checking sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -35/115 files checked 33% done +36/120 files checked 30% done Checking sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -36/115 files checked 34% done +37/120 files checked 30% done Checking sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -37/115 files checked 35% done +38/120 files checked 31% done Checking sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -38/115 files checked 36% done +39/120 files checked 32% done Checking sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -39/115 files checked 37% done +40/120 files checked 33% done Checking sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -40/115 files checked 38% done +41/120 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 -41/115 files checked 38% done +42/120 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 -42/115 files checked 39% done +43/120 files checked 35% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -43/115 files checked 40% done +44/120 files checked 36% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -44/115 files checked 41% done +45/120 files checked 37% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -45/115 files checked 42% done +46/120 files checked 38% done Checking sources/model/hd/alarm/MAlarmCleared.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -46/115 files checked 42% done +47/120 files checked 39% done Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -47/115 files checked 43% done +48/120 files checked 40% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -48/115 files checked 44% done +49/120 files checked 40% done Checking sources/model/hd/alarm/MAlarmTriggered.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -49/115 files checked 45% done +50/120 files checked 41% done Checking sources/model/hd/data/MHDAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -50/115 files checked 46% done +51/120 files checked 42% done Checking sources/model/hd/data/MHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -51/115 files checked 47% done +52/120 files checked 43% done Checking sources/model/hd/data/MPrimingData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -52/115 files checked 47% done +53/120 files checked 44% done Checking sources/model/hd/data/MTreatmentBloodPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -53/115 files checked 48% done +54/120 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 -54/115 files checked 49% done +55/120 files checked 45% done Checking sources/model/hd/data/MTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -55/115 files checked 50% done +56/120 files checked 46% done Checking sources/model/hd/data/MTreatmentOutletFlowData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -56/115 files checked 51% done +57/120 files checked 47% done Checking sources/model/hd/data/MTreatmentPressureOcclusionData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -57/115 files checked 52% done +58/120 files checked 48% done Checking sources/model/hd/data/MTreatmentRangesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -58/115 files checked 52% done +59/120 files checked 49% done Checking sources/model/hd/data/MTreatmentRecirculateData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -59/115 files checked 53% done +60/120 files checked 50% done Checking sources/model/hd/data/MTreatmentRinsebackData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -60/115 files checked 54% done +61/120 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 -61/115 files checked 55% done +62/120 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 -62/115 files checked 56% done +63/120 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 -63/115 files checked 57% done +64/120 files checked 53% done Checking sources/storage/DriveWatcher.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -64/115 files checked 57% done +65/120 files checked 54% done Checking sources/storage/FileHandler.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -65/115 files checked 58% done +66/120 files checked 55% done Checking sources/storage/FileSaver.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -66/115 files checked 59% done +67/120 files checked 55% done Checking sources/storage/Logger.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -67/115 files checked 60% done +68/120 files checked 56% done Checking sources/storage/StorageGlobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -68/115 files checked 61% done +Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_DESKTOP... +Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_TARGET... +69/120 files checked 57% done Checking sources/utility/crc.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -69/115 files checked 61% done +70/120 files checked 58% done Checking sources/utility/format.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -70/115 files checked 62% done +71/120 files checked 59% done Checking sources/utility/types.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -71/115 files checked 63% done +72/120 files checked 60% done +Checking sources/view/VAlert.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +73/120 files checked 60% done +Checking sources/view/VBluetooth.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +74/120 files checked 61% done +Checking sources/view/VBluetoothDeviceInfo.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +75/120 files checked 62% 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... -72/115 files checked 64% done +76/120 files checked 63% done Checking sources/view/VPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -73/115 files checked 65% done +77/120 files checked 64% done Checking sources/view/VPriming.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -74/115 files checked 66% done +78/120 files checked 65% done Checking sources/view/VTreatmentBegin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -75/115 files checked 66% done +79/120 files checked 65% done Checking sources/view/VTreatmentCreate.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -76/115 files checked 67% done +80/120 files checked 66% done +Checking sources/view/VVitals.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +81/120 files checked 67% done Checking sources/view/dg/data/VDGAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -77/115 files checked 68% done +82/120 files checked 68% done Checking sources/view/dg/data/VDGDrainPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -78/115 files checked 69% done +83/120 files checked 69% done Checking sources/view/dg/data/VDGHeatersData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -79/115 files checked 70% done +84/120 files checked 70% done Checking sources/view/dg/data/VDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -80/115 files checked 71% done +85/120 files checked 70% done Checking sources/view/dg/data/VDGOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -81/115 files checked 71% done +86/120 files checked 71% done Checking sources/view/dg/data/VDGPressuresData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -82/115 files checked 72% done +87/120 files checked 72% done Checking sources/view/dg/data/VDGROPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -83/115 files checked 73% done +88/120 files checked 73% done Checking sources/view/dg/data/VDGReservoirData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -84/115 files checked 74% done +89/120 files checked 74% done Checking sources/view/dg/data/VDGTemperaturesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -85/115 files checked 75% done +90/120 files checked 75% done Checking sources/view/dg/data/VDGValvesStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -86/115 files checked 76% done +91/120 files checked 75% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -87/115 files checked 76% done +92/120 files checked 76% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -88/115 files checked 77% done +93/120 files checked 77% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -89/115 files checked 78% done +94/120 files checked 78% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -90/115 files checked 79% done +95/120 files checked 79% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -91/115 files checked 80% done +96/120 files checked 80% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -92/115 files checked 80% done +97/120 files checked 80% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -93/115 files checked 81% done +98/120 files checked 81% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -94/115 files checked 82% done +99/120 files checked 82% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -95/115 files checked 83% done +100/120 files checked 83% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -96/115 files checked 84% done +101/120 files checked 84% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -97/115 files checked 85% done +102/120 files checked 85% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -98/115 files checked 85% done +103/120 files checked 85% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -99/115 files checked 86% done +104/120 files checked 86% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -100/115 files checked 87% done +105/120 files checked 87% done Checking sources/view/hd/alarm/VAlarmStatus.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -101/115 files checked 88% done +106/120 files checked 88% done Checking sources/view/hd/data/VHDAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -102/115 files checked 89% done +107/120 files checked 89% done Checking sources/view/hd/data/VHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -103/115 files checked 90% done +108/120 files checked 90% done Checking sources/view/hd/data/VHDTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -104/115 files checked 90% done +109/120 files checked 90% done Checking sources/view/hd/data/VTreatmentBloodFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -105/115 files checked 91% done +110/120 files checked 91% done Checking sources/view/hd/data/VTreatmentBloodPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -106/115 files checked 92% done +111/120 files checked 92% done Checking sources/view/hd/data/VTreatmentDialysateFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -107/115 files checked 93% done +112/120 files checked 93% done Checking sources/view/hd/data/VTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -108/115 files checked 94% done +113/120 files checked 94% done Checking sources/view/hd/data/VTreatmentPressureOcclusion.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -109/115 files checked 95% done +114/120 files checked 95% done Checking sources/view/hd/data/VTreatmentRanges.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -110/115 files checked 95% done +115/120 files checked 95% done Checking sources/view/hd/data/VTreatmentRecirculateData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -111/115 files checked 96% done +116/120 files checked 96% done Checking sources/view/hd/data/VTreatmentRinsebackData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -112/115 files checked 97% done +117/120 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 -113/115 files checked 98% done +118/120 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 -114/115 files checked 99% done +119/120 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 -115/115 files checked 100% done +120/120 files checked 100% done Index: denali.pro =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- denali.pro (.../denali.pro) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ denali.pro (.../denali.pro) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -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 \ @@ -120,6 +131,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 \ @@ -131,12 +144,16 @@ 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/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 @@ -265,6 +282,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 \ @@ -275,11 +294,15 @@ 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/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 Index: denali.pro.user =================================================================== diff -u -rf61c0aebdb0768f44883696c3a55bf26e7156489 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- denali.pro.user (.../denali.pro.user) (revision f61c0aebdb0768f44883696c3a55bf26e7156489) +++ denali.pro.user (.../denali.pro.user) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -86,315 +86,10 @@ ProjectExplorer.Project.Target.0 - Qt 5.12.5 (iMX8) - Qt 5.12.5 (iMX8) - {5d6458ef-f917-4aef-a092-c77bbe106149} - 1 - 0 - 0 - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Check for free disk space - - RemoteLinux.CheckForFreeDiskSpaceStep - - - - - / - 5242880 - - - - - true - Kill current application instance - - RemoteLinux.KillAppStep - - - - - - - - - true - Deploy files via rsync - - RemoteLinux.RsyncDeployStep - - - - - - - -av - false - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Remote Linux Host - - DeployToGenericLinux - - 1 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 1 - - - denali (on Generic Linux Device (iMX8))2 - RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro - 1 - - false - -u - 3768 - false - true - false - false - true - false - - - :0 - - 1 - - - - ProjectExplorer.Project.Target.1 - Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 1 0 0 @@ -405,11 +100,11 @@ qmake QtProjectManager.QMakeBuildStep - false + true false false - true + false true @@ -1481,21 +1176,326 @@ 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 + ProjectExplorer.Project.Target.1 + + Qt 5.12.5 (iMX8) + Qt 5.12.5 (iMX8) + {5d6458ef-f917-4aef-a092-c77bbe106149} + 1 + 0 + 0 + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Check for free disk space + + RemoteLinux.CheckForFreeDiskSpaceStep + + + + + / + 5242880 + + + + + true + Kill current application instance + + RemoteLinux.KillAppStep + + + + + + + + + true + Deploy files via rsync + + RemoteLinux.RsyncDeployStep + + + + + + + -av + false + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy to Remote Linux Host + + DeployToGenericLinux + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 1 + + + denali (on UI Test Board) + RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro + 1 + + false + + 3768 + false + true + false + false + true + false + + + :0 + + 1 + + + ProjectExplorer.Project.TargetCount 2 Index: denali.qrc =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- denali.qrc (.../denali.qrc) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ denali.qrc (.../denali.qrc) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -4,12 +4,15 @@ sources/gui/qml/pages/SettingsStack.qml sources/gui/qml/pages/SettingsHome.qml sources/gui/qml/pages/ManagerHome.qml + sources/gui/qml/pages/SettingsBluetooth.qml sources/gui/qml/dialogs/PowerOff.qml sources/gui/qml/dialogs/AutoHideInfo.qml sources/gui/qml/dialogs/NotificationDialog.qml sources/gui/qml/dialogs/AlarmListDialog.qml + sources/gui/qml/dialogs/Alert.qml + sources/gui/qml/dialogs/VitalsEntry.qml resources/images/Settings_gear_setting_tools-128.png @@ -21,6 +24,7 @@ resources/images/logo d Dark Transparent.png resources/images/Close.png resources/images/alarm.png + resources/images/alert.png resources/images/bell.png resources/images/bell-off.png resources/images/Back.png @@ -74,14 +78,10 @@ sources/gui/qml/components/TimeText.qml sources/gui/qml/components/ProgressCircle.qml sources/gui/qml/components/Slider.qml - sources/gui/qml/components/SliderCreateTreatment.qml - sources/gui/qml/components/ConfirmTreatmentTable.qml - sources/gui/qml/components/ConfirmTreatmentSubTable.qml sources/gui/qml/components/GridSelection.qml sources/gui/qml/components/TitleBarCreateTreatment.qml sources/gui/qml/components/ProgressBarEx.qml sources/gui/qml/components/CloseButton.qml - sources/gui/qml/components/ConfirmButton.qml sources/gui/qml/components/TickMarks.qml sources/gui/qml/components/NotificationBar.qml sources/gui/qml/components/NotificationBarSmall.qml @@ -90,13 +90,21 @@ sources/gui/qml/components/ImageClock.qml sources/gui/qml/components/ImageLogoDDarkTransparent.qml sources/gui/qml/components/PrimingTimer.qml - sources/gui/qml/components/ConfirmTreatmentTableEntry.qml sources/gui/qml/components/DebugDataColumn.qml sources/gui/qml/components/CheckListItem.qml + sources/gui/qml/components/ConfirmButton.qml + sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml + sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml + sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml + sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml + sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml + sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml sources/gui/qml/components/RangeSlider.qml sources/gui/qml/components/MuteButton.qml sources/gui/qml/components/UpDownButton.qml sources/gui/qml/components/ImageText.qml + sources/gui/qml/components/TextEntry.qml + sources/gui/qml/components/Keyboard.qml sources/gui/qml/compounds/PressureRangeSlider.qml Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -305,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); } /*! @@ -358,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); } /** @@ -480,10 +480,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/MessageGlobals.h =================================================================== diff -u -ra0f2700fad25ef602d0e3b953186d5572efd8169 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a0f2700fad25ef602d0e3b953186d5572efd8169) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -87,9 +87,9 @@ {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes // ---- - {Gui::GuiActionType::ID_StartTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_StartTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_ConfirmTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentStartReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentStartRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentConfirmReq , 1 * 4 }, // 1 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TreatmentRanges , 6 * 4 }, // 6 parameters each 4bytes @@ -124,8 +124,8 @@ {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 6 * 4 }, // 6 parameters each 4bytes // --- - {Gui::GuiActionType::ID_CreateTreatmentReq , 17 * 4 }, // 17 parameters, each 4 bytes - {Gui::GuiActionType::ID_CreateTreatmentRsp , 18 * 4 }, // 18 parameters, each 4 bytes + {Gui::GuiActionType::ID_TreatmentCreateReq , 17 * 4 }, // 17 parameters, each 4 bytes + {Gui::GuiActionType::ID_TreatmentCreateRsp , 18 * 4 }, // 18 parameters, each 4 bytes // ---- Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r2cee3c28bf7565eeb55dcb033961fe6962f11d16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2cee3c28bf7565eeb55dcb033961fe6962f11d16) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -247,9 +247,9 @@ case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_RECEIVED_MESSAGE(AdjustRecirculateRequestData ); break; case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentEndRequestData ); 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_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_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; @@ -341,7 +341,7 @@ 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; @@ -360,7 +360,7 @@ 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_TreatmentStartRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_TreatmentStartRsp ); break; // Alarms case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; Index: sources/gui/GuiController.cpp =================================================================== diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision a3030123e885fb9f22dea5839c4e988896a257e4) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -332,3 +332,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/GuiController.h =================================================================== diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/GuiController.h (.../GuiController.h) (revision a3030123e885fb9f22dea5839c4e988896a257e4) +++ sources/gui/GuiController.h (.../GuiController.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -74,6 +74,9 @@ void doUSBDriveUmount(); // UI => OS void doExportLog (); // UI => OS + void doAlertRequest (const GuiAlertRequestData &alertRequest); + void doAlertResponse(const GuiAlertResponseData &alertResponse); + private slots: // Should be private for thread safety and is connected internally. void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG @@ -100,6 +103,9 @@ void didExportLog(); void didExport (); + void didAlertRequest (GuiAlertRequestData); + void didAlertResponse(GuiAlertResponseData); + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -56,6 +56,8 @@ #include "VDGAccelerometerData.h" #include "VTreatmentCreate.h" +#include "VBluetooth.h" +#include "VBluetoothDeviceInfo.h" #include "VPriming.h" #include "VTreatmentBegin.h" #include "VTreatmentAdjustmentDuration.h" @@ -65,6 +67,8 @@ #include "VTreatmentAdjustmentUltrafiltrationEdit.h" #include "VTreatmentAdjustmentUltrafiltrationConfirm.h" #include "VTreatmentAdjustmentSaline.h" +#include "VVitals.h" +#include "VAlert.h" #include "VTreatmentAdjustmentHeparin.h" #include "VTreatmentAdjustmentRinseback.h" #include "VTreatmentAdjustmentRecirculate.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -103,11 +103,14 @@ ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD // Pre-Treatment Parameters - ID_CreateTreatmentReq = 0x3500, // 53 - ID_CreateTreatmentRsp = 0x3600, // 54 - ID_StartTreatmentReq = 0x3800, // 56 - ID_StartTreatmentRsp = 0x3900, // 57 - ID_ConfirmTreatmentReq = 0x3B00, // 59 + ID_TreatmentCreateReq = 0x3500, // 53 + ID_TreatmentCreateRsp = 0x3600, // 54 + ID_TreatmentStartReq = 0x3800, // 56 + ID_TreatmentStartRsp = 0x3900, // 57 + ID_TreatmentConfirmReq = 0x3B00, // 59 + ID_TreatmentEndReq = 0x3C00, // 60 + ID_TreatmentEndRsp = 0x3D00, // 61 + ID_PrimingData = 0x4300, // 67 // DG Data Messages @@ -184,6 +187,23 @@ Timeout = 0x01, }; + enum AlertID { + ID_Alert_None = 0, + ID_Alert_BLE_Connection, + ID_Alert_BLE_Measurement_Timeout + }; + + struct AlertRequest { + AlertID id; + QString title; + QString description; + }; + + struct AlertResponse { + AlertID id; + bool confirmed = false; + }; + Q_ENUM(GuiActionsType_Enum) Q_ENUM(GuiActionsData_Enum) @@ -270,6 +290,10 @@ // typedef GuiActions::Requested_Treatment_Stop_User_Actions GuiTreatmentStopCommands; // No user Action defined + typedef GuiActions::AlertID GuiAlertID; + typedef GuiActions::AlertRequest GuiAlertRequestData; + typedef GuiActions::AlertResponse GuiAlertResponseData; + void registerTypes(); void registerQmlTypes(); Index: sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml =================================================================== diff -u -rc3a1e077ddeba65709084f9af5dd756741db8b4f -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) +++ sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -14,62 +14,49 @@ // Qt import QtQuick 2.12 -import QtQuick.Layouts 1.12 // Project // Qml imports import "qrc:/globals" import "qrc:/components" -Rectangle { - id: _root - property var prescriptionKeys: [] - property var prescriptionValues: [] - property var operatingKeys: [] - property var operatingValues: [] +Rectangle { id: _root + property var prescriptionKeys : [] + property var prescriptionValues : [] + property var operatingKeys : [] + property var operatingValues : [] objectName: "ConfirmTreatmentSubTable" - color: "transparent" + color: Colors.transparent - GridLayout { - id: _prescription_grid - anchors.top: parent.top - anchors.topMargin: Variables.sliderTextMargin + Column { id: _prescriptionColumn + anchors { + top: parent.top + topMargin: Variables.sliderTextMargin + } width: _root.width / 2 - rows: _root.prescriptionKeys.length - columns: 1 - - Repeater { - id: _prescription_repeater + Repeater { id: _prescription_repeater model: prescriptionKeys ConfirmTreatmentTableEntry { - key: prescriptionKeys[index] - value: prescriptionValues[index] + key : prescriptionKeys[index] + value : prescriptionValues[index] } } } - GridLayout { - id: _operating_grid - anchors.top: parent.top - anchors.topMargin: Variables.sliderTextMargin - anchors.left: _prescription_grid.right - rows: _root.prescriptionKeys.length + Column { id: _operatingColumn + anchors { + top : parent.top + topMargin : Variables.sliderTextMargin + left : _prescriptionColumn.right + } width: _root.width / 2 - columns: 1 - - Repeater { - id: _operating_repeater + Repeater { id: _operating_repeater model: operatingKeys ConfirmTreatmentTableEntry { - key: operatingKeys[index] + key : operatingKeys[index] value: operatingValues[index] } - - } } - - - } Index: sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -67,15 +67,15 @@ anchors.leftMargin: 20 text: "New Treatment" color: "white" - font.pixelSize: Fonts.createTreatmentFontSize + font.pixelSize: Fonts.fontPixelCreateTreatment } } Text { id: _prescription objectName: _root.objectName + "_prescription" text: "PRESCRIPTION" - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fontPixelCreateTreatmentTable color: "white" anchors.left: parent.left anchors.top: _header.bottom @@ -86,7 +86,7 @@ id: _operating_parameters objectName: _root.objectName + "_operating_parameters" text: "OPERATING PARAMETERS" - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fontPixelCreateTreatmentTable color: "white" anchors.top: _header.bottom anchors.left: _root.horizontalCenter Index: sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml =================================================================== diff -u -rc3a1e077ddeba65709084f9af5dd756741db8b4f -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) +++ sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -51,7 +51,7 @@ text: key anchors.left: parent.left anchors.verticalCenter: _root.verticalCenter - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fontPixelCreateTreatmentTable } Text { @@ -62,6 +62,6 @@ anchors.left: _line.horizontalCenter anchors.verticalCenter: _root.verticalCenter anchors.leftMargin: 3*Variables.createTreatmentMargin - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fontPixelCreateTreatmentTable } } Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -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 TREATMENT") width : _buttonGroup.buttonsWidth borderColor : Colors.white } TouchRect { id : _okTouchRect + objectName: "_alarmOK" visible : okVisible button.onPressed: okClicked() text.text : qsTr("OK") Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -53,6 +53,7 @@ readonly property color rangeMarkerShort : "#9fb6d1" readonly property color textMain : "#FCFCFC" + readonly property color textSelected : "#000000" readonly property color textButton : "#FCFCFC" //"#E8E8E8" readonly property color textDisableButton : "#607A91" readonly property color textTickMark : "#438FEB" @@ -118,6 +119,8 @@ readonly property color createTreatmentTextReady : white readonly property color createTreatmentInvalidParam : red + readonly property color textEntry : "#3d8eef" + // ---------- < PRS > Related Section ---------- // Alarm priority colors function alarmPriorityColors(vPriority) { Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -rdd2d4b50f32f74eccbc9592be5ef9da0bc0fbd25 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision dd2d4b50f32f74eccbc9592be5ef9da0bc0fbd25) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -71,4 +71,10 @@ readonly property int fontPixelPriming : 20 readonly property int fontPixelCreateTreatment : 30 readonly property int fontPixelCreateTreatmentTable : 24 + + readonly property int primingFontSize : 20 + readonly property int createTreatmentFontSize : 30 + readonly property int crTreatmentTableFontSize : 24 + readonly property int bleTitleFontSize : 30 + readonly property int bleConnectedFontSize : 16 } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r25e7d601d795c1622dd4c6e437b3dce91a676e83 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 25e7d601d795c1622dd4c6e437b3dce91a676e83) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -113,12 +113,27 @@ readonly property int notificationBarIconHeight : 30 readonly property int notificationBarIconWidth : 30 + readonly property int settingsArrowHeight : 30 + readonly property int settingsArrowWidth : 24 + + readonly property int settingsBLEListViewWidth : 360 + readonly property int settingsBLEItemRightMargin : 20 + readonly property int settingsBLEButtonWidth : 300 + readonly property int settingsBLEButtonHeight : 85 + readonly property int settingsBLEMargin : 75 + readonly property int settingsBLEListViewMargin : 25 readonly property int settingsOptionWidth : 550 readonly property int settingsOptionHeight : 50 readonly property int rinsebackIconDiameterDefault : 85 readonly property int rinsebackIconDiameterResumePause : 110 + readonly property int vitalsTopMargin : 30 + readonly property int vitalsLeftMargin : 50 + readonly property int textInputWidth : 350 + readonly property int textInputHeight : 50 + readonly property int textInputLineWidth : 100 + // ---------- < PRS > Related Section ---------- // Min/Max readonly property int bloodFlowMin : 100 @@ -159,6 +174,13 @@ readonly property int venousLimitStep : +10; ///< PRS356,PRS357 // has to be the same since it's on the same line scale readonly property int venousLimitGap : +30; + readonly property int vitalsEntrySystolicMin : 60 // PRS 451 + readonly property int vitalsEntrySystolicMax : 250 // PRS 451 + readonly property int vitalsEntryDiastolicMin : 40 // PRS 452 + readonly property int vitalsEntryDiastolicMax : 180 // PRS 452 + readonly property int vitalsEntryPulseBPMMin : 40 // PRS 453 + readonly property int vitalsEntryPulseBPMMax : 180 // PRS 453 + readonly property string notSetVariableText : "__" readonly property string preTreatmentStepLabelCreate : qsTr("CREATE" ) 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() + } + } } Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -28,6 +28,25 @@ * which is the default screen in the "Settings" stack */ ScreenItem { id: _root + backgroundRect.color: Colors.backgroundMenu + + TouchRect { id : _clearAlarmCondition + objectName: "_clearAlarmCondition" + width: 300 + height: Variables.logoHeight + animated: true + anchors { + top : parent.top + right : _usbButton.left + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + } + text.text: qsTr("Clear Alarm Condition") + button.onPressed: { + vAlarmStatus.doClearCondition(); + } + } + USBButton { id: _usbButton anchors { top : parent.top @@ -63,33 +82,39 @@ _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) } } -} -/* TitleText { id: _titleText anchors.horizontalCenter: parent.horizontalCenter; anchors.top: parent.top anchors.topMargin: 150 width: parent.width text: qsTr("Device Settings") - } + /* Diagnostics { id: _diagnostics onBackClicked: pop() } + */ + SettingsBluetooth { + id: _bluetooth + onClickedBack: pop() + + } + Column { anchors.centerIn: parent; // add each settings page here. - SettingsItem { id: _item_diagnostics - title : qsTr("Diagnostics") - onClicked: push(_diagnostics); + SettingsItem { id: _item_bluetooth + title : qsTr("Bluetooth") + onClicked: push(_bluetooth); + } } -*/ +} Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml =================================================================== diff -u -r43b80bc100e5bbc5f940e014cb622b5269a55e6c -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 43b80bc100e5bbc5f940e014cb622b5269a55e6c) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -21,6 +21,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief Pre-Treatment confirm screen Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -rf772cc152a61bf775aa7c4ce968024670f204f17 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision f772cc152a61bf775aa7c4ce968024670f204f17) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -21,6 +21,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief Pre-Treatment create screen @@ -278,6 +279,7 @@ } Column { id: _arterialColumn + objectName: "_arterialPressureLimitsColumn" spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _arterialLabel @@ -342,6 +344,7 @@ } Column { id: _venousColumn + objectName: "_venousPressureLimitsColumn" spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _venousLabel @@ -418,9 +421,11 @@ onPressed: { setInteractive(false) vTreatmentCreate.bloodPressureMeasureInterval = value + vVitals.doUpdateBPMeasureInterval(value) } onReleased: { vTreatmentCreate.bloodPressureMeasureInterval = value + vVitals.doUpdateBPMeasureInterval(value) setInteractive(true) } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml =================================================================== diff -u -r76f632ce5a9039ae662d9a52286079b772f8ae7f -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -20,7 +20,9 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" + /*! * \brief Pre-Treatment priming screen * \details which contains the priming timer and steps to let user know about the priming status. Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r76f632ce5a9039ae662d9a52286079b772f8ae7f -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief Pre-Treatment ultrafiltration screen @@ -66,6 +67,7 @@ } Text { id: _textValue + objectName: "_treatmentBeginUltrafiltrationValue" visible : true color : "white" text : _root.ufVolume.toFixed(Variables.ultrafiltrationPrecision) @@ -101,7 +103,6 @@ onPressed: isActive = true } - TouchRect { id: _startButton objectName: "_startButton" width : 515 Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -116,7 +116,7 @@ PreTreatmentUltrafiltration { id: _pretreatmentUltrafiltration onBackClicked : {vTreatmentCreate.doRequestPop() } - onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentUltrafiltration.ufVolume) } + onStartClicked : {vTreatmentBegin.doCheckBLE() } } //// Treatment Adjustment Dialogs @@ -228,7 +228,7 @@ _pretreatmentUltrafiltration.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume // but only if it has been accepted it will navigate if (vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted) { - vTreatmentCreate.doStartTreatment() + vTreatmentBegin.doStartTreatment() } else { _pretreatmentUltrafiltration.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() @@ -334,4 +334,10 @@ onTsRecirculateChanged : { if ( vtsRecirculate ) { /* No action defined yet */ }} onTsRecirculateNoChanged: { if ( vtsRecirculateNo ) { /* No action defined yet */ }} } + + Connections { target: vTreatmentBegin + onDidConfirmReadyToStartTreament: { + vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentUltrafiltration.ufVolume); + } + } } Index: sources/model/MModel.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/model/MModel.h (.../MModel.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/model/MModel.h (.../MModel.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -229,9 +229,8 @@ REGISTER_METATYPE( PrimingData ) \ \ /* Request */ \ - REGISTER_METATYPE( StartTreatmentRequestData ) \ - REGISTER_METATYPE( ConfirmTreatmentRequestData ) \ - \ + REGISTER_METATYPE( TreatmentStartRequestData ) \ + REGISTER_METATYPE( TreatmentConfirmRequestData ) \ 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. @@ -252,7 +251,8 @@ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ /* Response */ \ - REGISTER_METATYPE( StartTreatmentResponseData ) \ + REGISTER_METATYPE( GuiAlertRequestData ) \ + REGISTER_METATYPE( TreatmentStartResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ @@ -261,14 +261,15 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( GuiAlertResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ REGISTER_METATYPE( AdjustRinsebackResponseData ) \ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) \ REGISTER_METATYPE( AdjustHDVersionsResponseData ) \ - REGISTER_METATYPE( AdjustDGVersionsResponseData ) \ + REGISTER_METATYPE( AdjustDGVersionsResponseData ) //===============================================================================// /*! @@ -329,7 +330,7 @@ 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, TreatmentStartResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \ @@ -349,8 +350,8 @@ 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, TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, TreatmentConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackRequestData ) \ @@ -429,7 +430,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( StartTreatmentResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStartResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \ @@ -448,8 +449,8 @@ 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( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( TreatmentConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRinsebackRequestData ) \ @@ -473,8 +474,8 @@ 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( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( TreatmentConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRinsebackRequestData ) \ @@ -504,8 +505,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRinsebackRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( ConfirmTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ \ @@ -554,7 +555,7 @@ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ ACTION_RECEIVE_SIGNAL( PrimingData ) \ /* Response */ \ - ACTION_RECEIVE_SIGNAL( StartTreatmentResponseData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentStartResponseData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r25e7d601d795c1622dd4c6e437b3dce91a676e83 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 25e7d601d795c1622dd4c6e437b3dce91a676e83) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -570,7 +570,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 | @@ -582,7 +582,7 @@ * | #1:(U32) | \ref request | * */ -class MStartTreatmentReq : public MModel { +class MTreatmentStartReq : public MModel { public: enum Options { eSelectParams = 0, @@ -602,19 +602,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, @@ -710,7 +710,6 @@ return MModel::toString("AdjustTreatmentParametersRequest", vParameters); } }; - } typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; @@ -726,8 +725,8 @@ typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MStartTreatmentReq StartTreatmentRequestData; -typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData; +typedef Model:: MTreatmentStartReq TreatmentStartRequestData; +typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; // Alarms Index: sources/storage/FileHandler.cpp =================================================================== diff -u -r20ee20860851dbe0d38a3d2f202794f9d6ed5345 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 20ee20860851dbe0d38a3d2f202794f9d6ed5345) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -205,13 +205,15 @@ { QDir dir(vFolder); if ( ! dir.exists(vFolder) ) { + // coco begin validated: Has been validated manually if ( ! dir.mkpath(vFolder) ) { QString msg = "Cannot create folder " + vFolder; // here cannot use LOG_XXXX because if the folder cannot be created then the log cannot be written. errOut(msg); return false; } } + // coco end return true; } Index: sources/storage/Logger.cpp =================================================================== diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision a3030123e885fb9f22dea5839c4e988896a257e4) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -168,12 +168,13 @@ // coco begin validated: It can only happen if the file system is readonly for any reason. // it has been tested and works perfectly fine in normal run. if (! setLogPath()) { // check and create log folders & if unsuccessful then - // coco end setLogBasePath(true); // try to use application folder setLogPath ( ); // check and create log folders // Note: it may require to check for write access regarding device setup } } +// coco end + /*! * \brief Logger::setLogBasePath * \details Tries to the set the log path to the default log path (Log_Base_Path_Name) @@ -183,6 +184,7 @@ */ void Logger::setLogBasePath(bool vUseApplicationDirPath) { + // coco begin validated: Has been validated manually if (vUseApplicationDirPath) { _dir.setPath(qApp->applicationDirPath()); // Don't use LOG_XXXXX, At this moment Logger has not been initialized yet @@ -192,6 +194,7 @@ _dir.setPath(SDCard_Base_Path_Name); } } +// coco end /*! * \brief Logger::setLogPath Index: sources/view/VBluetooth.cpp =================================================================== diff -u -rfaa306f41ddc70a48d042cc265396ef32116ad97 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision faa306f41ddc70a48d042cc265396ef32116ad97) +++ sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -358,7 +358,7 @@ { _pairedDevices.clear(); QJsonObject obj; - if (!FileHandler::readJSON(path, obj)) + if (!FileHandler::read(path, obj)) { LOG_EVENT(tr("Could not load my bluetooth devices from %1").arg(path)); return; Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision a3030123e885fb9f22dea5839c4e988896a257e4) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -36,14 +36,14 @@ connect(&_GuiController, SIGNAL(didActionReceive(AdjustTreatmentParametersResponseData)), this, SLOT(doActionReceive(AdjustTreatmentParametersResponseData))); - connect(this, SIGNAL(requestSelectParameters(StartTreatmentRequestData)), - &_GuiController, SLOT(doAdjustment(StartTreatmentRequestData))); + connect(this, SIGNAL(requestSelectParameters(TreatmentStartRequestData)), + &_GuiController, SLOT(doAdjustment(TreatmentStartRequestData))); - connect(this, SIGNAL(requestConfirm(ConfirmTreatmentRequestData)), - &_GuiController, SLOT(doAdjustment(ConfirmTreatmentRequestData))); + connect(this, SIGNAL(requestConfirm(TreatmentConfirmRequestData)), + &_GuiController, SLOT(doAdjustment(TreatmentConfirmRequestData))); - connect(&_GuiController, SIGNAL(didActionReceive(StartTreatmentResponseData)), - this, SLOT(doActionReceive(StartTreatmentResponseData))); + connect(&_GuiController, SIGNAL(didActionReceive(TreatmentStartResponseData)), + this, SLOT(doActionReceive(TreatmentStartResponseData))); connect(this, SIGNAL(requestConcurrentSave(QString,QString,bool)), &_FileSaver, SLOT(onConcurrentSave(QString,QString,bool))); @@ -328,7 +328,7 @@ emit fwValidationFailed(enumToString(static_cast(data.requestValid))); } - qDebug() << "fw validation success = " << success; + LOG_DEBUG(QString("FW Validation Success? %1").arg(success)); if (success) { @@ -345,13 +345,15 @@ * to start selecting treatment parameters, cancel, or start the treatment * @param messageData */ -void VTreatmentCreate::doActionReceive(const StartTreatmentResponseData &messageData) +void VTreatmentCreate::doActionReceive(const TreatmentStartResponseData &messageData) { - qDebug() << "Received response after start treatment request: " << messageData.startTreatmentResponse; + LOG_DEBUG(QString("Received response after start treatment request: %1, Reason: %2") + .arg(messageData.startTreatmentResponse) + .arg(messageData.startTreatmentRejectReason)); if (messageData.startTreatmentResponse != 1) return; - if (startTreatmentRequest.request == StartTreatmentRequestData::eCancel) + if (startTreatmentRequest.request == TreatmentStartRequestData::eCancel) goToNextPage(false); else goToNextPage(true); @@ -365,7 +367,7 @@ */ void VTreatmentCreate::goToNextPage(bool forward) { - qDebug() << __FUNCTION__ << pageToShow; + LOG_DEBUG(QString("Create treatment: go to page #%1").arg(pageToShow)); switch (pageToShow) { @@ -435,9 +437,8 @@ * application controller will save the data to disk. */ void VTreatmentCreate::doFinishedConfirm() { - qDebug() << "Finished create treatment confirm..."; + LOG_DEBUG(QString("Finished create treatment confirm...")); - QJsonObject obj { {"bloodFlowRate", QString::number(treatmentData.bloodFlowRate)}, {"dialysateFlowRate", QString::number(treatmentData.dialysateFlowRate)}, @@ -463,7 +464,7 @@ saveNewTreatment(obj); // Tell FW we confirm - confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eConfirm; + confirmTreatmentRequest.request = TreatmentConfirmRequestData::eConfirm; emit requestConfirm(confirmTreatmentRequest); // no FW response required @@ -486,6 +487,7 @@ i++; } QString filename = QString("%0treatment%1.json").arg(dir).arg(i); + _requestedSaveNewTreatmentProfile = true; emit requestConcurrentSave(filename, document.toJson(), false); return filename; } @@ -548,12 +550,21 @@ return FileHandler::write(filename, csvData); } +/*! + * \brief VTreatmentCreate::onFinishedSaveNewTreatment + * Called when any file has been saved to disk. If this + * class requested the + * \param success - (bool) Whether saving was successful + */ void VTreatmentCreate::onFinishedSaveNewTreatment(bool success) { - if (success) { - qDebug() << "------------------> Saved a new treatment."; - } else { - qDebug() << "------------------> Failed to save new treatment."; + if (_requestedSaveNewTreatmentProfile) { + if (success) { + LOG_DEBUG("Treatment profile saved successfully."); + } else { + LOG_DEBUG("Failed to save the treatment profile."); + } + _requestedSaveNewTreatmentProfile = false; } } @@ -569,16 +580,6 @@ } /** - * \brief VCreateTreatment::start - * Called when user is ready to begin a new treatment. - */ -void VTreatmentCreate::doStartTreatment() { - qDebug() << "Requesting to start a treatment..."; - startTreatmentRequest.request = StartTreatmentRequestData::eStartTreatment; - emit requestSelectParameters(startTreatmentRequest); -} - -/** * \brief VCreateTreatment::validate * Validates the create new treatment input. * \param vData - the selected TreatmentParametersData @@ -869,7 +870,7 @@ void VTreatmentCreate::doSelectParameters() { qDebug() << "Sending request to FW to select parameters..."; - startTreatmentRequest.request = StartTreatmentRequestData::eSelectParams; + startTreatmentRequest.request = TreatmentStartRequestData::eSelectParams; emit requestSelectParameters(startTreatmentRequest); } @@ -880,7 +881,7 @@ void VTreatmentCreate::doCancelSelectingParameters() { qDebug() << "Sending request to FW to cancel selecting parameters..."; - startTreatmentRequest.request = StartTreatmentRequestData::eCancel; + startTreatmentRequest.request = TreatmentStartRequestData::eCancel; emit requestSelectParameters(startTreatmentRequest); } @@ -891,8 +892,8 @@ void VTreatmentCreate::doCancelConfirmParameters() { // Tell FW we cancel confirm - qDebug() << "Telling FW user is canceling confirm treatment parameters..."; - confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eCancel; + qDebug() << "Telling FW user is cancelling confirm treatment parameters..."; + confirmTreatmentRequest.request = TreatmentConfirmRequestData::eCancel; emit requestConfirm(confirmTreatmentRequest); goToNextPage(false); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r25e7d601d795c1622dd4c6e437b3dce91a676e83 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 25e7d601d795c1622dd4c6e437b3dce91a676e83) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -61,6 +61,8 @@ // friends friend class::tst_views; + bool _requestedSaveNewTreatmentProfile = false; + public: explicit VTreatmentCreate(QObject *parent = nullptr); @@ -246,8 +248,8 @@ Page pageToShow = None; QString enumToString(GuiRequestReasons vEnum); - StartTreatmentRequestData startTreatmentRequest; - ConfirmTreatmentRequestData confirmTreatmentRequest; + TreatmentStartRequestData startTreatmentRequest; + TreatmentConfirmRequestData confirmTreatmentRequest; void goToNextPage(bool forward); @@ -262,8 +264,8 @@ void pop(); void showTreatmentStart(); void requestValidateParameters(const AdjustTreatmentParametersRequestData &data); - void requestConfirm(const ConfirmTreatmentRequestData &data); - void requestSelectParameters(const StartTreatmentRequestData &data); + void requestConfirm(const TreatmentConfirmRequestData &data); + void requestSelectParameters(const TreatmentStartRequestData &data); void resetCreateTreatment(); void fwValidationFailed(QString reason); void fwValidationSuccess(); @@ -275,9 +277,8 @@ void doFinishedCreate(); void doFinishedConfirm(); void doFinishedPrime(); - void doStartTreatment(); bool doActionReceive(AdjustTreatmentParametersResponseData data); - void doActionReceive(const StartTreatmentResponseData &messageData); + void doActionReceive(const TreatmentStartResponseData &messageData); void doUserModifiedParameters(); QStringList doGetPrescriptionParameterNames(); QStringList doGetPrescriptionParameterValues(); Index: sources/view/VView.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/view/VView.h (.../VView.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/VView.h (.../VView.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -144,8 +144,12 @@ REGISTER_TYPE( VTreatmentAdjustmentEnd ) \ REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ REGISTER_TYPE( VTreatmentCreate ) \ + REGISTER_TYPE( VBluetooth ) \ REGISTER_TYPE( VPriming ) \ REGISTER_TYPE( VTreatmentBegin ) \ REGISTER_TYPE( VTreatmentAdjustmentVersions ) \ + REGISTER_TYPE( VTreatmentAdjustmentSaline ) \ + REGISTER_TYPE( VVitals ) \ + REGISTER_TYPE( VAlert ) //--------------------------------------------------------------------------------// Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7777127f3b60d5f884cd07adc9d586353d914f69) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -143,6 +143,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 -r7777127f3b60d5f884cd07adc9d586353d914f69 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 7777127f3b60d5f884cd07adc9d586353d914f69) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -41,6 +41,7 @@ #include "MTreatmentSalineData.h" #include "MPrimingData.h" +#include "MTreatmentAdjustUltrafiltrationInitResponse.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" @@ -1515,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() @@ -1791,7 +1828,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MStartTreatmentResponse() { - Model::MStartTreatmentResponse mData; + Model::MTreatmentStartResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1829,7 +1866,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MEndTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MEndTreatmentResponse() { - Model::MEndTreatmentResponse mData; + Model::MTreatmentEndResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1962,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() @@ -1979,18 +2016,34 @@ 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_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)); +} Index: unittests/tst_models.h =================================================================== diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- unittests/tst_models.h (.../tst_models.h) (revision 7777127f3b60d5f884cd07adc9d586353d914f69) +++ unittests/tst_models.h (.../tst_models.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -121,6 +121,8 @@ // Alarms void tst_MAlarmStatus_text(); + void tst_MAlarmClearedConditionRequest(); + void tst_MAlarmUserActionRequest(); void tst_MAlarmStatus_data(); void tst_MAlarmStatus(); @@ -131,9 +133,9 @@ void tst_MAlarmCleared_data(); void tst_MAlarmCleared(); - void tst_MAlarmAcknowledgeRequest(); + void tst_MAlarmClearedCondition_data(); + void tst_MAlarmClearedCondition(); - // Treatment Parameters void tst_MTreatmentParametersResp_data(); void tst_MTreatmentParametersResp(); Index: unittests/tst_views.cpp =================================================================== diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision a3030123e885fb9f22dea5839c4e988896a257e4) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -23,6 +23,8 @@ #include "VTreatmentBegin.h" #include "VPriming.h" #include "VAlarmStatus.h" +#include "VBluetooth.h" +#include "VBluetoothDeviceInfo.h" tst_views::tst_views(QObject *parent) : QObject(parent) { } @@ -709,7 +711,7 @@ void tst_views::VCreateTreatment_fw_validation_response() { View::VTreatmentCreate view; - GuiActionType action = GuiActionType::ID_CreateTreatmentRsp; + GuiActionType action = GuiActionType::ID_TreatmentCreateRsp; for (int i = 0; i < 18; ++i) { @@ -741,7 +743,7 @@ AdjustTreatmentParametersResponseData respData; - StartTreatmentResponseData startResponse; + TreatmentStartResponseData startResponse; startResponse.startTreatmentResponse = 0; // REJECT view.doActionReceive(startResponse); @@ -760,7 +762,6 @@ view.onFinishedSaveNewTreatment(true); view.onFinishedSaveNewTreatment(false); view.doFinishedPrime(); - view.doStartTreatment(); QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate); QCOMPARE(view.treatmentData.dialysateFlowRate, dataBackup.dialysateFlowRate); @@ -863,3 +864,29 @@ view.continueEnabled(false); QCOMPARE(view.continueEnabled(), false); } + +void tst_views::VBluetoothDeviceInfo_properties() +{ + View::VBluetoothDeviceInfo view("EC:21:E5:F4:BC:C9", "BP7000"); + QCOMPARE("EC:21:E5:F4:BC:C9", view.getAddress()); + QCOMPARE("BP7000", view.getName()); + QCOMPARE(view.isValid(), true); + + QCOMPARE(view.isConnected(), false); + view.setConnected(true); + QCOMPARE(view.isConnected(), true); + view.setConnected(false); + QCOMPARE(view.isConnected(), false); + + View::VBluetoothDeviceInfo view2("EC:21:E5:F4:BC", "BP7000"); + QCOMPARE(view2.isValid(), false); + + View::VBluetoothDeviceInfo view3("EC:21:E5:F4:BC:C9", ""); + QCOMPARE(view3.isValid(), false); + + QCOMPARE(view2 == view3, false); + + View::VBluetoothDeviceInfo view4("EC:21:E5:F4:BC:C9", "BP7000"); + QCOMPARE(view == view4, true); + +}