Index: cppcheck.err =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- cppcheck.err (.../cppcheck.err) (revision a89b5249df072be403141463d7d88728b66a848e) +++ cppcheck.err (.../cppcheck.err) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -45,16 +45,17 @@ [sources/view/settings/VNetworkModel.cpp:223]: (style) The function 'doCheckIfConnected' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:93]: (style) The function 'doClearCondition' 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/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp:74]: (style) The function 'doDisinfectChemical' is never used. +[sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp:64]: (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:44]: (style) The function 'doInit' is never used. -[sources/view/VEventSpy.cpp:139]: (style) The function 'doMouseReset' is never used. +[sources/view/VEventSpy.cpp:146]: (style) The function 'doMouseReset' 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/hd/alarm/VAlarmActiveList.cpp:106]: (style) The function 'doRequest' 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. @@ -64,7 +65,7 @@ [sources/view/settings/VNetworkModel.cpp:338]: (style) The function 'doSetSubnetMask' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:76]: (style) The function 'doSilence' 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/VEventSpy.cpp:189]: (style) The function 'doTouchReset' 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. @@ -75,6 +76,5 @@ [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/settings/VNetworkModel.cpp:166]: (style) The function 'roleNames' 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 -r571019286d14ba1b655897c70ee28b7a9a0d80d5 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- cppcheck.log (.../cppcheck.log) (revision 571019286d14ba1b655897c70ee28b7a9a0d80d5) +++ cppcheck.log (.../cppcheck.log) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -4,841 +4,891 @@ Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking main.cpp: UNIT_TEST... -1/167 files checked 4% done +1/177 files checked 3% done Checking sources/AlarmGenerator.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -2/167 files checked 4% done +2/177 files checked 4% done Checking sources/ApplicationController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -3/167 files checked 5% done +3/177 files checked 4% done Checking sources/ApplicationPost.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -4/167 files checked 5% done +4/177 files checked 5% done Checking sources/MainTimer.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -5/167 files checked 6% done +5/177 files checked 6% done Checking sources/Threads.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -6/167 files checked 6% done +6/177 files checked 6% done Checking sources/canbus/CanInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -7/167 files checked 7% done +7/177 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/167 files checked 8% done +8/177 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/167 files checked 8% done +9/177 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/167 files checked 9% done +10/177 files checked 8% 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/167 files checked 9% done +11/177 files checked 9% done Checking sources/canbus/MessageInterpreter.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -12/167 files checked 10% done +12/177 files checked 9% done +Checking sources/device/DeviceController.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +13/177 files checked 10% done +Checking sources/device/DeviceError.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +14/177 files checked 10% done +Checking sources/device/DeviceModels.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +15/177 files checked 11% done +Checking sources/device/DeviceView.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +16/177 files checked 12% done Checking sources/gui/GuiController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -13/167 files checked 10% done +17/177 files checked 12% done Checking sources/gui/GuiGlobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -14/167 files checked 11% done +18/177 files checked 13% done Checking sources/gui/GuiView.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -15/167 files checked 12% done +19/177 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/167 files checked 12% done +20/177 files checked 14% 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/167 files checked 13% done +21/177 files checked 14% done +Checking sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +22/177 files checked 15% done +Checking sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +23/177 files checked 15% 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/167 files checked 13% done +24/177 files checked 16% done Checking sources/model/dg/data/MDGAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -19/167 files checked 14% done +25/177 files checked 16% done Checking sources/model/dg/data/MDGDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -20/167 files checked 15% done +26/177 files checked 17% done Checking sources/model/dg/data/MDGDrainPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -21/167 files checked 15% done +27/177 files checked 18% done Checking sources/model/dg/data/MDGHeatersData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -22/167 files checked 16% done +28/177 files checked 18% done Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -23/167 files checked 16% done +29/177 files checked 19% done Checking sources/model/dg/data/MDGOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -24/167 files checked 17% done +30/177 files checked 19% done Checking sources/model/dg/data/MDGPressuresData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -25/167 files checked 17% done +31/177 files checked 20% done Checking sources/model/dg/data/MDGROPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -26/167 files checked 18% done +32/177 files checked 20% done Checking sources/model/dg/data/MDGReservoirData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -27/167 files checked 19% done +33/177 files checked 21% done Checking sources/model/dg/data/MDGTemperaturesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -28/167 files checked 19% done +34/177 files checked 21% done Checking sources/model/dg/data/MDGValvesStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -29/167 files checked 20% done +35/177 files checked 22% done Checking sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -30/167 files checked 20% done +36/177 files checked 22% done Checking sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -31/167 files checked 21% done +37/177 files checked 23% done Checking sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -32/167 files checked 21% done +38/177 files checked 24% done Checking sources/model/dg/data/disinfect/MDisinfectStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -33/167 files checked 22% done +39/177 files checked 24% done Checking sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -34/167 files checked 23% done +40/177 files checked 25% done Checking sources/model/hd/adjustment/MAdjustPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -35/167 files checked 23% done +41/177 files checked 25% done Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -36/167 files checked 24% done +42/177 files checked 26% done Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -37/167 files checked 24% done +43/177 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 -38/167 files checked 25% done +44/177 files checked 27% done Checking sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -39/167 files checked 26% done +45/177 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 -40/167 files checked 26% done +46/177 files checked 28% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -41/167 files checked 27% done +47/177 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 -42/167 files checked 27% done +48/177 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/167 files checked 28% done +49/177 files checked 30% 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/167 files checked 28% done +50/177 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/167 files checked 29% done +51/177 files checked 31% 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/167 files checked 30% done +52/177 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/167 files checked 30% done +53/177 files checked 32% done +Checking sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +54/177 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/167 files checked 31% done +55/177 files checked 33% done +Checking sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +56/177 files checked 33% done +Checking sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +57/177 files checked 34% 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/167 files checked 31% done +58/177 files checked 34% 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/167 files checked 32% done +59/177 files checked 35% 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/167 files checked 32% done +60/177 files checked 36% 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/167 files checked 33% done +61/177 files checked 36% 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/167 files checked 34% done +62/177 files checked 37% 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/167 files checked 34% done +63/177 files checked 37% 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/167 files checked 35% done +64/177 files checked 38% 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/167 files checked 35% done +65/177 files checked 38% 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/167 files checked 36% done +66/177 files checked 39% 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/167 files checked 36% done +67/177 files checked 39% 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/167 files checked 37% done +68/177 files checked 40% 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/167 files checked 38% done +69/177 files checked 40% done Checking sources/model/hd/alarm/MAlarmActiveList.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -61/167 files checked 38% done +70/177 files checked 41% done Checking sources/model/hd/alarm/MAlarmCleared.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -62/167 files checked 39% done +71/177 files checked 42% done Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -63/167 files checked 39% done +72/177 files checked 42% done Checking sources/model/hd/alarm/MAlarmMapping.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -64/167 files checked 40% done +73/177 files checked 43% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -65/167 files checked 41% done +74/177 files checked 43% done Checking sources/model/hd/alarm/MAlarmTriggered.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -66/167 files checked 41% done +75/177 files checked 44% done Checking sources/model/hd/data/MHDAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -67/167 files checked 42% done +76/177 files checked 44% done Checking sources/model/hd/data/MHDDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -68/167 files checked 42% done +77/177 files checked 45% done Checking sources/model/hd/data/MHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -69/167 files checked 43% done +78/177 files checked 45% done Checking sources/model/hd/data/MTreatmentRangesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -70/167 files checked 43% done +79/177 files checked 46% done Checking sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -71/167 files checked 44% done +80/177 files checked 46% done Checking sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -72/167 files checked 45% done +81/177 files checked 47% done Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -73/167 files checked 45% done +82/177 files checked 48% done Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -74/167 files checked 46% done +83/177 files checked 48% done Checking sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -75/167 files checked 46% done +84/177 files checked 49% done Checking sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -76/167 files checked 47% done +85/177 files checked 49% done Checking sources/model/hd/data/treatment/MTreatmentFlowsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -77/167 files checked 47% done +86/177 files checked 50% done Checking sources/model/hd/data/treatment/MTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -78/167 files checked 48% done +87/177 files checked 50% done Checking sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -79/167 files checked 49% done +88/177 files checked 51% done Checking sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -80/167 files checked 49% done +89/177 files checked 51% done Checking sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -81/167 files checked 50% done +90/177 files checked 52% done Checking sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -82/167 files checked 50% done +91/177 files checked 53% done Checking sources/model/hd/data/treatment/MTreatmentSalineData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -83/167 files checked 51% done +92/177 files checked 53% done Checking sources/model/hd/data/treatment/MTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -84/167 files checked 52% done +93/177 files checked 54% done Checking sources/model/hd/data/treatment/MTreatmentTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -85/167 files checked 52% done +94/177 files checked 54% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -86/167 files checked 53% done +95/177 files checked 55% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -87/167 files checked 53% done +96/177 files checked 55% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -88/167 files checked 54% done +97/177 files checked 56% done Checking sources/model/settings/MSettings.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -89/167 files checked 54% done -Checking sources/storage/DriveWatcher.cpp ... -Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ -Platform:Native -90/167 files checked 55% done +98/177 files checked 56% done Checking sources/storage/FileHandler.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -91/167 files checked 56% done -Checking sources/storage/FileSaver.cpp ... -Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ -Platform:Native -92/167 files checked 56% done +99/177 files checked 57% done Checking sources/storage/Logger.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -93/167 files checked 57% done +100/177 files checked 57% done Checking sources/storage/Settings.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -94/167 files checked 57% done +101/177 files checked 58% done Checking sources/storage/StorageGlobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_DESKTOP... Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_TARGET... -95/167 files checked 58% done +102/177 files checked 59% done Checking sources/storage/TreatmentLog.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -96/167 files checked 58% done +103/177 files checked 59% done Checking sources/utility/crc.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -97/167 files checked 59% done +104/177 files checked 60% done Checking sources/utility/format.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -98/167 files checked 60% done +105/177 files checked 60% done Checking sources/utility/types.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -99/167 files checked 60% done +106/177 files checked 61% done Checking sources/view/VAdjustmentResponseBase.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -100/167 files checked 61% done +107/177 files checked 61% 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... -101/167 files checked 61% done +108/177 files checked 62% done Checking sources/view/VPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -102/167 files checked 62% done +109/177 files checked 62% done Checking sources/view/VTreatmentCreate (legacy).cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -103/167 files checked 63% done +110/177 files checked 63% done Checking sources/view/VTreatmentCreate.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -104/167 files checked 63% done +111/177 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 -105/167 files checked 64% done +112/177 files checked 64% done Checking sources/view/dg/data/VDGDrainPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -106/167 files checked 64% done +113/177 files checked 65% done Checking sources/view/dg/data/VDGHeatersData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -107/167 files checked 65% done +114/177 files checked 65% done Checking sources/view/dg/data/VDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -108/167 files checked 65% done +115/177 files checked 66% done Checking sources/view/dg/data/VDGOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -109/167 files checked 66% done +116/177 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 -110/167 files checked 67% done +117/177 files checked 67% done Checking sources/view/dg/data/VDGROPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -111/167 files checked 67% done +118/177 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 -112/167 files checked 68% done +119/177 files checked 68% done Checking sources/view/dg/data/VDGTemperaturesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -113/167 files checked 68% done +120/177 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 -114/167 files checked 69% done +121/177 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 -115/167 files checked 69% done +122/177 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 -116/167 files checked 70% done +123/177 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 -117/167 files checked 71% done +124/177 files checked 71% done Checking sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -118/167 files checked 71% done +125/177 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 -119/167 files checked 72% done +126/177 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 -120/167 files checked 72% done +127/177 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 -121/167 files checked 73% done +128/177 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 -122/167 files checked 73% done +129/177 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 -123/167 files checked 74% done +130/177 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 -124/167 files checked 75% done +131/177 files checked 74% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -125/167 files checked 75% done +132/177 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 -126/167 files checked 76% done +133/177 files checked 75% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -127/167 files checked 76% done +134/177 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 -128/167 files checked 77% done +135/177 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 -129/167 files checked 78% done +136/177 files checked 77% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -130/167 files checked 78% done +137/177 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 -131/167 files checked 79% done +138/177 files checked 78% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -132/167 files checked 79% done +139/177 files checked 79% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -133/167 files checked 80% done +140/177 files checked 79% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -134/167 files checked 80% done +141/177 files checked 80% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -135/167 files checked 81% done +142/177 files checked 80% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -136/167 files checked 82% done +143/177 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -137/167 files checked 82% done +144/177 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -138/167 files checked 83% done +145/177 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -139/167 files checked 83% done +146/177 files checked 83% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -140/167 files checked 84% done +147/177 files checked 83% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -141/167 files checked 84% done +148/177 files checked 84% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -142/167 files checked 85% done +149/177 files checked 84% done +Checking sources/view/hd/alarm/VAlarmActiveList.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +150/177 files checked 85% done Checking sources/view/hd/alarm/VAlarmStatus.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -143/167 files checked 86% done +151/177 files checked 85% done Checking sources/view/hd/data/VHDAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -144/167 files checked 86% done +152/177 files checked 86% done Checking sources/view/hd/data/VHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -145/167 files checked 87% done +153/177 files checked 86% done Checking sources/view/hd/data/VTreatmentRanges.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -146/167 files checked 87% done +154/177 files checked 87% done Checking sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -147/167 files checked 88% done +155/177 files checked 87% done Checking sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -148/167 files checked 89% done +156/177 files checked 88% done Checking sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -149/167 files checked 89% done +157/177 files checked 89% done Checking sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -150/167 files checked 90% done +158/177 files checked 89% done Checking sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -151/167 files checked 90% done +159/177 files checked 90% done Checking sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -152/167 files checked 91% done +160/177 files checked 90% done Checking sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -153/167 files checked 91% done +161/177 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -154/167 files checked 92% done +162/177 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -155/167 files checked 93% done +163/177 files checked 92% done Checking sources/view/hd/data/treatment/VTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -156/167 files checked 93% done +164/177 files checked 92% done Checking sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -157/167 files checked 94% done +165/177 files checked 93% done Checking sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -158/167 files checked 94% done +166/177 files checked 93% done Checking sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -159/167 files checked 95% done +167/177 files checked 94% done Checking sources/view/hd/data/treatment/VTreatmentSalineData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -160/167 files checked 95% done +168/177 files checked 95% done Checking sources/view/hd/data/treatment/VTreatmentTime.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -161/167 files checked 96% done +169/177 files checked 95% done Checking sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -162/167 files checked 97% done +170/177 files checked 96% done +Checking sources/view/settings/VAdjustmentAlarmVolume.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +171/177 files checked 96% done +Checking sources/view/settings/VAdjustmentService.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +172/177 files checked 97% done Checking sources/view/settings/VAdjustmentVersions.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -163/167 files checked 97% done +173/177 files checked 97% done Checking sources/view/settings/VDateTime.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -164/167 files checked 98% done +174/177 files checked 98% done Checking sources/view/settings/VNetworkModel.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -165/167 files checked 98% done +175/177 files checked 98% done Checking sources/view/settings/VSettings.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -166/167 files checked 99% done +176/177 files checked 99% done Checking sources/wifi/WifiInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -167/167 files checked 100% done +177/177 files checked 100% done Index: denali.pro =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- denali.pro (.../denali.pro) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ denali.pro (.../denali.pro) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -114,6 +114,10 @@ \ # ---------- Models - settings sources/model/settings/MSettings.h \ sources/model/settings/MWifiNetwork.h \ + sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ + sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ @@ -235,6 +239,7 @@ sources/view/settings/VAdjustmentVersions.h \ sources/view/settings/VNetworkModel.h \ sources/view/settings/VAdjustmentAlarmVolume.h \ + sources/view/settings/VAdjustmentService.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ sources/view/hd/alarm/VAlarmActiveList.h \ @@ -338,6 +343,10 @@ sources/device/DeviceModels.cpp \ \ # ---------- Models - settings sources/model/settings/MSettings.cpp \ + sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \ + sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ @@ -454,6 +463,7 @@ sources/view/settings/VAdjustmentVersions.cpp \ sources/view/settings/VNetworkModel.cpp \ sources/view/settings/VAdjustmentAlarmVolume.cpp \ + sources/view/settings/VAdjustmentService.cpp \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.cpp \ \ # ---------- Views - HD - Adjustment - Pre-Treatment Index: denali.pro.user =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- denali.pro.user (.../denali.pro.user) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ denali.pro.user (.../denali.pro.user) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- en_US.udic (.../en_US.udic) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ en_US.udic (.../en_US.udic) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -128,3 +128,8 @@ hd RECIRCULATION recirculation +HDSerial +DGSerial +SIGINT +SIGTERM +DGVersions Index: main.cpp =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- main.cpp (.../main.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ main.cpp (.../main.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -307,11 +307,8 @@ if(_Logger.init(Threads::_Logger_Thread)) { _Logger.enableConsoleOut(gConsoleoutLogs); } + _Logger.postInit(); - LOG_DEBUG("UI," + QString("Application %1 Started") - .arg(app.applicationName())); - LOG_EVENT(app.applicationVersion()); - if (gFakeInterval) { QString msg = " ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ "; qDebug() << msg; Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -429,6 +429,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the DG Set Date Time Denali message. + * \param vData - Data model contains the epoch time + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustServiceRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustServiceReq, mData); +} + + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Pressures Limits Adjustment Denali message. * \param vData - Data model contains treatment Pressures Limits adjustment. * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -144,6 +144,8 @@ GuiActionType::ID_AdjustDisinfectReq , GuiActionType::ID_AdjustChemicalConfirmReq , // Settings + GuiActionType::ID_AdjustVersionsReq , + GuiActionType::ID_AdjustServiceReq , GuiActionType::ID_AdjustHDDateTimeReq , GuiActionType::ID_AdjustDGDateTimeReq , // Treatment Log Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -199,9 +199,16 @@ // ---- Versions {Gui::GuiActionType::ID_AdjustVersionsReq , 0 * 4 }, // 0 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustHDVersionsRsp , 9 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDGVersionsRsp , 9 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,1+1+1+2+1+1+1+1}, // variable length parameters + {Gui::GuiActionType::ID_AdjustSerialHDRsp , 10 * 1 }, // 1 parameter 10bytes + {Gui::GuiActionType::ID_AdjustSerialDGRsp , 10 * 1 }, // 1 parameter 10bytes + // ---- Service Information + {Gui::GuiActionType::ID_AdjustServiceReq , 0 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustServiceHDRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustServiceDGRsp , 2 * 4 }, // 2 parameters each 4bytes + // ---- RTC {Gui::GuiActionType::ID_AdjustHDDateTimeReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustHDDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -240,6 +240,7 @@ case Gui::GuiActionType::ID_AdjustVersionsReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustVersionsRequestData ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData ); break; case Gui::GuiActionType::ID_AdjustDGDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData ); break; + case Gui::GuiActionType::ID_AdjustServiceReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceRequestData ); break; // Pre-Treatment case Gui::GuiActionType::ID_AdjustInitTreatmentReq : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData ); break; case Gui::GuiActionType::ID_AdjustParametersValidationReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData ); break; @@ -370,9 +371,12 @@ case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_EVENT("HD,ShuttingDown"); break; // TODO : implement notify<>() // ----- Settings - case Gui::GuiActionType::ID_AdjustHDVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp ); break; + case Gui::GuiActionType::ID_AdjustVersionsHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp ); break; + case Gui::GuiActionType::ID_AdjustServiceHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceHDRsp ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; + // ----- States case Gui::GuiActionType::ID_HDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData ); break; case Gui::GuiActionType::ID_PreTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates ); break; @@ -500,7 +504,9 @@ case Gui::GuiActionType::ID_DisinfectStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates ); break; // DG Response Messages - case Gui::GuiActionType::ID_AdjustDGVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp ); break; + case Gui::GuiActionType::ID_AdjustVersionsDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp ); break; + case Gui::GuiActionType::ID_AdjustServiceDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDGRsp ); break; case Gui::GuiActionType::ID_AdjustDGDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp ); break; // unhandled messages: these will only be logged as received message Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -33,6 +33,7 @@ #include "VAlarmActiveList.h" #include "VPowerOff.h" #include "VAdjustmentVersions.h" +#include "VAdjustmentService.h" #include "VDateTime.h" #include "VNetworkModel.h" #include "VAdjustmentAlarmVolume.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -78,9 +78,17 @@ // ----- Settings // Version ID_AdjustVersionsReq = 0x1C00, // 28 - ID_AdjustHDVersionsRsp = 0x1D00, // 29 - ID_AdjustDGVersionsRsp = 0x1E00, // 30 + ID_AdjustVersionsHDRsp = 0x1D00, // 29 + ID_AdjustVersionsDGRsp = 0x1E00, // 30 + ID_AdjustSerialHDRsp = 0x9900, // 153 + ID_AdjustSerialDGRsp = 0x8800, // 136 + // Service Information + ID_AdjustServiceReq = 0x8900, // 137 + ID_AdjustServiceHDRsp = 0x8A00, // 138 + ID_AdjustServiceDGRsp = 0x8C00, // 140 + + // RTC ID_AdjustHDDateTimeReq = 0x6D00, // 109 ID_AdjustHDDateTimeRsp = 0x6E00, // 110 Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -102,19 +102,33 @@ onEndClicked : vAlarmStatus.doUserActionEnd () onOkClicked : vAlarmStatus.doUserActionOk () onMinimizeClicked : { - alarmMinimize() - // when user minimizes the alarm it can stay minimized until otherwize is set - // by the next alarm status received. - // see also the "Connections { target: vAlarmStatus" implementation - vAlarmStatus.alarm_KeepMinimized = true + if ( vAlarmStatus.alarm_Flag_noMinimize ) { + alarmList() + } + else { + alarmMinimize() + // when user minimizes the alarm it can stay minimized until otherwize is set + // by the next alarm status received. + // see also the "Connections { target: vAlarmStatus" implementation + vAlarmStatus.alarm_KeepMinimized = true + } } } AlarmListDialog { id : _alarmListDialog - isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - timeout : vAlarmStatus.alarm_MuteTimeout - onMuteClicked : vAlarmStatus.doSilence() - onMinimizeClicked : alarmMinimize() + isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + timeout : vAlarmStatus.alarm_MuteTimeout + minVisible : ! vAlarmStatus.alarm_Flag_noMinimize + onMuteClicked : vAlarmStatus.doSilence() + onMinimizeClicked : { + if ( vAlarmStatus.alarm_Flag_noMinimize ) { + alarmMaximize() + } + else { + alarmMinimize() + } + } + titleFading : vHDOperationMode.fault } Index: sources/gui/qml/components/UpDownButton.qml =================================================================== diff -u -r1a8e9578b27bb3877116675d0b2361ce4f5b5539 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539) +++ sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -21,6 +21,7 @@ TouchRect { id : _root property bool isUp : false + property bool isList: false height: 45 width : height @@ -32,6 +33,6 @@ anchors.centerIn: parent height : Variables.iconsDiameter width : Variables.iconsDiameter - source : _root.isUp ? "qrc:/images/iChevronUp" : "qrc:/images/iChevronDown" + source : _root.isList ? "qrc:/images/iList" : _root.isUp ? "qrc:/images/iChevronUp" : "qrc:/images/iChevronDown" } } Index: sources/gui/qml/compounds/TouchGrid.qml =================================================================== diff -u -r20b286ab574a6b8ad25a51aeb3477506f7dafc5d -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision 20b286ab574a6b8ad25a51aeb3477506f7dafc5d) +++ sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -35,12 +35,13 @@ property var itemsHasImage : [] property var itemsHasLine : [] property var itemsTouchable : [] + property bool touchable : true property int itemWidth : 350 property int itemHeight : 50 property alias layoutOrder : _grid.flow property alias rowSpacing : _grid.rowSpacing - property alias columnSpacing : _grid.columnSpacing + property alias colSpacing : _grid.columnSpacing property color lineColor : Colors.borderButtonHalfDarker property real lineThickness : 1.5 property real itemsValueLeftMargin : itemWidth / 2 @@ -75,7 +76,7 @@ model : _root.itemsText TouchRect { id: _touchItem clip : true - touchable : undef( _root.itemsTouchable[index], true ) + touchable : undef( _root.itemsTouchable[index], _root.touchable ) text.anchors.horizontalCenter: undefined text.leftPadding : Variables.minVGap text.text : modelData Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -34,6 +34,7 @@ property alias isSilenced : _muteButton.isSilenced property alias timeout : _muteButton.timeout property int alarmID : -1 + property bool minVisible : true radius : Variables.dialogRadius @@ -73,12 +74,14 @@ } MouseArea { id: _minimizeArea + enabled : _root.minVisible anchors.fill: parent onClicked : _root.minimizeClicked() } UpDownButton { - isUp: false + isUp : false + isList : ! _root.minVisible anchors { verticalCenter : _titleBar.verticalCenter right : _titleBar.right @@ -140,7 +143,7 @@ itemHeight : 80 itemWidth : Variables.dialogWidth - Variables.minVGap * (2 + 1) // * 2 : for each side & the +1 to not cover the scrollbar rowSpacing : 0 - columnSpacing : 0 + colSpacing : 0 lineColor : Colors.backgroundMain itemsText : vAlarmActiveList.alarmIDs itemsValue : vAlarmActiveList.alarmTexts Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r78cf0c96836f3fd612e5871a9f48dbb048bd7e99 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 78cf0c96836f3fd612e5871a9f48dbb048bd7e99) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -87,15 +87,15 @@ } MouseArea { id: _minimizeArea - enabled: _root.minVisible + enabled : _root.minVisible anchors.fill: parent onClicked : _root.minimizeClicked() } UpDownButton { id: _minimizeButton - visible: _root.minVisible backgroundColor: _titleBar.color - isUp: false + isUp : false + isList : ! _root.minVisible anchors { verticalCenter : _titleBar.verticalCenter right : _titleBar.right Index: sources/gui/qml/main.qml =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/main.qml (.../main.qml) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/gui/qml/main.qml (.../main.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -30,6 +30,7 @@ // Settings import VSettings 0.1 import VAdjustmentVersions 0.1 +import VAdjustmentService 0.1 import VDateTime 0.1 import VNetworkModel 0.1 import VAdjustmentAlarmVolume 0.1 @@ -116,6 +117,7 @@ VDevice { id: vDevice } VSettings { id: vSettings } VAdjustmentVersions { id: vAdjustmentVersions } + VAdjustmentService { id: vAdjustmentService } VDateTime { id: vDateTime } VNetworkModel { id: vNetwork } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -69,7 +69,7 @@ rowCount : 17 itemWidth : 575 rowSpacing : 0 - columnSpacing : 50 + colSpacing : 50 lineColor : Colors.backgroundMain itemsText : vPostTreatmentAdjustmentTreatmentLog.parametersTitle itemsValue : vPostTreatmentAdjustmentTreatmentLog.parametersText Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -22,6 +22,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" import "qrc:/pages" /*! @@ -82,7 +83,7 @@ true , // WiFi true , // Bluetooth true , // DGSettings - ! serviceMode , // Services + ! serviceMode , // Services serviceMode , // SetDateTime serviceMode , // Language serviceMode , // Calibration @@ -91,7 +92,64 @@ ] SettingsBase { id: _settingsInformation - itemIndex : SettingsStack.Information + itemIndex : SettingsStack.Information + confirmVisible : false + onVisibleChanged: { + if ( visible ) { + vAdjustmentVersions.doAdjustment() + vAdjustmentService .doAdjustment() + } + } + + TouchGrid { + anchors.centerIn: parent + colCount : 2 + colSpacing : 50 + rowCount : 8 + rowSpacing : 0 + itemHeight : 50 + itemWidth : 550 + touchable : false + itemsHasLine: [ + 0, // title C1 + 1,1,1,1,1,1,1, + 0, // title C2 + 1,1,1,1, + ] + itemsValueLeftMargin: 350 + itemsValue : [ + "" , + Qt.application.version , + vAdjustmentVersions.hdVerDevice , + vAdjustmentVersions.hdVerFPGA , + vAdjustmentVersions.hdSerial , + vAdjustmentVersions.dgVerDevice , + vAdjustmentVersions.dgVerFPGA , + vAdjustmentVersions.dgSerial , + "", + vAdjustmentService.hdLastServiceDate , + vAdjustmentService.hdNextServiceDate , + vAdjustmentService.dgLastServiceDate , + vAdjustmentService.dgNextServiceDate , + ] + itemsText : [ + qsTr("Versions" ), // col1 title + qsTr("UI Version" ), + qsTr("HD Version" ), + qsTr("HD FPGA Version" ), + qsTr("HD Serial Number" ), + qsTr("DG Version" ), + qsTr("DG FPGA Version" ), + qsTr("DG Serial Number" ), + + qsTr("Services" ), // col2 title + qsTr("HD Last Service Date" ), + qsTr("HD Next Service Date" ), + qsTr("DG Last Service Date" ), + qsTr("DG Next Service Date" ), + + ] + } } SettingsVolumeBrightness { id: _settingsVolumeBrightness Index: sources/model/MModel.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/MModel.h (.../MModel.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/model/MModel.h (.../MModel.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -58,6 +58,10 @@ #include "MAdjustDGRequests.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" +#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustDGSerialNumberResponse.h" +#include "MAdjustHDServiceResponse.h" +#include "MAdjustDGServiceResponse.h" #include "MAdjustHDDateTimeResponse.h" #include "MAdjustDGDateTimeResponse.h" @@ -338,6 +342,7 @@ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ + REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ @@ -370,8 +375,12 @@ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ - REGISTER_METATYPE( AdjustHDVersionsResponseData ) \ - REGISTER_METATYPE( AdjustDGVersionsResponseData ) \ + REGISTER_METATYPE( AdjustVersionsHDResponseData ) \ + REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \ + REGISTER_METATYPE( AdjustServiceHDResponseData ) \ + REGISTER_METATYPE( AdjustServiceDGResponseData ) \ REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -476,8 +485,12 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDGResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -501,6 +514,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ @@ -630,8 +644,12 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDGResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -674,6 +692,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ @@ -720,6 +739,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ @@ -766,6 +786,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ @@ -860,8 +881,12 @@ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceDGResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ /* Alarms */ \ Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision a89b5249df072be403141463d7d88728b66a848e) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -62,4 +62,3 @@ } typedef Model::MAdjustDGDateTimeReq AdjustDGDateTimeRequestData; - Index: sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,32 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDGSerialNumberResponse.cpp + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 09-Jun-2021 + * \date (original) 09-Jun-2021 + * + */ +#include "MAdjustDGSerialNumberResponse.h" + +using namespace Model; + +QVariantList MAdjustSerialNumberDGResponse::parameters() const { + return { + _data.mSerialNumber + }; +} + +bool MAdjustSerialNumberDGResponse::fromByteArray(const QByteArray &vByteArray, int *) { + _data.mSerialNumber = qPrintable(vByteArray); + return true; +} + +MAdjustSerialNumberDGResponse::Data MAdjustSerialNumberDGResponse::data() const { + return _data; +} Index: sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,76 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDGSerialNumberResponse.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 09-Jun-2021 + * \date (original) 09-Jun-2021 + * + */ +#pragma once + +// Qt + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustSerialNumberDGResponse class + * \details The DG serial number response data model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x8800| 0x070 | Rsp | Y | DG | UI | DG Serial Number | + * + * | Payload || + * | || + * | #1:(bytes) | \ref Data::serialNumber + null term | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DG | + * | infoText | Serial | + * + */ +class MAdjustSerialNumberDGResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent; } + Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + QString infoText () const override { return QString("Serial"); } + + struct Data { + QString mSerialNumber; + }; + + MAdjustSerialNumberDGResponse() {} + + bool fromByteArray (const QByteArray &vByteArray, int *vIndex = nullptr) override; + Data data ( ) const ; +private: + Data _data; +}; +} + +typedef Model::MAdjustSerialNumberDGResponse::Data AdjustSerialNumberDGResponseData; Index: sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.cpp =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.cpp (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.cpp (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,44 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDGServiceResponse.cpp + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 11-Jun-2021 + * \date (original) 11-Jun-2021 + * + */ +#include "MAdjustDGServiceResponse.h" + +using namespace Model; + +QVariantList MAdjustServiceDGResponse::parameters() const { return { + _data.mLastServiceDateEpoch .value, + _data.mServiceIntervalSeconds .value, + }; +} + +bool MAdjustServiceDGResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mLastServiceDateEpoch )) + if (GetValue(vByteArray, index, _data.mServiceIntervalSeconds )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAdjustDGDateTimeResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustServiceDGResponseData MAdjustServiceDGResponse::data() const { + Data data; + data.mLastServiceDateEpoch = _data.mLastServiceDateEpoch .value; + data.mServiceIntervalSeconds = _data.mServiceIntervalSeconds .value; + return data; +} Index: sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.h =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.h (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.h (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,82 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDGServiceResponse.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 11-Jun-2021 + * \date (original) 11-Jun-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustServiceDGResponse class + * \details The DG Date and Time adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0x8A00| 0x020 | Rsp | Y | DG | UI | Service Dates | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mLastServiceDateEpoch | + * | #2:(U32) | \ref Data::mServiceIntervalSeconds | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DG | + * | infoText | ServiceDates | + * + */ +class MAdjustServiceDGResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mLastServiceDateEpoch ; + Types::U32 mServiceIntervalSeconds; + } _data; + +public: + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + QString infoText () const override { return QString("ServiceDate") ; } + + struct Data { + quint32 mLastServiceDateEpoch = 0; + quint32 mServiceIntervalSeconds = 0; + }; + + MAdjustServiceDGResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; + +} + +typedef Model::MAdjustServiceDGResponse::Data AdjustServiceDGResponseData; Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp (.../MAdjustDGVersionsResponse.cpp) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp (.../MAdjustDGVersionsResponse.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -16,7 +16,7 @@ using namespace Model; -QVariantList MAdjustDGVersionsResponse::parameters() const { +QVariantList MAdjustVersionsDGResponse::parameters() const { return { _data.mMajor .value, _data.mMinor .value, @@ -29,7 +29,7 @@ }; } -bool MAdjustDGVersionsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MAdjustVersionsDGResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mMajor )) if (GetValue(vByteArray, index, _data.mMinor )) @@ -50,7 +50,7 @@ else { if(vIndex) *vIndex = index; return false; } } -AdjustDGVersionsResponseData MAdjustDGVersionsResponse::data() const { +AdjustVersionsDGResponseData MAdjustVersionsDGResponse::data() const { Data data; data.mMajor = _data.mMajor .value; data.mMinor = _data.mMinor .value; Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MTreatmentAdjustDGVersionsResponse.h - * \author (last) Peman Montazemi - * \date (last) 8-Dec-2020 - * \author (original) Peman Montazemi - * \date (original) 8-Dec-2020 + * \file MTreatmentAdjustDGVersionsResponse.h + * \author (last) Peman Montazemi + * \date (last) 8-Dec-2020 + * \author (original) Peman Montazemi + * \date (original) 8-Dec-2020 * */ #pragma once @@ -27,12 +27,12 @@ namespace Model { /*! - * \brief The MAdjustDGVersionsResponse class + * \brief The MAdjustVersionsDGResponse class * \details The DG versions data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| - * | 0x1E00 | 0x070 | 17 | Rsp | Y | DG | UI | DG Versions Data | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x1E00 | 0x070 | Rsp | Y | DG | UI | DG Versions Data | * * | Payload || * | || @@ -46,17 +46,17 @@ * | #8:(U08) | \ref Data::mFPGALab | * * \sa Data - * \sa MAdjustDGVersionsResponse : DG Versions Response Data + * \sa MAdjustVersionsDGResponse : DG Versions Response Data * *

