Index: .gitignore =================================================================== diff -u -re3ea695f144bc3c779d84879147c1858478710fa -rf68b226e67eb500758ee94fe015df48931240013 --- .gitignore (.../.gitignore) (revision e3ea695f144bc3c779d84879147c1858478710fa) +++ .gitignore (.../.gitignore) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -3,3 +3,5 @@ tags scripts/denali resources/settings +denali.pro.* +denali.pro.user.* Index: AlarmMapping.csv =================================================================== diff -u -r550c426d0137a5b51852d2dee335c7b9ca4914f2 -rf68b226e67eb500758ee94fe015df48931240013 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 550c426d0137a5b51852d2dee335c7b9ca4914f2) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -301,7 +301,7 @@ 300,"HD invalid serial number." 301,"DG primary heater power voltage out of range." 302,"DG processor RAM error." - 303,"Alarm ID available for use." + 303,"DG drain pump direction FPGA fault." 304,"HD invalid usage record." 305,"HD processor RAM error." 306,"HD air trap over-fill alarm." @@ -310,5 +310,5 @@ 309,"DG CPo conductivity sensor invalid character received." 310,"DG CD1 conductivity sensor invalid character received." 311,"DG CD2 conductivity sensor invalid character received." - 312,"HD measured flow checks against estimated flow failure." + 312,"HD Dialysate In flow rate to too low." 313,"Total number of alarms." Index: cppcheck.log =================================================================== diff -u -r93223f7d403a66dcb0d72a31802181c1b38e7ce3 -rf68b226e67eb500758ee94fe015df48931240013 --- cppcheck.log (.../cppcheck.log) (revision 93223f7d403a66dcb0d72a31802181c1b38e7ce3) +++ cppcheck.log (.../cppcheck.log) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -1,1039 +1,1244 @@ -11/03/2022 14:42 +11/23/2022 13:28 Behrouz NematiPour (information) Couldn't find path given by -I './/sources/configuration/' Checking main.cpp ... -Defines: +Defines: +Undefines: 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/205 files checked 1% done Checking sources/AlarmGenerator.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -2/205 files checked 3% done +2/205 files checked 2% done Checking sources/ApplicationController.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 3/205 files checked 4% done Checking sources/ApplicationPost.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 4/205 files checked 4% done Checking sources/MainTimer.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 5/205 files checked 5% done Checking sources/Threads.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 6/205 files checked 5% done Checking sources/bluetooth/BluetoothInterface.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -7/205 files checked 6% done +7/205 files checked 11% done Checking sources/canbus/CanInterface.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -8/205 files checked 6% done +8/205 files checked 12% done Checking sources/canbus/FrameInterface.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -9/205 files checked 7% done +9/205 files checked 13% done Checking sources/canbus/MessageAcknowModel.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -10/205 files checked 7% done +10/205 files checked 14% done Checking sources/canbus/MessageBuilder.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/canbus/MessageBuilder.cpp: DISABLE_CRC... -11/205 files checked 8% done +11/205 files checked 16% done Checking sources/canbus/MessageDispatcher.cpp ... -Defines: +Defines: +Undefines: 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... -12/205 files checked 8% done +12/205 files checked 19% done Checking sources/canbus/MessageInterpreter.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -13/205 files checked 9% done +13/205 files checked 25% done Checking sources/cloudsync/CloudSyncController.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -14/205 files checked 9% done +14/205 files checked 28% done Checking sources/device/DeviceController.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/device/DeviceController.cpp: BUILD_FOR_DESKTOP... -15/205 files checked 9% done +15/205 files checked 31% done Checking sources/device/DeviceError.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -16/205 files checked 10% done +16/205 files checked 31% done Checking sources/device/DeviceModels.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -17/205 files checked 10% done +17/205 files checked 31% done Checking sources/device/DeviceView.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -18/205 files checked 11% done +18/205 files checked 32% done Checking sources/gui/GuiController.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -19/205 files checked 11% done +19/205 files checked 33% done Checking sources/gui/GuiGlobals.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/gui/GuiGlobals.cpp: BUILD_FOR_DESKTOP... -20/205 files checked 12% done +20/205 files checked 34% done Checking sources/gui/GuiView.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/gui/GuiView.cpp: BUILD_FOR_DESKTOP... -21/205 files checked 12% done +21/205 files checked 35% done Checking sources/model/MAbstract.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -22/205 files checked 13% done +22/205 files checked 35% done Checking sources/model/MAbstractDynamic.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -23/205 files checked 13% done +23/205 files checked 36% done Checking sources/model/confirm/MDuetConfirmHDi.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -24/205 files checked 14% done +24/205 files checked 36% done Checking sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -25/205 files checked 14% done +25/205 files checked 36% done Checking sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -26/205 files checked 15% done +26/205 files checked 36% done Checking sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -27/205 files checked 15% done +27/205 files checked 36% done Checking sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -28/205 files checked 16% done +28/205 files checked 37% done Checking sources/model/dg/data/MDGAccelerometerData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -29/205 files checked 16% done +29/205 files checked 37% done Checking sources/model/dg/data/MDGConductivityData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -30/205 files checked 17% done +30/205 files checked 37% done Checking sources/model/dg/data/MDGDebugText.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -31/205 files checked 17% done +31/205 files checked 37% done Checking sources/model/dg/data/MDGDrainPumpData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -32/205 files checked 18% done +32/205 files checked 37% done Checking sources/model/dg/data/MDGGeneralEvent.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -33/205 files checked 18% done +33/205 files checked 37% done Checking sources/model/dg/data/MDGHeatersData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -34/205 files checked 18% done +34/205 files checked 38% done Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -35/205 files checked 19% done +35/205 files checked 38% done Checking sources/model/dg/data/MDGOperationModeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -36/205 files checked 19% done +36/205 files checked 38% done Checking sources/model/dg/data/MDGPressuresData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -37/205 files checked 20% done +37/205 files checked 38% done Checking sources/model/dg/data/MDGROPumpData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -38/205 files checked 20% done +38/205 files checked 38% done Checking sources/model/dg/data/MDGReservoirData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -39/205 files checked 21% done +39/205 files checked 38% done Checking sources/model/dg/data/MDGTemperaturesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -40/205 files checked 21% done +40/205 files checked 39% done Checking sources/model/dg/data/MDGValvesStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -41/205 files checked 22% done +41/205 files checked 39% done Checking sources/model/dg/data/post/MDGPostFinalResultData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -42/205 files checked 22% done +42/205 files checked 39% done Checking sources/model/dg/data/post/MDGPostSingleResultData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -43/205 files checked 23% done +43/205 files checked 39% done Checking sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -44/205 files checked 23% done +44/205 files checked 39% done Checking sources/model/hd/adjustment/MAdjustPowerOff.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -45/205 files checked 24% done +45/205 files checked 39% done Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -46/205 files checked 24% done +46/205 files checked 39% done Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -47/205 files checked 25% done +47/205 files checked 40% done Checking sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -48/205 files checked 25% done +48/205 files checked 40% done Checking sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -49/205 files checked 26% done +49/205 files checked 41% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -50/205 files checked 26% done +50/205 files checked 41% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -51/205 files checked 27% done +51/205 files checked 41% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -52/205 files checked 27% done +52/205 files checked 41% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -53/205 files checked 27% done +53/205 files checked 42% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -54/205 files checked 28% done +54/205 files checked 42% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -55/205 files checked 28% done +55/205 files checked 42% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -56/205 files checked 29% done +56/205 files checked 42% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -57/205 files checked 29% done +57/205 files checked 43% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -58/205 files checked 30% done +58/205 files checked 43% done Checking sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -59/205 files checked 30% done +59/205 files checked 43% done Checking sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -60/205 files checked 31% done +60/205 files checked 43% done Checking sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -61/205 files checked 31% done +61/205 files checked 43% done Checking sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -62/205 files checked 32% done +62/205 files checked 43% done Checking sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -63/205 files checked 32% done +63/205 files checked 43% done Checking sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -64/205 files checked 33% done +64/205 files checked 43% done Checking sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -65/205 files checked 33% done +65/205 files checked 44% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -66/205 files checked 34% done +66/205 files checked 44% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -67/205 files checked 34% done +67/205 files checked 44% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -68/205 files checked 35% done +68/205 files checked 44% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -69/205 files checked 35% done +69/205 files checked 44% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -70/205 files checked 36% done +70/205 files checked 45% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -71/205 files checked 36% done +71/205 files checked 45% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -72/205 files checked 36% done +72/205 files checked 45% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -73/205 files checked 37% done +73/205 files checked 45% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -74/205 files checked 37% done +74/205 files checked 45% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -75/205 files checked 38% done +75/205 files checked 46% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -76/205 files checked 38% done +76/205 files checked 46% done Checking sources/model/hd/alarm/MAlarmActiveList.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -77/205 files checked 39% done +77/205 files checked 46% done Checking sources/model/hd/alarm/MAlarmCleared.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -78/205 files checked 39% done +78/205 files checked 46% done Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -79/205 files checked 40% done +79/205 files checked 46% done Checking sources/model/hd/alarm/MAlarmMapping.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -80/205 files checked 40% done +80/205 files checked 55% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -81/205 files checked 41% done +81/205 files checked 55% done Checking sources/model/hd/alarm/MAlarmTriggered.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -82/205 files checked 41% done +82/205 files checked 55% done Checking sources/model/hd/data/MHDAccelerometerData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -83/205 files checked 42% done +83/205 files checked 56% done Checking sources/model/hd/data/MHDAirBubbleData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -84/205 files checked 42% done +84/205 files checked 56% done Checking sources/model/hd/data/MHDAirTrapData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -85/205 files checked 43% done +85/205 files checked 56% done Checking sources/model/hd/data/MHDBloodLeakData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -86/205 files checked 43% done +86/205 files checked 56% done Checking sources/model/hd/data/MHDDebugText.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -87/205 files checked 44% done +87/205 files checked 56% done Checking sources/model/hd/data/MHDGeneralEvent.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -88/205 files checked 44% done +88/205 files checked 57% done Checking sources/model/hd/data/MHDOperationModeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -89/205 files checked 45% done +89/205 files checked 57% done Checking sources/model/hd/data/MHDSyringePumpData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -90/205 files checked 45% done +90/205 files checked 57% done Checking sources/model/hd/data/MTreatmentRangesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -91/205 files checked 45% done +91/205 files checked 57% done Checking sources/model/hd/data/post/MHDPostFinalResultData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -92/205 files checked 46% done +92/205 files checked 57% done Checking sources/model/hd/data/post/MHDPostSingleResultData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -93/205 files checked 46% done +93/205 files checked 57% done Checking sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -94/205 files checked 47% done +94/205 files checked 58% done Checking sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -95/205 files checked 47% done +95/205 files checked 58% done Checking sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -96/205 files checked 48% done +96/205 files checked 58% done Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -97/205 files checked 48% done +97/205 files checked 58% done Checking sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -98/205 files checked 49% done +98/205 files checked 58% done Checking sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -99/205 files checked 49% done +99/205 files checked 58% done Checking sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -100/205 files checked 50% done +100/205 files checked 59% done Checking sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -101/205 files checked 50% done +101/205 files checked 59% done Checking sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -102/205 files checked 51% done +102/205 files checked 59% done Checking sources/model/hd/data/treatment/MTreatmentHeparinData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -103/205 files checked 51% done +103/205 files checked 59% done Checking sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -104/205 files checked 52% done +104/205 files checked 59% done Checking sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -105/205 files checked 52% done +105/205 files checked 60% done Checking sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -106/205 files checked 53% done +106/205 files checked 60% done Checking sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -107/205 files checked 53% done +107/205 files checked 60% done Checking sources/model/hd/data/treatment/MTreatmentSalineData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -108/205 files checked 54% done +108/205 files checked 60% done Checking sources/model/hd/data/treatment/MTreatmentStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -109/205 files checked 54% done +109/205 files checked 60% done Checking sources/model/hd/data/treatment/MTreatmentStopData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -110/205 files checked 54% done +110/205 files checked 61% done Checking sources/model/hd/data/treatment/MTreatmentTimeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -111/205 files checked 55% done +111/205 files checked 61% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -112/205 files checked 55% done +112/205 files checked 61% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -113/205 files checked 56% done +113/205 files checked 61% done Checking sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -114/205 files checked 56% done +114/205 files checked 61% done Checking sources/model/settings/MBluetooth.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -115/205 files checked 57% done +115/205 files checked 61% done Checking sources/model/settings/MSettings.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -116/205 files checked 57% done +116/205 files checked 62% done Checking sources/model/ui/data/MUIBloodPressureData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -117/205 files checked 58% done +117/205 files checked 62% done Checking sources/storage/FileHandler.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -118/205 files checked 58% done +118/205 files checked 64% done Checking sources/storage/Logger.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native Checking sources/storage/Logger.cpp: BUILD_FOR_DESKTOP... -119/205 files checked 59% done +119/205 files checked 66% done Checking sources/storage/Settings.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -120/205 files checked 59% done +120/205 files checked 67% done Checking sources/storage/StorageGlobals.cpp ... -Defines: +Defines: +Undefines: 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 +121/205 files checked 67% done Checking sources/storage/TreatmentLog.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -122/205 files checked 60% done +122/205 files checked 69% done Checking sources/utility/crc.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -123/205 files checked 61% done +123/205 files checked 69% done Checking sources/utility/format.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -124/205 files checked 61% done +124/205 files checked 70% done Checking sources/utility/types.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -125/205 files checked 62% done +125/205 files checked 70% done Checking sources/view/VAdjustmentResponseBase.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -126/205 files checked 62% done +126/205 files checked 70% done Checking sources/view/VEventSpy.cpp ... -Defines: +Defines: +Undefines: 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 +127/205 files checked 71% done Checking sources/view/VGeneralEvent.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -128/205 files checked 63% done +128/205 files checked 71% done Checking sources/view/VTreatmentCreate(legacy).cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -129/205 files checked 63% done +129/205 files checked 74% done Checking sources/view/VTreatmentCreate.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -130/205 files checked 64% done +130/205 files checked 75% done Checking sources/view/confirm/VConfirm.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -131/205 files checked 64% done +131/205 files checked 76% done Checking sources/view/dg/data/VDGAccelerometerData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -132/205 files checked 65% done +132/205 files checked 76% done Checking sources/view/dg/data/VDGConductivityData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -133/205 files checked 65% done +133/205 files checked 76% done Checking sources/view/dg/data/VDGDrainPumpData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -134/205 files checked 66% done +134/205 files checked 76% done Checking sources/view/dg/data/VDGHeatersData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -135/205 files checked 66% done +135/205 files checked 76% done Checking sources/view/dg/data/VDGLoadCellReadingsData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -136/205 files checked 67% done +136/205 files checked 76% done Checking sources/view/dg/data/VDGOperationModeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -137/205 files checked 67% done +137/205 files checked 76% done Checking sources/view/dg/data/VDGPressuresData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -138/205 files checked 68% done +138/205 files checked 76% done Checking sources/view/dg/data/VDGROPumpData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -139/205 files checked 68% done +139/205 files checked 76% done Checking sources/view/dg/data/VDGReservoirData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -140/205 files checked 69% done +140/205 files checked 76% done Checking sources/view/dg/data/VDGTemperaturesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -141/205 files checked 69% done +141/205 files checked 77% done Checking sources/view/dg/data/VDGValvesStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -142/205 files checked 70% done +142/205 files checked 77% done Checking sources/view/dg/data/post/VDGPOSTData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -143/205 files checked 70% done +143/205 files checked 77% done Checking sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -144/205 files checked 71% done +144/205 files checked 77% done Checking sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -145/205 files checked 71% done +145/205 files checked 78% done Checking sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -146/205 files checked 72% done +146/205 files checked 78% done Checking sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -147/205 files checked 72% done +147/205 files checked 78% done Checking sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -148/205 files checked 72% done +148/205 files checked 78% done Checking sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -149/205 files checked 73% done +149/205 files checked 79% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -150/205 files checked 73% done +150/205 files checked 79% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -151/205 files checked 74% done +151/205 files checked 79% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -152/205 files checked 74% done +152/205 files checked 80% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -153/205 files checked 75% done +153/205 files checked 80% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -154/205 files checked 75% done +154/205 files checked 80% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -155/205 files checked 76% done +155/205 files checked 80% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -156/205 files checked 76% done +156/205 files checked 80% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -157/205 files checked 77% done +157/205 files checked 80% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -158/205 files checked 77% done +158/205 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -159/205 files checked 78% done +159/205 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -160/205 files checked 78% done +160/205 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -161/205 files checked 79% done +161/205 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -162/205 files checked 79% done +162/205 files checked 81% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -163/205 files checked 80% done +163/205 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -164/205 files checked 80% done +164/205 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -165/205 files checked 81% done +165/205 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -166/205 files checked 81% done +166/205 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -167/205 files checked 81% done +167/205 files checked 82% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -168/205 files checked 82% done +168/205 files checked 83% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -169/205 files checked 82% done +169/205 files checked 83% done Checking sources/view/hd/alarm/VAlarmActiveList.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 170/205 files checked 83% done Checking sources/view/hd/alarm/VAlarmStatus.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -171/205 files checked 83% done +171/205 files checked 84% done Checking sources/view/hd/data/VHDAccelerometerData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 172/205 files checked 84% done Checking sources/view/hd/data/VHDAirBubbleData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 173/205 files checked 84% done Checking sources/view/hd/data/VHDAirTrapData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 174/205 files checked 85% done Checking sources/view/hd/data/VHDBloodLeakData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 175/205 files checked 85% done Checking sources/view/hd/data/VHDOperationModeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -176/205 files checked 86% done +176/205 files checked 85% done Checking sources/view/hd/data/VHDSyringePumpData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -177/205 files checked 86% done +177/205 files checked 85% done Checking sources/view/hd/data/VTreatmentRanges.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 178/205 files checked 87% done Checking sources/view/hd/data/post/VHDPOSTData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 179/205 files checked 87% done Checking sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -180/205 files checked 88% done +180/205 files checked 87% done Checking sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -181/205 files checked 88% done +181/205 files checked 87% done Checking sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -182/205 files checked 89% done +182/205 files checked 87% done Checking sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -183/205 files checked 89% done +183/205 files checked 87% done Checking sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -184/205 files checked 90% done +184/205 files checked 89% done Checking sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 185/205 files checked 90% done Checking sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 186/205 files checked 90% done Checking sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -187/205 files checked 91% done +187/205 files checked 90% done Checking sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -188/205 files checked 91% done +188/205 files checked 90% done Checking sources/view/hd/data/treatment/VTreatmentHeparinData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -189/205 files checked 92% done +189/205 files checked 90% done Checking sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -190/205 files checked 92% done +190/205 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -191/205 files checked 93% done +191/205 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -192/205 files checked 93% done +192/205 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentSalineData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -193/205 files checked 94% done +193/205 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentStopData.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -194/205 files checked 94% done +194/205 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentTime.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -195/205 files checked 95% done +195/205 files checked 91% done Checking sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -196/205 files checked 95% done +196/205 files checked 91% done Checking sources/view/settings/VAdjustmentAlarmVolume.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -197/205 files checked 96% done +197/205 files checked 91% done Checking sources/view/settings/VAdjustmentServiceDates.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -198/205 files checked 96% done +198/205 files checked 91% done Checking sources/view/settings/VAdjustmentServiceMode.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -199/205 files checked 97% done +199/205 files checked 92% done Checking sources/view/settings/VAdjustmentVersions.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -200/205 files checked 97% done +200/205 files checked 92% done Checking sources/view/settings/VBluetooth.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -201/205 files checked 98% done +201/205 files checked 93% done Checking sources/view/settings/VDateTime.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -202/205 files checked 98% done +202/205 files checked 94% done Checking sources/view/settings/VNetworkModel.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -203/205 files checked 99% done +203/205 files checked 95% done Checking sources/view/settings/VSettings.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native -204/205 files checked 99% done +204/205 files checked 96% done Checking sources/wifi/WifiInterface.cpp ... -Defines: +Defines: +Undefines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ Platform:Native 205/205 files checked 100% done Index: cppcheck.sh =================================================================== diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013 --- cppcheck.sh (.../cppcheck.sh) (revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e) +++ cppcheck.sh (.../cppcheck.sh) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -26,15 +26,20 @@ $cppcheck $app_path \ --enable=all \ -v \ - -i$app_path/unittests \ - -I$app_path/sources \ - -I$app_path/sources/gui \ - -I$app_path/sources/storage \ - -I$app_path/sources/configuration \ - -I$app_path/sources/canbus \ - 1>>$app_path/cppcheck.log \ - 2>>$app_path/cppcheck.err - + -I $app_path/sources \ + -I $app_path/sources/bluetooth \ + -I $app_path/sources/canbus \ + -I $app_path/sources/cloudsync \ + -I $app_path/sources/device \ + -I $app_path/sources/gui \ + -I $app_path/sources/model \ + -I $app_path/sources/storage \ + -I $app_path/sources/utility \ + -I $app_path/sources/view \ + -I $app_path/sources/wifi \ + -I $app_path/unittests \ + 1>> $app_path/cppcheck.log \ + 2>> $app_path/cppcheck.err # grep -nir "(warning)" ./cppcheck.err # grep -nir "(error)" ./cppcheck.err Index: denali.pro =================================================================== diff -u -r45809f32e7c54277c75159ca6ce3143586c13ffb -rf68b226e67eb500758ee94fe015df48931240013 --- denali.pro (.../denali.pro) (revision 45809f32e7c54277c75159ca6ce3143586c13ffb) +++ denali.pro (.../denali.pro) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -2,6 +2,7 @@ CONFIG += c++17 warn_on # CONFIG += disable-desktop QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wimplicit-fallthrough=3 # -save-temps # see .ii +# -Wpedantic -Wconversion -Wshadow # these can't always be used, since it gives errors in Qt library. #CONFIG += disable_crc disable_crc { Index: denali.pro.user =================================================================== diff -u -ra5c75192af33a9284e4b4886df0c337ba6fcc9f9 -rf68b226e67eb500758ee94fe015df48931240013 --- denali.pro.user (.../denali.pro.user) (revision a5c75192af33a9284e4b4886df0c337ba6fcc9f9) +++ denali.pro.user (.../denali.pro.user) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -1,14 +1,14 @@ - + EnvironmentId {ddf40c78-6189-40d0-9901-6a46fe7d9735} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -99,15 +99,28 @@ true + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true QtProjectManager.QMakeBuildStep false - + true Qt4ProjectManager.MakeStep - 2 + + true + -b --tag denali >> denali + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 Build Build ProjectExplorer.BuildSteps.Build @@ -125,28 +138,44 @@ 2 false - - false + + {a08b7fef-65d2-4d56-83b0-f70e4a7becaa} + + true Debug Qt4ProjectManager.Qt4BuildConfiguration 2 + 0 /home/denali/Projects/build-denali-Desktop_Qt_5_15_10_GCC_64bit-Release /home/denali/Projects/build-denali-Desktop_Qt_5_15_10_GCC_64bit-Release true + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true QtProjectManager.QMakeBuildStep false - + true Qt4ProjectManager.MakeStep - 2 + + true + -b --tag denali >> denali + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 Build Build ProjectExplorer.BuildSteps.Build @@ -167,7 +196,7 @@ {a08b7fef-65d2-4d56-83b0-f70e4a7becaa} - false + true Release Qt4ProjectManager.Qt4BuildConfiguration @@ -248,8 +277,227 @@ + ProjectExplorer.Project.Target.1 + + GenericLinuxOsType + Qt 5.15.10 (iMx8) + Qt 5.15.10 (iMx8) + {ef9cd54a-0a2c-42e1-974b-097b637c09b9} + 0 + 0 + 0 + + 0 + /home/denali/Projects/build-denali-Qt_5_15_10_iMx8-Debug + /home/denali/Projects/build-denali-Qt_5_15_10_iMx8-Debug + + + false + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + + true + -b --tag denali >> denali + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + {a08b7fef-65d2-4d56-83b0-f70e4a7becaa} + + true + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 0 + + + /home/denali/Projects/build-denali-Qt_5_15_10_iMx8-Release + /home/denali/Projects/build-denali-Qt_5_15_10_iMx8-Release + + + true + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + + true + -b --tag denali >> denali + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + {a08b7fef-65d2-4d56-83b0-f70e4a7becaa} + + true + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + /home/denali/Projects/build-denali-Qt_5_15_10_iMx8-Profile + /home/denali/Projects/build-denali-Qt_5_15_10_iMx8-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + + true + RemoteLinux.KillAppStep + + + + + + + + + true + RemoteLinux.RsyncDeployStep + + + + + + + -av + + 2 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + DeployToGenericLinux + + 1 + + true + + 1 + + denali (on %{Device:Name}) + RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro + /home/denali/Projects/application/denali.pro + 1 + /home/root/denali + true + --disable-alarm-no-minimize --disable-timeout --disable-unhandled-report + false + true + false + true + :0 + + 1 + + + ProjectExplorer.Project.TargetCount - 1 + 2 ProjectExplorer.Project.Updater.FileVersion Index: denali.qrc =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -rf68b226e67eb500758ee94fe015df48931240013 --- denali.qrc (.../denali.qrc) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ denali.qrc (.../denali.qrc) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -25,16 +25,13 @@ sources/gui/qml/dialogs/DiagnosticsDialog.qml - resources/images/Settings_gear_setting_tools-128.png resources/images/Logo d.png - resources/images/Logo Diality.png - resources/images/Power_symbol-128.png + resources/images/Logo DialityT.png resources/images/splash.png resources/images/ArrowRight.png resources/images/ArrowLeft.png resources/images/logo d Dark Transparent.png resources/images/Close.png - resources/images/alarm.png resources/images/bell.png resources/images/bell-off.png resources/images/Back.png @@ -47,11 +44,6 @@ resources/images/Wave-Minus.png resources/images/Wave-Plus.png resources/images/check.png - resources/images/checkCircle.png - resources/images/OffGray.png - resources/images/Done.png - resources/images/audio.png - resources/images/mute.png resources/images/chevron-down.png resources/images/chevron-up.png resources/images/list.png Index: resources/images/AlarmBell.png =================================================================== diff -u -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/AlarmBellSilent.png =================================================================== diff -u -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/Busy2.png =================================================================== diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/Done.png =================================================================== diff -u -raabacb1dbdd30968ec8bc8ffc6c97263b09db71b -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/Logo Diality.png =================================================================== diff -u -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/Logo DialityT.png =================================================================== diff -u Binary files differ Index: resources/images/Logo Qt 1024px_old.png =================================================================== diff -u -r108450c58851ff7c48c4607494b8cdae59952908 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/Logo d-blue.png =================================================================== diff -u -rcbb246d6efa242f927f88ac5da518dedb2d63320 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/OffGray.png =================================================================== diff -u -raabacb1dbdd30968ec8bc8ffc6c97263b09db71b -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/Power_symbol-128.png =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/Settings_gear_setting_tools-128.png =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/alarm.png =================================================================== diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/audio.png =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/checkCircle.png =================================================================== diff -u -r1d2ab4adce5e88a7e316cad3c75e519704511813 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/doted-list.png =================================================================== diff -u -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: resources/images/mute.png =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -rf68b226e67eb500758ee94fe015df48931240013 Binary files differ Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -ra5c75192af33a9284e4b4886df0c337ba6fcc9f9 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision a5c75192af33a9284e4b4886df0c337ba6fcc9f9) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -266,12 +266,10 @@ if ( eMessageID_Start > message.id || message.id > eMessageID_Count ) { error = eError_InvalidID ; ok = false; goto lErr; } // getting the parameters - for ( quint32 index = eMessage_Count; index < eMessage_Count + message.paramCount; index++ ) { - message.params.append( items[index] ); + for ( quint32 i = eMessage_Count; i < eMessage_Count + message.paramCount; i++ ) { + message.params.append( items[i] ); } - - vMessage = message; return true; Index: sources/device/DeviceController.h =================================================================== diff -u -ra5c75192af33a9284e4b4886df0c337ba6fcc9f9 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/device/DeviceController.h (.../DeviceController.h) (revision a5c75192af33a9284e4b4886df0c337ba6fcc9f9) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -42,14 +42,14 @@ Q_OBJECT explicit TimedProcess(QObject *parent = nullptr) : QObject(parent) { } - int _id = 0; + int _pid = 0; int _timeout = 0; QProcess *_process = nullptr; QString _command = ""; private slots: void onFinish(int) { - killTimer(_id); + killTimer(_pid); _process->kill(); _process = nullptr; deleteLater(); @@ -61,7 +61,7 @@ this , SLOT(onFinish (int))); } void start() { - _id = startTimer(_timeout); + _pid = startTimer(_timeout); _process->start(_command, QStringList()); } Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -51,7 +51,6 @@ vAlarmStatus.doClearCondition() } - // Alarms dialog/bar navigation handling ----- vvvvv ----- function alarmMinimize() { // The has alarm check has been added here to let other components call this function, // without worrying about the alarmDialog popoing up without an alarm present. @@ -91,26 +90,22 @@ } Connections { target: _alarmDialog - onMinimizeClicked : vAlarmStatus.alarm_Flag_noMinimize ? alarmList() : alarmMinimize() + function onMinimizeClicked ( ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmList (); else alarmMinimize(); } } Connections { target: _alarmListDialog - onMinimizeClicked : vAlarmStatus.alarm_Flag_noMinimize ? alarmMaximize() : alarmMinimize() + function onMinimizeClicked ( ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmMaximize(); else alarmMinimize(); } } Connections { target: _alarmBar - onListClicked : alarmList() - onMaximizeClicked : alarmMaximize() - onClicked : alarmMaximize() + function onListClicked ( ) { alarmList () } + function onMaximizeClicked ( ) { alarmMaximize () } + function onClicked ( ) { alarmMaximize () } + function onMuteClicked ( ) { vAlarmStatus.doSilence() } } Connections { target: vAlarmStatus - onDidAlarmRaise: alarmMaximize() - onDidAlarmEmpty: alarmHide() + function onDidAlarmRaise ( ) { alarmMaximize () } + function onDidAlarmEmpty ( ) { alarmHide () } } - // ----- ^^^^^ ----- - Connections { target: _alarmBar - onMuteClicked : vAlarmStatus.doSilence() - } - // TODO : Later need to create a base Notification dialog class // and inherit NotificationDialog and AlarmListDialog from that // Better be the NotificationDialog defined as parent @@ -152,11 +147,13 @@ } Connections { target: vAlarmStatus - onAlarm_PriorityChanged: [ - _alarmDialog.titleBarBackground, - _alarmDialog.titleBarForeground, - _alarmDialog.backgroundColor , - _alarmDialog.textColor , - ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority) + function onAlarm_PriorityChanged ( vValue ) { + [ + _alarmDialog.titleBarBackground, + _alarmDialog.titleBarForeground, + _alarmDialog.backgroundColor , + _alarmDialog.textColor , + ] = Colors.alarmPriorityColors(vValue) + } } } Index: sources/gui/qml/Comments.qml.notes =================================================================== diff -u --- sources/gui/qml/Comments.qml.notes (revision 0) +++ sources/gui/qml/Comments.qml.notes (revision f68b226e67eb500758ee94fe015df48931240013) @@ -0,0 +1,79 @@ +// /home/denali/Projects/application/sources/gui/qml/pages/treatment/TreatmentStack.qml:99 +// ScreenItem { id: _treatmentTrending } +/* ----- TEST: Under the test code, for the plotting of the items ----- + + Timer { id: _timer + property real x1: 0 + property real x2: 0 + interval: 500 + running: _treatmentTrending.visible + repeat: true + onTriggered: { + x1 = x1 + 1 + x2 = x2 + 0.1 + + var r = Math.random() + _lineSerries1.append(x1, r * 10 ) + _lineSerries2.append(x2, r ) + } + } + Column { + anchors.fill: parent + anchors.topMargin: Variables.mainMenuHeight + Slider { id : _zoomSlider + width : parent.width + minimum : 0 + maximum : 2 + step : 0.1 + value : 0 + onValueChanged: _chartView.zoom(value) + } + TouchRect { + width : 50 + height : 50 + onClicked: _chartView.zoomReset() + } + + ChartView { id: _chartView + title: "Line" + width: parent.width + height: parent.height - _zoomSlider.height + antialiasing: true + backgroundColor: Colors.transparent + + legend.labelColor: Colors.white + + ValueAxis { id: xAxis1 + color: Colors.white + min: 0 + max: _timer.x1 + } + ValueAxis { id: yAxis1 + color: Colors.white + min: 0 + max: 10 + } + SplineSeries { id: _lineSerries1 + name: "LineSeries" + axisX: xAxis1 + axisY: yAxis1 + } + ValueAxis { id: xAxis2 + color: Colors.white + min: 0 + max: _timer.x2 + } + ValueAxis { id: yAxis2 + color: Colors.white + labelsColor: Colors.red + min: 0 + max: 10 + } + SplineSeries { id: _lineSerries2 + name: "LineSeries" + axisX: xAxis2 + axisY: yAxis2 + } + } + } +*/ Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -re961fc7bcdeba8ffab9c96da20244b07405f8f99 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision e961fc7bcdeba8ffab9c96da20244b07405f8f99) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -95,7 +95,7 @@ // ---- Connections Connections { target: _GuiView - onDidActionReceive: { + function onDidActionReceive( vAction, vData ) { switch(vAction) { case GuiActions.ID_ShuttingDown: _autoHideInfo.showDialog ( @@ -108,23 +108,23 @@ } Connections { target: vConfirm - onIsRejectChanged: { + function onIsRejectChanged ( vValue ) { _powerOffDialog.footerUpdate() } - onVisibleChanged: { - if ( vvisible ) open () - else close () + function onVisibleChanged ( vValue ) { + if ( vValue ) open () + else close () } - onPoweroffTriggered: { - switch (vpoweroff) { + function onPoweroffTriggered ( vValue ) { + switch ( vValue ) { case GuiActions.Command : open (); break; case GuiActions.Timeout : close (); break; case GuiActions.Rejected: reject(); break; } } - onAdjustmentTriggered: { + function onAdjustmentTriggered ( vValue ) { // DEBUG: // console.debug('\n' + // 'id : ' + vConfirm.id + '\n' + Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -197,14 +197,14 @@ } } - function checkLimitsMinValueBounds( vValue ) { + function checkLimitsMinValueBounds ( vValue ) { curHandler = RangeSlider.HandlerOption.Min if ( vValue < minValueLowerBound ) { minValue = minValueLowerBound; return } if ( vValue > minValueUpperBound ) { minValue = minValueUpperBound; return } setMinvalue(vValue) } - function checkLimitsMaxValueBounds( vValue ) { + function checkLimitsMaxValueBounds ( vValue ) { curHandler = RangeSlider.HandlerOption.Max if ( vValue < maxValueLowerBound ) { maxValue = maxValueLowerBound; return } if ( vValue > maxValueUpperBound ) { maxValue = maxValueUpperBound; return } Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -583,7 +583,8 @@ } Connections { target: _GuiView - onDidActionReceive: { + function onDidActionReceive( vAction, vData ) { + // DEBUG: console.debug("onDidActionReceive", vAction, vData) if (vAction === GuiActions.ID_CANBusFaultCount ) { _canbusFaultCountText.count = vData[0] } Index: sources/gui/qml/main.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/main.qml (.../main.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/main.qml (.../main.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -259,7 +259,7 @@ } Connections { target: vHDOperationMode - onStandbyWaitDisinfectChanged : { _mainMenu.isTreatment() } + function onStandbyWaitDisinfectChanged ( vValue ) { _mainMenu.isTreatment() } } // 9 - Others Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -125,7 +125,7 @@ } Connections { target: vSettings - onNoCANBusChanged: { + function onNoCANBusChanged ( vValue ) { //// DEBUG: // console.debug("vSettings.noCANBus" , vSettings .noCANBus , // "vHDOperationMode.init" , vHDOperationMode .init , @@ -142,27 +142,27 @@ } Connections { target: vHDOperationMode - onIsTreatmentChanged : { if( visTreatment ) _mainMenu.isTreatment() } - onIsManagerChanged : { if( visManager ) _mainMenu.isManager () } - onIsSettingsChanged : { if( visSettings ) _mainMenu.isSettings () } + function onIsTreatmentChanged ( vValue ) { if( vValue ) _mainMenu.isTreatment() } + function onIsManagerChanged ( vValue ) { if( vValue ) _mainMenu.isManager () } + function onIsSettingsChanged ( vValue ) { if( vValue ) _mainMenu.isSettings () } - onFaultChanged : { page( _faultModeScreen , vfault && ! vSettings.noCANBus )} - onServiceChanged : { page( _serviceModeScreen , vservice )} - onInitChanged : { page( _postModeScreen , vinit && ! vSettings.noCANBus ) - if ( vinit ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run + function onFaultChanged ( vValue ) { page( _faultModeScreen , vValue && ! vSettings.noCANBus )} + function onServiceChanged ( vValue ) { page( _serviceModeScreen , vValue )} + function onInitChanged ( vValue ) { page( _postModeScreen , vValue && ! vSettings.noCANBus ) + if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run } - onHomeChanged : { page( _mainHome , vhome )} - onStandbyChanged : { /* It depends on the subModes of the standBy. Handled by onHome. */ } - onStandbyStartChanged : { /* It depends on the subModes of the standBy. Handled by onHome. */ } - onStandbyWaitTreatmentChanged : { /* It depends on the subModes of the standBy. Handled by onHome. */ } - onStandbyWaitDisinfectChanged : { page( _disinfectStack , vstandbyWaitDisinfect )} + function onHomeChanged ( vValue ) { page( _mainHome , vValue )} + function onStandbyChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } + function onStandbyStartChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } + function onStandbyWaitTreatmentChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } + function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectStack , vValue )} - onValidateParametersChanged : { page( _preTreatmentCreateStack , vvalidateParameters )} - onPreTreatmentChanged : { page( _preTreatmentStack , vpreTreatment )} - onInTreatmentChanged : { page( _treatmentStack , vinTreatment )} - onPostTreatmentChanged : { page( _postTreatmentStack , vpostTreatment )} - onInvalidModeChanged : { page( null , vinvalidMode )} + function onValidateParametersChanged ( vValue ) { page( _preTreatmentCreateStack , vValue )} + function onPreTreatmentChanged ( vValue ) { page( _preTreatmentStack , vValue )} + function onInTreatmentChanged ( vValue ) { page( _treatmentStack , vValue )} + function onPostTreatmentChanged ( vValue ) { page( _postTreatmentStack , vValue )} + function onInvalidModeChanged ( vValue ) { page( null , vValue )} } // the page function is more flixible regarding our current design @@ -171,25 +171,25 @@ // also with what ever order they have been push with the reverse/correct animation will be poped or pushed. Connections { target: vHDTreatmentStates // Blood Prime - onBpRampChanged : { page( null , vbpRamp )} + function onBpRampChanged ( vValue ) { page( null , vValue )} // in-Treatmet - onTxDialysisChanged : { page( _treatmentStack , vtxDialysis )} + function onTxDialysisChanged ( vValue ) { page( _treatmentStack , vValue )} - onTxRinsebackChanged : { page( _endTreatmentRinsebackStack , vtxRinseback )} - onTxRecirculateChanged : { page( _endTreatmentRecirculateStack , vtxRecirculate )} - onTxEndChanged : { page( _endTreatmentEndStack , vtxEnd )} + function onTxRinsebackChanged ( vValue ) { page( _endTreatmentRinsebackStack , vValue )} + function onTxRecirculateChanged ( vValue ) { page( _endTreatmentRecirculateStack , vValue )} + function onTxEndChanged ( vValue ) { page( _endTreatmentEndStack , vValue )} // Treatment Stop - onTxStopChanged : { page( _treatmentStack , vtxStop )} - onTsRecirculateChanged : { page( null , vtsRecirculate )} - onTsRecirculateDialysateChanged : { page( null , vtsRecirculateDialysate )} - onTsRecirculateBloodChanged : { page( null , vtsRecirculateBlood )} - onTsRecirculateNoChanged : { page( null , vtsRecirculateNo )} + function onTxStopChanged ( vValue ) { page( _treatmentStack , vValue )} + function onTsRecirculateChanged ( vValue ) { page( null , vValue )} + function onTsRecirculateDialysateChanged( vValue ) { page( null , vValue )} + function onTsRecirculateBloodChanged ( vValue ) { page( null , vValue )} + function onTsRecirculateNoChanged ( vValue ) { page( null , vValue )} } Connections { target: vPreTreatmentAdjustmentInitTreatment - onAdjustmentTriggered: { + function onAdjustmentTriggered ( vValue ) { _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText } } Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -66,6 +66,17 @@ signal backClicked() signal confirmClicked() + onVisibleChanged: { + if (checkList) + checkList.resetItems() + if (instruction) + instruction.currentStepIndex = 0 + _notification.text = "" + if (visible) { + _mainMenu.hidden = true + } + } + // vvvvvvvvvvvvvvvvvvvvvvvvv HEADER vvvvvvvvvvvvvvvvvvvvvvvvv // StepNavigationTitleBar { id: _titleBar stepIndex : stackStepIndex // shall have a definition in the parent stack @@ -167,7 +178,7 @@ NotificationBarSmall { id: _notification } Connections { target: vSettings - onInstructionsChanged : { + function onInstructionsChanged ( vValue ) { if ( instructionBased ) { let stepName = header.stepNames[stackStepIndex] if ( stepName === undefined ) stepName = "" @@ -184,14 +195,4 @@ } } - onVisibleChanged: { - if (checkList) - checkList.resetItems() - if (instruction) - instruction.currentStepIndex = 0 - _notification.text = "" - if (visible) { - _mainMenu.hidden = true - } - } } Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -111,15 +111,15 @@ // ----- Navigation Connections { target: vHDOperationMode - onStandbyWaitDisinfectChanged : { page( _disinfectHome , vstandbyWaitDisinfect )} // initialItem + function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectHome , vValue )} // initialItem } // ----- Responses Connections { target: vDisinfectAdjustDisinfect - onAdjustment_DisinfectModeTriggered : { doDisplayReasonText( _disinfectHome )} - onAdjustment_DisinfectStartFlushTriggered : { doDisplayReasonText( _disinfectFlush )} - onAdjustment_DisinfectStartHeatTriggered : { doDisplayReasonText( _disinfectHeat )} - onAdjustment_DisinfectStartChemicalTriggered : { doDisplayReasonText( _disinfectChemical )} + function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )} + function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )} + function onAdjustment_DisinfectStartHeatTriggered ( vValue ) { doDisplayReasonText( _disinfectHeat )} + function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )} } onVisibleChanged: { Index: sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml (.../EndTreatmentEndStack.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml (.../EndTreatmentEndStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -33,6 +33,8 @@ signal rinsebackClicked() + onRinsebackClicked : vTreatmentAdjustmentEnd.doEnd () //87.0 + EndTreatmentBase { id : _endTreatmentEnd title.text : qsTr("Treatment Complete") instructionBased : true @@ -53,15 +55,13 @@ } Connections { target : vHDTreatmentStates - onTeWaitRinsebackChanged : { page( _endTreatmentEnd , vteWaitRinseback )} - onTePausedChanged : { page( _endTreatmentEndPaused , vtePaused )} + function onTeWaitRinsebackChanged ( vValue ) { page( _endTreatmentEnd , vValue )} + function onTePausedChanged ( vValue ) { page( _endTreatmentEndPaused , vValue )} } Connections { target : vTreatmentAdjustmentEnd - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { _endTreatmentEnd.reasonText = vTreatmentAdjustmentEnd.text(); } } - - onRinsebackClicked : vTreatmentAdjustmentEnd.doEnd () //87.0 } Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -36,6 +36,11 @@ signal recirculateBackClicked () signal treatmentEndClicked () + onReconnectClicked : vTreatmentAdjustmentRecirculate.doReconnect () //84.0 + onRecirculateConfirmClicked : vTreatmentAdjustmentRecirculate.doConfirm () //84.1 + onRecirculateBackClicked : vTreatmentAdjustmentRecirculate.doResume () //84.2 + onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd () //84.3 + // Recirculate EndTreatmentBase { id : _endTreatmentRecirculate title.text : qsTr("Recirculate") @@ -99,18 +104,13 @@ } } - onReconnectClicked : vTreatmentAdjustmentRecirculate.doReconnect () //84.0 - onRecirculateConfirmClicked : vTreatmentAdjustmentRecirculate.doConfirm () //84.1 - onRecirculateBackClicked : vTreatmentAdjustmentRecirculate.doResume () //84.2 - onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd() //84.3 - Connections { target: vHDTreatmentStates - onRcStartedChanged : { page( _endTreatmentRecirculate , vrcStarted )} - onRcStoppedChanged : { page( _endTreatmentReconnect , vrcStopped )} + function onRcStartedChanged ( vValue ) { page( _endTreatmentRecirculate , vValue )} + function onRcStoppedChanged ( vValue ) { page( _endTreatmentReconnect , vValue )} } Connections { target: vTreatmentAdjustmentRecirculate - onAdjustmentTriggered: { + function onAdjustmentTriggered ( vValue ) { // there is only one message to handle all the sub pages of rinseback // since the rejection reason will be cleared by each trasition // so it's fine to set all at the same time Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -33,36 +33,40 @@ property int stackStepIndex : 0 // Rinseback - EndTreatmentRinsebackInit { id: _endTreatmentRinsebackInit - onRinsebackClicked : vTreatmentAdjustmentRinseback.doStart () //82.0 - onTreatmentEndClicked : vTreatmentAdjustmentRinseback.doTreatmentEnd () //82.8 - onTreatmentBackClicked : vTreatmentAdjustmentRinseback.doTreatmentBack () //82.9 + EndTreatmentRinsebackInit { id: _endTreatmentRinsebackInit } + EndTreatmentRinseback { id: _endTreatmentRinseback } + EndTreatmentRinsebackComplete { id: _endTreatmentRinsebackComplete } + EndTreatmentAdditional { id: _endTreatmentAdditional } + + Connections { target: _endTreatmentRinsebackInit + function onRinsebackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doStart ()} //82.0 + function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8 + function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9 } - EndTreatmentRinseback { id: _endTreatmentRinseback - onAccelerateClicked : vTreatmentAdjustmentRinseback.doIncrement () //82.1 - onDeccelerateClicked : vTreatmentAdjustmentRinseback.doDecrement () //82.2 - onPauseClicked : vTreatmentAdjustmentRinseback.doPause () //82.3 - onResumeClicked : vTreatmentAdjustmentRinseback.doResume () //82.4 - onEndClicked : vTreatmentAdjustmentRinseback.doEnd () //82.5 + Connections { target: _endTreatmentRinseback + function onAccelerateClicked ( vValue ) { vTreatmentAdjustmentRinseback.doIncrement ()} //82.1 + function onDeccelerateClicked ( vValue ) { vTreatmentAdjustmentRinseback.doDecrement ()} //82.2 + function onPauseClicked ( vValue ) { vTreatmentAdjustmentRinseback.doPause ()} //82.3 + function onResumeClicked ( vValue ) { vTreatmentAdjustmentRinseback.doResume ()} //82.4 + function onEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doEnd ()} //82.5 } - EndTreatmentRinsebackComplete { id: _endTreatmentRinsebackComplete - onAdditionalClicked : vTreatmentAdjustmentRinseback.doAdditional () //82.6 - onTreatmentBackClicked : vTreatmentAdjustmentRinseback.doTreatmentBack () //82.9 - onConfirmClicked : vTreatmentAdjustmentRinseback.doConfirm () //82.7 - onTreatmentEndClicked : vTreatmentAdjustmentRinseback.doTreatmentEnd () //82.8 + Connections { target: _endTreatmentRinsebackComplete + function onAdditionalClicked ( vValue ) { vTreatmentAdjustmentRinseback.doAdditional ()} //82.6 + function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9 + function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doConfirm ()} //82.7 + function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8 } - EndTreatmentAdditional { id: _endTreatmentAdditional } Connections { target: vHDTreatmentStates - onRbInitChanged : { page( _endTreatmentRinsebackInit , vrbInit )} - onRbRunChanged : { page( _endTreatmentRinseback , vrbRun )} - onRbPausedChanged : { page( _endTreatmentRinseback , vrbPaused )} - onRbStopChanged : { page( _endTreatmentRinsebackComplete , vrbStop )} - onRbAdditionalChanged : { page( _endTreatmentAdditional , vrbAdditional )} + function onRbInitChanged ( vValue ) { page( _endTreatmentRinsebackInit , vValue )} + function onRbRunChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} + function onRbPausedChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} + function onRbStopChanged ( vValue ) { page( _endTreatmentRinsebackComplete , vValue )} + function onRbAdditionalChanged ( vValue ) { page( _endTreatmentAdditional , vValue )} } Connections { target: vTreatmentAdjustmentRinseback - onAdjustmentTriggered: { + function onAdjustmentTriggered ( vValue ) { // there is only one message to handle all the sub pages of rinseback // since the rejection reason will be cleared by each trasition // so it's fine to set all at the same time Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -35,6 +35,21 @@ signal disposablesRemovalConfirm () signal disposablesRemovalBack () + onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( ) + /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) + /* After navigate ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} + onTreatmentReviewConfirm : page( _disposablesRemovalConfirm ) + onDisposablesRemovalConfirm : vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) + onDisposablesRemovalBack : page( _treatmentReviewConfirm ) + onVisibleChanged: { + if (visible) { + _mainMenu.hidden = true + } + else { + stackView.initialItem = null + } + } + PostTreatmentBase { id: _patientDisconnectionConfirm objectName :"_patientDisconnectionConfirm" property int stackStepIndex : 0 @@ -76,24 +91,18 @@ onBackClicked : _root.disposablesRemovalBack () } + // connections Connections { target: vPostTreatmentStates - onPatientDisconnectionChanged : { console.debug("patientDisconnection", vpatientDisconnection )} - onDrainReservoirsChanged : { console.debug("drainReservoirs ", vdrainReservoirs )} - onVerifyChanged : { console.debug("verify ", vverify )} + function onPatientDisconnectionChanged ( vValue ) { console.debug("patientDisconnection", vValue )} + function onDrainReservoirsChanged ( vValue ) { console.debug("drainReservoirs ", vValue )} + function onVerifyChanged ( vValue ) { console.debug("verify ", vValue )} } Connections { target: vHDOperationMode - onPostTreatmentChanged : { page( _patientDisconnectionConfirm , vpostTreatment )} + function onPostTreatmentChanged ( vValue ) { page( _patientDisconnectionConfirm , vValue )} } - onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( ) - /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) - /* After navigate ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} - onTreatmentReviewConfirm : { page( _disposablesRemovalConfirm )} - onDisposablesRemovalConfirm : { vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( )} - onDisposablesRemovalBack : { page( _treatmentReviewConfirm )} - Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) { _disposablesRemovalConfirm.reasonText = "" } else { @@ -103,21 +112,12 @@ } Connections { target: vPostTreatmentAdjustmentTreatmentLog - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentTreatmentLog.adjustment_Accepted ) { _treatmentReviewConfirm.reasonText = "" } else { _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentTreatmentLog.text() } } } - - onVisibleChanged: { - if (visible) { - _mainMenu.hidden = true - } - else { - stackView.initialItem = null - } - } } Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -54,21 +54,21 @@ } Connections { target: vPreTreatmentStates - onSelfTestConsumables_installChanged : { page( _preTreatmentConsumablesInstall , vselfTestConsumables_install )} - onSelfTestConsumables_waterQualityEntered : {/*_preTreatmentConsumablesSelfTest.checkList.setItem( 0, vselfTestConsumables_waterQuality)*/} - onSelfTestConsumables_biCarbPumpEntered : { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vselfTestConsumables_biCarbPump )} - onSelfTestConsumables_acidPumpEntered : { _preTreatmentConsumablesSelfTest.checkList.setItem( 1, vselfTestConsumables_acidPump )} + function onSelfTestConsumables_installChanged ( vValue ) { page( _preTreatmentConsumablesInstall , vValue )} + function onSelfTestConsumables_waterQualityEntered ( vValue ) {/* _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )*/ } + function onSelfTestConsumables_biCarbPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )} + function onSelfTestConsumables_acidPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 1, vValue )} } Connections { target: _preTreatmentConsumablesInstall - onConfirmClicked : { + function onConfirmClicked ( vValue ) { vPreTreatmentAdjustmentConsumablesConfirm.doConfirm() page( _preTreatmentConsumablesSelfTest ) } } Connections { target: _preTreatmentConsumablesSelfTest - onConfirmClicked : { /* the state shall automatically change after user confirms the consumables installation */ } + function onConfirmClicked ( vValue ) { /* the state shall automatically change after user confirms the consumables installation */ } } onVisibleChanged: { Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -97,17 +97,17 @@ } Connections { target: vPreTreatmentStates - onSelfTestNoCartridge_startChanged : { /* , vselfTestNoCartridge_start */ } + function onSelfTestNoCartridge_startChanged ( vValue ) { /* , vValue */ } // FW does not go all the time to start so the main state change should be sufficient to update the disposables stack. - onSelfTestNoCartridgeChanged : { page( _preTreatmentDisposablesSelfTest , vselfTestNoCartridge )} - onInstallationChanged : { page( _preTreatmentDisposablesCartridgeInstallation , vinstallation )} + function onSelfTestNoCartridgeChanged ( vValue ) { page( _preTreatmentDisposablesSelfTest , vValue )} + function onInstallationChanged ( vValue ) { page( _preTreatmentDisposablesCartridgeInstallation , vValue )} } // FIXME: this is just a BandAid // there should be a final screen after SalineBag to collect HD errors of user disposables installation // the current message response regarding of the error will be displayed on the SalineBag screen which at least currently doesn't related to that screen (It is Heparin Syringe not installed.) Connections { target: vPreTreatmentAdjustmentDisposablesConfirm - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) { _preTreatmentDisposablesSalineBag.reasonText = "" } else { Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -re1351d7e3e0083e1c7c5842992c40622c2deae22 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision e1351d7e3e0083e1c7c5842992c40622c2deae22) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -105,41 +105,39 @@ } Connections { target: vPreTreatmentStates - onSelfTestDryChanged : { page( _preTreatmentDrySelfTest , vselfTestDry )} - onSelfTestDry_startChanged : {} - onSelfTestDry_waitDoorCloseChanged : {} - onSelfTestDry_usedCartridgeEntered : { _preTreatmentDrySelfTest .checkList.setItem(0, vselfTestDry_usedCartridge )} - onSelfTestDry_occlusionSensorsEntered : { _preTreatmentDrySelfTest .checkList.setItem(1, vselfTestDry_occlusionSensors )} - onSelfTestDry_pressureSensorsNormalSetupEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, true )} - onSelfTestDry_pressureSensorsVenousSetupEntered : {} - onSelfTestDry_pressureSensorsVenousEntered : {} - onSelfTestDry_pressureSensorsArterialSetupEntered : {} - onSelfTestDry_pressureSensorsArterialEntered : {} - onSelfTestDry_pressureSensorsDecayEntered : {} - onSelfTestDry_pressureSensorsStabilityEntered : {} - onSelfTestDry_pressureSensorsNormalEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, vselfTestDry_pressureSensorsNormal )} - onSelfTestDry_syringePumpEntered : { _preTreatmentDrySelfTest .checkList.setItem(3, vselfTestDry_syringePump )} - onSelfTestDry_stoppedEntered : {} - onSelfTestDry_completeEntered : {} + function onSelfTestDryChanged ( vValue ) { page( _preTreatmentDrySelfTest , vValue )} + function onSelfTestDry_startChanged ( vValue ) {} + function onSelfTestDry_waitDoorCloseChanged ( vValue ) {} + function onSelfTestDry_usedCartridgeEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(0, vValue )} + function onSelfTestDry_occlusionSensorsEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(1, vValue )} + function onSelfTestDry_pressureSensorsNormalSetupEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(2, true )} + function onSelfTestDry_pressureSensorsVenousSetupEntered ( vValue ) {} + function onSelfTestDry_pressureSensorsVenousEntered ( vValue ) {} + function onSelfTestDry_pressureSensorsArterialSetupEntered ( vValue ) {} + function onSelfTestDry_pressureSensorsArterialEntered ( vValue ) {} + function onSelfTestDry_pressureSensorsDecayEntered ( vValue ) {} + function onSelfTestDry_pressureSensorsStabilityEntered ( vValue ) {} + function onSelfTestDry_pressureSensorsNormalEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(2, vValue )} + function onSelfTestDry_syringePumpEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(3, vValue )} + function onSelfTestDry_stoppedEntered ( vValue ) {} + function onSelfTestDry_completeEntered ( vValue ) {} } Connections { target: vPreTreatmentStates - onPrimeChanged : { page( _preTreatmentDisposablesPrime , vprime )} - onPrime_waitUserStartEntered : {} - onPrime_salineSetupEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, true )} - onPrime_salinePurgeAirEntered : {} - onPrime_salineCirculateBloodCircuitEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, vprime_salineCirculateBloodCircuit )} - onPrime_reservoiOneFillCompleteEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, true )} - onPrime_dialysateDialyzerEntered : {} - onPrime_reservoirTwoFillCompleteEntered : {} - onPrime_dialysateBypassEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, vprime_dialysateBypass )} - onPrime_wetSelfTestsEntered : { _preTreatmentDisposablesPrime .checkList.setItem(2, vprime_wetSelfTests )} - onPrime_pauseEntered : {} - onPrime_completeEntered : {} + function onPrimeChanged ( vValue ) { page( _preTreatmentDisposablesPrime , vValue )} + function onPrime_waitUserStartEntered ( vValue ) {} + function onPrime_salineSetupEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItem(0, true )} + function onPrime_salineCirculateBloodCircuitEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItem(0, vValue )} + function onPrime_reservoiOneFillCompleteEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItem(1, true )} + function onPrime_dialysateDialyzerEntered ( vValue ) {} + function onPrime_dialysateBypassEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItem(1, vValue )} + function onPrime_wetSelfTestsEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItem(2, vValue )} + function onPrime_pauseEntered ( vValue ) {} + function onPrime_completeEntered ( vValue ) {} } Connections { target: vPreTreatmentAdjustmentDisposablesPrime - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) { _preTreatmentDisposablesPrime.reasonText = "" } else { @@ -149,11 +147,13 @@ } Connections { target: _preTreatmentDisposablesPrime - onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionBegin.doBegin() } + function onConfirmClicked ( vValue ) { + vPreTreatmentAdjustmentPatientConnectionBegin.doBegin() + } } Connections { target: vPreTreatmentAdjustmentPatientConnectionBegin - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentPatientConnectionBegin.adjustment_Accepted ) { _preTreatmentDisposablesPrime.reasonText = "" } else { Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -39,15 +39,15 @@ PreTreatmentConnectionStack { id: _pretreatmentConnectionStack ;objectName: "_pretreatmentConnectionStack " } Connections { target: vPreTreatmentStates - onStartChanged : {} - onWaterSampleChanged : { page( _preTreatmentWaterSampleStack , vwaterSample )} - onSelfTestConsumablesChanged: { page( _preTreatmentConsumablesStack , vselfTestConsumables )} - onSelfTestNoCartridgeChanged: { page( _preTreatmentDisposablesStack , vselfTestNoCartridge )} - onInstallationChanged : { page( _preTreatmentDisposablesStack , vinstallation )} // DEBUG: Experimental : console.debug("vinstallation " - onSelfTestDryChanged : { page( _pretreatmentPrimeStack , vselfTestDry )} - onPrimeChanged : { page( _pretreatmentPrimeStack , vprime )} // DEBUG: Experimental : console.debug("vprime " - onRecirculateChanged : { page( _pretreatmentPrimeStack , vrecirculate )} // DEBUG: Experimental : console.debug("vrecirculate " - onPatientConnectionChanged : { page( _pretreatmentConnectionStack , vpatientConnection )} + function onStartChanged ( vValue ) {} + function onWaterSampleChanged ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )} + function onSelfTestConsumablesChanged ( vValue ) { page( _preTreatmentConsumablesStack , vValue )} + function onSelfTestNoCartridgeChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} + function onInstallationChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} // DEBUG: Experimental : console.debug("vinstallation " + function onSelfTestDryChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} + function onPrimeChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vprime " + function onRecirculateChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vrecirculate " + function onPatientConnectionChanged ( vValue ) { page( _pretreatmentConnectionStack , vValue )} } onVisibleChanged: { Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -93,17 +93,17 @@ // ----- Screens Navigations Connections { target: vPreTreatmentStates - onWaterSample_setupChanged : { page( _preTreatmentFilterFlush , vwaterSample_setup )} - onWaterSample_runningChanged: { page( _preTreatmentWaterSample , vwaterSample_running )} + function onWaterSample_setupChanged ( vValue ) { page( _preTreatmentFilterFlush , vValue )} + function onWaterSample_runningChanged ( vValue ) { page( _preTreatmentWaterSample , vValue )} } // ----- Screen Actions/Navigations Connections { target: _preTreatmentWaterSample - onConfirmClicked : { page( _preTreatmentWaterSampleResult )} + function onConfirmClicked ( vValue ) { page( _preTreatmentWaterSampleResult )} } Connections { target: _preTreatmentWaterSampleResult - onBackClicked : { page( _preTreatmentWaterSample )} + function onBackClicked ( vValue ) { page( _preTreatmentWaterSample )} } onSamplePressed : { vPreTreatmentAdjustmentWaterSample.doSample( true )} @@ -113,7 +113,7 @@ onOkClicked : { vPreTreatmentAdjustmentWaterSample.doResult( false )} Connections { target: vPreTreatmentAdjustmentWaterSample - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentWaterSample.adjustment_Accepted ) { _preTreatmentWaterSample.reasonText = "" } else { Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -80,7 +80,7 @@ } Connections { target: vTreatmentVitals - onDidTrigger: { + function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { _preTreatmentVitals.update( vSystolic, vDiastolic, vHeartRate ) } } @@ -105,11 +105,11 @@ } Connections { target: vPreTreatmentStates - onPatientConnectionChanged : { page( _preTreatmentUltrafiltration , vpatientConnection )} + function onPatientConnectionChanged ( vValue ) { page( _preTreatmentUltrafiltration , vValue )} } Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { // the maximum ultrafiltration volume has to be set/revert regardless vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume _preTreatmentUltrafiltration.ufVolume = vPreTreatmentAdjustmentUltrafiltrationInit.volume @@ -124,27 +124,27 @@ } Connections { target: _preTreatmentUltrafiltration - onConfirmClicked : { vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_preTreatmentUltrafiltration.ufVolume)} + function onConfirmClicked ( vValue ) { vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_preTreatmentUltrafiltration.ufVolume)} } Connections { target: _preTreatmentVitals - onBackClicked : { page( _preTreatmentUltrafiltration )} - onConfirmClicked : { page( _preTreatmentPatientConnection ) + function onBackClicked ( vValue ) { page( _preTreatmentUltrafiltration )} + function onConfirmClicked ( vValue ) { page( _preTreatmentPatientConnection ) } } Connections { target: _preTreatmentPatientConnection - onBackClicked : { page( _preTreatmentVitals )} - onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm()} + function onBackClicked ( vValue ) { page( _preTreatmentVitals )} + function onConfirmClicked ( vValue ) { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm()} } Connections { target: _preTreatmentStartTreatment - onBackClicked : { page( _preTreatmentPatientConnection )} - onConfirmClicked : { vPreTreatmentAdjustmentStartTreatment.doStart() } + function onBackClicked ( vValue ) { page( _preTreatmentPatientConnection )} + function onConfirmClicked ( vValue ) { vPreTreatmentAdjustmentStartTreatment.doStart()} } Connections { target: vPreTreatmentAdjustmentPatientConnectionConfirm - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentPatientConnectionConfirm.adjustment_Accepted ) { page( _preTreatmentStartTreatment ) _preTreatmentPatientConnection.reasonText = "" @@ -155,7 +155,7 @@ } Connections { target: vPreTreatmentAdjustmentStartTreatment - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentStartTreatment.adjustment_Accepted ) { _preTreatmentStartTreatment.reasonText = "" } else { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -45,7 +45,7 @@ return } - patientID = "" + _root.patientID = "" page( _pretreatmentPatientID ) _pretreatmentPatientID.setFocus() } @@ -95,28 +95,28 @@ } Connections { target: vHDOperationMode - onValidateParametersChanged : { pagePatientID ( vvalidateParameters )} + function onValidateParametersChanged ( vValue ) { pagePatientID ( vValue )} } Connections { target: _pretreatmentPatientID - onBackClicked : { vPreTreatmentAdjustmentInitTreatment.doCancel ()} - onConfirmClicked : { setPatientID ( patientID ) - page( _pretreatmentCreate )} + function onBackClicked ( ) { vPreTreatmentAdjustmentInitTreatment.doCancel ()} + function onConfirmClicked ( ) { setPatientID ( _root.patientID ) + page( _pretreatmentCreate )} } Connections { target: _pretreatmentCreate - onBackClicked : { pagePatientID ()} - onConfirmClicked : { vTreatmentCreate.doValidation ()} + function onBackClicked ( ) { pagePatientID ()} + function onConfirmClicked ( ) { vTreatmentCreate.doValidation ()} } Connections { target: vTreatmentCreate - onFwValidationSuccess : { page( _pretreatmentConfirm )} + function onFwValidationSuccess ( vValue ) { page( _pretreatmentConfirm )} } Connections { target: _pretreatmentConfirm - onBackClicked : { vTreatmentCreate.doCancel () - page( _pretreatmentCreate )} - onConfirmClicked : { vTreatmentCreate.doConfirm ()} + function onBackClicked ( ) { vTreatmentCreate.doCancel () + page( _pretreatmentCreate )} + function onConfirmClicked ( ) { vTreatmentCreate.doConfirm ()} } onVisibleChanged: { Index: sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -119,7 +119,7 @@ } Connections { target: vDevice - onBluetoothPairedResetChanged : { + function onBluetoothPairedResetChanged ( vValue ) { // DEBUG: console.debug("bluetoothPairedReset", vbluetoothPairedReset, vDevice.accepted, vDevice.reason, vDevice.status) // NOTE : vbluetoothPairedReset eq vDevice.reason if ( vDevice.accepted ) { Index: sources/gui/qml/pages/settings/SettingsDG.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -147,7 +147,7 @@ // ----- Responses Connections { target: vDisinfectAdjustDisinfect - onAdjustment_DisinfectModeTriggered: { + function onAdjustment_DisinfectModeTriggered ( vValue ) { if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ _root.notificationText = "" } else { _root.notificationText = vDisinfectAdjustDisinfect.text() } } Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -135,12 +135,14 @@ } Connections { target: _GuiView - onSdIsReadyChanged: { - _root.updatePanels() - } - onDidExportStat: { - _sdcFolderView.positionViewAtIndex(vIndex, ListView.Center) - } + function onSdIsReadyChanged ( vValue ) { _root.updatePanels() } + function onDidExportStat ( vIndex, vFileName, vPercent ) { _sdcFolderView.positionViewAtIndex(vIndex, ListView.Center) } + + function onDidUSBDriveUmount ( ) { _usbFolderColumn. clearModel ( )} + function onDidUSBDriveRemove ( ) { _usbFolderColumn. clearModel ( )} + function onDidExportLog ( vValue ) { _usbFolderColumn. clearModel ( )} + function onDidUSBDriveMount ( ) { _usbFolderColumn.updateModel ( )} + function onDidExport ( ) { _usbFolderColumn.updateModel ( )} } USBButton { id: _usbEjectButton @@ -380,7 +382,7 @@ marker.visible : false maximum : 100 // percent value : maximum - exportPercent - width : parent.width + width : _sdcFileDelegate.width height : 40 bgColor : Colors.transparent color : inExportList ? Colors.borderButtonSelected : Colors.transparent @@ -446,14 +448,6 @@ } } - Connections { target: _GuiView - onDidUSBDriveUmount : _usbFolderColumn. clearModel() - onDidUSBDriveRemove : _usbFolderColumn. clearModel() - onDidExportLog : _usbFolderColumn. clearModel() - onDidUSBDriveMount : _usbFolderColumn.updateModel() - onDidExport : _usbFolderColumn.updateModel() - } - spacing : 5 width : _contentRect.columnWidthFolder height : parent.height @@ -491,7 +485,7 @@ } Component { id : _usbFileDelegate Row { id : _usbFileRow - width : parent.width + width : _usbFileDelegate.width height : 40 Text { id : _usbFileNameText clip : true Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -266,8 +266,8 @@ } Connections { target: vAdjustmentServiceMode - onAdjustmentTriggered : { - if ( vAdjustmentServiceMode.adjustment_Accepted ) { + function onAdjustmentTriggered ( vValue ) { + if ( vAdjustmentServiceMode.adjustment_Accepted ) { _settingsHome.notificationText = "" } else { @@ -288,8 +288,8 @@ Connections { target: vHDOperationMode - onServiceChanged : gotoServiceMode(vservice) - onStandbyWaitDisinfectChanged : { page( _settingsHome , vstandbyWaitDisinfect )} + function onServiceChanged ( vValue ) { gotoServiceMode( vValue )} + function onStandbyWaitDisinfectChanged ( vValue ) { page( _settingsHome , vValue )} } onVisibleChanged: { Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -59,8 +59,8 @@ Connections { target: vDevice // in case the value is rejecte it will be set to the previous value // also the init value shall be set when navigate to the screen - onBrightnessChanged : _brightness.value = vbrightness - onStatusChanged : _root.notificationText = vstatus + function onBrightnessChanged ( vValue ) { _brightness.value = vValue } + function onStatusChanged ( vValue ) { _root.notificationText = vValue } } } Label { @@ -92,7 +92,7 @@ vAdjustmentAlarmVolume.doAdjustment( _alarmVolume.value ) } Connections { target: vSettings - onAlarmVolumeChanged: { + function onAlarmVolumeChanged ( vValue ) { if ( _alarmVolume.postInit ) { vAdjustmentAlarmVolume.doAdjustment( vSettings.alarmVolume ) } @@ -103,7 +103,7 @@ Connections { target: vAdjustmentAlarmVolume // in case the value is rejecte it will be set to the previous value // also the init value shall be set when navigate to the screen - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { _alarmVolume.postInit = false if ( vAdjustmentAlarmVolume.adjustment_Accepted ) { vSettings.alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume @@ -113,7 +113,7 @@ _root.notificationText = vAdjustmentAlarmVolume.adjustment_ReasonText } } - onHdAlarmVolumeChanged : { + function onHdAlarmVolumeChanged ( vValue ) { _alarmVolume.postInit = false _alarmVolume.value = vAdjustmentAlarmVolume.hdAlarmVolume } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -74,117 +74,32 @@ TreatmentBloodPrime { id: _treatmentBloodPrime } TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem } - TreatmentHome { id: _treatmentHome - onSectionFlowClicked : { + TreatmentHome { id: _treatmentHome } + + Connections { target: _treatmentHome + function onSectionFlowClicked ( vValue ) { _treatmentAdjustmentFlow.open() } - onSectionVitalsClicked : { + function onSectionVitalsClicked ( vValue ) { _vitalEntry.open() } - onSectionPressuresClicked: { + function onSectionPressuresClicked ( vValue ) { _treatmentAdjustmentPressuresLimits.open() } - onSectionTimeClicked : { + function onSectionTimeClicked ( vValue ) { _treatmentAdjustmentDuration.durationValue = vTreatmentTime.time_Total / 60 // minutes => hours _treatmentAdjustmentDuration.open() } - onSectionUltrafiltrationClicked: { + function onSectionUltrafiltrationClicked ( vValue ) { _treatmentUltrafiltrationItem.open() } } - ScreenItem { id: _treatmentTrending -/* ----- TEST: Under the test code, for the plotting of the items ----- - Timer { id: _timer - property real x1: 0 - property real x2: 0 - interval: 500 - running: _treatmentTrending.visible - repeat: true - onTriggered: { - x1 = x1 + 1 - x2 = x2 + 0.1 + ScreenItem { id: _treatmentTrending } - var r = Math.random() - _lineSerries1.append(x1, r * 10 ) - _lineSerries2.append(x2, r ) - } - } - Column { - anchors.fill: parent - anchors.topMargin: Variables.mainMenuHeight - Slider { id : _zoomSlider - width : parent.width - minimum : 0 - maximum : 2 - step : 0.1 - value : 0 - onValueChanged: _chartView.zoom(value) - } - TouchRect { - width : 50 - height : 50 - onClicked: _chartView.zoomReset() - } - - ChartView { id: _chartView - title: "Line" - width: parent.width - height: parent.height - _zoomSlider.height - antialiasing: true - backgroundColor: Colors.transparent - - legend.labelColor: Colors.white - - ValueAxis { id: xAxis1 - color: Colors.white - min: 0 - max: _timer.x1 - } - ValueAxis { id: yAxis1 - color: Colors.white - min: 0 - max: 10 - } - SplineSeries { id: _lineSerries1 - name: "LineSeries" - axisX: xAxis1 - axisY: yAxis1 - } - ValueAxis { id: xAxis2 - color: Colors.white - min: 0 - max: _timer.x2 - } - ValueAxis { id: yAxis2 - color: Colors.white - labelsColor: Colors.red - min: 0 - max: 10 - } - SplineSeries { id: _lineSerries2 - name: "LineSeries" - axisX: xAxis2 - axisY: yAxis2 - } - } - } -*/ - } - //// Treatment Adjustment Dialogs - TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow - onConfirmClicked : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) - } - - TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits - onConfirmClicked : vTreatmentAdjustmentPressuresLimits.doAdjustment( - arterialPressureLowerBound , - arterialPressureUpperBound , - venousPressureLowerBound , - venousPressureUpperBound - ) - + TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow } + TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits arterialPressureMinimum : vTreatmentRanges.arterialPressureMonitorMin arterialPressureMaximum : vTreatmentRanges.arterialPressureMonitorMax venousPressureMinimum : vTreatmentRanges.venousPressureMonitorMin @@ -202,10 +117,25 @@ venousPressureValue : vTreatmentPressureOcclusion.venousPressure } - TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration - onConfirmClicked : vTreatmentAdjustmentDuration.doAdjustment(durationValue) + Connections { target: _treatmentAdjustmentFlow + function onConfirmClicked ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) } } + Connections { target: _treatmentAdjustmentPressuresLimits + function onConfirmClicked ( vValue ) { vTreatmentAdjustmentPressuresLimits.doAdjustment( + arterialPressureLowerBound , + arterialPressureUpperBound , + venousPressureLowerBound , + venousPressureUpperBound + ) + } + } + TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration } + Connections { target: _treatmentAdjustmentDuration + function onConfirmClicked ( vValue ) { vTreatmentAdjustmentDuration.doAdjustment( + _treatmentAdjustmentDuration.durationValue )} + } + EntryDialog { id: _vitalEntry function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : "" @@ -242,7 +172,7 @@ } Connections { target: vTreatmentVitals - onDidTrigger : { + function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { if ( vTreatmentVitals.enableDialog ) { _vitalEntry.update(vSystolic, vDiastolic, vHeartRate ) _vitalEntry.open() @@ -253,7 +183,7 @@ // ---------- Manages Responses ---------- Connections { target: vTreatmentAdjustmentDuration - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) { vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentDuration.ultrafiltration _treatmentAdjustmentDuration.accept() @@ -265,7 +195,7 @@ } Connections { target: vTreatmentAdjustmentPressuresLimits - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { // values have to be update even when rejected HD is reverting back the values. // if accepted will be updated for later [may need refresh later] _treatmentAdjustmentPressuresLimits.arterialPressureLowerBound = vTreatmentAdjustmentPressuresLimits.arterialLimitLow @@ -285,11 +215,11 @@ Connections { target: vHDOperationMode // The initail screen should be the Blood Prime, since that one is the earlier state in the list. // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack. - onInTreatmentChanged : { page( _treatmentBloodPrime , vinTreatment )} + function onInTreatmentChanged ( vValue ) { page( _treatmentBloodPrime , vValue )} } Connections { target: _treatmentBloodPrime - onVisibleChanged: { + function onVisibleChanged ( vValue ) { if (_treatmentBloodPrime.visible) { _treatmentMenu.hidden = true } @@ -298,11 +228,11 @@ Connections { target: vHDTreatmentStates // in-Treatmet - onTxBloodPrimeChanged : { page( _treatmentBloodPrime , vtxBloodPrime )} - onTxDialysisChanged : { page( _treatmentHome , vtxDialysis )} + function onTxBloodPrimeChanged ( vValue ) { page( _treatmentBloodPrime , vValue )} + function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )} } Connections { target: _mainHome - onStartTreatment : { page( _treatmentHome )} + function onStartTreatment ( vValue ) { page( _treatmentHome )} } } Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -94,7 +94,7 @@ } Connections { target: vTreatmentAdjustmentUltrafiltrationState - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted ) { if (vHDTreatmentStates.ufPaused) { // handle screen regarding current accepted _treatmentAdjustmentUltrafiltrationStart .close() @@ -114,7 +114,7 @@ } Connections { target: vTreatmentAdjustmentUltrafiltrationEdit - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vTreatmentAdjustmentUltrafiltrationEdit.volume _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration = vTreatmentAdjustmentUltrafiltrationEdit.duration @@ -133,7 +133,7 @@ } Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationConfirm.volume _treatmentAdjustmentUltrafiltrationConfirm.close() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -67,7 +67,7 @@ } Connections { target: vTreatmentAdjustmentFlows - onAdjustmentTriggered: { + function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentFlows.adjustment_Accepted ) { accept() } else { Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -88,12 +88,12 @@ } Connections { target: vTreatmentAdjustmentHeparin - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { _private.displayReason = ! vTreatmentAdjustmentHeparin.adjustment_Accepted } } Connections { target: vHDTreatmentStates - onHeparinChanged: { + function onHeparinChanged ( vValue ) { _private.displayReason = false } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r75ce1b81d790999579df838f496011340c3af61c -rf68b226e67eb500758ee94fe015df48931240013 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 75ce1b81d790999579df838f496011340c3af61c) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 08-Nov-2022 + * \date (last) 23-Nov-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -341,7 +341,12 @@ /*0305*/case GuiAlarmID::ALARM_ID_HD_CPU_RAM_ERROR : { result = QObject::tr("HD processor RAM error." ); break; } /* 305*/ /*0306*/case GuiAlarmID::ALARM_ID_HD_AIR_TRAP_OVERFILL : { result = QObject::tr("HD air trap over-fill alarm." ); break; } /* 306*/ /*0307*/case GuiAlarmID::ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT : { result = QObject::tr("HD AC power lost second alarm." ); break; } /* 307*/ -/*0308*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 308*/ +/*0308*/case GuiAlarmID::ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CPi conductivity sensor invalid character received." ); break; } /* 308*/ +/*0309*/case GuiAlarmID::ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CPo conductivity sensor invalid character received." ); break; } /* 309*/ +/*0310*/case GuiAlarmID::ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CD1 conductivity sensor invalid character received." ); break; } /* 310*/ +/*0311*/case GuiAlarmID::ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CD2 conductivity sensor invalid character received." ); break; } /* 311*/ +/*0312*/case GuiAlarmID::ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE : { result = QObject::tr("HD Dialysate In flow rate to too low." ); break; } /* 312*/ +/*0313*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 313*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Index: sources/view/settings/VNetworkModel.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf68b226e67eb500758ee94fe015df48931240013 --- sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -386,15 +386,17 @@ void VNetworkModel::checkEthernet() { const QNetworkInterface eth0 = QNetworkInterface::interfaceFromName("eth0"); + _ethernetIP = tr("No Ethernet"); if ( eth0.isValid() ) { auto addresses = eth0.allAddresses(); - if ( addresses.count() > 2 ) { - ethernetIP(addresses[2].toString()); + for ( const auto & address : addresses ) { + if ( !address.isLoopback() && !address.isBroadcast() && address.protocol() == QAbstractSocket::IPv4Protocol ) { + _ethernetIP = address.toString(); + break; // stop on first item found, our HW configuration only have one Ethernet. + } } - else { - ethernetIP("No Ethernet"); - } } + emit ethernetIPChanged( _ethernetIP ); } /*! Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -66,7 +66,7 @@ updateInstructions(group ); } else { //TODO: Since it is global system settings, move this to the settings controller so the C++ backend can also use it. like Date/Time formats. - for (const auto &key : keys) { + for (const auto &key : qAsConst(keys)) { // DEBUG: qDebug() << " ~~~~~~~~~~ " << category << group << key << _Settings.value(category, group, key).toString (); QVariantMap keyValue; if ( isservicePass (category, group, key) ) { @@ -92,8 +92,6 @@ else { keyValue[key] = _Settings.value(category, group, key); } - QVariantMap groups; - groups [group] = keyValue; } } } @@ -186,7 +184,7 @@ if (_replacements.contains(id)) { isChanged = true; //DEBUG: qDebug() << _replacements[id].count(); - for ( auto item : _replacements[id]) { + for ( const auto &item : _replacements[id]) { //DEBUG: qDebug() << id << item.group << item.keyIndex << item.locIndex << item.prmIndex; QString value; quint16 len = vData.length();