Index: cppcheck.err =================================================================== diff -u -rb238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- cppcheck.err (.../cppcheck.err) (revision b238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5) +++ cppcheck.err (.../cppcheck.err) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -51,7 +51,10 @@ [sources/device/DeviceController.cpp:311] -> [sources/device/DeviceController.cpp:313]: (style) Variable 'mCIsReady' is reassigned a value before the old one has been used. [sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h:67] -> [sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:61]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name 'stringPrefix' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. [sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h:79] -> [sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:79]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name '_data' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. -[sources/storage/Logger.cpp:188]: (style) The scope of the variable 'notified' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: +[sources/model/settings/MSettings.h:56]: (style) The KeyValue::operator= does not conform to standard C/C++ behaviour. To conform to standard C/C++ behaviour, return a reference to self (such as: 'KeyValue &KeyValue::operator=(..) { .. return *this; }'. For safety reasons it might be better to not fix this message. If you think that safety is always more important than conformance then please ignore/suppress this message. For more details about this topic, see the book "Effective C++" by Scott Meyers. +[sources/model/settings/MSettings.h:44]: (warning) The class 'KeyValue' has 'operator=' but lack of 'copy constructor'. +[sources/storage/Logger.cpp:259] -> [sources/storage/Logger.cpp:261]: (style) Variable 'ok' is reassigned a value before the old one has been used. +[sources/storage/Logger.cpp:189]: (style) The scope of the variable 'notified' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: void f(int x) { int i = 0; @@ -64,7 +67,6 @@ } } When you see this message it is always safe to reduce the variable scope 1 level. -[sources/storage/Logger.cpp]: (information) The configuration 'MIXED_EVENT_DATUM' was not checked because its code equals another one. [sources/view/VEventSpy.cpp]: (information) The configuration 'DEBUG_BCUFF_MIMIC' was not checked because its code equals another one. [sources/view/VTreatmentCreate.cpp:132]: (style) The function 'doCancel' is never used. [sources/view/settings/VNetworkModel.cpp:238]: (style) The function 'doCheckIfConnected' is never used. Index: cppcheck.log =================================================================== diff -u -rb238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- cppcheck.log (.../cppcheck.log) (revision b238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5) +++ cppcheck.log (.../cppcheck.log) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -4,1035 +4,1039 @@ Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking main.cpp: UNIT_TEST... -1/205 files checked 3% done +1/206 files checked 3% done Checking sources/AlarmGenerator.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -2/205 files checked 3% done +2/206 files checked 3% done Checking sources/ApplicationController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -3/205 files checked 4% done +3/206 files checked 4% done Checking sources/ApplicationPost.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -4/205 files checked 4% done +4/206 files checked 4% done Checking sources/MainTimer.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -5/205 files checked 5% done +5/206 files checked 5% done Checking sources/Threads.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -6/205 files checked 5% done +6/206 files checked 5% done Checking sources/_wip_/fileCopy/main.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -7/205 files checked 6% done +7/206 files checked 6% done Checking sources/bluetooth/BluetoothInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -8/205 files checked 6% done +8/206 files checked 6% done Checking sources/canbus/CanInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -9/205 files checked 7% done +9/206 files checked 7% done Checking sources/canbus/FrameInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -10/205 files checked 7% done +10/206 files checked 7% done Checking sources/canbus/MessageAcknowModel.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -11/205 files checked 8% done +11/206 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... -12/205 files checked 8% done +12/206 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... -13/205 files checked 9% done +13/206 files checked 8% done Checking sources/canbus/MessageInterpreter.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -14/205 files checked 9% done +14/206 files checked 9% done Checking sources/cloudsync/CloudSyncController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -15/205 files checked 9% done +15/206 files checked 9% done Checking sources/device/DeviceController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/device/DeviceController.cpp: BUILD_FOR_DESKTOP... -16/205 files checked 10% done +16/206 files checked 10% done Checking sources/device/DeviceError.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -17/205 files checked 10% done +17/206 files checked 10% done Checking sources/device/DeviceModels.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -18/205 files checked 11% done +18/206 files checked 11% done Checking sources/device/DeviceView.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -19/205 files checked 11% done +19/206 files checked 11% done Checking sources/gui/GuiController.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -20/205 files checked 12% done +20/206 files checked 12% done Checking sources/gui/GuiGlobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/gui/GuiGlobals.cpp: BUILD_FOR_DESKTOP... -21/205 files checked 12% done +21/206 files checked 12% done Checking sources/gui/GuiView.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/gui/GuiView.cpp: BUILD_FOR_DESKTOP... -22/205 files checked 13% done +22/206 files checked 13% done Checking sources/model/MAbstract.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -23/205 files checked 13% done +23/206 files checked 13% done Checking sources/model/MAbstractDynamic.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -24/205 files checked 14% done +24/206 files checked 14% done +Checking sources/model/confirm/MDuetConfirmHDi.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Platform:Native +25/206 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 -25/205 files checked 14% done +26/206 files checked 15% done Checking sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -26/205 files checked 15% done +27/206 files checked 15% done Checking sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -27/205 files checked 15% done +28/206 files checked 16% done Checking sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -28/205 files checked 16% done +29/206 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 -29/205 files checked 16% done +30/206 files checked 16% done Checking sources/model/dg/data/MDGConductivityData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -30/205 files checked 17% done +31/206 files checked 17% done Checking sources/model/dg/data/MDGDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -31/205 files checked 17% done +32/206 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 -32/205 files checked 18% done +33/206 files checked 18% done Checking sources/model/dg/data/MDGGeneralEvent.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -33/205 files checked 18% done +34/206 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 -34/205 files checked 18% done +35/206 files checked 19% done Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -35/205 files checked 19% done +36/206 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 -36/205 files checked 19% done +37/206 files checked 20% done Checking sources/model/dg/data/MDGPressuresData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -37/205 files checked 20% done +38/206 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 -38/205 files checked 20% done +39/206 files checked 21% done Checking sources/model/dg/data/MDGReservoirData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -39/205 files checked 21% done +40/206 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 -40/205 files checked 21% done +41/206 files checked 22% done Checking sources/model/dg/data/MDGValvesStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -41/205 files checked 22% done +42/206 files checked 22% done Checking sources/model/dg/data/post/MDGPostFinalResultData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -42/205 files checked 22% done +43/206 files checked 23% done Checking sources/model/dg/data/post/MDGPostSingleResultData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -43/205 files checked 23% done +44/206 files checked 23% done Checking sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -44/205 files checked 23% done +45/206 files checked 24% done Checking sources/model/hd/adjustment/MAdjustPowerOff.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -45/205 files checked 24% done +46/206 files checked 24% done Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -46/205 files checked 24% done +47/206 files checked 25% done Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -47/205 files checked 25% done +48/206 files checked 25% done Checking sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -48/205 files checked 25% done +49/206 files checked 25% done Checking sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -49/205 files checked 26% done +50/206 files checked 26% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -50/205 files checked 26% done +51/206 files checked 26% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -51/205 files checked 27% done +52/206 files checked 27% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -52/205 files checked 27% done +53/206 files checked 27% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -53/205 files checked 27% done +54/206 files checked 28% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -54/205 files checked 28% done +55/206 files checked 28% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -55/205 files checked 28% done +56/206 files checked 29% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -56/205 files checked 29% done +57/206 files checked 29% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -57/205 files checked 29% done +58/206 files checked 30% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -58/205 files checked 30% done +59/206 files checked 30% done Checking sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -59/205 files checked 30% done +60/206 files checked 31% done Checking sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -60/205 files checked 31% done +61/206 files checked 31% done Checking sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -61/205 files checked 31% done +62/206 files checked 32% done Checking sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -62/205 files checked 32% done +63/206 files checked 32% done Checking sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -63/205 files checked 32% done +64/206 files checked 33% done Checking sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -64/205 files checked 33% done +65/206 files checked 33% done Checking sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -65/205 files checked 33% done +66/206 files checked 33% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -66/205 files checked 34% done +67/206 files checked 34% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -67/205 files checked 34% done +68/206 files checked 34% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -68/205 files checked 35% done +69/206 files checked 35% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -69/205 files checked 35% done +70/206 files checked 35% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -70/205 files checked 36% done +71/206 files checked 36% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -71/205 files checked 36% done +72/206 files checked 36% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -72/205 files checked 36% done +73/206 files checked 37% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -73/205 files checked 37% done +74/206 files checked 37% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -74/205 files checked 37% done +75/206 files checked 38% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -75/205 files checked 38% done +76/206 files checked 38% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -76/205 files checked 38% done +77/206 files checked 39% done Checking sources/model/hd/alarm/MAlarmActiveList.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -77/205 files checked 39% done +78/206 files checked 39% done Checking sources/model/hd/alarm/MAlarmCleared.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -78/205 files checked 39% done +79/206 files checked 40% done Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -79/205 files checked 40% done +80/206 files checked 40% done Checking sources/model/hd/alarm/MAlarmMapping.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -80/205 files checked 40% done +81/206 files checked 41% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -81/205 files checked 41% done +82/206 files checked 41% done Checking sources/model/hd/alarm/MAlarmTriggered.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -82/205 files checked 41% done +83/206 files checked 41% done Checking sources/model/hd/data/MHDAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -83/205 files checked 42% done +84/206 files checked 42% done Checking sources/model/hd/data/MHDAirBubbleData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -84/205 files checked 42% done +85/206 files checked 42% done Checking sources/model/hd/data/MHDAirTrapData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -85/205 files checked 43% done +86/206 files checked 43% done Checking sources/model/hd/data/MHDBloodLeakData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -86/205 files checked 43% done +87/206 files checked 43% done Checking sources/model/hd/data/MHDDebugText.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -87/205 files checked 44% done +88/206 files checked 44% done Checking sources/model/hd/data/MHDGeneralEvent.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -88/205 files checked 44% done +89/206 files checked 44% done Checking sources/model/hd/data/MHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -89/205 files checked 45% done +90/206 files checked 45% done Checking sources/model/hd/data/MHDSyringePumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -90/205 files checked 45% done +91/206 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 -91/205 files checked 45% done +92/206 files checked 46% done Checking sources/model/hd/data/post/MHDPostFinalResultData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -92/205 files checked 46% done +93/206 files checked 46% done Checking sources/model/hd/data/post/MHDPostSingleResultData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -93/205 files checked 46% done +94/206 files checked 47% done Checking sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -94/205 files checked 47% done +95/206 files checked 47% done Checking sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -95/205 files checked 47% done +96/206 files checked 48% done Checking sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -96/205 files checked 48% done +97/206 files checked 48% done Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -97/205 files checked 48% done +98/206 files checked 49% done Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -98/205 files checked 49% done +99/206 files checked 49% done Checking sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -99/205 files checked 49% done +100/206 files checked 50% done Checking sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -100/205 files checked 50% done +101/206 files checked 50% done Checking sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -101/205 files checked 50% done +102/206 files checked 50% done Checking sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -102/205 files checked 51% done +103/206 files checked 51% done Checking sources/model/hd/data/treatment/MTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -103/205 files checked 51% done +104/206 files checked 51% done Checking sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -104/205 files checked 52% done +105/206 files checked 52% done Checking sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -105/205 files checked 52% done +106/206 files checked 52% done Checking sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -106/205 files checked 53% done +107/206 files checked 53% done Checking sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -107/205 files checked 53% done +108/206 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 -108/205 files checked 54% done +109/206 files checked 54% done Checking sources/model/hd/data/treatment/MTreatmentStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -109/205 files checked 54% done +110/206 files checked 54% done Checking sources/model/hd/data/treatment/MTreatmentStopData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -110/205 files checked 54% done +111/206 files checked 55% done Checking sources/model/hd/data/treatment/MTreatmentTimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -111/205 files checked 55% done +112/206 files checked 55% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -112/205 files checked 55% done +113/206 files checked 56% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -113/205 files checked 56% done +114/206 files checked 56% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -114/205 files checked 56% done +115/206 files checked 57% done Checking sources/model/settings/MBluetooth.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -115/205 files checked 57% done +116/206 files checked 57% done Checking sources/model/settings/MSettings.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -116/205 files checked 57% done +117/206 files checked 58% done Checking sources/model/ui/data/MUIBloodPressureData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -117/205 files checked 58% done +118/206 files checked 58% done Checking sources/storage/FileHandler.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -118/205 files checked 58% done +119/206 files checked 58% done Checking sources/storage/Logger.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/storage/Logger.cpp: BUILD_FOR_DESKTOP... -Checking sources/storage/Logger.cpp: MIXED_EVENT_DATUM... -119/205 files checked 59% done +120/206 files checked 59% done Checking sources/storage/Settings.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -120/205 files checked 59% done +121/206 files checked 59% 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_TARGET... -121/205 files checked 60% done +122/206 files checked 60% done Checking sources/storage/TreatmentLog.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -122/205 files checked 60% done +123/206 files checked 60% done Checking sources/utility/crc.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -123/205 files checked 61% done +124/206 files checked 61% done Checking sources/utility/format.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -124/205 files checked 61% done +125/206 files checked 61% done Checking sources/utility/types.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -125/205 files checked 62% done +126/206 files checked 62% done Checking sources/view/VAdjustmentResponseBase.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -126/205 files checked 62% done +127/206 files checked 62% done Checking sources/view/VEventSpy.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/view/VEventSpy.cpp: DEBUG_BCUFF_MIMIC... Checking sources/view/VEventSpy.cpp: SPY_MOUSE_EVENT... -127/205 files checked 63% done +128/206 files checked 63% done Checking sources/view/VGeneralEvent.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -128/205 files checked 63% done -Checking sources/view/VPowerOff.cpp ... +129/206 files checked 63% done +Checking sources/view/VTreatmentCreate(legacy).cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -129/205 files checked 63% done -Checking sources/view/VTreatmentCreate(legacy).cpp ... +130/206 files checked 64% done +Checking sources/view/VTreatmentCreate.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -130/205 files checked 64% done -Checking sources/view/VTreatmentCreate.cpp ... +131/206 files checked 64% done +Checking sources/view/confirm/VConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -131/205 files checked 64% done +132/206 files checked 65% done Checking sources/view/dg/data/VDGAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -132/205 files checked 65% done +133/206 files checked 65% done Checking sources/view/dg/data/VDGConductivityData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -133/205 files checked 65% done +134/206 files checked 66% done Checking sources/view/dg/data/VDGDrainPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -134/205 files checked 66% done +135/206 files checked 66% done Checking sources/view/dg/data/VDGHeatersData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -135/205 files checked 66% done +136/206 files checked 66% done Checking sources/view/dg/data/VDGLoadCellReadingsData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -136/205 files checked 67% done +137/206 files checked 67% done Checking sources/view/dg/data/VDGOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -137/205 files checked 67% done +138/206 files checked 67% done Checking sources/view/dg/data/VDGPressuresData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -138/205 files checked 68% done +139/206 files checked 68% done Checking sources/view/dg/data/VDGROPumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -139/205 files checked 68% done +140/206 files checked 68% done Checking sources/view/dg/data/VDGReservoirData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -140/205 files checked 69% done +141/206 files checked 69% done Checking sources/view/dg/data/VDGTemperaturesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -141/205 files checked 69% done +142/206 files checked 69% done Checking sources/view/dg/data/VDGValvesStatesData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -142/205 files checked 70% done +143/206 files checked 70% done Checking sources/view/dg/data/post/VDGPOSTData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -143/205 files checked 70% done +144/206 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 -144/205 files checked 71% done +145/206 files checked 71% done Checking sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -145/205 files checked 71% done +146/206 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 -146/205 files checked 72% done +147/206 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 -147/205 files checked 72% done +148/206 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 -148/205 files checked 72% done +149/206 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 -149/205 files checked 73% done +150/206 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 -150/205 files checked 73% done +151/206 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 -151/205 files checked 74% done +152/206 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 -152/205 files checked 74% done +153/206 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 -153/205 files checked 75% done +154/206 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 -154/205 files checked 75% done +155/206 files checked 75% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -155/205 files checked 76% done +156/206 files checked 76% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -156/205 files checked 76% done +157/206 files checked 76% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -157/205 files checked 77% done +158/206 files checked 77% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -158/205 files checked 77% done +159/206 files checked 77% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -159/205 files checked 78% done +160/206 files checked 78% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -160/205 files checked 78% done +161/206 files checked 78% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -161/205 files checked 79% done +162/206 files checked 79% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -162/205 files checked 79% done +163/206 files checked 79% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -163/205 files checked 80% done +164/206 files checked 80% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -164/205 files checked 80% done +165/206 files checked 80% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -165/205 files checked 81% done +166/206 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -166/205 files checked 81% done +167/206 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -167/205 files checked 81% done +168/206 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -168/205 files checked 82% done +169/206 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -169/205 files checked 82% done +170/206 files checked 83% done Checking sources/view/hd/alarm/VAlarmActiveList.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -170/205 files checked 83% done +171/206 files checked 83% done Checking sources/view/hd/alarm/VAlarmStatus.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -171/205 files checked 83% done +172/206 files checked 83% done Checking sources/view/hd/data/VHDAccelerometerData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -172/205 files checked 84% done +173/206 files checked 84% done Checking sources/view/hd/data/VHDAirBubbleData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -173/205 files checked 84% done +174/206 files checked 84% done Checking sources/view/hd/data/VHDAirTrapData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -174/205 files checked 85% done +175/206 files checked 85% done Checking sources/view/hd/data/VHDBloodLeakData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -175/205 files checked 85% done +176/206 files checked 85% done Checking sources/view/hd/data/VHDOperationModeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -176/205 files checked 86% done +177/206 files checked 86% done Checking sources/view/hd/data/VHDSyringePumpData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -177/205 files checked 86% done +178/206 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 -178/205 files checked 87% done +179/206 files checked 87% done Checking sources/view/hd/data/post/VHDPOSTData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -179/205 files checked 87% done +180/206 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 -180/205 files checked 88% done +181/206 files checked 88% done Checking sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -181/205 files checked 88% done +182/206 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 -182/205 files checked 89% done +183/206 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 -183/205 files checked 89% done +184/206 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 -184/205 files checked 90% done +185/206 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 -185/205 files checked 90% done +186/206 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 -186/205 files checked 90% done +187/206 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 -187/205 files checked 91% done +188/206 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 -188/205 files checked 91% done +189/206 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentHeparinData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -189/205 files checked 92% done +190/206 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 -190/205 files checked 92% done +191/206 files checked 92% done Checking sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -191/205 files checked 93% done +192/206 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 -192/205 files checked 93% done +193/206 files checked 93% done Checking sources/view/hd/data/treatment/VTreatmentSalineData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -193/205 files checked 94% done +194/206 files checked 94% done Checking sources/view/hd/data/treatment/VTreatmentStopData.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -194/205 files checked 94% done +195/206 files checked 94% done Checking sources/view/hd/data/treatment/VTreatmentTime.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -195/205 files checked 95% done +196/206 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 -196/205 files checked 95% done +197/206 files checked 95% done Checking sources/view/settings/VAdjustmentAlarmVolume.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -197/205 files checked 96% done +198/206 files checked 96% done Checking sources/view/settings/VAdjustmentServiceDates.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -198/205 files checked 96% done +199/206 files checked 96% done Checking sources/view/settings/VAdjustmentServiceMode.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -199/205 files checked 97% done +200/206 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 -200/205 files checked 97% done +201/206 files checked 97% done Checking sources/view/settings/VBluetooth.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -201/205 files checked 98% done +202/206 files checked 98% done Checking sources/view/settings/VDateTime.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -202/205 files checked 98% done +203/206 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 -203/205 files checked 99% done +204/206 files checked 99% done Checking sources/view/settings/VSettings.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -204/205 files checked 99% done +205/206 files checked 99% done Checking sources/wifi/WifiInterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -205/205 files checked 100% done +206/206 files checked 100% done Index: cppcheck.sh =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- cppcheck.sh (.../cppcheck.sh) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ cppcheck.sh (.../cppcheck.sh) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -15,7 +15,7 @@ ############################################################################ app_path=./ cppcheck=cppcheck -$cppcheck --version +echo $($cppcheck --version) $cppcheck $app_path \ --enable=all \ -v \ @@ -25,6 +25,6 @@ -I$app_path/sources/storage \ -I$app_path/sources/configuration \ -I$app_path/sources/canbus \ - 1> $1cppcheck.log \ - 2> $1cppcheck.err + 1>$app_path/cppcheck.log \ + 2>$app_path/cppcheck.err Index: denali.pro.user =================================================================== diff -u -rb77869b5e44de6f8b140f6d8764efc5a2bb61a59 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- denali.pro.user (.../denali.pro.user) (revision b77869b5e44de6f8b140f6d8764efc5a2bb61a59) +++ denali.pro.user (.../denali.pro.user) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -106,7 +106,7 @@ true - /home/denali/Projects/application/alarmMapping.sh + /home/denali/Projects/application/imake.sh %{sourceDir} Custom Process Step @@ -180,8 +180,8 @@ true - staging - /home/denali/Projects/application/alarmMapping.sh + + /home/denali/Projects/application/imake.sh %{sourceDir} Custom Process Step Index: en_US.udic =================================================================== diff -u -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- en_US.udic (.../en_US.udic) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) +++ en_US.udic (.../en_US.udic) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -209,3 +209,4 @@ MHDAccelerometer MVC Jahnavi +txr Index: imake.sh =================================================================== diff -u --- imake.sh (revision 0) +++ imake.sh (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -0,0 +1,20 @@ +#!/bin/sh +########################################################################### +# +# Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. +# +# 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 alarmMapping.sh +# +# @author (last) Behrouz NematiPour +# @date (last) 13-Oct-2022 +# @author (original) Behrouz NematiPour +# @date (original) 13-oct-2022 +# +############################################################################ + +./alarmMapping.sh +./cppcheck.sh + Index: main.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- main.cpp (.../main.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ main.cpp (.../main.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -381,7 +381,7 @@ if (gFakeInterval) { QString msg = " ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ "; qDebug() << msg; - LOG_EVENT(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ " + LOG_APPED(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ " " \n " + msg + " \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "); } Index: sources/ApplicationPost.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -68,7 +68,7 @@ else { // TODO: Ignored for now but this could be a FileSystem check failure, and the post.log has to always exist. // _done = false; - LOG_EVENT(tr("The POST log file could not be read.")); + LOG_APPED(tr("The POST log file could not be read.")); } emit didDone(_isDone); } Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -1146,7 +1146,7 @@ { UIBloodPressureData data = vModel.data(); emit didActionReceive(data); - LOG_EVENT(vModel.toString()); + LOG_APPED(vModel.toString()); } /*! Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -818,7 +818,7 @@ if (mNeedsAcknow) { mSequence = -mSequence; if ( gEnableAcknowLog ) { - LOG_EVENT(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); + LOG_APPED(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence); @@ -892,7 +892,7 @@ if ( mActionId == GuiActionType::ID_Acknow ) { ok = true; if ( gEnableAcknowLog ) { - LOG_EVENT(tr("%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence)); + LOG_APPED(tr("%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence)); } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); @@ -921,7 +921,7 @@ if (mSequence < 0) { ok = true; if ( gEnableAcknowLog ) { - LOG_EVENT(tr("%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId))); + LOG_APPED(tr("%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId))); } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); @@ -931,7 +931,7 @@ Can_Id dstID = MessageInterpreter::identifyDestination(vMessage.can_id, &dstText); actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID); if ( gEnableAcknowLog ) { - LOG_EVENT(tr("UI,Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText)); + LOG_APPED(tr("UI,Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText)); } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId); Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r40c09957821fb3779fa06214a856c20cca110e56 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 40c09957821fb3779fa06214a856c20cca110e56) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -37,7 +37,7 @@ if ( ! length ) { logInvalidLength(vActionId); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ - LOG_EVENT(vMODEL::toString(vData)); \ + LOG_APPED(vMODEL::toString(vData)); \ DEBUG_SIGNAL(0, typeid(vMODEL).name()) // another version of the INTERPRET_TRANSMIT_MESSAGE for empty messages @@ -46,7 +46,7 @@ if ( length ) { logInvalidLength(vActionId); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ - LOG_EVENT(vMODEL::toString(vData)); \ + LOG_APPED(vMODEL::toString(vData)); \ DEBUG_SIGNAL(0, typeid(vMODEL).name()) /*! @@ -82,7 +82,7 @@ if ( ! ok ) return false; // disabled coco end emit didActionReceive(tModel.data()); - logReceivedMessage(tModel); + LOG_APPED(tModel.toString()); DEBUG_SIGNAL(vIdCheck, typeid(TModel).name()) return ok; } @@ -183,23 +183,6 @@ } /*! - * \brief MessageInterpreter::logReceived - * \details Regarding the type of message logs the message received. - * \param vModel - the MAbstract model type - */ -void MessageInterpreter::logReceivedMessage(const Model::MAbstract &vModel) -{ - switch (vModel.typeText()) { - case Model::MAbstract::Type_Enum::eDatum: - LOG_DATUM(vModel.toString()); - break; - case Model::MAbstract::Type_Enum::eEvent: - LOG_EVENT(vModel.toString()); - break; - } -} - -/*! * \brief MessageInterpreter::interpretMessage * \details This method will be called * to interpret messages from UI regarding vActionId. @@ -229,15 +212,15 @@ vPayload = Format::fromVariant(vData[0]); } if ( gEnableCheckInLog ) - LOG_EVENT_UI(QString("CheckIn")); + LOG_APPED_UI(QString("CheckIn")); break; case Gui::GuiActionType::ID_RawData: // len: 255, can have any len if ( length ) { // this message has a variable length vPayload = Format::fromVariant(vData[0]); } - LOG_EVENT_UI(QString("RawData")); + LOG_APPED_UI(QString("RawData")); break; // Generic Confirm case Gui::GuiActionType::ID_DuetConfirmUIr : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData ); break; @@ -434,7 +417,7 @@ // ----- Events case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break; case Gui::GuiActionType::ID_PowerOff : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PowerOff ); break; - case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_EVENT("HD,ShuttingDown"); /* TODO : implement notify<>() */ break; + case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_APPED("HD,ShuttingDown"); /* TODO : implement notify<>() */ break; case Gui::GuiActionType::ID_DuetConfirmHDi : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmHDi ); break; @@ -558,7 +541,7 @@ switch (vMessage.actionId) { // notice we are in receive mode case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break; case Gui::GuiActionType::ID_DGCheckIn : ok = true; /* TODO : implement notify<>() */ - LOG_EVENT(QString("DG,CheckIn," + QVariant(vData).toStringList().join(','))); break; + LOG_APPED(QString("DG,CheckIn," + QVariant(vData).toStringList().join(','))); break; // ----- POST case Gui::GuiActionType::ID_DGPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData ); break; case Gui::GuiActionType::ID_DGPostFinalResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData ); break; @@ -640,7 +623,7 @@ Model::MAdjustUltrafiltrationEditResponse mData; ok = mData.fromByteArray(vMessage.data); - LOG_EVENT("HD," + mData.toString()); // TODO : Not Standard + LOG_APPED("HD," + mData.toString()); // TODO : Not Standard mData.toVariantList(vData); emit didActionReceive(mData.data()); @@ -664,7 +647,7 @@ Model::MAdjustUltrafiltrationConfirmResponse mData; ok = mData.fromByteArray(vMessage.data); - LOG_EVENT("HD," + mData.toString()); // TODO : Not Standard + LOG_APPED("HD," + mData.toString()); // TODO : Not Standard mData.toVariantList(vData); emit didActionReceive(mData.data()); @@ -756,7 +739,7 @@ } } } - LOG_DATUM(logString); + LOG_APPED(logString); } else { if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return. Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -61,7 +61,6 @@ void logInvalidLength (const Gui::GuiActionType &vActionId); void printUnhandled (const Message &vMessage ) const; - void logReceivedMessage (const Model::MAbstract &vModel); bool interpretMessage_HD (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool interpretMessage_DG (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -479,7 +479,7 @@ // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // writing the message into the buffer. - LOG_EVENT_UI( vInpBuff ); + LOG_APPED_UI( vInpBuff ); if ( ! Storage::FileHandler::write(_date_inp_File, vInpBuff + "\n") ) { error = eError_LogFileInp; args = { _date_inp_File }; ok = false; goto lErr; } return ok; Index: sources/device/DeviceController.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -471,7 +471,7 @@ vModel._data.mAccepted = false ; vModel._data.mReason = vError ; vModel._data.mMessage = DeviceError::deviceErrorText(vError, vError); - LOG_EVENT(src + vModel._data.mMessage + " " + vExtraLogInfo); + LOG_APPED(src + vModel._data.mMessage + " " + vExtraLogInfo); emit didAttributeResponse(vModel._data); return true; } @@ -491,7 +491,7 @@ // ----- extract the required data _deviceBrightnessRequest.setBrightnessSysVal(); - LOG_EVENT( _deviceBrightnessRequest.toString()); + LOG_APPED( _deviceBrightnessRequest.toString()); // ----- check that script exists. QString script; @@ -537,7 +537,7 @@ _deviceBrightnessResponse.setBrightnessPercent(_deviceBrightnessRequest._data.mBrightness_val); _deviceBrightnessResponse._data.mMessage = _deviceBrightnessResponse.toString(); } - LOG_EVENT(_deviceBrightnessResponse._data.mMessage); + LOG_APPED(_deviceBrightnessResponse._data.mMessage); emit didAttributeResponse(_deviceBrightnessResponse._data); } } @@ -568,7 +568,7 @@ if ( vStatus ) vExitCode = Device::DeviceError::eDevice_Scripts_Error_Status; else deviceInfo = _processBluetoothPairedReset.readAll(); model.fromByteArray( deviceInfo, &vExitCode ); - LOG_EVENT_UI(model.data().mMessage); + LOG_APPED_UI(model.data().mMessage); didAttributeResponse(model.data()); } @@ -601,7 +601,7 @@ else deviceInfo = _processBluetoothPairedQuery.readAll(); model.fromByteArray( deviceInfo, &vExitCode ); didAttributeResponse(model.data()); - LOG_EVENT_UI(model.data().mMessage); + LOG_APPED_UI(model.data().mMessage); } /*! Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rb77869b5e44de6f8b140f6d8764efc5a2bb61a59 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision b77869b5e44de6f8b140f6d8764efc5a2bb61a59) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 11-Oct-2022 + * \date (last) 13-Oct-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/storage/Logger.cpp =================================================================== diff -u -r8b044d8ef7db6f72c65aa6109d5f29a79bca92a2 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 8b044d8ef7db6f72c65aa6109d5f29a79bca92a2) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -86,10 +86,11 @@ void Logger::postInit() { if ( ! checkThread() ) return; - ADD_EVENT_HEADER; + ADD_APPED_HEADER; + ADD_DEBUG_HEADER; LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); LOG_DEBUG(tr("Application %1 Started").arg(qApp->applicationName())); - LOG_EVENT_UI(qApp-> applicationVersion()); + LOG_APPED_UI(qApp-> applicationVersion()); } /*! @@ -240,14 +241,11 @@ bool Logger::setLogPath() { bool ok = true; - // disabled coco begin validated: Has been tested manually, this needs user interaction to check the file system - if ( ok && ! setLogPath(LogType::eLogEvent) ) ok = false; - if ( ok && ! setLogPath(LogType::eLogDatum) ) ok = false; + if ( ok && ! setLogPath(LogType::eLogAppED) ) ok = false; if ( ok && ! setLogPath(LogType::eLogDebug) ) ok = false; if ( ok && ! setLogPath(LogType::eLogTrtmt) ) ok = false; return ok; } -// disabled coco end /*! * \brief Logger::setLogPath @@ -259,15 +257,7 @@ bool Logger::setLogPath(LogType vLogType) { bool ok = false; - switch (vLogType) { - case LogType::eLogDebug: - _logPathNames[vLogType] = _dir.path() + "/" + _logBasePathNames[vLogType]; - break; - - default: - _logPathNames[vLogType] = _dir.path() + "/" + _logBasePathNames[vLogType]; - break; - } + _logPathNames[vLogType] = _dir.path() + "/" + _logBasePathNames[vLogType]; ok = FileHandler::makeFolder(_logPathNames[vLogType]); if ( ok ) emit didLogPathSet(vLogType, _logPathNames[vLogType]); return ok; @@ -287,19 +277,26 @@ static QString date; QString mContent; + + // - Add header QString currentDate = QDate::currentDate().toString(_dateFormat); - if (date != currentDate) { - if (!date.isEmpty()) { - mContent = _headerE; - mContent += "\r\n" ; + if ( date != currentDate ) { + if ( ! date.isEmpty() ) { + switch ( vLogType ) { + case eLogAppED : mContent = _headerA; break; + case eLogDebug : mContent = _headerD; break; + // case LogType::eLogTrtmt: // this type of log will never happen here. Only put here to make sure it is intentional. + default : mContent = _headerD; break; + } + mContent += "\r\n"; } date = currentDate; } + // - Make log file name QString fileName = date + _dateSeparator + _logFileNamePrefix; switch (vLogType) { - case LogType::eLogEvent: - case LogType::eLogDatum: + case LogType::eLogAppED: case LogType::eLogDebug: // case LogType::eLogTrtmt: // this type of log will never happen here. Only put here to make sure it is intentional. fileName += _logFileNameExt[vLogType]; @@ -310,28 +307,26 @@ LOG_DEBUG(QString("Incorrect type of logging %1").arg(vLogType)); } + // - Add timestamp if ( vTimestamp ) mContent = QTime::currentTime().toString(_timeFormat) + _separator; - QString logPrefix = _logPrefix[vLogType]; - if (vTimestamp && ! logPrefix.isEmpty()) { - mContent += logPrefix; - mContent += _separator; - } + // - Add the content mContent += vContent; // some messages like the version having the U08(uchar) parameters which converts to '\0' and causes problems in reading the log file. mContent.replace('\0', "0"); + // - Make the log path and write to log. QString logPathName = _logPathNames[vLogType]; if (logPathName.isEmpty()) logPathName = _logPathNames[eLogDebug]; _logFileName = logPathName + fileName; FileHandler::write(_logFileName, mContent + "\r\n", true); - // disabled coco begin validated: This code is only for debugging purposes and had been tested manually. + + // console out the log if enabled. if (_enableConsoleOut) { qDebug().noquote() << mContent; } - // disabled coco end } /*! @@ -342,21 +337,14 @@ */ bool Logger::exportLogs(const Gui::GuiStringIndexMap &vExportList) { - // DEBUG: qDebug() << __FUNCTION__ << vExportList; return false; + // DEBUG: + qDebug() << __FUNCTION__ << vExportList; return false; // qDebug() << " ~~~~~~~~~~ " << QThread::currentThread()->objectName(); int result = 0; - static QString mOSource; QString mDestination = USB_Mount_Point; - for ( const auto &iType : { eLogEvent, eLogDatum } ) { - QString mCSource = _logPathNames[iType]; - // if the event and datum are mixed (mOSource == mCSource) in one file then no need to go over the same files in same folder and do it again. - if (mOSource != mCSource) { - mOSource = mCSource; - // Copy Folder - result = FileHandler::copyFolder( mCSource, mDestination); - } - } - mOSource = ""; + QString mCSource = _logPathNames[eLogAppED]; + // Copy Folder + result = FileHandler::copyFolder( mCSource, mDestination); return result >= 0; // refer to QProcess::execute(hit F1 on execute) doc. } @@ -368,7 +356,8 @@ */ bool Logger::exportErrs(const Gui::GuiStringIndexMap &vExportList) { - // DEBUG: qDebug() << __FUNCTION__ << vExportList; return false; + // DEBUG: + qDebug() << __FUNCTION__ << vExportList; return false; // qDebug() << " ~~~~~~~~~~ " << QThread::currentThread()->objectName(); int result = 0; QString mDestination = USB_Mount_Point; @@ -386,7 +375,8 @@ */ bool Logger::exportTrts(const Gui::GuiStringIndexMap &vExportList) { - // DEBUG: qDebug() << __FUNCTION__ << vExportList; return false; + // DEBUG: + qDebug() << __FUNCTION__ << vExportList; return false; // qDebug() << " ~~~~~~~~~~ " << QThread::currentThread()->objectName(); int result = 0; QString mDestination = USB_Mount_Point; @@ -420,7 +410,7 @@ { if ( ! concurrentExportIsOk() ) return false; - _exportLogsType = eLogEvent; + _exportLogsType = eLogAppED; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); QFuture future = QtConcurrent::run(this, &Logger::exportLogs, vExportList); _exportLogsWatcher.setFuture(future); @@ -481,64 +471,45 @@ */ int Logger::removeLogs() { - // disabled coco begin validated: This needs user interaction to check the old files deleted // Storage::FileHandler::find("/media/denali/0CAA-40C1/log/", {"*.err"}, 15); return 0; // has been tested manually LOG_DEBUG(tr("Initializing log clean up")); - static QString mOSource; - static QString mOExtension; int removeCount = 0; - QString mLogFileFilter; - for ( const auto &iType : { eLogEvent , eLogDatum , eLogDebug , eLogTrtmt } ) { + for ( const auto &iType : { eLogAppED , eLogDebug , eLogTrtmt } ) { QString mCSource = _logPathNames [iType]; QString mCExtension = _logFileNameExt[iType]; - // if the event and datum are mixed (mOSource == mCSource && mCExtension == mOExtension) in one file then no need to go over the same files in same folder and do it again. - if (mOSource != mCSource || mCExtension != mOExtension) { - mOSource = mCSource; - mOExtension = mCExtension; - // Remove Logs - // TODO: It appeared to me that the filter on extension may not be necessary, since the folder of each type is different. - // NOTE: The filter on the extension comes from the idea that in the same folder(log) we may want to separate the event(log) from datum(dat) with different usage percentage. -#ifdef MIXED_EVENT_DATUM - mLogFileFilter = QString("*%1").arg(".*"); -#else - mLogFileFilter = QString("*%1").arg(mCExtension); -#endif - // DEBUG: qDebug() << "@" << mCSource << mLogFileFilter << mCExtension << iType << _logTypeMaxUsageLimit[iType]; - QFileInfoList fileInfoList = FileHandler::find(mCSource, {mLogFileFilter}, _logTypeMaxUsageLimit[iType]); - removeCount = fileInfoList.count(); - // qDebug() << "@" << removeCount << fileInfoList; - if (removeCount) { - LOG_DEBUG(QString("Removing %1 logs of type (%2) more than %3% limit from folder %4") - .arg(removeCount) - .arg(mCExtension) - .arg(_logTypeMaxUsageLimit[iType]) - .arg(mCSource)); - for (const auto &info: fileInfoList) { - if (info.lastModified().date() == QDate().currentDate()) { - LOG_DEBUG(QString("Current day log %1 cannot be deleted").arg(info.fileName())); + // DEBUG: qDebug() << "@" << mCSource << mLogFileFilter << mCExtension << iType << _logTypeMaxUsageLimit[iType]; + QFileInfoList fileInfoList = FileHandler::find(mCSource, {"*.*"}, _logTypeMaxUsageLimit[iType]); + removeCount = fileInfoList.count(); + // qDebug() << "@" << removeCount << fileInfoList; + if (removeCount) { + LOG_DEBUG(QString("Removing %1 logs of type (%2) more than %3% limit from folder %4") + .arg(removeCount) + .arg(mCExtension) + .arg(_logTypeMaxUsageLimit[iType]) + .arg(mCSource)); + for (const auto &info: fileInfoList) { + if (info.lastModified().date() == QDate().currentDate()) { + LOG_DEBUG(QString("Current day log %1 cannot be deleted").arg(info.fileName())); + } + else { + QString mFileName = mCSource + info.fileName(); + // DEBUG: qDebug() << "#" << mFileName; + bool ok = QFile::remove(mFileName); + if (ok) { + LOG_DEBUG(QString("Removing %1 succeeded").arg(mFileName)); + } else { + LOG_DEBUG(QString("Removing %1 failed" ).arg(mFileName)); } - else { - QString mFileName = mCSource + info.fileName(); - // DEBUG: qDebug() << "#" << mFileName; - bool ok = QFile::remove(mFileName); - if (ok) { - LOG_DEBUG(QString("Removing %1 succeeded").arg(mFileName)); - } else { - LOG_DEBUG(QString("Removing %1 failed" ).arg(mFileName)); - } - } } } - else { - LOG_DEBUG("No log file is deleted for " + mCExtension); - } } + else { + LOG_DEBUG("No log file is deleted for " + mCExtension); + } } - mOSource = ""; return removeCount; } -// disabled coco end /*! * \brief Logger::concurrentRemoveLogs Index: sources/storage/Logger.h =================================================================== diff -u -r8b044d8ef7db6f72c65aa6109d5f29a79bca92a2 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/storage/Logger.h (.../Logger.h) (revision 8b044d8ef7db6f72c65aa6109d5f29a79bca92a2) +++ sources/storage/Logger.h (.../Logger.h) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -31,16 +31,13 @@ #define LOG_EXPORTERR(vExportName) _Logger.concurrentExportErrs(vExportName) #define LOG_EXPORTTRT(vExportName) _Logger.concurrentExportTrts(vExportName) -#define ADD_EVENT_HEADER emit Storage::Logger::I().didLog(_headerE, Storage::Logger::LogType::eLogEvent, false) -#define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent, true ) -#define LOG_DATUM(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDatum, true ) +#define ADD_APPED_HEADER emit Storage::Logger::I().didLog(_headerA, Storage::Logger::LogType::eLogAppED, false) +#define ADD_DEBUG_HEADER emit Storage::Logger::I().didLog(_headerD, Storage::Logger::LogType::eLogDebug, false) +#define LOG_APPED(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogAppED, true ) #define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug, true ) -#define LOG_EVENT_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogEvent, true ) -#define LOG_DATUM_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogDatum, true ) +#define LOG_APPED_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogAppED, true ) -#define MIXED_EVENT_DATUM - // forward declarations class tst_logging; @@ -49,7 +46,7 @@ /*! * \brief The Logger class * \details Main logger class that has all the required implementation for logging. - * The provided interface is the LOG_DATUM, LOG_EVENT, LOG_DEBUG, LOG_EXPORT defines + * The provided interface is the LOG_EVENT, LOG_DEBUG, LOG_EXPORT defines * and no other methods. * * This object is logging all the registered Denali Messages transactions over the CANBus in CSV format text file. @@ -68,7 +65,7 @@ * PLEASE BE CAREFUL THIS CLASS IS USING QtConcurrent::run FOR THE EXPORT LOG FILES. * AND ONLY PRIVATE VOID LOG (,) IS CALLING IN POOLED THREAD * PLEASE BE VERY CAREFUL. - * ALL THE OTHER CLASSES TO USE THIS CLASS SHOULD ONLY USE LOG_DATUM, LOG_EVENT, LOG_DEBUG + * ALL THE OTHER CLASSES TO USE THIS CLASS SHOULD ONLY USE LOG_EVENT, LOG_DEBUG * TO DO THE LOGGING */ class Logger : public QObject @@ -85,11 +82,8 @@ enum LogType { eLogNone = -1, - eLogDebug, ///< Application Error : CANBus messages does not have error it's Event/Data only - - eLogEvent, ///< Massages on the CANBus : Error is an event type - eLogDatum, ///< Massages on the CANBus : Broadcast data type - + eLogAppED, ///< Application Events and Data : Massages on the CANBus + eLogDebug, ///< Application Error : Service logs eLogTrtmt, ///< Treatment Log Files eLogType_Count, @@ -100,53 +94,35 @@ bool _logStorageReady = true; - const char *_headerE = "TimeStamp,Type,SubSys,Name,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40"; + const char *_headerA = "TimeStamp,SubSys,Name,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40"; + const char *_headerD = "TimeStamp,Description"; QDir _dir; QString _logFileNamePrefix; QHash _logPathNames; const QHash _logBasePathNames { - { LogType::eLogEvent, Storage::Log_Folder_Event }, - { LogType::eLogDatum, Storage::Log_Folder_Data }, + { LogType::eLogAppED, Storage::Log_Folder_Application}, { LogType::eLogDebug, Storage::Log_Folder_Service }, { LogType::eLogTrtmt, Storage::Log_Folder_Treatment }, }; - const QHash _logPrefix { // Will be used for the logging in the file - { LogType::eLogEvent, "E" }, - { LogType::eLogDatum, "D" }, - { LogType::eLogDebug, "" }, // it has its own file and all the content is Error - }; - const QHash _logNames { // Will be used for the logging in the file - { LogType::eLogEvent, "Log" }, - { LogType::eLogDatum, "Service" }, - { LogType::eLogDebug, "Treatment" }, // it has its own file and all the content is Error + { LogType::eLogAppED, "Log" }, + { LogType::eLogDebug, "Service" }, + { LogType::eLogTrtmt, "Treatment" }, }; const QHash _logFileNameExt { - { LogType::eLogEvent, ".log" }, -#ifdef MIXED_EVENT_DATUM - { LogType::eLogDatum, ".log" }, -#else - { LogType::eLogDatum, ".dat" }, -#endif - { LogType::eLogDebug, ".err" }, - { LogType::eLogTrtmt, ".log" }, + { LogType::eLogAppED, ".log" }, // Application log + { LogType::eLogDebug, ".err" }, // Application error + { LogType::eLogTrtmt, ".txr" }, // Treatment report }; // !!!!!!!!!! IMPORTANT !!!!!!!!!! // be careful with these percentages // please refer to the Storage namespace. const QHash _logTypeMaxUsageLimit { -#ifdef MIXED_EVENT_DATUM - { LogType::eLogEvent, Storage::Log_Max_Allowable_AppED_Space_Percent }, - { LogType::eLogDatum, Storage::Log_Max_Allowable_AppED_Space_Percent }, -#else - { LogType::eLogEvent, Storage::Log_Max_Allowable_Event_Space_Percent }, - { LogType::eLogDatum, Storage::Log_Max_Allowable_Datum_Space_Percent }, -#endif + { LogType::eLogAppED, Storage::Log_Max_Allowable_AppED_Space_Percent }, { LogType::eLogDebug, Storage::Log_Max_Allowable_Debug_Space_Percent }, - // Not Sure yet so commented out in the remove. { LogType::eLogTrtmt, Storage::Log_Max_Allowable_Trtmt_Space_Percent }, }; Index: sources/storage/Settings.cpp =================================================================== diff -u -r40c09957821fb3779fa06214a856c20cca110e56 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/storage/Settings.cpp (.../Settings.cpp) (revision 40c09957821fb3779fa06214a856c20cca110e56) +++ sources/storage/Settings.cpp (.../Settings.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -120,7 +120,7 @@ else if ( line == attribute.arg(_duplicate_key_off ) ) { enableDuplicateKey = false ;} else { - LOG_EVENT_UI(( "Unknown '" + line + "' attribute in %1").arg(detail.category)); + LOG_APPED_UI(( "Unknown '" + line + "' attribute in %1").arg(detail.category)); } } Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -r40c09957821fb3779fa06214a856c20cca110e56 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 40c09957821fb3779fa06214a856c20cca110e56) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -108,11 +108,10 @@ // Please notice that is the folder not the path // and it needs to be concatenated after SDCard_Base_Path_Name for each build configuration - const char *Log_Folder_Base = SDCard_Base_Path_Name; // Base Log Folder - const char *Log_Folder_Event = "log/" ; // Event Log - const char *Log_Folder_Data = "log/" ; // Data Log - const char *Log_Folder_Service = "service/" ; // Service Log - const char *Log_Folder_Treatment = "treatment/" ; // Treatment Log + const char *Log_Folder_Base = SDCard_Base_Path_Name; // Base Log Folder + const char *Log_Folder_Application = "log/" ; // Event/Data Log + const char *Log_Folder_Service = "service/" ; // Service Log + const char *Log_Folder_Treatment = "treatment/" ; // Treatment Log // FIXME : Not sure having global settings object is a good idea. Index: sources/storage/StorageGlobals.h =================================================================== diff -u -r40c09957821fb3779fa06214a856c20cca110e56 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 40c09957821fb3779fa06214a856c20cca110e56) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -68,8 +68,7 @@ // Log Type Folders extern const char *Log_Folder_Base; // Base Log Folder - extern const char *Log_Folder_Event; // Event Log - extern const char *Log_Folder_Data; // Data Log + extern const char *Log_Folder_Application; // Event/Data Log extern const char *Log_Folder_Service; // Service Log extern const char *Log_Folder_Treatment; // Treatment Log Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r40c09957821fb3779fa06214a856c20cca110e56 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 40c09957821fb3779fa06214a856c20cca110e56) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -383,7 +383,7 @@ } else { status = "Treatment log '" + srcFileName + "' exported successfully"; - LOG_EVENT_UI(status); + LOG_APPED_UI(status); } emit didNotification(status); Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -51,7 +51,7 @@ update_rt (vData.mSystolic, vData.mDiastolic, vData.mPulseRate); emit didTrigger(vData.mSystolic, vData.mDiastolic, vData.mPulseRate); // if the vitals is disabled it means Gui is probably in an incorrect state and is unable to handle the vital information. - LOG_EVENT_UI(tr("Vital received,%1,%2,%3") + LOG_APPED_UI(tr("Vital received,%1,%2,%3") .arg(vData.mSystolic ) .arg(vData.mDiastolic) .arg(vData.mPulseRate)); @@ -72,7 +72,7 @@ update(vSystolic, vDiastolic, vHeartRate); treatmentLog(); - LOG_EVENT_UI(tr("Vital Confirmed,%1,%2,%3") + LOG_APPED_UI(tr("Vital Confirmed,%1,%2,%3") .arg(_systolic ) .arg(_diastolic) .arg(_heartRate) @@ -86,7 +86,7 @@ */ void View::VTreatmentVitals::doSkip() { - LOG_EVENT_UI(tr("Vital Skipped")); + LOG_APPED_UI(tr("Vital Skipped")); timerReset(); } Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -r40c09957821fb3779fa06214a856c20cca110e56 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 40c09957821fb3779fa06214a856c20cca110e56) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -93,7 +93,7 @@ keyValue[key] = mNoCANBus ; noCANBus ( mNoCANBus); if (_noCANBus ) - LOG_EVENT_UI(QString("System is working on NoCANBus set")); + LOG_APPED_UI(QString("System is working on NoCANBus set")); } else { keyValue[key] = _Settings.value(category, group, key); Index: unittests/tst_logging.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb --- unittests/tst_logging.cpp (.../tst_logging.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ unittests/tst_logging.cpp (.../tst_logging.cpp) (revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb) @@ -57,7 +57,7 @@ void tst_logging::logEvent() { - LOG_EVENT("1 - Event log has been created"); + LOG_APPED("1 - Event log has been created"); QString mContent; FileHandler::read(_Logger._logFileName, mContent); QCOMPARE(mContent, ",E,1 - Event log has been created\n");