Fisheye on application/

application (demo_test): Resolved merge issue

Behrouz NematiPour — Tue, 22 Dec 2020 10:00:45 -0800

Behrouz NematiPour committed c444c15 on branch demo_test in application

Resolved merge issue

· /sources/canbus/MessageInterpreter.cpp

(-1, +0)

| History

| Source

| Diff

application (demo_test): Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

Behrouz NematiPour — Tue, 22 Dec 2020 09:53:10 -0800

Behrouz NematiPour committed 07478da on branch demo_test in application

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

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

(-4, +6)

| History

| Source

| Diff

application (demo_test): Merge branch 'DEN-5830_AlarmDesign' into demo_test

Behrouz NematiPour — Tue, 22 Dec 2020 09:48:23 -0800

Behrouz NematiPour committed 241eac1 on branch demo_test in application

Merge branch 'DEN-5830_AlarmDesign' into demo_test

· /denali.pro	(-0, +2)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +9)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Tue, 22 Dec 2020 09:28:28 -0800

Behrouz NematiPour committed 1909215 on branch master, @Environement_Swith and 242 more in application

DEN-5833: Implementation

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

· /denali.pro	(-0, +2)	\| History	\| Source	\| Diff
· /sources/AlarmGenerator.cpp	(-0, +75)	\| History	\| Source
· /sources/AlarmGenerator.h	(-0, +55)	\| History	\| Source
· /sources/gui/GuiController.cpp	(-6, +2)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-8, +9)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 17 Dec 2020 16:19:09 -0800

Behrouz NematiPour committed 0d31142 on branch master, @Environement_Swith and 242 more in application

DEN-5833: Implementation

- Cleaned up the unit tests

· /unittests/tst_canbus.cpp	(-25, +3)	\| History	\| Source	\| Diff
· /unittests/tst_canbus.h	(-1, +0)	\| History	\| Source	\| Diff
· /unittests/tst_messaging.cpp	(-225, +0)	\| History	\| Source	\| Diff
· /unittests/tst_messaging.h	(-16, +0)	\| History	\| Source	\| Diff
· /unittests/tst_models.cpp	(-1, +1)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 17 Dec 2020 13:19:01 -0800

Behrouz NematiPour committed cd76941 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- added a touch expanding area for the TouchArea so regardless of its visual size it can have expanded touchable area.

- the touch expanding for the mute button set to 25 so it can have a bigger touch area that its size which is little.

· /sources/gui/qml/components/MuteButton.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBar.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchRect.qml	(-1, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/NotificationDialog.qml	(-0, +1)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Wed, 16 Dec 2020 15:07:12 -0800

Behrouz NematiPour committed c1111db on branch master, @Environement_Swith and 239 more in application

DEN-5754: Implementation

- cherry picked a fix from DEN-5830_AlarmDesign@51accb for the Treatment End message which has no payload.

- Also made the interpretMessage() for received messages to be more identical to the DEN-5830_AlarmDesign to hopefully help merging easier.

· /sources/canbus/MessageInterpreter.cpp

(-7, +20)

| History

| Source

| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-6022: The ultrafiltration inconsistency...

Behrouz NematiPour — Wed, 16 Dec 2020 14:55:35 -0800

Behrouz NematiPour committed 50a109d on branch master, @Environement_Swith and 239 more in application

DEN-6022: The ultrafiltration inconsistency

- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix and if that happens it would be the FW bug.

- The modification is that the main progress bar will always has VTreatmentUltratiltration.minimum as minimum (current;y always zero) and VTreatmentUltratiltration.maximum as maximum.

- The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to eachother.

- Removed the precision from VTreatmentUltrafiltration and moved into the Variables.

· /sources/gui/qml/globals/Variables.qml	(-4, +6)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentBegin.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(-27, +17)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VTreatmentUltrafiltration.h	(-6, +2)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Tue, 15 Dec 2020 21:45:35 -0800

Behrouz NematiPour committed 51accb0 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Added a MACRO for convenience of empty payload messages handling.

· /sources/canbus/MessageInterpreter.cpp

(-1, +9)

| History

| Source

| Diff

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

Behrouz NematiPour — Tue, 15 Dec 2020 21:12:35 -0800

Behrouz NematiPour committed 9aedfea on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

· /sources/view/hd/alarm/VAlarmStatus.cpp

(-6, +6)

| History

| Source

| Diff

application (demo_test): Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

Behrouz NematiPour — Tue, 15 Dec 2020 18:34:20 -0800

Behrouz NematiPour committed aa9749d on branch demo_test in application

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

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

Behrouz NematiPour — Tue, 15 Dec 2020 18:33:45 -0800

Behrouz NematiPour committed c2a3943 on branch master, @Environement_Swith and 239 more in application

DEN-5754: Implementation

- Fixed a bug caused by a typo

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

(-1, +1)

| History

| Source

| Diff

application (demo_test): Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

Behrouz NematiPour — Tue, 15 Dec 2020 11:31:05 -0800

Behrouz NematiPour committed e182162 on branch demo_test in application

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

· /denali.pro	(-2, +6)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.cpp	(-0, +13)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-3, +8)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-16, +25)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/model/MModel.h	(-3, +13)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(-0, +28)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Mon, 14 Dec 2020 19:02:52 -0800

Behrouz NematiPour committed 679f728 on branch master, 2020_EOY_DEMO and 243 more in application

DEN-5754: Implementation

- linked the pre-treatment ultrafiltration adjustment with the in-treatment ultrafiltration section and the adjustment flow.

- added the rejection reason text to the pTx uf adj screen.

· /sources/gui/qml/components/NotificationBar.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentBegin.qml	(-10, +14)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-2, +17)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Mon, 14 Dec 2020 13:43:45 -0800

Behrouz NematiPour committed 2d3e2f9 on branch master, 2020_EOY_DEMO and 243 more in application

DEN-5754: Implementation

- Fixed the message id of the ID_ConfirmTreatmentReq from 58 to 59

- Enabled the priming button for now since there is no FW implementation.

· /sources/gui/GuiGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentPrime.qml	(-1, +2)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Mon, 14 Dec 2020 12:33:05 -0800

Behrouz NematiPour committed 5b17a1d on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Moved version and sd-card icon to to not to cover others.

· /sources/gui/qml/main.qml

(-6, +5)

| History

| Source

| Diff

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

Behrouz NematiPour — Mon, 14 Dec 2020 11:57:03 -0800

Behrouz NematiPour committed c9aec44 on branch master, 2020_EOY_DEMO and 243 more in application

DEN-5754: Implementation

- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

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

(-1, +0)

| History

| Source

| Diff

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

Behrouz NematiPour — Sun, 13 Dec 2020 21:20:29 -0800

Behrouz NematiPour committed d92f6ff on branch master, 2020_EOY_DEMO and 243 more in application

DEN-5754: Implementation

- Removed the semi-colon at the end of the imports.

· /sources/gui/qml/main.qml

(-24, +24)

| History

| Source

| Diff

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

Behrouz NematiPour — Fri, 11 Dec 2020 18:06:16 -0800

Behrouz NematiPour committed 0e001d4 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- The message 63 has been tested

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-25, +26)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-1, +15)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.h	(-0, +1)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Fri, 11 Dec 2020 15:47:04 -0800

Behrouz NematiPour committed 3e5cdca on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Added the message 63 (req/rsp)

· /denali.pro	(-4, +6)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.cpp	(-13, +13)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-1, +2)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-13, +20)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-1, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-7, +4)	\| History	\| Source	\| Diff
· /sources/model/MModel.h	(-5, +10)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(-7, +8)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmClearedCondition.cpp	(-0, +41)	\| History	\| Source
· /sources/model/hd/alarm/MAlarmClearedCondition.h	(-0, +79)	\| History	\| Source
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-4, +4)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.h	(-4, +4)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 10 Dec 2020 22:04:18 -0800

Behrouz NematiPour committed 1d43ff7 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- moved version and SD-Card icon to top which were covering the alarm bar.

- added list icon on the notification bar

- implemented the basics of the alarm list dialog.

- tweaked the Notification default coloring

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /denali.qrc	(-0, +2)	\| History	\| Source	\| Diff
· /resources/images/AlarmBell.png	(binary)	\| History	\| Source
· /resources/images/AlarmBellSilent.png	(binary)	\| History	\| Source
· /resources/images/doted-list.png	(binary)	\| History	\| Source
· /resources/images/list.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/NotificationBar.qml	(-4, +28)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/AlarmListDialog.qml	(-0, +100)	\| History	\| Source
· /sources/gui/qml/dialogs/NotificationDialog.qml	(-3, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Colors.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-1, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-26, +51)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 10 Dec 2020 19:19:53 -0800

Behrouz NematiPour committed f325fa7 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- fix a naming bug.

· /sources/canbus/MessageDispatcher.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(-1, +1)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 10 Dec 2020 18:39:09 -0800

Behrouz NematiPour committed 71784f7 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Fixed the bug of silence logic which was reverse

- Fixed the bug that length of the silence message payload was incorrectly set to 4 instead of 1.

- changed the name of the MAlarmSilenceReq member variable to silence instead of state which now implies it is silent (1) or not (0).

· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-2, +2)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 10 Dec 2020 18:17:55 -0800

