Fisheye on application/sources/gui/qml/components/TouchArea.qml

application (release/stagingmerge-DEN-16786-ui-dn-s119): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 09 Oct 2023 15:33:06 -0700

Dara Navaei committed 1a9eb27 on branch master, @Environement_Swith and 88 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /sources/canbus/MessageInterpreter.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/SliderCreateTreatment.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchArea.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDecommission.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/storage/Logger.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16256: Updated - UI.P1B : Display UF Rate...

Behrouz NematiPour — Tue, 26 Sep 2023 10:21:43 -0700

Behrouz NematiPour committed c6e2812 on branch master, @Environement_Swith and 88 more in application

DEN-16256: Updated - UI.P1B : Display UF Rate

- minor clean up, layout fix and typo fixes

· /sources/gui/qml/components/TouchArea.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-4, +6)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 04 Jan 2023 16:48:39 -0800

Dara Navaei committed c9f8f8c on branch master, @Environement_Swith and 181 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /cppcheck.sh

(-2, +2)

| History

| Source

| Diff

· /cr_objectives.sh

(-1, +1)

| History

| Source

| Diff

· /imake.sh

(-1, +1)

| History

| Source

| Diff

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /remove-exra-emptylines.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/autostart

(-2, +2)

| History

| Source

| Diff

· /scripts/bluetooth_paired_clear.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/bluetooth_paired_query.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/brightness_get.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/brightness_set.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/date_time_set.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/export_logs.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/globals.sh

(-3, +4)

| History

| Source

| Diff

· /scripts/run.sh

(-3, +3)

| History

| Source

| Diff

… 594 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 16 Feb 2022 10:10:27 -0800

Dara Navaei committed 27cc308 on branch master, @Environement_Swith and 200 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-7, +6)

| History

| Source

| Diff

· /cppcheck.sh

(-6, +6)

| History

| Source

| Diff

· /cr_objectives.sh

(-0, +15)

| History

| Source

| Diff

· /main.cpp

(-6, +6)

| History

| Source

| Diff

· /remove-exra-emptylines.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/autostart

(-6, +6)

| History

| Source

| Diff

· /scripts/bluetooth_paired_clear.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/bluetooth_paired_query.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/brightness_get.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/brightness_set.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/date_time_set.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/export_logs.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/run.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/setup.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/start.sh

(-6, +6)

| History

| Source

| Diff

… 570 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-7374: preTx: Implementation [Component][Instruction section type 1] ( 1 )...

Behrouz NematiPour — Fri, 12 Mar 2021 13:39:40 -0800

Behrouz NematiPour committed fa1b7c7 on branch master, @Environement_Swith and 224 more in application

DEN-7374: preTx: Implementation [Component][Instruction section type 1] ( 1 )

- The first draft Implementation

· /denali.qrc	(-1, +2)	\| History	\| Source	\| Diff
· /resources/images/ArrowLeft.png	(binary)	\| History	\| Source
· /sources/gui/qml/components/SettingsItem.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/StepBullet.qml	(-4, +7)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/StepIndicator.qml	(-9, +15)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchArea.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/sample/PreTreatmentWaterSample.qml	(-2, +116)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-5339: Integration Testing...

Behrouz NematiPour — Mon, 26 Oct 2020 05:21:47 -0700

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

DEN-5339: Integration Testing

- Debugging, Refactoring, Testing

· /denali.pro.user

(-15, +15)

| History

| Source

| Diff

· /en_US.udic

(-0, +5)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-6, +7)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-0, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-18, +13)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-1, +3)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

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

(-8, +8)

| History

| Source

| Diff

· /sources/gui/qml/components/NotificationBarSmall.qml

(-1, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/TouchArea.qml

(-1, +2)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-6, +0)

| History

| Source

| Diff

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

(-20, +24)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-3, +4)

| History

| Source

| Diff

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

(-3, +5)

| History

| Source

| Diff

… 19 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

Dara Navaei — Mon, 31 Aug 2020 14:05:55 -0700

Dara Navaei committed 56e378f on branch master, 2020_EOY_DEMO and 253 more in application

Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

· /main.cpp

(-2, +2)

| History

| Source

| Diff

· /scripts/autostart

(-9, +12)

| History

| Source

| Diff

· /scripts/copy.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/run.sh

(-3, +3)

| History

| Source

| Diff

· /scripts/setup.sh

(-1, +1)

| History

| Source

| Diff

· /sources/abstract/singleton.h

(-3, +3)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-2, +2)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.h

(-3, +3)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/frameinterface.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/frameinterface.h

(-3, +3)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.cpp

(-4, +4)

| History

| Source

| Diff

… 242 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Updated the Copyright with the current year and replaced tabs with 4 spaces

Dara Navaei — Tue, 07 Jul 2020 12:22:46 -0700

Dara Navaei committed 44a85c9 on branch master, 2020_EOY_DEMO and 258 more in application

Updated the Copyright with the current year and replaced tabs with 4 spaces

· /cppcheck.sh

(-0, +15)

| History

| Source

| Diff

· /main.cpp

(-10, +11)

| History

| Source

| Diff

· /scripts/copy.sh

(-11, +13)

| History

| Source

| Diff

· /scripts/run.sh

(-12, +13)

| History

| Source

| Diff

· /scripts/setup.sh

(-10, +12)

| History

| Source

| Diff

· /sources/abstract/singleton.h

(-10, +11)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-10, +11)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-10, +11)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-10, +11)

| History

| Source

| Diff

· /sources/applicationpost.h

(-10, +11)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-13, +14)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-13, +14)

| History

| Source

| Diff

· /sources/canbus/frameinterface.cpp

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/frameinterface.h

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.cpp

(-9, +10)

| History

| Source

| Diff

… 184 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Updates to support unit testing

Thu, 25 Jun 2020 17:55:30 -0700

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

Updates to support unit testing

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /denali.qrc	(-1, +1)	\| History	\| Source	\| Diff
· /main.cpp	(-0, +7)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBar2.qml	(-83, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBarSmall.qml	(-0, +83)	\| History	\| Source
· /sources/gui/qml/components/TouchArea.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/SettingsHome.qml	(-2, +5)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/main.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/view/valarmstatus.cpp	(-0, +5)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Merged master into UI Alarms.

Thu, 25 Jun 2020 09:22:39 -0700

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

Merged master into UI Alarms.

· /denali.pro

(-2, +33)

| History

| Source

| Diff

· /denali.pro.user

(-106, +270)

| History

| Source

| Diff

· /denali.qrc

(-1, +18)

| History

| Source

| Diff

· /main.cpp

(-18, +33)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-34, +2)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-8, +9)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-4, +80)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-4, +10)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-0, +15)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-20, +225)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-10, +2)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-13, +3)

| History

| Source

| Diff

· /sources/gui/guiglobals.h

(-1, +18)

| History

| Source

| Diff

· /sources/gui/guiview.h

(-13, +0)

| History

| Source

| Diff

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

(-1, +6)

| History

| Source

| Diff

… 11 more files in changeset.

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

Behrouz NematiPour — Tue, 26 May 2020 20:31:26 -0700

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

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added selected Ultrafiltration Volume value label in the Ultrafiltration Edit dialog

- Changed notification object exposure logic in TouchArea and ModalDialog.

- Used measuredVolume but passed refVol in C++ to make one place changed,.

- Changed connection call to property binding for the TreatmentUltrafiltration section pause notification.

