Fisheye on application/resources

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

Behrouz NematiPour — Mon, 01 Feb 2021 10:44:40 -0800

Behrouz NematiPour committed 76f632c on branch master, @Environement_Swith and 234 more in application

6636: ptTx_Rinseback: Implementation

- Added the PostTreatmentRinseback.qml

- Added the PostTreatmentRecirculate.qml

- Improved the StackItem.qml

- Added Rinseback/Recirculate Navigation

- Removed Diagnostics screen since it's not one screen anymore and is too old.

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /denali.qrc

(-3, +10)

| History

| Source

| Diff

· /resources/images/Accelerate.png

(binary)

| History

| Source

· /resources/images/Decelerate.png

(binary)

| History

| Source

· /resources/images/End.png

(binary)

| History

| Source

· /resources/images/Pause.png

(binary)

| History

| Source

| Diff

· /resources/images/PauseDarkBlue.png

(binary)

| History

| Source

· /resources/images/PauseLightBlue.png

(binary)

| History

| Source

· /sources/gui/qml/components/CheckListItem.qml

(-1, +1)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /sources/gui/qml/components/ConfirmTreatmentTableEntry.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/components/StackItem.qml

(-5, +36)

| History

| Source

| Diff

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

(-4, +3)

| History

| Source

| Diff

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

(-0, +3)

| History

| Source

| Diff

· /sources/gui/qml/pages/Diagnostics.qml

(-301, +0)

| History

| Source

| Diff

… 9 more files in changeset.

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 243 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 — Wed, 09 Dec 2020 22:20:23 -0800

Behrouz NematiPour committed 45ce6e7 on branch master, 2020_EOY_DEMO and 243 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-5337: Implementation

Behrouz NematiPour — Tue, 20 Oct 2020 23:53:11 -0700

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

DEN-5337: Implementation

· /denali.pro.user

(-1, +19)

| History

| Source

| Diff

· /denali.qrc

(-0, +2)

| History

| Source

| Diff

· /en_US.aff

(-0, +205)

| History

| Source

· /en_US.dic

(-0, +49525)

| History

| Source

· /en_US.udic

(-0, +4)

| History

| Source

· /remove-exra-emptylines.sh

(-0, +18)

| History

| Source

· /resources/images/Done.png

(binary)

| History

| Source

· /resources/images/OffGray.png

(binary)

| History

| Source

· /resources/images/alarm.svg

(-3, +0)

| History

| Source

| Diff

· /resources/images/bell-off.svg

(-1, +0)

| History

| Source

| Diff

· /resources/images/bell.svg

(-1, +0)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-16, +25)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml

(-5, +9)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml

(-1, +5)

| History

| Source

| Diff

… 5 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-4601, DEN-4598: Updated priming screen to show check mark after completion. Ensure Priming Complete has the right fo...

Tue, 13 Oct 2020 14:02:18 -0700

Peter Lucia committed 1d2ab4a on branch master, 2020_EOY_DEMO and 245 more in application

DEN-4601, DEN-4598: Updated priming screen to show check mark after completion. Ensure Priming Complete has the right font size.

· /denali.qrc	(-0, +1)	\| History	\| Source	\| Diff
· /resources/images/checkCircle.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/PrimingTimer.qml	(-0, +8)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentPrime.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-2, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-4601, DEN-4598: Updated priming screen.

Mon, 12 Oct 2020 17:56:56 -0700

Peter Lucia committed 32bc2f0 on branch master, 2020_EOY_DEMO and 245 more in application

DEN-4601, DEN-4598: Updated priming screen.

· /denali.pro.user	(-368, +368)	\| History	\| Source	\| Diff
· /denali.qrc	(-0, +2)	\| History	\| Source	\| Diff
· /resources/images/alarm.svg	(-3, +0)	\| History	\| Source	\| Diff
· /resources/images/bell-off.svg	(-1, +0)	\| History	\| Source	\| Diff
· /resources/images/bell.svg	(-1, +0)	\| History	\| Source	\| Diff
· /resources/images/check.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/CheckListItem.qml	(-0, +39)	\| History	\| Source
· /sources/gui/qml/globals/Fonts.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentPrime.qml	(-17, +34)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-1, +2)	\| History	\| Source	\| Diff
· /sources/view/VPriming.h	(-8, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): EMC Support and SD-Card Notification