Logging info

- * | || - * | || - * | typeText | Event | - * | unitText | DG | - * | infoText | DGVersions | + * | || + * | || + * | typeText | Event | + * | unitText | DG | + * | infoText | Version | * */ -class MAdjustDGVersionsResponse : public MAbstract { +class MAdjustVersionsDGResponse : public MAbstract { // friends friend class ::tst_models; @@ -76,9 +76,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } - QString infoText () const override { return QString("DGVersions") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + QString infoText () const override { return QString("Version") ; } struct Data { quint8 mMajor = 0; /*!< DG Versions Major value of type quint8 extracted out */ @@ -91,11 +91,11 @@ quint8 mFPGALab = 0; /*!< DG Versions FPGA Lab value of type quint8 extracted out */ }; - MAdjustDGVersionsResponse () { } + MAdjustVersionsDGResponse () { } bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MAdjustDGVersionsResponse::Data AdjustDGVersionsResponseData; +typedef Model::MAdjustVersionsDGResponse::Data AdjustVersionsDGResponseData; Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision a89b5249df072be403141463d7d88728b66a848e) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -85,7 +85,68 @@ return MModel::toString("AdjustHDAlarmVolume", vParameters); } }; + +/*! + * \brief The MAdjustVersionsReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x1C00 | 0x200 | Req | Y | UI | All | DG/HD Versions/SN Request | + * + * | Payload || + * | || + * | (N/A) || + * + */ +class MAdjustVersionsReq : public MModel { +public: + + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("Version", vParameters); + } + + static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } +}; + +/*! + * \brief The MAdjustServiceReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| + * | 0x8900 | 0x200 | Req | Y | UI | All | DG/HD Service Dates Request | + * + * | Payload || + * | || + * | (N/A) || + * + */ +class MAdjustServiceReq : public MModel { +public: + + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("ServiceDates", vParameters); + } + + static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } +}; + } -typedef Model::MAdjustHDDateTimeReq AdjustHDDateTimeRequestData ; -typedef Model::MAdjustHDAlarmVolumeReq AdjustHDAlarmVolumeRequestData ; +typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; +typedef Model:: MAdjustServiceReq AdjustServiceRequestData; +typedef Model:: MAdjustHDDateTimeReq AdjustHDDateTimeRequestData; +typedef Model::MAdjustHDAlarmVolumeReq AdjustHDAlarmVolumeRequestData; Index: sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,32 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDSerialNumberResponse.cpp + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 09-Jun-2021 + * \date (original) 09-Jun-2021 + * + */ +#include "MAdjustHDSerialNumberResponse.h" + +using namespace Model; + +QVariantList MAdjustSerialNumberHDResponse::parameters() const { + return { + _data.mSerialNumber + }; +} + +bool MAdjustSerialNumberHDResponse::fromByteArray(const QByteArray &vByteArray, int *) { + _data.mSerialNumber = qPrintable(vByteArray); + return true; +} + +MAdjustSerialNumberHDResponse::Data MAdjustSerialNumberHDResponse::data() const { + return _data; +} Index: sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,76 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDSerialNumberResponse.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 09-Jun-2021 + * \date (original) 09-Jun-2021 + * + */ +#pragma once + +// Qt + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustSerialNumberHDResponse class + * \details The HD serial number response data model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x9900| 0x020 | Rsp | Y | HD | UI | HD Serial Number | + * + * | Payload || + * | || + * | #1:(bytes) | \ref Data::mSerialNumber + null term | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | Serial | + * + */ +class MAdjustSerialNumberHDResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("Serial"); } + + struct Data { + QString mSerialNumber; + }; + + MAdjustSerialNumberHDResponse() {} + + bool fromByteArray (const QByteArray &vByteArray, int *vIndex = nullptr) override; + Data data ( ) const ; +private: + Data _data; +}; +} + +typedef Model::MAdjustSerialNumberHDResponse::Data AdjustSerialNumberHDResponseData; Index: sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.cpp (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.cpp (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,45 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDServiceResponse.cpp + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 11-Jun-2021 + * \date (original) 11-Jun-2021 + * + */ +#include "MAdjustHDServiceResponse.h" + +using namespace Model; + +QVariantList MAdjustServiceHDResponse::parameters() const { + return { + _data.mLastServiceDateEpoch .value, + _data.mServiceIntervalSeconds .value, + }; +} + +bool MAdjustServiceHDResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mLastServiceDateEpoch )) + if (GetValue(vByteArray, index, _data.mServiceIntervalSeconds )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAdjustHDDateTimeResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustServiceHDResponseData MAdjustServiceHDResponse::data() const { + Data data; + data.mLastServiceDateEpoch = _data.mLastServiceDateEpoch .value; + data.mServiceIntervalSeconds = _data.mServiceIntervalSeconds .value; + return data; +} Index: sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.h (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.h (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,81 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDServiceResponse.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 11-Jun-2021 + * \date (original) 11-Jun-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustServiceHDResponse class + * \details The HD Date and Time adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0x8A00| 0x020 | Rsp | Y | HD | UI | Service Dates | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mLastServiceDateEpoch | + * | #2:(U32) | \ref Data::mServiceIntervalSeconds | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | ServiceDates | + * + */ +class MAdjustServiceHDResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mLastServiceDateEpoch ; + Types::U32 mServiceIntervalSeconds ; + } _data; + +public: + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("ServiceDate") ; } + + struct Data { + quint32 mLastServiceDateEpoch = 0; + quint32 mServiceIntervalSeconds = 0; + }; + + MAdjustServiceHDResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustServiceHDResponse::Data AdjustServiceHDResponseData; Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp (.../MAdjustHDVersionsResponse.cpp) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp (.../MAdjustHDVersionsResponse.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -5,40 +5,40 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MHDVersionResponse.cpp - * \author (last) Peman Montazemi - * \date (last) 4-Nov-2020 - * \author (original) Peman Montazemi - * \date (original) 4-Nov-2020 + * \file MAdjustHDVersionsResponse.h + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 * */ #include "MAdjustHDVersionsResponse.h" using namespace Model; -QVariantList MAdjustHDVersionsResponse::parameters() const { +QVariantList MAdjustVersionsHDResponse::parameters() const { return { - _data.mMajor .value, - _data.mMinor .value, - _data.mMicro .value, - _data.mBuild .value, - _data.mFPGAId .value, - _data.mFPGAMajor.value, - _data.mFPGAMinor.value, - _data.mFPGALab .value + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor .value, + _data.mFPGAMinor .value, + _data.mFPGALab .value, }; } -bool MAdjustHDVersionsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MAdjustVersionsHDResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mMajor )) - if (GetValue(vByteArray, index, _data.mMinor )) - if (GetValue(vByteArray, index, _data.mMicro )) - if (GetValue(vByteArray, index, _data.mBuild )) - if (GetValue(vByteArray, index, _data.mFPGAId )) - if (GetValue(vByteArray, index, _data.mFPGAMajor)) - if (GetValue(vByteArray, index, _data.mFPGAMinor)) - if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor )) + if (GetValue(vByteArray, index, _data.mFPGAMinor )) + if (GetValue(vByteArray, index, _data.mFPGALab )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -50,7 +50,7 @@ else { if(vIndex) *vIndex = index; return false; } } -AdjustHDVersionsResponseData MAdjustHDVersionsResponse::data() const { +AdjustVersionsHDResponseData MAdjustVersionsHDResponse::data() const { Data data; data.mMajor = _data.mMajor .value; data.mMinor = _data.mMinor .value; Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MTreatmentAdjustHDVersionsResponse.h - * \author (last) Peman Montazemi - * \date (last) 6-Nov-2020 - * \author (original) Peman Montazemi - * \date (original) 4-Nov-2020 + * \file MAdjustHDVersionsResponse.h + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 * */ #pragma once @@ -27,12 +27,12 @@ namespace Model { /*! - * \brief The MAdjustHDVersionsResponse class + * \brief The MAdjustVersionsHDResponse class * \details The HD versions data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| - * | 0x1D00 | 0x020 | 6 | Rsp | Y | HD | UI | HD Versions Data | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------:| + * | 0x1D00 | 0x020 | Rsp | Y | HD | UI | HD Versions Data | * * | Payload || * | || @@ -46,17 +46,17 @@ * | #8:(U08) | \ref Data::mHDFPGALab | * * \sa Data - * \sa MAdjustHDVersionsResponse : HD Versions Response Data + * \sa MAdjustVersionsHDResponse : HD Versions Response Data * *

Logging info

- * | || - * | || - * | typeText | Event | - * | unitText | HD | - * | infoText | HDVersions | + * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | Version | * */ -class MAdjustHDVersionsResponse : public MAbstract { +class MAdjustVersionsHDResponse : public MAbstract { // friends friend class ::tst_models; @@ -76,9 +76,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } - QString infoText () const override { return QString("HDVersions") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("Version") ; } struct Data { quint8 mMajor = 0; /*!< HD Versions Major value of type quint8 extracted out */ @@ -91,11 +91,11 @@ quint8 mFPGALab = 0; /*!< HD Versions FPGA Lab value of type quint8 extracted out */ }; - MAdjustHDVersionsResponse () { } + MAdjustVersionsHDResponse () { } bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MAdjustHDVersionsResponse::Data AdjustHDVersionsResponseData; +typedef Model::MAdjustVersionsHDResponse::Data AdjustVersionsHDResponseData; Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -415,35 +415,6 @@ } }; -/*! - * \brief The MAdjustVersionsReq class - * \details The DG/HD versions request model - * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------:| - * | 0x1C00 | 0x200 | 10 | Req | Y | UI | All | DG/HD Versions Request | - * - * | Payload || - * | || - * | #1:(N/A) | \ref None | - * - */ -class MAdjustVersionsReq : public MModel { -public: - - // coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. - QString toString() { - return toString({}); - } - // coco end - static QString toString(const QVariantList &vParameters) { - return MModel::toString("Version", vParameters); - } - - static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } -}; - //// ---------- Alarms /*! @@ -544,7 +515,6 @@ typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; Index: sources/storage/Logger.cpp =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -57,9 +57,6 @@ checkLogPath(); initConnections(); - ADD_EVENT_HEADER; - LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className())); - return true; } @@ -82,6 +79,36 @@ // coco end /*! + * \brief Logger::postInit + * \details these are the actions that should be executed after the logger has been initialized + * but also cannot be done in the Logger class since it is not immediately moving to the thread. + */ +void Logger::postInit() +{ + if ( ! checkThread() ) return; + ADD_EVENT_HEADER; + LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className())); + LOG_DEBUG("UI," + QString("Application %1 Started").arg(qApp->applicationName())); + LOG_EVENT("UI," + qApp-> applicationVersion()); +} + +/*! + * \brief Logger::checkThread + * \details Checks the current thread to be the logger thread + * otherwise sends out a message to the console and returns false. + * \return false if not logger thread + */ +bool Logger::checkThread() +{ + bool ok = true; + if ( this->thread() != &Threads::_Logger_Thread ) { + qDebug() << " ----- " << "The main Log function rejection: The Logger is not initialized for proper use"; + ok = false; + } + return ok; +} + +/*! * \brief Logger quit * \details quits the class * Calls quitThread @@ -245,6 +272,8 @@ */ void Logger::log(const QString &vContent, LogType vLogType, bool vTimestamp) { + if ( ! checkThread() ) return; + static QString date; QString mContent; QString currentDate = QDate::currentDate().toString(_dateFormat); Index: sources/storage/Logger.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/storage/Logger.h (.../Logger.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/storage/Logger.h (.../Logger.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -157,6 +157,7 @@ public: void enableConsoleOut(bool vEnabled); + void postInit(); signals: void didLogPathSet(Logger::LogType vLogType, const QString &vLogPath); @@ -175,6 +176,8 @@ void initThread(QThread &vThread); void quitThread(); + bool checkThread(); + private: // ----- setting up void checkLogPath (); Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -46,6 +46,13 @@ const char *SDCard_Base_Path_Name = "/media/denali/sd-card/"; #endif + // Screenshot store folder +#ifdef BUILD_FOR_TARGET + const char *Screenshot_Base_Path_Name = "/home/root/screenshots/"; +#else + const char *Screenshot_Base_Path_Name = "/home/denali/Desktop/Screenshots/"; +#endif + // Settings #ifdef BUILD_FOR_TARGET const char *Settings_Path_Name = "/home/root/.config/"; Index: sources/storage/StorageGlobals.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -30,6 +30,9 @@ extern const short Available_Space_Percent; extern const char *SDCard_Base_Path_Name; + // Screenshot store folder + extern const char *Screenshot_Base_Path_Name; + // Settings extern const char *Settings_Path_Name; Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r20b286ab574a6b8ad25a51aeb3477506f7dafc5d -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 20b286ab574a6b8ad25a51aeb3477506f7dafc5d) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -67,9 +67,9 @@ // qDebug() << _Settings.groups(); // SRSUI910 : PRS187 : Clinical - Data - Order - QString mTreatmentDuration = QTime (0, 0).addSecs(vData.mTreatmentDuration ).toString("HH:mm"); - QString mActualTreatmentDuration = QTime (0, 0).addSecs(vData.mActualTreatmentDuration ).toString("HH:mm"); - QString mTreatmentDateTime = QDateTime::fromSecsSinceEpoch ( vData.mTreatmentDateTime ).toString("yyyy/MM/dd HH:mm"); + QString mTreatmentDuration = QTime (0, 0).addSecs(vData.mTreatmentDuration ).toString(_timeFormat); + QString mActualTreatmentDuration = QTime (0, 0).addSecs(vData.mActualTreatmentDuration ).toString(_timeFormat); + QString mTreatmentDateTime = Format::fromEpoch( vData.mTreatmentDateTime , _datetimeFormat); quint32 mHeparinConcentration = 1000; // vData.mHeparinConcentration // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods. Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -40,6 +40,10 @@ QFutureWatcher _saveWatcher; QFutureWatcher _exportWatcher; + QString _dateFormat = "yyyy/MM/dd" ; + QString _timeFormat = "HH:mm" ; + QString _datetimeFormat = _dateFormat + " " + _timeFormat; + // TODO : A Unit class needs to be created to have all the unit string and all the required conversions. QString _unitTextFlowRate = tr("mL/min" ); QString _unitTextDuration = tr("min" ); Index: sources/utility/format.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/utility/format.cpp (.../format.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/utility/format.cpp (.../format.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -15,9 +15,10 @@ #include "format.h" // Qt +#include // Project -#include +#include "types.h" Format::Format() { } @@ -148,3 +149,16 @@ } return list; } + +/*! + * \brief Format::fromEpoch + * \details Converts the epoch (in seconds) to the date string format, formatted by vDateTimeFormat + * \param vEpoch - epoch + * \param vFormat - returned date time format + * \return the date time representation of the epoch in QString by vFormat. + */ +QString Format::fromEpoch(qint64 vEpoch, QString vFormat) +{ + QDateTime dateTime = QDateTime::fromSecsSinceEpoch(vEpoch); + return dateTime.toString(vFormat); +} Index: sources/utility/format.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/utility/format.h (.../format.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/utility/format.h (.../format.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -20,14 +20,18 @@ // Project -#define FSN(vInt) QString::number(vInt) +#define FSN(vNumber) QString::number(vNumber) + class Format { Format(); + public: static QString toHexString ( quint16 vValue, bool vWith0x = true, quint8 vLen = 4); static QByteArray toHexByteArray(const QByteArray &vData , char separator = '.'); static QString toHexString (const QByteArray &vData , char separator = '.'); static QByteArray fromVariant (const QVariant &vData ); static QStringList toStringList (const QList vList, bool vRemoveDuplicate = false, QString vPrefix = ""); + static QString fromEpoch ( qint64 vEpoch, QString vFormat = "yyyy/MM/dd HH:mm"); + }; Index: sources/view/VEventSpy.cpp =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -17,17 +17,20 @@ // Qt #include #include +#include // Project #include "GuiGlobals.h" #include "Logger.h" +#include "FileHandler.h" // if needs to spy on the mouse events // (which is happening on the desktop only since there is not mouse attached to the device) // remove the #define comment line below. // #define SPY_MOUSE_EVENT using namespace View; +using namespace Storage; VEventSpy::VEventSpy(QObject *) { @@ -70,6 +73,10 @@ case QEvent::Type::TouchUpdate : touchEventSpy(vEvent, "tU"); break; case QEvent::Type::TouchCancel : touchEventSpy(vEvent, "tC"); break; case QEvent::Type::TouchEnd : touchEventSpy(vEvent, "tE"); break; + + // Keyboard + case QEvent::Type::KeyPress : keybdEventSpy(vEvent ); break; + // coco end default : break; @@ -181,3 +188,41 @@ */ void VEventSpy::doTouchReset() { touchCount(0); } // coco end + + +// coco begin validated: this code has been manually tested. +// the only intention of this code is to be used for testing and has been tested and is working fine. +/*! + * \brief VEventSpy::keybdEventSpy + * \param vEvent + */ +void VEventSpy::keybdEventSpy(QEvent *vEvent) { + const char *datetimeFormat = "yyyyMMdd-HHmmss"; + static bool firstEntry = true; + static bool folderAvailable = false; + static QString dateTime = QDateTime::currentDateTime().toString(datetimeFormat); + QString currentDateTime = QDateTime::currentDateTime().toString(datetimeFormat); + if ( firstEntry ) { // we will only need to check for the folder once in application life time. + folderAvailable = FileHandler::makeFolder(Screenshot_Base_Path_Name); + if ( ! folderAvailable ) { + LOG_DEBUG(QString("Folder is not available for screenshot [%1]").arg(Storage::Screenshot_Base_Path_Name)); + } + } + + if ( ! folderAvailable ) return; + if ( ! firstEntry && dateTime == currentDateTime ) return; // prevents user to request more than 1 screen shot per second (defined by date time format.) + dateTime = currentDateTime; + + firstEntry = false; + QKeyEvent *keyEvent = static_cast(vEvent); + if (keyEvent->key() == Qt::Key_F12) { + // it's known that this code will be called in the main thread. + // Since this is a test code it is not worth working on the threading. + // Logging has it's own thread and is independent of the function it is being called. + QImage screenshot = Gui::_viewer->grabWindow(); + QString screenshotFileName = QString(Screenshot_Base_Path_Name) + currentDateTime + ".png"; + screenshot.save(screenshotFileName); + LOG_DEBUG("Screenshot saved in " + screenshotFileName); + } +} +// coco end Index: sources/view/VEventSpy.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/view/VEventSpy.h (.../VEventSpy.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/VEventSpy.h (.../VEventSpy.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -52,6 +52,7 @@ void initConnections(); void mouseEventSpy(QEvent *vEvent, const QString &vTypeName); void touchEventSpy(QEvent *vEvent, const QString &vTypeName); + void keybdEventSpy(QEvent *vEvent ); signals : void countChanged(int vCount); Index: sources/view/VView.h =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/view/VView.h (.../VView.h) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/view/VView.h (.../VView.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -106,6 +106,7 @@ /* Settings */ \ REGISTER_TYPE( VSettings ) \ REGISTER_TYPE( VAdjustmentVersions ) \ + REGISTER_TYPE( VAdjustmentService ) \ REGISTER_TYPE( VDateTime ) \ REGISTER_TYPE( VNetworkModel ) \ REGISTER_TYPE( VAdjustmentAlarmVolume ) \ Index: sources/view/settings/VAdjustmentService.cpp =================================================================== diff -u --- sources/view/settings/VAdjustmentService.cpp (revision 0) +++ sources/view/settings/VAdjustmentService.cpp (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,57 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VAdjustmentService.cpp + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 6-Nov-2020 + * + */ +#include "VAdjustmentService.h" + +// Project +#include "GuiController.h" +#include "format.h" + + +VIEW_DEF_CLASS_ADJUSTMENT(VAdjustmentService) + +void View::VAdjustmentService::initConnections() { + ADJUST_VIEW_CONNECTION( AdjustServiceRequestData); + ACTION_VIEW_CONNECTION(AdjustServiceHDResponseData); + ACTION_VIEW_CONNECTION(AdjustServiceDGResponseData); +} + +void View::VAdjustmentService::onActionReceive(const AdjustServiceHDResponseData &vData) +{ + // HD Service data + hdLastServiceEpoch (vData.mLastServiceDateEpoch ); + hdServiceInterval (vData.mServiceIntervalSeconds ); + + hdLastServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch , _serviceDateFormat)); + hdNextServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds , _serviceDateFormat)); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustmentHD(true); // set here only because adjustment parent needs it, but HD Service does not +} + +void View::VAdjustmentService::onActionReceive(const AdjustServiceDGResponseData &vData) +{ + // DG Service data + dgLastServiceEpoch (vData.mLastServiceDateEpoch ); + dgServiceInterval (vData.mServiceIntervalSeconds ); + + dgLastServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch , _serviceDateFormat)); + dgNextServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds , _serviceDateFormat)); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustmentDG(true); // set here only because adjustment parent needs it, but HD Service does not +} + Index: sources/view/settings/VAdjustmentService.h =================================================================== diff -u --- sources/view/settings/VAdjustmentService.h (revision 0) +++ sources/view/settings/VAdjustmentService.h (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -0,0 +1,77 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VAdjustmentService.h + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 6-Nov-2020 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VAdjustmentResponseBase.h" +#include "MAdjustHDServiceResponse.h" +#include "MAdjustDGServiceResponse.h" + +namespace View { + +/*! + * \brief The VAdjustmentService class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustServiceResponse + * + */ +class VAdjustmentService : public VAdjustmentResponseBase { + Q_OBJECT + + // friends + friend class ::tst_views; + + const QString _serviceDateFormat = "yyyy/MM/dd"; + + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustmentHD , 0) + TRIGGER( bool , adjustmentDG , 0) + // coco end + + // Service seconds + PROPERTY( quint8 , hdLastServiceEpoch, 0) + PROPERTY( quint8 , hdServiceInterval , 0) + PROPERTY( quint8 , dgLastServiceEpoch, 0) + PROPERTY( quint8 , dgServiceInterval , 0) + + // Service data + PROPERTY( QString , hdLastServiceDate , 0) + PROPERTY( QString , hdNextServiceDate , 0) + PROPERTY( QString , dgLastServiceDate , 0) + PROPERTY( QString , dgNextServiceDate , 0) + + VIEW_DEC_CLASS(VAdjustmentService) + VIEW_DEC_SLOT (AdjustServiceHDResponseData) + VIEW_DEC_SLOT (AdjustServiceDGResponseData) + +// ---------- Version +public slots: + void doAdjustment() { + AdjustServiceRequestData data; + emit didAdjustment(data); + } + +signals: + void didAdjustment(const AdjustServiceRequestData &vData); +}; +} Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -20,41 +20,79 @@ VIEW_DEF_CLASS_ADJUSTMENT(VAdjustmentVersions) void VAdjustmentVersions::initConnections() { - ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); - ACTION_VIEW_CONNECTION(AdjustDGVersionsResponseData); ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); + ACTION_VIEW_CONNECTION(AdjustVersionsHDResponseData); + ACTION_VIEW_CONNECTION(AdjustVersionsDGResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberDGResponseData); } -void VAdjustmentVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDResponseData &vData) { // HD versions data - hdVerMajor (vData.mMajor ); - hdVerMinor (vData.mMinor ); - hdVerMicro (vData.mMicro ); - hdVerBuild (vData.mBuild ); - hdVerFPGAId (vData.mFPGAId ); - hdVerFPGAMajor (vData.mFPGAMajor); - hdVerFPGAMinor (vData.mFPGAMinor); - hdVerFPGALab (vData.mFPGALab ); + hdVerMajor ( vData.mMajor ); + hdVerMinor ( vData.mMinor ); + hdVerMicro ( vData.mMicro ); + hdVerBuild ( vData.mBuild ); + hdVerFPGAId ( vData.mFPGAId ); + hdVerFPGAMajor ( vData.mFPGAMajor ); + hdVerFPGAMinor ( vData.mFPGAMinor ); + hdVerFPGALab ( vData.mFPGALab ); + hdVerDevice ( + _hdVerDeviceFormat + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild )); + hdVerFPGA ( + _hdVerFPGAFormat + .arg ( vData.mFPGAId ) + .arg ( vData.mFPGAMajor ) + .arg ( vData.mFPGAMinor ) + .arg ( vData.mFPGALab )); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustmentHD(true); // set here only because adjustment parent needs it, but HD Versions does not } -void VAdjustmentVersions::onActionReceive(const AdjustDGVersionsResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsDGResponseData &vData) { // DG versions data - dgVerMajor (vData.mMajor ); - dgVerMinor (vData.mMinor ); - dgVerMicro (vData.mMicro ); - dgVerBuild (vData.mBuild ); - dgVerFPGAId (vData.mFPGAId ); - dgVerFPGAMajor (vData.mFPGAMajor); - dgVerFPGAMinor (vData.mFPGAMinor); - dgVerFPGALab (vData.mFPGALab ); + dgVerMajor ( vData.mMajor ); + dgVerMinor ( vData.mMinor ); + dgVerMicro ( vData.mMicro ); + dgVerBuild ( vData.mBuild ); + dgVerFPGAId ( vData.mFPGAId ); + dgVerFPGAMajor ( vData.mFPGAMajor ); + dgVerFPGAMinor ( vData.mFPGAMinor ); + dgVerFPGALab ( vData.mFPGALab ); + dgVerDevice ( + _dgVerDeviceFormat + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild )); + dgVerFPGA ( + _dgVerFPGAFormat + .arg ( vData.mFPGAId ) + .arg ( vData.mFPGAMajor ) + .arg ( vData.mFPGAMinor ) + .arg ( vData.mFPGALab )); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustmentDG(true); // set here only because adjustment parent needs it, but HD Versions does not } + +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberHDResponseData &vData) +{ + hdSerial( vData.mSerialNumber ); +} + +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDGResponseData &vData) +{ + dgSerial( vData.mSerialNumber ); +} Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -21,6 +21,8 @@ #include "VAdjustmentResponseBase.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" +#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustDGSerialNumberResponse.h" namespace View { @@ -39,6 +41,11 @@ AdjustVersionsRequestData _data; + const QString _hdVerDeviceFormat = "%1.%2.%3.%4"; + const QString _hdVerFPGAFormat = "%1.%2.%3.%4"; + const QString _dgVerDeviceFormat = "%1.%2.%3.%4"; + const QString _dgVerFPGAFormat = "%1.%2.%3.%4"; + // coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI @@ -67,9 +74,18 @@ PROPERTY( quint8 , dgVerFPGAMinor , 0) PROPERTY( quint8 , dgVerFPGALab , 0) + PROPERTY( QString , hdVerDevice ,"") + PROPERTY( QString , hdVerFPGA ,"") + PROPERTY( QString , hdSerial ,"") + PROPERTY( QString , dgVerDevice ,"") + PROPERTY( QString , dgVerFPGA ,"") + PROPERTY( QString , dgSerial ,"") + VIEW_DEC_CLASS(VAdjustmentVersions) - VIEW_DEC_SLOT (AdjustHDVersionsResponseData) - VIEW_DEC_SLOT (AdjustDGVersionsResponseData) + VIEW_DEC_SLOT (AdjustVersionsHDResponseData) + VIEW_DEC_SLOT (AdjustVersionsDGResponseData) + VIEW_DEC_SLOT (AdjustSerialNumberHDResponseData) + VIEW_DEC_SLOT (AdjustSerialNumberDGResponseData) // ---------- Version public slots: