Index: cppcheck.err =================================================================== diff -u -r59029602c59977b2354fd8fc8d2633e88baf5224 -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- cppcheck.err (.../cppcheck.err) (revision 59029602c59977b2354fd8fc8d2633e88baf5224) +++ cppcheck.err (.../cppcheck.err) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -37,39 +37,38 @@ } } When you see this message it is always safe to reduce the variable scope 1 level. -[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/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h:67] -> [sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:61]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name 'stringPrefix' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. +[sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h:79] -> [sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:79]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name '_data' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. +[sources/storage/Settings.h:39]: (style) Unused private function: 'Settings::makeSetting' [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:124]: (style) The function 'doCancel' 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: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:114]: (style) The function 'doConfirm' is never used. +[sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp:73]: (style) The function 'doDisinfectChemical' is never used. +[sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp:63]: (style) The function 'doDisinfectHeat' is never used. +[sources/view/VTreatmentCreate (legacy).cpp:520]: (style) The function 'doGetOperatingParameterNames' is never used. +[sources/view/VTreatmentCreate (legacy).cpp:539]: (style) The function 'doGetOperatingParameterValues' is never used. +[sources/view/VTreatmentCreate (legacy).cpp:487]: (style) The function 'doGetPrescriptionParameterNames' is never used. +[sources/view/VTreatmentCreate (legacy).cpp:504]: (style) The function 'doGetPrescriptionParameterValues' is never used. +[sources/view/settings/VDateTime.cpp:42]: (style) The function 'doInit' 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: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/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp:66]: (style) The function 'doOptionDuration' is never used. +[sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp:51]: (style) The function 'doReconnect' is never used. +[sources/view/VTreatmentCreate (legacy).cpp:111]: (style) The function 'doResetCreateTreatment' is never used. +[sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp:64]: (style) The function 'doResult' is never used. +[sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp:51]: (style) The function 'doResume' 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/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp:58]: (style) The function 'doStop' 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/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp:75]: (style) The function 'doTreatmentEnd' 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/view/VTreatmentCreate.cpp:94]: (style) The function 'doValidation' 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/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/VAdjustmentResponseBase.cpp:28]: (style) The function 'text' 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 -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- cppcheck.log (.../cppcheck.log) (revision 59029602c59977b2354fd8fc8d2633e88baf5224) +++ cppcheck.log (.../cppcheck.log) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -4,579 +4,800 @@ 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/159 files checked 4% 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/159 files checked 4% 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/159 files checked 5% 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/159 files checked 6% 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/159 files checked 6% 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/159 files checked 7% 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 +7/159 files checked 7% done Checking sources/canbus/FrameInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -8/115 files checked 11% done +8/159 files checked 8% done Checking sources/canbus/MessageAcknowModel.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -9/115 files checked 12% done +9/159 files checked 9% done Checking sources/canbus/MessageBuilder.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/canbus/MessageBuilder.cpp: DISABLE_CRC... -10/115 files checked 13% done +10/159 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 +11/159 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 +12/159 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 +13/159 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 +14/159 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 +15/159 files checked 12% 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 -Checking sources/model/MDGDebugText.cpp ... +16/159 files checked 13% done +Checking sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -17/115 files checked 19% done -Checking sources/model/MHDDebugText.cpp ... +17/159 files checked 13% done +Checking sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -18/115 files checked 19% done -Checking sources/model/MPowerOff.cpp ... +18/159 files checked 14% done +Checking sources/model/dg/data/MDGAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -19/115 files checked 20% done -Checking sources/model/MStartTreatmentResponse.cpp ... +19/159 files checked 15% done +Checking sources/model/dg/data/MDGDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -20/115 files checked 21% 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 -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 -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 +20/159 files checked 15% 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 +21/159 files checked 16% 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 +22/159 files checked 16% 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 +23/159 files checked 17% 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 +24/159 files checked 18% 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 +25/159 files checked 18% 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 +26/159 files checked 19% 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 +27/159 files checked 20% 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 +28/159 files checked 20% 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 -Checking sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp ... +29/159 files checked 21% done +Checking sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -33/115 files checked 32% done -Checking sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp ... +30/159 files checked 21% done +Checking sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -34/115 files checked 33% done -Checking sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp ... +31/159 files checked 22% done +Checking sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -35/115 files checked 33% done -Checking sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp ... +32/159 files checked 23% done +Checking sources/model/dg/data/disinfect/MDisinfectStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -36/115 files checked 34% done -Checking sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp ... +33/159 files checked 23% done +Checking sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -37/115 files checked 35% done -Checking sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp ... +34/159 files checked 24% done +Checking sources/model/hd/adjustment/MAdjustPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -38/115 files checked 36% done -Checking sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp ... +35/159 files checked 24% done +Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -39/115 files checked 37% done -Checking sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp ... +36/159 files checked 25% done +Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -40/115 files checked 38% done -Checking sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp ... +37/159 files checked 26% done +Checking sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -41/115 files checked 38% done -Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp ... +38/159 files checked 26% done +Checking sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -42/115 files checked 39% done -Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... +39/159 files checked 27% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -43/115 files checked 40% done -Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp ... +40/159 files checked 27% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -44/115 files checked 41% done -Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... +41/159 files checked 28% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -45/115 files checked 42% done +42/159 files checked 29% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +43/159 files checked 29% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +44/159 files checked 30% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +45/159 files checked 30% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +46/159 files checked 31% done +Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +47/159 files checked 32% done +Checking sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +48/159 files checked 32% done +Checking sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +49/159 files checked 33% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +50/159 files checked 33% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +51/159 files checked 34% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +52/159 files checked 35% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +53/159 files checked 35% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +54/159 files checked 36% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +55/159 files checked 36% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +56/159 files checked 37% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +57/159 files checked 38% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +58/159 files checked 38% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +59/159 files checked 39% done +Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +60/159 files checked 40% 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 +61/159 files checked 40% done Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -47/115 files checked 43% done +62/159 files checked 41% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -48/115 files checked 44% done +63/159 files checked 41% 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 +64/159 files checked 42% 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 +65/159 files checked 43% done +Checking sources/model/hd/data/MHDDebugText.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +66/159 files checked 43% done Checking sources/model/hd/data/MHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -51/115 files checked 47% done -Checking sources/model/hd/data/MPrimingData.cpp ... +67/159 files checked 44% done +Checking sources/model/hd/data/MTreatmentRangesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -52/115 files checked 47% done -Checking sources/model/hd/data/MTreatmentBloodPrimeData.cpp ... +68/159 files checked 44% done +Checking sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -53/115 files checked 48% done -Checking sources/model/hd/data/MTreatmentFlowsData.cpp ... +69/159 files checked 45% done +Checking sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -54/115 files checked 49% done -Checking sources/model/hd/data/MTreatmentHeparinData.cpp ... +70/159 files checked 46% done +Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -55/115 files checked 50% done -Checking sources/model/hd/data/MTreatmentOutletFlowData.cpp ... +71/159 files checked 46% done +Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -56/115 files checked 51% done -Checking sources/model/hd/data/MTreatmentPressureOcclusionData.cpp ... +72/159 files checked 47% done +Checking sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -57/115 files checked 52% done -Checking sources/model/hd/data/MTreatmentRangesData.cpp ... +73/159 files checked 47% done +Checking sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -58/115 files checked 52% done -Checking sources/model/hd/data/MTreatmentRecirculateData.cpp ... +74/159 files checked 48% done +Checking sources/model/hd/data/treatment/MTreatmentFlowsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -59/115 files checked 53% done -Checking sources/model/hd/data/MTreatmentRinsebackData.cpp ... +75/159 files checked 49% done +Checking sources/model/hd/data/treatment/MTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -60/115 files checked 54% done -Checking sources/model/hd/data/MTreatmentSalineData.cpp ... +76/159 files checked 49% done +Checking sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -61/115 files checked 55% done -Checking sources/model/hd/data/MTreatmentStatesData.cpp ... +77/159 files checked 50% done +Checking sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -62/115 files checked 56% done -Checking sources/model/hd/data/MTreatmentTimeData.cpp ... +78/159 files checked 50% done +Checking sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -63/115 files checked 57% done +79/159 files checked 51% done +Checking sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +80/159 files checked 52% done +Checking sources/model/hd/data/treatment/MTreatmentSalineData.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +81/159 files checked 52% done +Checking sources/model/hd/data/treatment/MTreatmentStatesData.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +82/159 files checked 53% done +Checking sources/model/hd/data/treatment/MTreatmentTimeData.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +83/159 files checked 53% done +Checking sources/model/settings/MSettings.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +84/159 files checked 54% 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 +85/159 files checked 55% 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 +86/159 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 +87/159 files checked 56% 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 +88/159 files checked 56% done +Checking sources/storage/Settings.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +89/159 files checked 57% 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_TARGET... +90/159 files checked 58% 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 +91/159 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 +92/159 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 +93/159 files checked 60% done +Checking sources/view/VAdjustmentResponseBase.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +94/159 files checked 60% 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 +95/159 files checked 61% 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 -Checking sources/view/VPriming.cpp ... +96/159 files checked 61% done +Checking sources/view/VTreatmentCreate (legacy).cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -74/115 files checked 66% 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 +97/159 files checked 62% 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 +98/159 files checked 63% 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 +99/159 files checked 63% 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 +100/159 files checked 64% 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 +101/159 files checked 64% 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 +102/159 files checked 65% 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 +103/159 files checked 66% 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 +104/159 files checked 66% 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 +105/159 files checked 67% 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 +106/159 files checked 67% 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 +107/159 files checked 68% 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 -Checking sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp ... +108/159 files checked 69% done +Checking sources/view/dg/data/disinfect/VDisinfectDGData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -87/115 files checked 76% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp ... +109/159 files checked 69% done +Checking sources/view/dg/data/disinfect/VDisinfectStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -88/115 files checked 77% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp ... +110/159 files checked 70% done +Checking sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -89/115 files checked 78% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp ... +111/159 files checked 70% done +Checking sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -90/115 files checked 79% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp ... +112/159 files checked 71% done +Checking sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -91/115 files checked 80% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp ... +113/159 files checked 72% done +Checking sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -92/115 files checked 80% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp ... +114/159 files checked 72% done +Checking sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -93/115 files checked 81% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp ... +115/159 files checked 73% done +Checking sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -94/115 files checked 82% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp ... +116/159 files checked 73% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -95/115 files checked 83% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... +117/159 files checked 74% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -96/115 files checked 84% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... +118/159 files checked 75% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -97/115 files checked 85% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp ... +119/159 files checked 75% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -98/115 files checked 85% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp ... +120/159 files checked 76% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -99/115 files checked 86% done -Checking sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp ... +121/159 files checked 76% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -100/115 files checked 87% done +122/159 files checked 77% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +123/159 files checked 78% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +124/159 files checked 78% done +Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +125/159 files checked 79% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +126/159 files checked 80% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +127/159 files checked 80% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +128/159 files checked 81% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +129/159 files checked 81% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +130/159 files checked 82% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +131/159 files checked 83% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +132/159 files checked 83% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +133/159 files checked 84% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +134/159 files checked 84% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +135/159 files checked 85% done +Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +136/159 files checked 86% 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 +137/159 files checked 86% 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 +138/159 files checked 87% 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 -Checking sources/view/hd/data/VHDTreatmentStatesData.cpp ... +139/159 files checked 87% done +Checking sources/view/hd/data/VTreatmentRanges.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -104/115 files checked 90% done -Checking sources/view/hd/data/VTreatmentBloodFlow.cpp ... +140/159 files checked 88% done +Checking sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -105/115 files checked 91% done -Checking sources/view/hd/data/VTreatmentBloodPrimeData.cpp ... +141/159 files checked 89% done +Checking sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -106/115 files checked 92% done -Checking sources/view/hd/data/VTreatmentDialysateFlow.cpp ... +142/159 files checked 89% done +Checking sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -107/115 files checked 93% done -Checking sources/view/hd/data/VTreatmentHeparinData.cpp ... +143/159 files checked 90% done +Checking sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -108/115 files checked 94% done -Checking sources/view/hd/data/VTreatmentPressureOcclusion.cpp ... +144/159 files checked 90% done +Checking sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -109/115 files checked 95% done -Checking sources/view/hd/data/VTreatmentRanges.cpp ... +145/159 files checked 91% done +Checking sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -110/115 files checked 95% done -Checking sources/view/hd/data/VTreatmentRecirculateData.cpp ... +146/159 files checked 92% done +Checking sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -111/115 files checked 96% done -Checking sources/view/hd/data/VTreatmentRinsebackData.cpp ... +147/159 files checked 92% done +Checking sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -112/115 files checked 97% done -Checking sources/view/hd/data/VTreatmentSalineData.cpp ... +148/159 files checked 93% done +Checking sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -113/115 files checked 98% done -Checking sources/view/hd/data/VTreatmentTime.cpp ... +149/159 files checked 93% done +Checking sources/view/hd/data/treatment/VTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -114/115 files checked 99% done -Checking sources/view/hd/data/VTreatmentUltrafiltration.cpp ... +150/159 files checked 94% done +Checking sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -115/115 files checked 100% done +151/159 files checked 95% done +Checking sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +152/159 files checked 95% done +Checking sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +153/159 files checked 96% done +Checking sources/view/hd/data/treatment/VTreatmentSalineData.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +154/159 files checked 96% done +Checking sources/view/hd/data/treatment/VTreatmentTime.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +155/159 files checked 97% done +Checking sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +156/159 files checked 98% done +Checking sources/view/settings/VAdjustmentVersions.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +157/159 files checked 98% done +Checking sources/view/settings/VDateTime.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +158/159 files checked 99% done +Checking sources/view/settings/VSettings.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +159/159 files checked 100% done Index: denali.pro.user =================================================================== diff -u -rd30b025325e38d823282ff23e28d35adf3d1d907 -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- denali.pro.user (.../denali.pro.user) (revision d30b025325e38d823282ff23e28d35adf3d1d907) +++ denali.pro.user (.../denali.pro.user) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,7 +89,7 @@ Qt 5.12.5 (iMX8) Qt 5.12.5 (iMX8) {5d6458ef-f917-4aef-a092-c77bbe106149} - 1 + 0 0 0 Index: sources/gui/GuiGlobals.h =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -252,6 +252,7 @@ Q_ENUM(Alarm_List ) Q_ENUM(Alarm_State_Flag_Bit_Positions) Q_ENUM(Alarm_User_Actions) + Q_ENUM(Alarm_Data_Types) #include "MsgDefs.h" Q_ENUM(Request_Reject_Reasons) @@ -320,6 +321,7 @@ typedef GuiActions::Alarm_List GuiAlarmID; typedef GuiActions::Alarm_State_Flag_Bit_Positions GuiAlarmFlags; typedef GuiActions::Alarm_User_Actions GuiAlarmUserActions; + typedef GuiActions::Alarm_Data_Types GuiAlarmDataTypes; typedef GuiActions::Request_Reject_Reasons GuiRequestReasons; // operation mode Index: sources/gui/qml/components/ProgressCircle.qml =================================================================== diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/gui/qml/components/ProgressCircle.qml (.../ProgressCircle.qml) (revision e159592e3a99658e661ab83fffef43322dc075f3) +++ sources/gui/qml/components/ProgressCircle.qml (.../ProgressCircle.qml) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -29,7 +29,7 @@ property int value : minimum property alias diameter : _circle.diameter property alias thickness : _circle.thickness - property color color : Colors.backgroundMainMenu + property color color : Colors.borderButton width : _circle.width height : _circle.height Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -30,6 +30,10 @@ PostTreatmentBase { id: _root signal itemClicked(int vIndex) + readonly property alias itemsText : _parametersGrid.itemsText + readonly property alias itemsValue: _parametersGrid.itemsValue + readonly property alias itemsUnit : _parametersGrid.itemsUnit + ExportButton { anchors.top : parent.top anchors.left : parent.left Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -35,6 +35,12 @@ signal disposablesRemovalConfirm () signal disposablesRemovalBack () + PostTreatmentBase { id: _detialTest + onBackClicked: pop() + header.backVisible: true + header.confirmVisible: false + } + PostTreatmentBase { id: _patientDisconnectionConfirm property int stackStepIndex : 0 header.confirmVisible : true @@ -49,6 +55,10 @@ title.text : qsTr("Treatment Review") instructionBased : false onConfirmClicked : _root.treatmentReviewConfirm() + onItemClicked : { + _detialTest.title.text = itemsText[vIndex] + push(_detialTest) + } } PostTreatmentBase { id: _disposablesRemovalConfirm Index: sources/gui/qml/pages/settings/SettingsDateTime.qml =================================================================== diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) +++ sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -29,6 +29,11 @@ */ SettingsBase { id: _root + function setFocus() { + _hours.textInput.forceActiveFocus() + _keyboard.setVisible(true) + } + property int labelWidth : 275 readonly property bool isValid : _year .textInput.acceptableInput && Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -32,7 +32,7 @@ stackView.initialItem : _settingsHome - enum ItmesIndex { + enum ItemsIndex { SetDateTime , WiFi , Bluetooth , @@ -61,6 +61,7 @@ case SettingsStack.SetDateTime: vDateTime.doInit() push(_settingsDateTime) + _settingsDateTime.setFocus() break case 1: Index: sources/model/hd/alarm/MAlarmTriggered.cpp =================================================================== diff -u -rf1e100d1368bfd132d88e09680f833dc53b4d0b0 -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/model/hd/alarm/MAlarmTriggered.cpp (.../MAlarmTriggered.cpp) (revision f1e100d1368bfd132d88e09680f833dc53b4d0b0) +++ sources/model/hd/alarm/MAlarmTriggered.cpp (.../MAlarmTriggered.cpp) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -8,25 +8,147 @@ * \file MAlarmTriggered.cpp * \author (last) Behrouz NematiPour * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ #include "MAlarmTriggered.h" +#include "GuiGlobals.h" using namespace Model; QVariantList MAlarmTriggered::parameters() const { - return { - _data.mAlarmID.value - }; + Gui::GuiAlarmDataTypes fieldType; + fieldType = static_cast(_data.mFieldDescriptor1.value); + quint32 zero = 0; + QVariantList params = { _data.mAlarmID.value }; + switch (fieldType) { + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : + params += {zero, zero, zero, zero}; + goto lOut; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_U32 : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldU1.value}; + break; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_S32 : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldS1.value}; + break; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_F32 : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldF1.value}; + break; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_BOOL : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldB1.value}; + break; + default: + params += {zero, zero, zero, zero}; + goto lOut; + } + + fieldType = static_cast(_data.mFieldDescriptor2.value); + switch (fieldType) { + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : + params += {zero, zero}; + break; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_U32 : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldU2.value}; + break; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_S32 : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldS2.value}; + break; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_F32 : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldF2.value}; + break; + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_BOOL : + params += {_data.mFieldDescriptor1.value, _data.mDataFieldB2.value}; + break; + default: + params += {zero, zero}; + break; + } + +lOut: + return params; } bool MAlarmTriggered::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mAlarmID)) - return true ; + _data.mFieldDescriptor1 .value = 0; + _data.mDataFieldU1 .value = 0; + _data.mDataFieldS1 .value = 0; + _data.mDataFieldF1 .value = 0; + _data.mDataFieldB1 .value = 0; + _data.mFieldDescriptor2 .value = 0; + _data.mDataFieldU2 .value = 0; + _data.mDataFieldS2 .value = 0; + _data.mDataFieldF2 .value = 0; + _data.mDataFieldB2 .value = 0; + if (GetValue(vByteArray, index, _data.mAlarmID )) + if (GetValue(vByteArray, index, _data.mFieldDescriptor1 )) + { + Gui::GuiAlarmDataTypes field1Type = static_cast(_data.mFieldDescriptor1.value); + switch (field1Type) { + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : + return true; + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_U32 : + if (GetValue(vByteArray, index, _data.mDataFieldU1)) + break; + else { if(vIndex) *vIndex = index; return false; } + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_S32 : + if (GetValue(vByteArray, index, _data.mDataFieldS1)) + break; + else { if(vIndex) *vIndex = index; return false; } + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_F32 : + if (GetValue(vByteArray, index, _data.mDataFieldF1)) + break; + else { if(vIndex) *vIndex = index; return false; } + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_BOOL : + if (GetValue(vByteArray, index, _data.mDataFieldB1)) + break; + else { if(vIndex) *vIndex = index; return false; } + + default: + return true; + } + + if (GetValue(vByteArray, index, _data.mFieldDescriptor2 )) + { + Gui::GuiAlarmDataTypes field1Type = static_cast(_data.mFieldDescriptor2.value); + switch (field1Type) { + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : + return true; + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_U32 : + if (GetValue(vByteArray, index, _data.mDataFieldU2)) + break; + else { if(vIndex) *vIndex = index; return false; } + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_S32 : + if (GetValue(vByteArray, index, _data.mDataFieldS2)) + break; + else { if(vIndex) *vIndex = index; return false; } + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_F32 : + if (GetValue(vByteArray, index, _data.mDataFieldF2)) + break; + else { if(vIndex) *vIndex = index; return false; } + + case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_BOOL : + if (GetValue(vByteArray, index, _data.mDataFieldB2)) + break; + else { if(vIndex) *vIndex = index; return false; } + + default: + return true; + } + return true; + } + else { if(vIndex) *vIndex = index; return false; } + } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -36,6 +158,16 @@ */ MAlarmTriggered::Data MAlarmTriggered::data() const { Data data; - data.mAlarmID = _data.mAlarmID.value; + data.mAlarmID = _data.mAlarmID .value; + data.mFieldDescriptor1 = _data.mFieldDescriptor1 .value; + data.mDataFieldU1 = _data.mDataFieldU1 .value; + data.mDataFieldS1 = _data.mDataFieldS1 .value; + data.mDataFieldF1 = _data.mDataFieldF1 .value; + data.mDataFieldB1 = _data.mDataFieldB1 .value ? true : false; + data.mFieldDescriptor2 = _data.mFieldDescriptor2 .value; + data.mDataFieldU2 = _data.mDataFieldU2 .value; + data.mDataFieldS2 = _data.mDataFieldS2 .value; + data.mDataFieldF2 = _data.mDataFieldF2 .value; + data.mDataFieldB2 = _data.mDataFieldB2 .value ? true : false; return data; } Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -rf1e100d1368bfd132d88e09680f833dc53b4d0b0 -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision f1e100d1368bfd132d88e09680f833dc53b4d0b0) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946) @@ -36,8 +36,13 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mAlarmID | + * | #1:(U32) | \ref Data::mAlarmID | + * | #2:(U32) | \ref Data::mFieldDescriptor1 | + * | #3:(Any) | \ref Data::mDataField1 | + * | #4:(U32) | \ref Data::mFieldDescriptor2 | + * | #5:(Any) | \ref Data::mDataField2 | * + * * \sa Data * *

Logging info

@@ -56,9 +61,20 @@ QVariantList parameters() const override; struct { - Types::U32 mAlarmID ; + Types::U32 mAlarmID ; + Types::U32 mFieldDescriptor1 ; + Types::U32 mDataFieldU1 ; + Types::S32 mDataFieldS1 ; + Types::F32 mDataFieldF1 ; + Types::U32 mDataFieldB1 ; + Types::U32 mFieldDescriptor2 ; + Types::U32 mDataFieldU2 ; + Types::S32 mDataFieldS2 ; + Types::F32 mDataFieldF2 ; + Types::U32 mDataFieldB2 ; } _data; + public: Type_Enum typeText() const override { return Type_Enum::eEvent ; } @@ -67,6 +83,16 @@ struct Data { quint32 mAlarmID = 0; ///< Alarm ID + quint32 mFieldDescriptor1 ; + quint32 mDataFieldU1 ; + qint32 mDataFieldS1 ; + float mDataFieldF1 ; + bool mDataFieldB1 ; + quint32 mFieldDescriptor2 ; + quint32 mDataFieldU2 ; + qint32 mDataFieldS2 ; + float mDataFieldF2 ; + bool mDataFieldB2 ; }; public: