application

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
Last Commit: 20 Nov
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 04 Jun 2020
7:08 pm

Peter Lucia <plucia@diality.com>

Continuation of alarms.

Options
    • -1
    • +1
    /scripts/run.sh
    • -0
    • +1
    /sources/canbus/messageglobals.h
    • -3
    • +3
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +1
    /sources/gui/guiglobals.h
    • -0
    • +1
    /sources/gui/qml/components/NotificationBar.qml
    • -3
    • +5
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -2
    • +9
    /sources/gui/qml/globals/Colors.qml
    • -8
    • +58
    /sources/gui/qml/main.qml
    • -52
    • +52
    /sources/model/malarmstatus.cpp
    • -17
    • +5
    /sources/view/valarmstatus.cpp
    • -2
    • +3
    /sources/view/valarmstatus.h
6:48 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Revert back the Ultrafiltration rate to the mL.

- Added a QT_DEBUG define for the Ultrafiltration volume because usually we are not connected to the pump and measVol would return 0 but RefVol is the calculated vol and should always have a value.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -6
    • +7
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -0
    • +4
    /sources/view/vtreatmentultrafiltration.cpp
6:22 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Adding the last Ultrafiltration message transaction to confirm the values.

- Added the modification of the Ultrafiltration Volume unit change.

- Modified the components to support real/float variables to support Ultrafiltration volume with Liter as unit and 3 digit precision.

- So much refactoring

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +4
    /denali.pro
    • -2
    • +2
    /sources/applicationcontroller.cpp
    • -3
    • +3
    /sources/applicationcontroller.h
    • -5
    • +5
    /sources/canbus/messagedispatcher.cpp
    • -7
    • +7
    /sources/canbus/messagedispatcher.h
    • -3
    • +5
    /sources/canbus/messageglobals.h
    • -30
    • +57
    /sources/canbus/messageinterpreter.cpp
    • -4
    • +8
    /sources/canbus/messageinterpreter.h
    • -2
    • +2
    /sources/gui/guicontroller.h
    • -3
    • +6
    /sources/gui/guiglobals.h
    • -0
    • +3
    /sources/gui/qml/components/ProgressBar.qml
    • -1
    • +1
    /sources/gui/qml/components/ProgressBarEx.qml
    • -2
    • +6
    /sources/gui/qml/components/ProgressRect.qml
    • -1
    • +4
    /sources/gui/qml/components/RangeBar.qml
    • -2
    • +3
    /sources/gui/qml/components/RangeMarker.qml
  16. … 27 more files in changeset.
Tuesday 02 Jun 2020
11:23 am

Peter Lucia <plucia@diality.com>

Added Notification Dialog

Options
    • -0
    • +111
    /sources/gui/qml/dialogs/NotificationDialog.qml
11:22 am

Peter Lucia <plucia@diality.com>

Added alarm svg

Options
    • -0
    • +1
    /resources/images/alarm.svg
11:22 am

Peter Lucia <plucia@diality.com>

Cleaned up main.qml

Options
    • -10
    • +2
    /sources/gui/qml/main.qml
11:16 am

Peter Lucia <plucia@diality.com>

Added Notification Dialog for Alarms and support for alarm dismiss actions by the user.

Options
    • -1
    • +1
    /denali.pro
    • -0
    • +2
    /denali.qrc
    • -4
    • +4
    /main.cpp
    • -3
    • +7
    /sources/gui/qml/components/ModalDialog.qml
    • -20
    • +4
    /sources/gui/qml/components/NotificationBar.qml
    • -2
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +3
    /sources/gui/qml/globals/Colors.qml
    • -0
    • +1
    /sources/gui/qml/globals/Fonts.qml
    • -0
    • +4
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +55
    /sources/gui/qml/main.qml
    • -1
    • +31
    /sources/view/valarmstatus.cpp
    • -0
    • +6
    /sources/view/valarmstatus.h
Monday 01 Jun 2020
7:31 pm

Behrouz NematiPour

DEN-3154 : Implementation [ Messaging ]

- Added the Ultrafiltration Adjustment Confirm Request

- Improved the MVC and some twicks in qml.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +4
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -59
    • +10
    /sources/applicationcontroller.cpp
    • -6
    • +10
    /sources/applicationcontroller.h
    • -0
    • +80
    /sources/canbus/messagedispatcher.cpp
    • -0
    • +14
    /sources/canbus/messagedispatcher.h
    • -0
    • +2
    /sources/canbus/messageglobals.h
    • -2
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -13
    • +10
    /sources/gui/guicontroller.h
    • -0
    • +2
    /sources/gui/guiglobals.cpp
    • -0
    • +3
    /sources/gui/guiglobals.h
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -2
    • +4
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -1
    • +1
    /sources/gui/qml/globals/Colors.qml
    • -0
    • +2
    /sources/gui/qml/main.qml
  16. … 7 more files in changeset.
Sunday 31 May 2020
6:42 pm

Behrouz NematiPour

Merge branch 'DEN-2795_UIHeparinBolus(UITreatmentScreenAssets)'

Options
    • -17
    • +17
    /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
6:36 pm

Behrouz NematiPour

DEN-3528 : The Ultrafiltration Unit shall be changed to Liter(L) form (mL)

- The Ultrafiltration Unit on the In-Treatment Screen has been changed to Liter (L)

- The simulation of the fluid has been removed.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -17
    • +17
    /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
Friday 29 May 2020
7:23 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Updated the MVC/Messaging with the updated Ultrafiltration Adjustment message.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +0
    /sources/canbus/messageinterpreter.h
    • -6
    • +6
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -4
    • +5
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationresponse.cpp
    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationresponse.h
    • -1
    • +1
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -2
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.h
Thursday 28 May 2020
8:42 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +2
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -20
    • +26
    /sources/applicationcontroller.cpp
    • -5
    • +4
    /sources/applicationcontroller.h
    • -0
    • +1
    /sources/canbus/messageglobals.h
    • -3
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -23
    • +9
    /sources/gui/guicontroller.h
    • -4
    • +0
    /sources/gui/guiglobals.h
    • -1
    • +5
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -1
    • +3
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -4
    • +6
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -63
    • +103
    /sources/model/mmodel.h
    • -2
    • +8
    /sources/model/mtreatmentadjustultrafiltrationresponse.cpp
    • -0
    • +2
    /sources/model/mtreatmentadjustultrafiltrationresponse.h
    • -0
    • +38
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp
  16. … 11 more files in changeset.
11:28 am

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Treatment Ultrafiltration Edit => Confirm Screen.

- Added Error notification for the ultrafiltration state/adjustment response on related dialogs.

- Modified the Image/Wave/Clock to have the positioning out of the component.

- Added/Separated the pause notification on the Treatment Adjustment Base Component so the code handling would be easier to handle the pause notification and the error message handling on the dialog.

- Added overloaded text method for the ultrafiltration state although it has no rejection reason.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +8
    /Todos
    • -0
    • +3
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -5
    • +0
    /sources/gui/qml/components/ImageClock.qml
    • -6
    • +0
    /sources/gui/qml/components/ImageWave.qml
    • -3
    • +32
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -0
    • +1
    /sources/gui/qml/globals/Colors.qml
    • -4
    • +18
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +7
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -10
    • +23
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -9
    • +7
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +3
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -1
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
    • -1
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
  16. … 4 more files in changeset.
Tuesday 26 May 2020
8:31 pm

Behrouz NematiPour

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

Options
    • -1
    • +1
    /denali.pro.user
    • -2
    • +1
    /sources/canbus/messagedispatcher.cpp
    • -3
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressBarEx.qml
    • -8
    • +6
    /sources/gui/qml/components/TouchArea.qml
    • -0
    • +1
    /sources/gui/qml/globals/Fonts.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
    • -8
    • +18
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -6
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -6
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -22
    • +12
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -1
    • +1
    /sources/model/mmodel.h
    • -1
    • +1
    /sources/view/vtreatmentadjustmentultrafiltration.h
    • -1
    • +6
    /sources/view/vtreatmentultrafiltration.cpp
Thursday 21 May 2020
10:57 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- BackUp push:

- Message 19 : UF Vol. Change Response

- Incomplete.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -0
    • +10
    /sources/applicationcontroller.cpp
    • -0
    • +1
    /sources/applicationcontroller.h
    • -1
    • +4
    /sources/canbus/messagedispatcher.cpp
    • -1
    • +2
    /sources/canbus/messagedispatcher.h
    • -0
    • +4
    /sources/canbus/messageglobals.h
    • -0
    • +36
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +3
    /sources/canbus/messageinterpreter.h
    • -0
    • +7
    /sources/gui/guicontroller.h
    • -0
    • +2
    /sources/gui/guiglobals.h
    • -2
    • +18
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -15
    • +21
    /sources/model/mmodel.h
    • -2
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -2
    • +4
    /sources/view/vtreatmentadjustmentultrafiltration.h
5:31 pm

Peter Lucia <plucia@diality.com>

Returning an empty string when there is no alarm so qml doesn't show any alarm. Updated doxygen comments, made toText static, and using the Gui namespace instead of including AlarmDefs.h

Options
    • -58
    • +56
    /sources/model/malarmstatus.cpp
    • -1
    • +5
    /sources/model/malarmstatus.h
    • -16
    • +5
    /sources/view/valarmstatus.cpp
4:25 pm

Behrouz NematiPour

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

Options
    • -0
    • +8
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -8
    • +18
    /sources/applicationcontroller.cpp
    • -4
    • +6
    /sources/applicationcontroller.h
    • -2
    • +2
    /sources/canbus/messagedispatcher.cpp
    • -0
    • +1
    /sources/canbus/messagedispatcher.h
    • -0
    • +3
    /sources/canbus/messageglobals.h
    • -1
    • +36
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +3
    /sources/canbus/messageinterpreter.h
    • -10
    • +0
    /sources/gui/guicontroller.cpp
    • -4
    • +13
    /sources/gui/guicontroller.h
    • -0
    • +2
    /sources/gui/guiglobals.cpp
    • -1
    • +12
    /sources/gui/guiglobals.h
    • -8
    • +0
    /sources/gui/guiview.cpp
    • -13
    • +0
    /sources/gui/guiview.h
  16. … 30 more files in changeset.
12:10 pm

Peter Lucia <plucia@diality.com>

When displayed, the alarms description will show instead of the enum name and additional flags.

Options
    • -0
    • +3
    /.gitignore
    • -1338
    • +0
    /denali.pro.user
    • -2
    • +2
    /scripts/run.sh
    • -1
    • +69
    /sources/model/malarmstatus.cpp
    • -2
    • +1
    /sources/model/malarmstatus.h
    • -17
    • +8
    /sources/view/valarmstatus.cpp
Tuesday 19 May 2020
2:09 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Separeted VTreatmentAdjustmentsResponse into 3 classes and used this class as parent of the two others and this class keeps the Accepted Boolean and the rejection reason.

- The other two keep the actual logic of the Adjustment values/properties.

- Moved the View includes from VView.h into the guiglobals.cpp since when including the vview.h the definition guard didn't let the inheritance work.

- Removed the VTreatmentAdjustmentsResponce from the list of the registered views into QML.

- made the TRIGGER_SLOT and PROPERTY_SLOT as protected so the children can use them.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +4
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -1
    • +12
    /sources/gui/guiglobals.cpp
    • -27
    • +34
    /sources/gui/qml/main.qml
    • -4
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
    • -5
    • +5
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
    • -7
    • +10
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -0
    • +2
    /sources/main.h
    • -0
    • +31
    /sources/view/vtreatmentadjustmentduration.cpp
    • -0
    • +44
    /sources/view/vtreatmentadjustmentduration.h
    • -0
    • +32
    /sources/view/vtreatmentadjustmentflows.cpp
    • -0
    • +44
    /sources/view/vtreatmentadjustmentflows.h
    • -27
    • +6
    /sources/view/vtreatmentadjustmentsresponse.cpp
    • -18
    • +1
    /sources/view/vtreatmentadjustmentsresponse.h
    • -16
    • +17
    /sources/view/vview.h
Monday 18 May 2020
3:19 pm

Behrouz NematiPour

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

Options
    • -1
    • +1
    /denali.pro.user
    • -1
    • +10
    /denali.qrc
    • binary
    /resources/images/Clock-Minus.png
    • binary
    /resources/images/Clock-Plus.png
    • binary
    /resources/images/Wave-Minus.png
    • binary
    /resources/images/Wave-Plus.png
    • -0
    • +46
    /sources/gui/qml/components/ImageClock.qml
    • -0
    • +39
    /sources/gui/qml/components/ImageLogoD.qml
    • -0
    • +35
    /sources/gui/qml/components/ImageLogoDDarkTransparent.qml
    • -0
    • +47
    /sources/gui/qml/components/ImageWave.qml
    • -38
    • +0
    /sources/gui/qml/components/LogoD.qml
    • -4
    • +1
    /sources/gui/qml/components/MainMenu.qml
    • -8
    • +10
    /sources/gui/qml/components/ProgressBar.qml
    • -2
    • +2
    /sources/gui/qml/components/Slider.qml
    • -0
    • +2
    /sources/gui/qml/components/TouchRect.qml
  16. … 8 more files in changeset.
Friday 15 May 2020
12:46 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added TreatmentAdjustmentUltrafiltrationEdit.qml

- Updated the z order in ProgressEx

- Added the Ultrafiltration Edit screen navigation

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +1
    /denali.qrc
    • -1
    • +1
    /sources/gui/qml/components/ProgressBar.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressBarEx.qml
    • -0
    • +8
    /sources/gui/qml/globals/Fonts.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +12
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +91
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
Thursday 14 May 2020
12:33 pm

Behrouz NematiPour

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

Options
    • -2
    • +2
    /denali.pro.user
    • -0
    • +3
    /denali.qrc
    • binary
    /resources/images/PauseGray.png
    • binary
    /resources/images/Resume.png
    • -2
    • +7
    /sources/gui/qml/components/ModalDialog.qml
    • -8
    • +18
    /sources/gui/qml/components/NotificationBar.qml
    • -6
    • +8
    /sources/gui/qml/components/ProgressBar.qml
    • -0
    • +3
    /sources/gui/qml/components/ProgressBarEx.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -3
    • +3
    /sources/gui/qml/main.qml
    • -0
    • +17
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
    • -0
    • +113
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -3
    • +4
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -1
    • +0
    /sources/model/mpoweroff.cpp
Tuesday 12 May 2020
12:31 pm

Behrouz NematiPour

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

Options
    • -0
    • +2
    /denali.pro
    • -0
    • +3
    /denali.qrc
    • -16
    • +30
    /main.cpp
    • binary
    /resources/images/Back.png
    • binary
    /resources/images/Pause.png
    • -9
    • +33
    /sources/gui/qml/components/BackButton.qml
    • -0
    • +1
    /sources/gui/qml/globals/Fonts.qml
    • -0
    • +4
    /sources/gui/qml/globals/Variables.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/TreatmentCreate.qml
    • -4
    • +11
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -9
    • +9
    /sources/gui/qml/pages/treatment/TreatmentStart.qml
    • -3
    • +15
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -0
    • +98
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -15
    • +15
    /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
    • -10
    • +15
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
Monday 11 May 2020
11:48 am

Behrouz NematiPour

Merge branch 'DEN-3024_TreatmentDurationAdjustment'

Options
Thursday 07 May 2020
3:54 am

Behrouz NematiPour

DEN-3164 : Code Review 0

- Corrected the copyright comment Doxygen tags.

- Corrected the copyright template Doxygen tags.

- Added check for fall through in switch statements to project.

- Added method comments in tst_messaging, unit test class.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -4
    • +4
    /copyright
    • -1
    • +1
    /denali.pro
    • -3
    • +3
    /sources/canbus/caninterface.cpp
    • -4
    • +4
    /sources/canbus/frameinterface.cpp
    • -4
    • +4
    /sources/canbus/frameinterface.h
    • -4
    • +4
    /sources/canbus/messageacknowmodel.cpp
    • -4
    • +4
    /sources/canbus/messageacknowmodel.h
    • -4
    • +4
    /sources/canbus/messagebuilder.cpp
    • -4
    • +4
    /sources/canbus/messagebuilder.h
    • -4
    • +4
    /sources/canbus/messagedispatcher.cpp
    • -4
    • +4
    /sources/canbus/messagedispatcher.h
    • -4
    • +4
    /sources/canbus/messageglobals.h
    • -4
    • +4
    /sources/canbus/messageinterpreter.cpp
    • -4
    • +4
    /sources/canbus/messageinterpreter.h
    • -4
    • +4
    /sources/gui/guiglobals.cpp
  16. … 69 more files in changeset.
Tuesday 05 May 2020
9:07 pm

Behrouz NematiPour

DEN-3024 : TreatmentDurationAdjustment

- Added Unit Testing

________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +16
    /unittests/tst_logging.cpp
    • -0
    • +2
    /unittests/tst_logging.h
5:01 pm

Behrouz NematiPour

DEN-3024 : TreatmentDurationAdjustment

- Registered TreatmentState as an unhandled message.

- Modified duration resolution regarding the PRS346 to 15

- Added stepSnap (snap to step marks) to Slider/TickMarks to support the slider values of the Treatment Duration.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -10
    • +17
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +2
    /sources/gui/guiglobals.h
    • -12
    • +19
    /sources/gui/qml/components/Slider.qml
    • -2
    • +10
    /sources/gui/qml/components/TickMarks.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
Friday 01 May 2020
10:41 pm

Behrouz NematiPour

DEN-3024_TreatmentDurationAdjustment

- cppCheck

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -41
    • +46
    /cppcheck.log
10:37 pm

Behrouz NematiPour

DEN-3024_TreatmentDurationAdjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -21
    • +38
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +19
    /unittests/tst_acknow.cpp
    • -0
    • +2
    /unittests/tst_acknow.h
5:59 pm

Behrouz NematiPour

DEN-3024_TreatmentDurationAdjustment

- Adding unit tests and coverage

- Modified the PROPERTY #define and separated from TRIGGERs

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +4
    /sources/canbus/messageacknowmodel.cpp
    • -3
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -27
    • +36
    /sources/main.h
    • -0
    • +15
    /unittests/tst_acknow.cpp
    • -0
    • +2
    /unittests/tst_acknow.h
    • -0
    • +28
    /unittests/tst_messaging.cpp
    • -0
    • +4
    /unittests/tst_messaging.h
    • -0
    • +50
    /unittests/tst_models.cpp
    • -0
    • +3
    /unittests/tst_models.h