Behrouz NematiPour — Tue, 25 Aug 2020 00:58:29 -0700

Behrouz NematiPour committed 4df19fe on branch master, 2020_EOY_DEMO and 254 more in application

EMC Support and SD-Card Notification

· /denali.pro.user

(-5, +5)

| History

| Source

| Diff

· /denali.qrc

(-0, +1)

| History

| Source

| Diff

· /resources/images/microsd.png

(binary)

| History

| Source

· /scripts/run.sh

(-2, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-0, +21)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-0, +4)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-2, +24)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-1, +5)

| History

| Source

| Diff

· /sources/gui/guiview.cpp

(-2, +22)

| History

| Source

| Diff

· /sources/gui/guiview.h

(-3, +13)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-0, +18)

| History

| Source

| Diff

· /sources/gui/qml/pages/ManagerHome.qml

(-5, +5)

| History

| Source

| Diff

· /sources/gui/qml/pages/SettingsHome.qml

(-15, +0)

| History

| Source

| Diff

· /sources/storage/DriveWatcher.cpp

(-14, +21)

| History

| Source

| Diff

· /sources/storage/DriveWatcher.h

(-4, +4)

| History

| Source

| Diff

… 3 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Squashed commit of the following:...

Mon, 03 Aug 2020 08:59:41 -0700

Peter Lucia committed c71deaa on branch master, 2020_EOY_DEMO and 250 more in application

Squashed commit of the following:

commit 5331f4838ac4d591fd26120f471f89c226863734

Author: Peter Lucia

Date: Thu Jul 30 12:52:48 2020 -0700

Began adding qml slots for when validation fails

commit 63c55a131a04f17a9306ff25988e686b1edbbc2a

Author: Peter Lucia

Date: Thu Jul 30 12:22:58 2020 -0700

Parsing FW validation response

commit b17f0bfe38526a16e02e7e5bcf295939e24fd659

Author: Peter Lucia

Date: Thu Jul 30 10:05:05 2020 -0700

Handling create treatment response message

commit a57d0fe761842df3e29136d78194b1d5b3ba18af

Author: Peter Lucia

Date: Wed Jul 29 13:22:44 2020 -0700

Fixed resetting of treatment parameters.

commit aab29013cf0691a7f61e4f531400f4943c6d3bf8

Author: Peter Lucia

Date: Wed Jul 29 11:24:10 2020 -0700

Improved UI side parameter selection validation.

commit edb0f66f1bc9c954ff1f51f375b0bdfd8b125859

Author: Peter Lucia

Date: Tue Jul 28 15:44:11 2020 -0700

Improved default parameter inactive / active colors

commit f2677a919a885333c8e34f8340593fbabc56f823

Author: Peter Lucia

Date: Tue Jul 28 15:11:38 2020 -0700

Ensuring treatment parameters indicate when they are adjusted or unset.

commit 5e83584957eab076c2ebe7d546362a461bbfbaa8

Author: Peter Lucia

Date: Tue Jul 28 09:55:23 2020 -0700

Added arterial and venous pressure limits

commit a1b67a61af501334847c8514360cf82348e2c65c

Author: Peter Lucia

Date: Mon Jul 27 17:56:55 2020 -0700

Using VCreateTreatment cpp / h class to determine new treatment ranges

commit 738cb12bc9b4400ab815b17c43228ad5e532db33

Author: Peter Lucia

Date: Mon Jul 27 15:43:56 2020 -0700

Loading create treatment ranges from the file system

Added macro to convert variable name to string

Added debug | release #define

commit fbc9f08ea3163b617bda7f393bf3285b8b4e8d41

Author: Peter Lucia

Date: Wed Jul 22 16:54:55 2020 -0700

Cleanup old comments

commit edf1640d8e797ac1820d09d1de2ef78ed4713746

Author: Peter Lucia

Date: Wed Jul 22 16:35:32 2020 -0700

Moved save new treatment out of application controller

commit 191a70deefd31a614508a22a586dbd244ab67eed

Author: Peter Lucia

Date: Fri Jul 17 17:53:09 2020 -0700

In progress update for create treatment

commit f03e0bc116bafb36ac119d4c2d07bd57e20a5c33

Author: Peter Lucia

Date: Fri Jul 17 16:19:45 2020 -0700

In progress update for create treatment

commit 387a0099948bff42f2e49557f8136610c3443938

Author: Peter Lucia

Date: Fri Jul 17 14:53:08 2020 -0700

Saving newly created treatment to the log file

commit 28920a32fc6f8fe437c69364d3c8f059f16f7cc7

Author: Peter Lucia

Date: Fri Jul 17 14:49:15 2020 -0700

In progress update - application controller will save a newly created treatment to disk

commit 137d8d36144a143c7205b9c4620a88cc340670f4

Author: Peter Lucia

Date: Fri Jul 17 14:05:07 2020 -0700

In progress update of create treatment

commit f9131f48b9bd8580a93ca959540ce4ac97f228c3

Author: Peter Lucia

Date: Fri Jul 17 11:59:13 2020 -0700

In progress update for create treatment

commit 4b498f8f90ff7b2c8a057a3ef509bd86e1ea681c

Author: Peter Lucia

Date: Thu Jul 16 17:17:08 2020 -0700

Added cpp backend logic, top bar refinements.

· /denali.pro

(-0, +17)

| History

| Source

| Diff

· /denali.pro.user

(-3, +3)

| History

| Source

| Diff

· /denali.qrc

(-3, +10)

| History

| Source

| Diff

· /resources/images/alarm.png

(binary)

| History

| Source

· /resources/images/bell-off.png

(binary)

| History

| Source

· /resources/images/bell.png

(binary)

| History

| Source

· /sources/applicationcontroller.cpp

(-0, +5)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-0, +3)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-0, +4)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-0, +27)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.h

(-0, +4)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-1, +0)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-1, +0)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-0, +1)

| History

| Source

| Diff

· /sources/gui/guiglobals.h

(-1, +6)

| History

| Source

| Diff

… 31 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Removed ColorOverlay and QGraphicalEffects

Tue, 23 Jun 2020 08:56:05 -0700

Peter Lucia committed eea7f07 on branch master, 2020_EOY_DEMO and 259 more in application

Removed ColorOverlay and QGraphicalEffects

· /resources/images/bell-off.svg	(-1, +1)	\| History	\| Source	\| Diff
· /resources/images/bell.svg	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBar.qml	(-21, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/NotificationDialog.qml	(-10, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-0, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Added indication when alarm silence function is active.

Wed, 10 Jun 2020 12:56:59 -0700

Peter Lucia committed 733dbd5 on branch master, 2020_EOY_DEMO and 259 more in application

Added indication when alarm silence function is active.

· /denali.qrc	(-0, +2)	\| History	\| Source	\| Diff
· /resources/images/bell-off.svg	(-0, +1)	\| History	\| Source
· /resources/images/bell.svg	(-0, +1)	\| History	\| Source
· /sources/gui/qml/components/NotificationBar.qml	(-4, +44)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-8, +11)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Raising alarm when HD communication times out Added Settings base page with Sound and Diagnostic pages. Alarm design upd...

Wed, 10 Jun 2020 11:48:24 -0700

Peter Lucia committed 255df1f on branch master, 2020_EOY_DEMO and 259 more in application

Raising alarm when HD communication times out Added Settings base page with Sound and Diagnostic pages. Alarm design updates

· /denali.qrc

(-1, +3)

| History

| Source

| Diff

· /resources/images/alarm.svg

(-1, +3)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-7, +13)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-0, +11)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-5, +2)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-0, +9)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-1, +2)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-1, +5)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-0, +20)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-0, +5)

| History

| Source

| Diff

· /sources/gui/guiglobals.h

(-1, +2)

| History

| Source

| Diff

· /sources/gui/guiview.h

(-0, +3)

| History

| Source

| Diff

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

(-4, +26)

| History

| Source

| Diff

· /sources/gui/qml/components/SettingsItem.qml

(-0, +72)

| History

| Source

· /sources/gui/qml/dialogs/Alarm.qml

(-0, +114)

| History

| Source

… 8 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Added alarm svg

Tue, 02 Jun 2020 11:22:29 -0700

Peter Lucia committed 19ad29b on branch master, 2020_EOY_DEMO and 259 more in application

Added alarm svg

· /resources/images/alarm.svg

(-0, +1)

| History

| Source

application (bugfix/DEN-16597-UI-BN-S114): DEN-3149 : Treatment Ultrafiltration Adjustment...

Behrouz NematiPour — Mon, 18 May 2020 15:19:08 -0700

Behrouz NematiPour committed 670f257 on branch master, 2020_EOY_DEMO and 261 more in application

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added Ultrafiltration button component for the Ultrafiltration Adjustment options

- Added two Clock(+.-) and Wave(+.-) icons for the Ultrafiltration Adjustment options

- Created special components (ImageWave.qml and ImageClock.qml) for each image to encapsulate all the image properties in one component.

- Added Ultrafiltration Adjustment Confirm dialog

- Added Ultrafiltration Adjustment Confirm dialog Navigation.

- Renamed LogoD.qml to ImageLogoD.qml to be consistent with the other Image Components.

- Inverted the slider handler object back and border color to be consistent with the UX design.

- Created the ImageLogoDDarkTransparent.qml for the MainMenu Diality Icon.

- Added disabled property to the TouchRect components.

- Aligned the Slider with the Ultrafiltration ProgressBar.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /denali.qrc

(-1, +10)

| History

| Source

| Diff

· /resources/images/Clock-Minus.png

(binary)

| History

| Source

· /resources/images/Clock-Plus.png

(binary)

| History

| Source

· /resources/images/Wave-Minus.png

(binary)

| History

| Source

· /resources/images/Wave-Plus.png

(binary)

| History

| Source

· /sources/gui/qml/components/ImageClock.qml

(-0, +46)

| History

| Source

· /sources/gui/qml/components/ImageLogoD.qml

(-0, +39)

| History

| Source

· /sources/gui/qml/components/ImageLogoDDarkTransparent.qml

(-0, +35)

| History

| Source

· /sources/gui/qml/components/ImageWave.qml

(-0, +47)

| History

| Source

· /sources/gui/qml/components/LogoD.qml

(-38, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/MainMenu.qml

(-4, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/ProgressBar.qml

(-8, +10)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/components/TouchRect.qml

(-0, +2)

| History

| Source

| Diff

… 8 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-3149 : Treatment Ultrafiltration Adjustment...

Behrouz NematiPour — Thu, 14 May 2020 12:33:39 -0700

Behrouz NematiPour committed 17f0906 on branch master, 2020_EOY_DEMO and 261 more in application

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added Ultrafiltration Paused Screen

- Added Ultrafiltration navigation/signalling

- Added pause icon for the notification bar on Ultrafiltration paused.

- Added resume icon for the Ultrafiltration resume button.

- Modified the ModalDialog Notification text to take effect of the text change all the time (binding/assignment)

- Added Icon feature for the notification bar

- Exposed the click signals of the other ProgressBars of the ProgressBarEx/ProgressBar so it can be overwritten.( used in the Ultrafiltration section when touching that area it needs to act like a one object to navigate to Ultrafiltration adjustment start screen)

- Changed the Treatment Duration Adjustment current Remaining time to current Elapsed Time.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.pro.user	(-2, +2)	\| History	\| Source	\| Diff
· /denali.qrc	(-0, +3)	\| History	\| Source	\| Diff
· /resources/images/PauseGray.png	(binary)	\| History	\| Source
· /resources/images/Resume.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/ModalDialog.qml	(-2, +7)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBar.qml	(-8, +18)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ProgressBar.qml	(-6, +8)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ProgressBarEx.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-3, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-0, +17)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml	(-0, +113)	\| History	\| Source
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-3, +4)	\| History	\| Source	\| Diff
· /sources/model/mpoweroff.cpp	(-1, +0)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-3149 : Treatment Ultrafiltration Adjustment...

Behrouz NematiPour — Tue, 12 May 2020 12:31:32 -0700

Behrouz NematiPour committed 7045fd6 on branch master, 2020_EOY_DEMO and 261 more in application

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added micro version to the application version

- Enhanced Back Button to have the back icon

- Enhanced TreatmentAdjustmentBase to have Back Button.

- Added TreatmentAsjustmtneUltrafiltrationStart dialog as the first entry screen of the Treatment Adjustment.

- Commented out the TreatmentFluid (SalineBolus, Heparin) test simulation animation.

- Modified TreatmentUltrafiltration section ranges and values. [FIXME]

- Changed the backPressed of the Back Button to backClicked to be consistent and updated related usages.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.pro	(-0, +2)	\| History	\| Source	\| Diff
· /denali.qrc	(-0, +3)	\| History	\| Source	\| Diff
· /main.cpp	(-16, +30)	\| History	\| Source	\| Diff
· /resources/images/Back.png	(binary)	\| History	\| Source
· /resources/images/Pause.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/BackButton.qml	(-9, +33)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentCreate.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-4, +11)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStart.qml	(-9, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-3, +15)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(-0, +98)	\| History	\| Source
· /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(-15, +15)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-10, +15)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-2087_BloodDialysateFlowAdjustment...

Behrouz NematiPour — Wed, 18 Mar 2020 04:04:41 -0700

Behrouz NematiPour committed 79bf4dd on branch master, 2020_EOY_DEMO and 268 more in application

DEN-2087_BloodDialysateFlowAdjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.qrc

(-0, +8)

| History

| Source

| Diff

· /resources/images/Close.png

(binary)

| History

| Source

· /sources/gui/qml/components/CloseButton.qml

(-0, +46)

| History

| Source

· /sources/gui/qml/components/ConfirmButton.qml

(-0, +38)

| History

| Source

· /sources/gui/qml/components/Line.qml

(-1, +1)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

· /sources/gui/qml/components/ModelessDialog.qml.WIP

(-0, +74)

| History

| Source

· /sources/gui/qml/components/ProgressBar.qml

(-23, +19)

| History

| Source

| Diff

· /sources/gui/qml/components/ProgressBarEx.qml

(-0, +48)

| History

| Source

· /sources/gui/qml/components/ProgressRect.qml

(-3, +9)

| History

| Source

| Diff

· /sources/gui/qml/components/RangeRect.qml

(-5, +15)

| History

| Source

| Diff

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

(-0, +114)

| History

| Source

· /sources/gui/qml/components/TouchRect.qml

(-1, +3)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-0, +4)

| History

| Source

| Diff

… 12 more files in changeset.

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

Behrouz NematiPour — Tue, 14 Jan 2020 13:32:20 -0800

Behrouz NematiPour committed 61bc469 on branch master, 2020_EOY_DEMO and 274 more in application

DEN-1437 : Implementation

- Added concurrent in Project as document says. I don't know why it's required since it was working event without adding it. Added anyway.

- Added required fonts as part of the repo. They should not be added as resources since they are huge and make application unnecessary big and is not required and should be referred to as a real file not as a qrc:/ .

· /denali.pro

(-1, +1)

| History

| Source

| Diff

· /resources/fonts/Barlow-Black.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-BlackItalic.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-Bold.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-BoldItalic.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-ExtraBold.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-ExtraBoldItalic.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-ExtraLight.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-ExtraLightItalic.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-Italic.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-Light.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-LightItalic.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-Medium.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-MediumItalic.ttf

(binary)

| History

| Source

· /resources/fonts/Barlow-Regular.ttf

(binary)

| History

| Source

| Diff

… 4 more files in changeset.

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

Behrouz NematiPour — Mon, 13 Jan 2020 14:34:58 -0800

Behrouz NematiPour committed 442d1c4 on branch master, 2020_EOY_DEMO and 274 more in application

DEN-1437 : Implementation

- Updated the Logo with the transparent version provided by K:D.

- Added darker version of the Logo d to be used on the Treatment screen top menu bar.

- Added Line Component to be used in the Treatment screen as section separator.

- Updated main menu component to have :

. Extra right most side item (Treatment settings button)

. Added drop up/down animation for the menu hide/show.

. Added a position feature to the component so it can be positioned on top of the screen or at the bottom of the screen.

- Added Orientation to the TouchArea Component.

- Moved USB, Export buttons into the Settings home screen.

- Moved LogoD object from main.qml to the TreatmentHome screen.

- Added the Treatment Top Menu Bar in the Treatment Stack screen.

- Improved the TextRect component.

· /denali.qrc	(-1, +3)	\| History	\| Source	\| Diff
· /resources/images/Logo d.png	(binary)	\| History	\| Source	\| Diff
· /resources/images/logo d Dark Transparent.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/Background.qml	(-0, +29)	\| History	\| Source
· /sources/gui/qml/components/BackgroundRect.qml	(-29, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/Line.qml	(-0, +37)	\| History	\| Source
· /sources/gui/qml/components/MainMenu.qml	(-10, +78)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TextRect.qml	(-4, +11)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchArea.qml	(-16, +25)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Colors.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-3, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/SettingsHome.qml	(-0, +21)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentHome.qml	(-0, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentStack.qml	(-0, +12)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentStart.qml	(-40, +127)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Sat, 11 Jan 2020 19:04:00 -0800

Behrouz NematiPour committed 2f7a417 on branch master, 2020_EOY_DEMO and 274 more in application

DEN-1437 : Implementation

- TextRect : is actually a rectangle with title/ lable / extra lable whcih is going to be used in the Treatment screen (Blood/Dialysate Flows).

- TextArea : is a contaoner Rectangle with title. which is used in Treatment an contains TextTecs(s).

- BackgroundRect : is a simple rectangle which is used for a background rect to have colors and borders.

- Added required common constant values for Colors and Fonts and Values.

· /denali.qrc	(-0, +4)	\| History	\| Source	\| Diff
· /resources/images/ArrowRight.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/BackgroundRect.qml	(-0, +29)	\| History	\| Source
· /sources/gui/qml/components/TextRect.qml	(-0, +81)	\| History	\| Source
· /sources/gui/qml/components/TouchArea.qml	(-0, +81)	\| History	\| Source
· /sources/gui/qml/globals/Colors.qml	(-1, +7)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-3, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-1, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentStart (test).qml	(-0, +366)	\| History	\| Source
· /sources/gui/qml/pages/TreatmentStart.qml	(-293, +22)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Mon, 21 Oct 2019 20:44:32 -0700

Behrouz NematiPour committed 5194f3a on branch master, 2020_EOY_DEMO and 280 more in application

DEN-629 : Implementation

- Implementing components

- Added Copyright

- Restructured the code.

· /copyright

(-0, +13)

| History

| Source

· /denali.qrc

(-8, +12)

| History

| Source

| Diff

· /main.cpp

(-2, +17)

| History

| Source

| Diff

· /resources/images/Logo Diality 14314c .png

(binary)

| History

| Source

| Diff

· /resources/images/Logo Diality 1a344d .png

(binary)

| History

| Source

| Diff

· /resources/images/Logo Diality.png

(binary)

| History

| Source

· /resources/images/Logo d 14314c .png

(binary)

| History

| Source

| Diff

· /resources/images/Logo d 1a344d .png

(binary)

| History

| Source

| Diff

· /resources/images/Logo d.png

(binary)

| History

| Source

· /sources/applicationcontroller.cpp

(-0, +13)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-0, +13)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-0, +13)

| History

| Source

| Diff

· /sources/applicationpost.h

(-0, +13)

| History

| Source

| Diff

· /sources/canbus/canbus.cpp

(-0, +13)

| History

| Source

| Diff

· /sources/canbus/canbus.h

(-0, +13)

| History

| Source

| Diff

… 39 more files in changeset.

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

Behrouz NematiPour — Thu, 17 Oct 2019 02:09:37 -0700

Behrouz NematiPour committed 1188770 on branch master, 2020_EOY_DEMO and 280 more in application

DEN-629 : Implementation

- Implemented the Home screen as main widget

- Created Main Menu component

- Updated the Application structure

- Updated the Start/Create Treatment screens

- Created Diality Logo image cropping and resizing

· /denali.qrc

(-16, +17)

| History

| Source

| Diff

· /qtquickcontrols2.conf

(-2, +2)

| History

| Source

| Diff

· /resources/fonts/Barlow-Regular.ttf

(binary)

| History

| Source

· /resources/images/00-ELASTOFONT-STORE-READY_user-circle-128.png

(binary)

| History

| Source

| Diff

· /resources/images/Logo Diality 14314c .png

(binary)

| History

| Source

· /resources/images/Logo Diality 1a344d .png

(binary)

| History

| Source

· /resources/images/Logo d 14314c .png

(binary)

| History

| Source

· /resources/images/Logo d 1a344d .png

(binary)

| History

| Source

· /resources/images/Power_symbol-128.png

(binary)

| History

| Source

· /resources/images/Settings_gear_setting_tools-128.png

(binary)

| History

| Source

| Diff

· /resources/images/Streamline-18-128.png

(binary)

| History

| Source

| Diff

· /resources/images/Vegetables_Outline-03-128.png

(binary)

| History

| Source

| Diff

· /resources/images/brightness_high_business_building_sky-128.png

(binary)

| History

| Source

| Diff

· /resources/images/brightness_low_battery_sun_light-128.png

(binary)

| History

| Source

| Diff

· /resources/images/ic_format_list_bulleted_48px-128.png

(binary)

| History

| Source

| Diff

… 18 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Initial Commit

Behrouz NematiPour — Tue, 24 Sep 2019 16:08:00 -0700

Behrouz NematiPour committed 09e6b96 on branch master, 2020_EOY_DEMO and 280 more in application

Initial Commit

· /.gitignore

(-0, +1)

| History

| Source

· /denali.pro

(-0, +61)

| History

| Source

· /denali.qrc

(-0, +21)

| History

| Source

· /main.cpp

(-0, +47)

| History

| Source

· /qtquickcontrols2.conf

(-0, +2)

| History

| Source

· /resources/images/00-ELASTOFONT-STORE-READY_user-circle-128.png

(binary)

| History

| Source

· /resources/images/Settings_gear_setting_tools-128.png

(binary)

| History

| Source

· /resources/images/Streamline-18-128.png

(binary)

| History

| Source

· /resources/images/Vegetables_Outline-03-128.png

(binary)

| History

| Source

· /resources/images/brightness_high_business_building_sky-128.png

(binary)

| History

| Source

· /resources/images/brightness_low_battery_sun_light-128.png

(binary)

| History

| Source

· /resources/images/ic_format_list_bulleted_48px-128.png

(binary)

| History

| Source

· /resources/images/logo.png

(binary)

| History

| Source

· /sources/applicationcontroller.cpp

(-0, +48)

| History

| Source

· /sources/applicationcontroller.h

(-0, +40)

| History

| Source

… 26 more files in changeset.