Behrouz NematiPour committed 43cdee7 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- made the mute button click optional and currently enabled.

- made minimize on silent on the Notification Dialog optional and is disabled currently.

- made separate slots for each user actions instead of one for all with 4 parameter cause I think it's easier and more convenient to use this way.

- increased the Notification Bar height a little bit more.

· /sources/gui/qml/components/NotificationBar.qml	(-2, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-33, +30)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-12, +45)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.h	(-2, +5)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 10 Dec 2020 17:29:50 -0800

Behrouz NematiPour committed d619b13 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Implementation of the message 64: 'Alarm User Action'

- Cleaned up the VAlarmStatus class.

· /sources/canbus/MessageGlobals.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ImageLogoD.qml	(-1, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-4, +7)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(-13, +13)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-38, +35)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.h	(-20, +17)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 10 Dec 2020 14:35:26 -0800

Behrouz NematiPour committed eb23f84 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Added User Action message response model.

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.cpp	(-0, +12)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-0, +3)	\| History	\| Source	\| Diff
· /sources/model/MModel.h	(-13, +28)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(-0, +28)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 10 Dec 2020 12:35:52 -0800

Behrouz NematiPour committed e1eed34 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Fixed a bouncing bug of the message when sent for the first time with silenced flag on to show the alarm not maximized.

· /sources/gui/qml/dialogs/NotificationDialog.qml	(-1, +12)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-5, +11)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Wed, 09 Dec 2020 22:20:23 -0800

Behrouz NematiPour committed 45ce6e7 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-5833: Implementation

- Added 3 Alarm buttons

- created Mute Button

- created Up and Down Button (minimize/maximize)

- used FW alarm status flag enum (Alarm_State_Flag_Bit_Positions) instead of the UI version and removed UI one.

Code cleaned up

- modified and cleaned up Notification Dialog and Bar.

- modified Time Text component to be able to show sections with one zero only.

- cleaned up main.qml

· /denali.pro.user

(-6, +6)

| History

| Source

| Diff

· /denali.qrc

(-0, +6)

| History

| Source

| Diff

· /resources/images/audio.png

(binary)

| History

| Source

· /resources/images/chevron-down.png

(binary)

| History

| Source

· /resources/images/chevron-up.png

(binary)

| History

| Source

· /resources/images/mute.png

(binary)

| History

| Source

· /sources/canbus/MessageInterpreter.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-19, +21)

| History

| Source

| Diff

· /sources/gui/qml/components/ModalDialog.qml

(-1, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/MuteButton.qml

(-0, +60)

| History

| Source

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

(-37, +27)

| History

| Source

| Diff

· /sources/gui/qml/components/TimeText.qml

(-3, +8)

| History

| Source

| Diff

· /sources/gui/qml/components/UpDownButton.qml

(-0, +37)

| History

| Source

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

(-40, +87)

| History

| Source

| Diff

· /sources/gui/qml/globals/Colors.qml

(-12, +55)

| History

| Source

| Diff

… 7 more files in changeset.

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

Behrouz NematiPour — Tue, 08 Dec 2020 15:24:41 -0800

Behrouz NematiPour committed 28f3f8d on branch master, 2020_EOY_DEMO and 243 more in application

DEN-5754: Implementation

- Added the new MVC for initial UF Volume adjustment messages (79/80).

· /denali.pro

(-2, +6)

| History

| Source

| Diff

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-0, +13)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-0, +2)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.cpp

(-1, +2)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-0, +2)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /sources/model/MModel.h

(-3, +13)

| History

| Source

| Diff

· /sources/model/hd/adjustment/MTreatmentAdjustRequests.h

(-0, +28)

| History

| Source

| Diff

· /sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp

(-0, +49)

| History

| Source

· /sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h

(-0, +86)

| History

| Source

… 4 more files in changeset.

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

Behrouz NematiPour — Tue, 08 Dec 2020 03:55:34 -0800

Behrouz NematiPour committed ccb91da on branch master, 2020_EOY_DEMO and 243 more in application

DEN-5754: Implementation

- reviewed the pre-treatment screens and modified

- added the double range slider for Arterial and Venous

- modified the treatmentBegin(ultrafiltration)

- so many other tweaks.

· /en_US.udic

(-0, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-0, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-3, +8)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-15, +24)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/ProgressCircle.qml

(-0, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/RangeSlider.qml

(-4, +41)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/components/SliderCreateTreatment.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/TickMarks.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/TopMenuBarCreateTreatment.qml

(-1, +1)

| History

| Source

| Diff

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

(-6, +8)

| History

| Source

| Diff

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

(-60, +77)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

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

(-131, +167)

| History

| Source

| Diff

… 4 more files in changeset.