application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -3
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressBarEx.qml
    • -8
    • +6
    /sources/gui/qml/components/TouchArea.qml
    • -1
    • +1
    /sources/view/vtreatmentadjustmentultrafiltration.h
    • -1
    • +6
    /sources/view/vtreatmentultrafiltration.cpp
DEN-3149 : Treatment Ultrafiltration Adjustment

- BackUp push:

- Message 19 : UF Vol. Change Response

- Incomplete.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +36
    /sources/canbus/messageinterpreter.cpp
    • -2
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -2
    • +4
    /sources/view/vtreatmentadjustmentultrafiltration.h
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

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

    • -1
    • +36
    /sources/canbus/messageinterpreter.cpp
  1. … 30 more files in changeset.
When displayed, the alarms description will show instead of the enum name and additional flags.

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

    • -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
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

    • 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
  1. … 8 more files in changeset.
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

    • -1
    • +1
    /sources/gui/qml/components/ProgressBar.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressBarEx.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
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

    • binary
    /resources/images/PauseGray.png
    • binary
    /resources/images/Resume.png
    • -2
    • +7
    /sources/gui/qml/components/ModalDialog.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
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

    • binary
    /resources/images/Back.png
    • binary
    /resources/images/Pause.png
    • -9
    • +33
    /sources/gui/qml/components/BackButton.qml
    • -0
    • +4
    /sources/gui/qml/globals/Variables.qml
Merge branch 'DEN-3024_TreatmentDurationAdjustment'

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

    • -4
    • +4
    /sources/canbus/messageacknowmodel.cpp
    • -4
    • +4
    /sources/canbus/messageinterpreter.cpp
  1. … 69 more files in changeset.
DEN-3024 : TreatmentDurationAdjustment

- Added Unit Testing

________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

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

    • -10
    • +17
    /sources/canbus/messageinterpreter.cpp
    • -12
    • +19
    /sources/gui/qml/components/Slider.qml
    • -2
    • +10
    /sources/gui/qml/components/TickMarks.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-3024_TreatmentDurationAdjustment

- cppCheck

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-3024_TreatmentDurationAdjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -21
    • +38
    /sources/gui/qml/components/TimeText.qml
DEN-3024_TreatmentDurationAdjustment

- Adding unit tests and coverage

- Modified the PROPERTY #define and separated from TRIGGERs

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +4
    /sources/canbus/messageacknowmodel.cpp
DEN-3024_TreatmentDurationAdjustment

- Changed the minor version of dev 9 =>0 since a release version of 9 has been added to the releases of the Denali project.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Merge branch 'master' into DEN-3024_TreatmentDurationAdjustment

DEN-3024_TreatmentDurationAdjustment

- Adding comment for command line arguments

- Updating Slider handler position in real-time when minimum/maximum changes

- Added another type of properties as a trigger to always trig the UI even the value is the same as before. And also removed the false/true of the end of each PROPERTY #define from all the view classes and updated the GUI's QML codes accordingly.

- Removed the Heparin cumulative Delivery.

-

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +10
    /sources/gui/qml/components/Slider.qml
    • -23
    • +24
    /sources/view/vtreatmentadjustmentsresponse.cpp
    • -12
    • +18
    /sources/view/vtreatmentadjustmentsresponse.h
  1. … 5 more files in changeset.
Fix the unit test fail on server.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Merge branch 'DEN-2795_UIHeparinBolus(UITreatmentScreenAssets)'

The first implementation of Treatment Duration Adjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -14
    • +19
    /sources/canbus/messageglobals.h
    • -12
    • +47
    /sources/canbus/messageinterpreter.cpp
  1. … 10 more files in changeset.
DEN-3024 : Treatment Duration Adjustment

- TreatmentAdjustmentDuration Screen ( Incomplete )

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +3
    /sources/gui/qml/components/Slider.qml
    • -3
    • +6
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
DEN-2795 : UI Heparin Bolus (UI Treatment Screen Assets)

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -4
    • +0
    /sources/gui/qml/components/TouchRect.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-2793 : Use Common Repository

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -5
    • +5
    /sources/canbus/messageinterpreter.cpp
DEN-2793 : Use Common Repository

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Modified Format::fromVariant

* \brief Format::fromVariant

* \details This static method converts the defined types into QByteArray

* \param vData - The value

* \return The QByteAttay of the value vData if can't be converted 0x00 will be returned

* \note Regarding the QVariant type conversion, if cannot be cionverted 0 will

be returned

* This rule has been used and also to be consistent followed the sae rule.

*/

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

UI-DEN-2087-1 : Code Review Comments

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

UI-DEN-2087-1 : Code Review Comments

- Modified the Format::fromVariant

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com