- Changed the MAdjustUltrafiltrationReq model from U32(quint32) to F32(float).

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/messagedispatcher.cpp	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ModalDialog.qml	(-3, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ProgressBarEx.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchArea.qml	(-8, +6)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(-8, +18)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml	(-6, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(-6, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-22, +12)	\| History	\| Source	\| Diff
· /sources/model/mmodel.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentadjustmentultrafiltration.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentultrafiltration.cpp	(-1, +6)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Thu, 21 May 2020 16:25:03 -0700

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

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added :

. Treatment Adjustment Ultrafiltration Response Model (mtreatmentadjustultrafiltrationresponse)

. Treatment Adjustment Ultrafiltration Response View (vtreatmentadjustmentultrafiltration)

. Treatment Ultrafiltration State Change Request Model (mtreatmentultrafiltrationstate)

. Treatment Ultrafiltration State Change Request View (vtreatmentultrafiltrationstate)

- Added Ultrafiltration Pause / Resume Messaging

- Modified NotificationBar to be able to use it in the Ultrafiltration Section when Ultrafiltration is paused.

- Modified TouchArea to make the TreatmentStart Screen clean. (Removed the Component List logic and layered out the components manually since each section is different and can't apply one rule for all)

- Updated the Ultrafiltration navigation stack regarding the MVC/Messaging responses.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.pro

(-0, +8)

| History

| Source

| Diff

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-8, +18)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-4, +6)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-0, +1)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-0, +3)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-1, +36)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.h

(-0, +3)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-10, +0)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-4, +13)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-0, +2)

| History

| Source

| Diff

· /sources/gui/guiglobals.h

(-1, +12)

| History

| Source

| Diff

· /sources/gui/guiview.cpp

(-8, +0)

| History

| Source

| Diff

· /sources/gui/guiview.h

(-13, +0)

| History

| Source

| Diff

… 30 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-2236_UI100%CoverageoftheApplicationSoftware...

Behrouz NematiPour — Wed, 08 Apr 2020 12:21:08 -0700

Behrouz NematiPour committed ae97f70 on branch master, 2020_EOY_DEMO and 266 more in application

DEN-2236_UI100%CoverageoftheApplicationSoftware

- tst_utilities and tst_logging are now 100% covered.

- Changed the TouchRect parent from Item to Rectangle to be identified by Squish Qt as an object on its parent.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /sources/gui/qml/components/TouchArea.qml	(-1, +2)	\| History	\| Source	\| Diff
· /sources/storage/logger.cpp	(-7, +20)	\| History	\| Source	\| Diff
· /sources/utility/format.cpp	(-22, +5)	\| History	\| Source	\| Diff
· /sources/utility/types.h	(-2, +2)	\| History	\| Source	\| Diff
· /unittests/tst_logging.cpp	(-5, +29)	\| History	\| Source	\| Diff
· /unittests/tst_logging.h	(-0, +4)	\| History	\| Source	\| Diff
· /unittests/tst_utilities.cpp	(-0, +121)	\| History	\| Source	\| Diff
· /unittests/tst_utilities.h	(-0, +11)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment...

Behrouz NematiPour — Fri, 27 Mar 2020 03:25:57 -0700

Behrouz NematiPour committed 7edbf10 on branch master, 2020_EOY_DEMO and 268 more in application

DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- Modified mL => mL/min for Blood/Dialysate Flow Unit

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /sources/gui/qml/components/TextRect.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchArea.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchRect.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(-2, +7)	\| History	\| Source	\| Diff
· /sources/main.h	(-2, +6)	\| History	\| Source	\| Diff
· /sources/model/mtreatmentflows.h	(-0, +6)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Sun, 22 Mar 2020 17:22:12 -0700

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

DEN-2087_BloodDialysateFlowAdjustment

- Added TreatmentAdjustmentBase as the base screen for all the Treatment Adjustment screens.

- Removing unnecessary imports

- Added TickMarks component for Slider (ranges).

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.qrc

(-1, +3)

| History

| Source

| Diff

· /sources/gui/qml/components/BackButton.qml

(-1, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/Circle.qml

(-1, +0)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/PlaceHolderText.qml

(-1, +0)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/RangeBar.qml

(-1, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/RangeMarker.qml

(-1, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/ScreenItem.qml

(-1, +0)

| History

| Source

| Diff

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

(-15, +24)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/components/TextRect.qml

(-1, +0)

| History

| Source

| Diff

… 27 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