Fisheye on application/AlarmMapping.csv

application (leahi/features/LEAH-1958-UI-screen-resizing): LEAH-1958-UI-screen-resizing:...

Tue, 26 Nov 2024 11:19:32 -0800

Amir Manesh committed 5b9ff62 on branch leahi/features/LEAH-1958-UI-screen-resizing in application

LEAH-1958-UI-screen-resizing:

To support Leahi-Screen 1920x1080

Adjusted the Font and modules like slider etc ...

Reduce the keyboard buttons size

· /AlarmMapping.csv

(-6, +6)

| History

| Source

| Diff

· /sources/gui/qml/AlarmItem.qml

(-8, +9)

| History

| Source

| Diff

· /sources/gui/qml/KeyboardItem.qml

(-16, +44)

| History

| Source

| Diff

· /sources/gui/qml/SDCProgressItem.qml

(-3, +3)

| History

| Source

| Diff

· /sources/gui/qml/components/Slider.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/compounds/StepNavigationTitleBar.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/globals/Fonts.qml

(-42, +42)

| History

| Source

| Diff

· /sources/gui/qml/globals/Variables.qml

(-16, +19)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-19, +19)

| History

| Source

| Diff

· /sources/gui/qml/pages/TreatmentFlowBase.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/disinfect/DisinfectBase.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml

(-9, +9)

| History

| Source

| Diff

· /sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml

(-5, +6)

| History

| Source

| Diff

· /sources/gui/qml/pages/settings/SettingsDGCleaning.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/pages/settings/SettingsExportLogs.qml

(-8, +8)

| History

| Source

| Diff

… 12 more files in changeset.

application (DEN-16553-UI-BN-WPA3-Support): DEN-16693: Institutional Settings Implementation...

Dara Navaei — Thu, 07 Mar 2024 11:00:26 -0800

Dara Navaei committed 9891a1d on branch master, @Environement_Swith and 54 more in application

DEN-16693: Institutional Settings Implementation

- Addressed the code review comments

· /AlarmMapping.csv	(-2, +2)	\| History	\| Source	\| Diff
· /denali.pro	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-6, +6)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-6, +30)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDAirTrapData.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-11, +0)	\| History	\| Source	\| Diff

application (DEN-16553-UI-BN-WPA3-Support): DEN-16693: Institutional Settings Implementation...

Dara Navaei — Sun, 03 Mar 2024 12:52:51 -0800

Dara Navaei committed ac49f0b on branch master, @Environement_Swith and 54 more in application

DEN-16693: Institutional Settings Implementation

Updated the qml file to display the insititutional record. Updated the model and view classes.

· /AlarmMapping.csv	(-2, +2)	\| History	\| Source	\| Diff
· /denali.pro.user	(-58, +58)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsStack.qml	(-2, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-3, +24)	\| History	\| Source	\| Diff

application (DEN-16553-UI-BN-WPA3-Support): DENBUG-163: High Venous Pressure Alarm 130 Triggers During Normal Treatment Operation...

Dara Navaei — Tue, 27 Feb 2024 14:41:13 -0800

Dara Navaei committed 10f946b on branch master, @Environement_Swith and 54 more in application

DENBUG-163: High Venous Pressure Alarm 130 Triggers During Normal Treatment Operation

Added air trap raw lower level and air trap raw upper level to be logged and displayed on the diagnostics screen

· /AlarmMapping.csv	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/DiagnosticsDialog.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDAirBubbleData.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDAirTrapData.cpp	(-2, +10)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDAirTrapData.h	(-2, +8)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VHDAirTrapData.cpp	(-2, +4)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VHDAirTrapData.h	(-0, +2)	\| History	\| Source	\| Diff

application (DEN-16553-UI-BN-WPA3-Support): DENBUG-204 updated the message payload of message 0x0B00 by adding an integer at the end of the structure

Dara Navaei — Thu, 18 Jan 2024 14:49:20 -0800

Dara Navaei committed f571021 on branch master, @Environement_Swith and 63 more in application

DENBUG-204 updated the message payload of message 0x0B00 by adding an integer at the end of the structure

· /AlarmMapping.csv	(-6, +7)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp	(-0, +4)	\| History	\| Source	\| Diff
· /sources/model/hd/data/treatment/MTreatmentOutletFlowData.h	(-0, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VTreatmentUltrafiltration.h	(-0, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Merge branch 'DEN-15279-UI-BN-S97-Cybersecurity' into staging

Behrouz NematiPour — Tue, 18 Jul 2023 03:08:14 -0700

Behrouz NematiPour committed 6c6f1f5 on branch master, @Environement_Swith and 117 more in application

Merge branch 'DEN-15279-UI-BN-S97-Cybersecurity' into staging

· /.gitignore

(-0, +1)

| History

| Source

| Diff

· /AlarmMapping.csv

(-8, +8)

| History

| Source

| Diff

· /cppcheck.err

(-67, +88)

| History

| Source

| Diff

· /cppcheck.log

(-220, +227)

| History

| Source

| Diff

· /cpplint.py

(-6901, +0)

| History

| Source

| Diff

· /denali.pro

(-2, +5)

| History

| Source

| Diff

· /denali.pro.user

(-2, +2)

| History

| Source

| Diff

· /denali.qrc

(-1, +9)

| History

| Source

| Diff

· /main.cpp

(-17, +69)

| History

| Source

| Diff

· /resources/images/EjectDisabled.png

(binary)

| History

| Source

| Diff

· /resources/images/EjectEnabled.png

(binary)

| History

| Source

| Diff

· /resources/images/eject.png

(binary)

| History

| Source

| Diff

· /scripts/autostart

(-30, +0)

| History

| Source

| Diff

· /scripts/bluetooth_main.conf

(-130, +0)

| History

| Source

| Diff

· /scripts/bluetooth_paired_clear.sh

(-39, +0)

| History

| Source

| Diff

… 101 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-15604 : UI Encryption/Decryption during normal operation...

Behrouz NematiPour — Thu, 15 Jun 2023 06:52:11 -0700

Behrouz NematiPour committed 1da89b0 on branch master, @Environement_Swith and 119 more in application

DEN-15604 : UI Encryption/Decryption during normal operation

- still needs work to clean up the execution order

- some of them have been disabled.

· /AlarmMapping.csv

(-3, +3)

| History

| Source

| Diff

· /cppcheck.err

(-13, +19)

| History

| Source

| Diff

· /cppcheck.log

(-43, +43)

| History

| Source

| Diff

· /scripts/crypt_setup.sh

(-2, +2)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-9, +38)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-6, +15)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-6, +27)

| History

| Source

| Diff

· /sources/MainTimer.h

(-0, +6)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-13, +68)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-10, +31)

| History

| Source

| Diff

· /sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml

(-18, +3)

| History

| Source

| Diff

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-4, +4)

| History

| Source

| Diff

· /sources/view/hd/data/VHDOperationModeData.cpp

(-17, +1)

| History

| Source

| Diff

· /sources/view/hd/data/VHDOperationModeData.h

(-14, +0)

| History

| Source

| Diff

· /sources/view/settings/VAdjustmentAlarmVolume.cpp

(-1, +15)

| History

| Source

| Diff

… 3 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-15400: UI: Cybersecurity: UI needs to auto generate the password for the Encrypted partition...

Behrouz NematiPour — Tue, 06 Jun 2023 20:27:23 -0700

Behrouz NematiPour committed 99e5b87 on branch master, @Environement_Swith and 120 more in application

DEN-15400: UI: Cybersecurity: UI needs to auto generate the password for the Encrypted partition

- The -KaukE added to run.sh which needs to be removed when done.

- Added the default service password

- fixed the issue after changing the confirm screen for the change password

- moved the settings post connections to a separate function to be called after the settings initialization.

· /AlarmMapping.csv	(-323, +324)	\| History	\| Source	\| Diff
· /cppcheck.err	(-55, +88)	\| History	\| Source	\| Diff
· /cppcheck.log	(-215, +243)	\| History	\| Source	\| Diff
· /scripts/run.sh	(-2, +2)	\| History	\| Source	\| Diff
· /sources/device/DeviceView.cpp	(-1, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsWiFi.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-7, +19)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.h	(-0, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-15359: Usability: Arterial and Venous Pressure Alarm Limits...

Behrouz NematiPour — Wed, 31 May 2023 03:07:57 -0700

Behrouz NematiPour committed cf61c77 on branch master, @Environement_Swith and 133 more in application

DEN-15359: Usability: Arterial and Venous Pressure Alarm Limits

- DEN-15387: UI: Updates for treatment parameter entry (A/V alarm window)

- DEN-15388: UI: Updates for in-treatment adjustment of alarm parameter window (pressure alarm screen)

- Monitoring components for the TxHome, Rinseback, BloodPrime

· /AlarmMapping.csv

(-323, +324)

| History

| Source

| Diff

· /cppcheck.err

(-67, +103)

| History

| Source

| Diff

· /cppcheck.log

(-215, +250)

| History

| Source

| Diff

· /denali.pro.user

(-2, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-22, +20)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-5, +5)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-3, +4)

| History

| Source

| Diff

· /sources/gui/qml/components/ConfirmTreatmentTable.qml

(-6, +5)

| History

| Source

| Diff

· /sources/gui/qml/globals/Fonts.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml

(-8, +6)

| History

| Source

| Diff

· /sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml

(-14, +24)

| History

| Source

| Diff

· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml

(-8, +4)

| History

| Source

| Diff

· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml

(-1, +6)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml

(-7, +5)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/TreatmentHome.qml

(-22, +2)

| History

| Source

| Diff

… 21 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Merge branch 'DEN-14733-UI-BN-S90-2' into staging

Behrouz NematiPour — Fri, 10 Feb 2023 09:51:39 -0800

Behrouz NematiPour committed 1f2e7db on branch master, @Environement_Swith and 176 more in application

Merge branch 'DEN-14733-UI-BN-S90-2' into staging

· /AlarmMapping.csv

(-2, +3)

| History

| Source

| Diff

· /cppcheck.err

(-39, +1221)

| History

| Source

| Diff

· /cppcheck.log

(-69, +271)

| History

| Source

| Diff

· /denali.pro.user

(-118, +66)

| History

| Source

| Diff

· /en_US.udic

(-0, +1)

| History

| Source

| Diff

· /imake.sh

(-6, +0)

| History

| Source

| Diff

· /main.cpp

(-0, +31)

| History

| Source

| Diff

· /sources/canbus/CanInterface.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-5, +5)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-1, +6)

| History

| Source

| Diff

· /sources/gui/GuiController.cpp

(-11, +2)

| History

| Source

| Diff

· /sources/gui/GuiView.h

(-0, +3)

| History

| Source

| Diff

· /sources/gui/qml/PowerItem.qml

(-4, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/DebugDataColumn.qml

(-3, +3)

| History

| Source

| Diff

… 29 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-14581 : General Implementation...

Behrouz NematiPour — Thu, 02 Feb 2023 19:57:15 -0800

Behrouz NematiPour committed 5b46bc8 on branch master, @Environement_Swith and 178 more in application

DEN-14581 : General Implementation

- Added a WiFi connection indication

- Improved the WiFi list parser

· /AlarmMapping.csv	(-14, +22)	\| History	\| Source	\| Diff
· /cppcheck.err	(-121, +99)	\| History	\| Source	\| Diff
· /cppcheck.log	(-412, +466)	\| History	\| Source	\| Diff
· /denali.pro.user	(-48, +175)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-1, +16)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsWiFi.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-8, +10)	\| History	\| Source	\| Diff
· /sources/view/settings/VNetworkModel.cpp	(-9, +39)	\| History	\| Source	\| Diff
· /sources/view/settings/VNetworkModel.h	(-8, +14)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.cpp	(-13, +17)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.h	(-1, +3)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-14736 IMP: Confirm Always on Top...

Behrouz NematiPour — Thu, 02 Feb 2023 14:57:57 -0800

Behrouz NematiPour committed 8b3412f on branch master, @Environement_Swith and 179 more in application

DEN-14736 IMP: Confirm Always on Top

- The Alarm won't cancel the Confirmation anymore

- The Alarm Dialog will still get updated while minimized.

- The Alarm Dialog will get maximized if the confirmation dialog gets closed.

· /AlarmMapping.csv	(-15, +23)	\| History	\| Source	\| Diff
· /cppcheck.err	(-121, +99)	\| History	\| Source	\| Diff
· /cppcheck.log	(-412, +466)	\| History	\| Source	\| Diff
· /denali.pro.user	(-48, +169)	\| History	\| Source	\| Diff
· /sources/gui/qml/AlarmItem.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/PowerItem.qml	(-0, +5)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(-1, +0)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-14524 - Updated AlarmMapping

Behrouz NematiPour — Sat, 21 Jan 2023 19:41:37 -0800

Behrouz NematiPour committed ecd3358 on branch master, @Environement_Swith and 177 more in application

DEN-14524 - Updated AlarmMapping

· /AlarmMapping.csv	(-15, +23)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-9, +11)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-14391 , DEN-14393 : Qt 5.15.10 [QML run-time issues]...

Behrouz NematiPour — Wed, 23 Nov 2022 16:08:49 -0800

Behrouz NematiPour committed f68b226 on branch master, @Environement_Swith and 182 more in application

DEN-14391 , DEN-14393 : Qt 5.15.10 [QML run-time issues]

- Fixed all the QML warning and errors

- Enabled the Clang-Tidy, Clazy and cppcheck and fixed some.

- Removed unused images

- made the Denali POST logo transparent.

· /.gitignore

(-0, +2)

| History

| Source

| Diff

· /AlarmMapping.csv

(-2, +2)

| History

| Source

| Diff

· /cppcheck.log

(-397, +602)

| History

| Source

| Diff

· /cppcheck.sh

(-9, +14)

| History

| Source

| Diff

· /denali.pro

(-0, +1)

| History

| Source

| Diff

· /denali.pro.user

(-10, +258)

| History

| Source

| Diff

· /denali.qrc

(-9, +1)

| History

| Source

| Diff

· /resources/images/AlarmBell.png

(binary)

| History

| Source

| Diff

· /resources/images/AlarmBellSilent.png

(binary)

| History

| Source

| Diff

· /resources/images/Busy2.png

(binary)

| History

| Source

| Diff

· /resources/images/Done.png

(binary)

| History

| Source

| Diff

· /resources/images/Logo Diality.png

(binary)

| History

| Source

| Diff

· /resources/images/Logo DialityT.png

(binary)

| History

| Source

· /resources/images/Logo Qt 1024px_old.png

(binary)

| History

| Source

| Diff

· /resources/images/Logo d-blue.png

(binary)

| History

| Source

| Diff

… 42 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Merge branch 'DEN-14263-UI-BN-S83' into staging

Behrouz NematiPour — Tue, 08 Nov 2022 16:00:43 -0800

Behrouz NematiPour committed 550c426 on branch master, @Environement_Swith and 185 more in application

Merge branch 'DEN-14263-UI-BN-S83' into staging

· /AlarmMapping.csv	(-1, +6)	\| History	\| Source	\| Diff
· /cppcheck.err	(-0, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-14263: Change Request: Enable the Alarms Dialog Timeout timer during rinseback

Behrouz NematiPour — Thu, 03 Nov 2022 14:49:44 -0700

Behrouz NematiPour committed 93223f7 on branch master, @Environement_Swith and 186 more in application

DEN-14263: Change Request: Enable the Alarms Dialog Timeout timer during rinseback

· /AlarmMapping.csv	(-1, +6)	\| History	\| Source	\| Diff
· /cppcheck.err	(-0, +2)	\| History	\| Source	\| Diff
· /cppcheck.log	(-0, +2)	\| History	\| Source	\| Diff
· /cppcheck.sh	(-2, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/AlarmItem.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +7)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-14147: Add Required Heparin Volume for Treatment to Syringe Installation Screen...

Behrouz NematiPour — Thu, 27 Oct 2022 19:17:14 -0700

Behrouz NematiPour committed 30d7e99 on branch master, @Environement_Swith and 186 more in application

DEN-14147: Add Required Heparin Volume for Treatment to Syringe Installation Screen

- The replacement finder is implemented

- The instruction updater is changed to meed the needs of the replacement finder.

- Next needs to update the instructions regarding the received message.

· /AlarmMapping.csv	(-23, +25)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /en_US.udic	(-0, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/data/treatment/MTreatmentHeparinData.cpp	(-1, +5)	\| History	\| Source	\| Diff
· /sources/model/hd/data/treatment/MTreatmentHeparinData.h	(-0, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VTreatmentHeparinData.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VTreatmentHeparinData.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-15, +84)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.h	(-0, +20)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-14209 - UI: Dry self test modifications...

Behrouz NematiPour — Tue, 25 Oct 2022 12:33:34 -0700

Behrouz NematiPour committed a7dd3f0 on branch master, @Environement_Swith and 187 more in application

DEN-14209 - UI: Dry self test modifications

- Updated the View and the qml code regarding the changes to the enum made in common HDDefs.h

· /AlarmMapping.csv	(-23, +25)	\| History	\| Source	\| Diff
· /denali.pro.user	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(-25, +28)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(-13, +16)	\| History	\| Source	\| Diff
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(-2, +7)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13939: IMP: Implementation of the the message [0xBA00]...

Behrouz NematiPour — Thu, 22 Sep 2022 03:22:24 -0700

Behrouz NematiPour committed 86acb3c on branch master, @Environement_Swith and 192 more in application

DEN-13939: IMP: Implementation of the the message [0xBA00]

- The Model/View are implemented and exposed to QML.

· /AlarmMapping.csv	(-1, +4)	\| History	\| Source	\| Diff
· /alarmMapping.sh	(-1, +1)	\| History	\| Source	\| Diff
· /denali.pro	(-0, +10)	\| History	\| Source	\| Diff
· /denali.pro.user	(-11, +20)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-0, +4)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.cpp	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +6)	\| History	\| Source	\| Diff
· /sources/model/MModel.h	(-0, +10)	\| History	\| Source	\| Diff
· /sources/model/confirm/MDuetConfirmHDi.cpp	(-0, +49)	\| History	\| Source
· /sources/model/confirm/MDuetConfirmHDi.h	(-0, +85)	\| History	\| Source
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +5)	\| History	\| Source	\| Diff
· /sources/view/VView.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/view/confirm/VConfirmDialog.cpp	(-0, +46)	\| History	\| Source
· /sources/view/confirm/VConfirmDialog.h	(-0, +56)	\| History	\| Source

application (bugfix/DEN-16597-UI-BN-S114): DEN-13845: CRV: Merge issue of DEN-12716-UI_BN_S70 into staging...

Behrouz NematiPour — Sun, 11 Sep 2022 04:08:23 -0700

Behrouz NematiPour committed b3a919e on branch master, @Environement_Swith and 195 more in application

DEN-13845: CRV: Merge issue of DEN-12716-UI_BN_S70 into staging

- Due to some enum changes, UI couldn't build

- An idea implemented to detect the enum changes by compiler. The implementation may be able to improve.

· /AlarmMapping.csv	(-27, +39)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-0, +5)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h	(-4, +4)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-293, +305)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(-1, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(-1, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(-32, +104)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(-2, +4)	\| History	\| Source	\| Diff
· /unittests/tst_models.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13844: DEN-13774: VITALS numpad appears during rinseback if BP interval is on...

Behrouz NematiPour — Thu, 01 Sep 2022 18:40:49 -0700

Behrouz NematiPour committed b238ed3 on branch master, @Environement_Swith and 192 more in application

DEN-13844: DEN-13774: VITALS numpad appears during rinseback if BP interval is on

- It was only working on the HDOpMode to be in-treatment, but needed to get the HDTreatmentState as well to make sure it is in Dialysis state too.

· /AlarmMapping.csv	(-3, +6)	\| History	\| Source	\| Diff
· /cppcheck.err	(-16, +35)	\| History	\| Source	\| Diff
· /cppcheck.log	(-241, +212)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +11)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-14, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-29, +29)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-4, +7)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13743: IMP: Mostly worked on Alarm Dialog/Bar...

Behrouz NematiPour — Tue, 30 Aug 2022 19:25:33 -0700

Behrouz NematiPour committed efb549a on branch master, @Environement_Swith and 192 more in application

DEN-13743: IMP: Mostly worked on Alarm Dialog/Bar

- Changed the Alarm Dialog (Title decreased by 4, Description increased by 4) / Bar (increased by 6) font size,

- Adjusted the AlarmDialog Timer position and layout.

- Removed the mouseArea from the WaitDone component.

- Added titel/description fontPixedSize for the NotificationDialog and NotificationBar

- Clear the reasontext on home screen when is not visible anymore.

- Clear the reasontext on SettingsDG when is not visible anymore.

- Used NotificationBarSmall instead of NotificationBar in:

- ModalDialog

- MainHome

- TreatmentAdjustmentBase

- TreatmentFlowBase

· /AlarmMapping.csv	(-1, +1)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/AlarmItem.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ModalDialog.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBar.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TimeText.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/WaitDone.qml	(-4, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/NotificationDialog.qml	(-4, +10)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainHome.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-3, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDG.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13736: Disinfection demo...

Behrouz NematiPour — Mon, 29 Aug 2022 16:23:25 -0700

Behrouz NematiPour committed 3c10146 on branch master, @Environement_Swith and 192 more in application

DEN-13736: Disinfection demo

- Some changes has been made to UI to able to navigate to the home while on disinfection.

- CloudSync disabled by default.

· /AlarmMapping.csv	(-7, +7)	\| History	\| Source	\| Diff
· /scripts/run.sh	(-1, +1)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.cpp	(-1, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-298, +298)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VHDOperationModeData.cpp	(-4, +22)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VHDOperationModeData.h	(-3, +14)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13743: IMP: Device Registration - CloudSync POST test - Device Serial/Version req/rsp...

Behrouz NematiPour — Wed, 24 Aug 2022 12:50:01 -0700

Behrouz NematiPour committed e5577fb on branch master, @Environement_Swith and 192 more in application

DEN-13743: IMP: Device Registration - CloudSync POST test - Device Serial/Version req/rsp

- Added the disable functionality ( main.h SINGLETON_... macros ) for the Singleton classes, which are basically controllers, to stop their thread event loop, so they literally stop working.

- Connected the disable functionality of the controllers like, CloudSync, Bluetooth (Maybe later Logger), to the POST result.

- Improved the ./run.sh script and same on the ApplicationPOST class.

- Set the minimum of the HD/DG serial length to 1 byte, since it is not exactly at 15 or 20 char length.

- Removed the "CS" from the UI log of sending out the messages to CS, which the source is UI, not the CS and this is confusing.

- Removed the "Settings/DG Cleaning" scheduling section.

- Changed the POST version/serial request from UI to all to be identified in the log from "Versionreq" to "POSTInfReq".

- Added a new UI POST Alarm in AlarmDefs.h, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC = 295, ///< UI POST CloudSync failure

- Fixed a potential bug on SD-Card not ready service logging.

· /AlarmMapping.csv	(-1, +2)	\| History	\| Source	\| Diff
· /denali.pro.user	(-2, +2)	\| History	\| Source	\| Diff
· /main.cpp	(-23, +33)	\| History	\| Source	\| Diff
· /scripts/run.sh	(-18, +42)	\| History	\| Source	\| Diff
· /sources/ApplicationController.cpp	(-0, +13)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-0, +7)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.cpp	(-8, +23)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.h	(-28, +36)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.cpp	(-0, +5)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/cloudsync/CloudSyncController.cpp	(-1, +8)	\| History	\| Source	\| Diff
· /sources/device/DeviceController.cpp	(-8, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDG.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/main.h	(-0, +27)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDRequests.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmTriggered.cpp	(-1, +0)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x9A]...

Behrouz NematiPour — Thu, 18 Aug 2022 15:52:54 -0700

Behrouz NematiPour committed c4b9550 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x9A]

- The UI application was refusing to send the message 0x9A, and the type of the message to be sent should change to U32 to work since FW is using U32 for bool.

· /AlarmMapping.csv	(-1, +5)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +6)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: Unhandled messages duplicate keys fix...

Behrouz NematiPour — Mon, 15 Aug 2022 20:47:30 -0700

Behrouz NematiPour committed 35db011 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: Unhandled messages duplicate keys fix

- it has been observed that the unhandled messages are not logged correctly and turned out it is because of the Types of each parameter used as keys and keys can't be duplicate by default which caused issue for the unhandled messages, since they may have 6 parameter and all with F32 type which then becomes one parameter of type F32.

- an attribute has been defined for the config file with the format:

#--duplicate_key_on

#--duplicate_key_off

to allow or disallow the duplicate key at any point in the config file.

- Note that the save config parameters are always unique key like AlarmVolume which doesn't make sense to have duplicate entry.

· /AlarmMapping.csv	(-4, +4)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-5, +5)	\| History	\| Source	\| Diff
· /sources/model/settings/MSettings.cpp	(-6, +11)	\| History	\| Source	\| Diff
· /sources/model/settings/MSettings.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-10, +40)	\| History	\| Source	\| Diff
· /sources/storage/Settings.h	(-2, +5)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(-0, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645 IMP: DEN-12958: UI shall generate the POST fail alarm if the SD-Card not present and stop logging...

Behrouz NematiPour — Thu, 11 Aug 2022 17:11:05 -0700

Behrouz NematiPour committed 465a935 on branch master, @Environement_Swith and 192 more in application

DEN-13645 IMP: DEN-12958: UI shall generate the POST fail alarm if the SD-Card not present and stop logging

__________

- Log Export

- Added the Alarm generation on the GuiController if SD-Card is not ready, or is/becomes read-only.

- AlarmGenerator

- Added the SD-Card failure alarm - ALARM_ID_UI_POST_FAILURE_SDCARD

- Added alarm clear - ALARM_ID_NO_ALARM

- Added a flag to stop logging if the SD-Card is not ready or is readonly.

- Removed pause on log clean up.

- Improved the DeviceController SD-Card, USB status detection.

- Fixed and improved the MVC connection betweein device/Application/Gui controllers.

- A CLI switch ( -S ) added to disable the feature that is disabling the log if the SD-Card doesn't exist. So if the -S switch is used while calling the denali application, the logging will NOT be disabled, if SD-Card fails.

- In the ExportButton and USBButton(eject) removed the enable logic and has to be done outside of the component. It has been done for the Settings/export and Post-Tx/Review.

- Added title and file count for each SD-Card and USB-Drive panels.

__________

- Run.sh

- Added a check for the CloudSync and if the folder doesn't exist it won't do the rest

- Kill the denali application, in case it is still running.

- Added SD-Card type as part of its detection and if it is not ext4 format it fails the test.

- Optimized the mount point detection.

__________

- NoCANBus

- added the NoCANBus to the fault and init modes to not to navigate to those if NoCANBus is true. Otherwise it conflict with navigate to the home.

- Added a log in case the NoCANBus is enabled.

__________

- Settings

- Converted the '\n' in the settings values to actual newline character.

__________

- Thread:

- Moved the QuiController in its own thread, _Gui_Thread.

__________

- Alarms

- Added an emit to update the Alarm Dialog with the latest title/message, received from Alarms.conf In case there was an alarm before even Alarm.conf is read.

· /AlarmMapping.csv

(-13, +13)

| History

| Source

| Diff

· /main.cpp

(-1, +8)

| History

| Source

| Diff

· /scripts/run.sh

(-34, +42)

| History

| Source

| Diff

· /sources/AlarmGenerator.cpp

(-0, +26)

| History

| Source

| Diff

· /sources/AlarmGenerator.h

(-0, +3)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-11, +20)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-0, +4)

| History

| Source

| Diff

· /sources/Threads.cpp

(-0, +2)

| History

| Source

| Diff

· /sources/Threads.h

(-0, +1)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-61, +45)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-3, +0)

| History

| Source

| Diff

· /sources/gui/GuiController.cpp

(-7, +29)

| History

| Source

| Diff

· /sources/gui/GuiController.h

(-0, +4)

| History

| Source

| Diff

· /sources/gui/GuiView.cpp

(-20, +17)

| History

| Source

| Diff

· /sources/gui/GuiView.h

(-3, +4)

| History

| Source

| Diff

… 13 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: General Implementation...

Behrouz NematiPour — Fri, 05 Aug 2022 02:03:32 -0700

Behrouz NematiPour committed 7ebc073 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: General Implementation

DEN-12836: Treatment Report/log export modifications

· /AlarmMapping.csv	(-1, +1)	\| History	\| Source	\| Diff
· /denali.pro.user	(-4, +4)	\| History	\| Source	\| Diff
· /sources/ApplicationController.cpp	(-6, +23)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-2, +4)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.cpp	(-6, +20)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.h	(-3, +7)	\| History	\| Source	\| Diff
· /sources/gui/GuiView.cpp	(-2, +28)	\| History	\| Source	\| Diff
· /sources/gui/GuiView.h	(-2, +7)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsExportLogs.qml	(-21, +144)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/storage/Logger.cpp	(-7, +89)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-3, +19)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13489 IMP: General Implementation...

Behrouz NematiPour — Wed, 03 Aug 2022 02:59:49 -0700

Behrouz NematiPour committed 6f2622b on branch master, @Environement_Swith and 192 more in application

DEN-13489 IMP: General Implementation

DEN-13035: Update alarm body messages

- Removed the exclamation mark icon form the Alarm Dialog.

- Removed the exclamation mark icon form the Alarm Bar.

- Made the whole AlarmDialog title bar doubleClick and diagnostics opener if the alarm is not minimizable.

- Moved the Alarm ID from title to the bottom left of the dialog with format: "ID:".

- Clipped the AlarmDialon body message area, crop the text if longer than dialog area.

- Changed the "settings" property name of the VSettings to "instructions".

- Changed the date/time formats keys to simplify the code and conf file.

- Implemented the Alarm Body messages, to load from Alams/Alarms.conf, instead of the FW.

- The FW texts/documents will still being used if the Alarms.conf doesn't have a definition.

- A instruction base capability has also been added to the MVC, but UI still not supporting it.

· /AlarmMapping.csv

(-3, +3)

| History

| Source

| Diff

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-3, +3)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/AlarmItem.qml

(-8, +9)

| History

| Source

| Diff

· /sources/gui/qml/components/NotificationBar.qml

(-9, +9)

| History

| Source

| Diff

· /sources/gui/qml/dialogs/NotificationDialog.qml

(-18, +27)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-4, +3)

| History

| Source

| Diff

· /sources/gui/qml/pages/TreatmentFlowBase.qml

(-8, +6)

| History

| Source

| Diff

· /sources/gui/qml/pages/settings/SettingsDG.qml

(-3, +3)

| History

| Source

| Diff

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-293, +293)

| History

| Source

| Diff

· /sources/model/settings/MSettings.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/storage/Settings.h

(-0, +25)

| History

| Source

| Diff

· /sources/storage/StorageGlobals.cpp

(-0, +7)

| History

| Source

| Diff

· /sources/storage/StorageGlobals.h

(-0, +6)

| History

| Source

| Diff

… 4 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13199: INT: DVT Support...

Behrouz NematiPour — Tue, 12 Jul 2022 18:15:50 -0700

Behrouz NematiPour committed a5fe0c9 on branch master, @Environement_Swith and 192 more in application

DEN-13199: INT: DVT Support

- During DVT support found out the BCuff vitals debug item on the top of the screen is not working, and fixed ti by adding a real time version of the same actual vital properties which gets updated every time the vitals received.

· /AlarmMapping.csv	(-7, +7)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-8, +4)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-10, +10)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp	(-0, +16)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h	(-0, +6)	\| History	\| Source	\| Diff