sources

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14909-UI-VD-S92-QS-Sliders' into staging

    • -3
    • +18
    ./gui/qml/components/RangeSlider.qml
Merge branch 'DEN-14909-UI-VD-S92-QS-Arrows' into staging

  1. … 2 more files in changeset.
DEN-14912 Quick Start- Sliders - Change default bool value for rounding rangeSlider to true based on CR comment

DEN-14912 Quick Start : Sliders - Remove Component and Loaders from TickMarks and changed to Rectangle - Made additional fixes based on CR comments

    • -68
    • +24
    ./gui/qml/components/TickMarks.qml
DEN-14912 Quick Start: Arrows - Bind visibility of the slider to the switch's check status

DEN-14912 Quick Start: Arrows - Additional changes based on Behrouz's feedback

  1. … 2 more files in changeset.
DEN-13152 : Flow Rate Settings Display "--" or "0" When Treatment is Paused

- Messages 0x0500 and 0x0800 has been updated and the Prescribed Flow Rate is being used.

- The diagnostics screen updated.

- The treatment main screen updated.

- The treatment flow adjustment screen updated.

- the Flows on the commit has 10f39b63ce8a992280ab123f05a5eb44a27c121b has been separated which has to be reverted back since these two messages almost all the time have the same payloads.

    • -0
    • +6
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +1
    ./view/hd/data/treatment/VTreatmentBloodFlow.h
DEN-14640 : Change Request: BP Set Flow Rate Shown during Blood Prime/Rinseback

- Added the message 0x0500#P1

|0x0500| 5 |0x040 |1 Hz |N |HD |All |Blood Flow Data Flow Set Pt (S32)|

regarding our conversation with @Sean.

DEN-14912 Quick Start - Arrows - Modify code based on feedback from Behrouz -- take out the CircleButton and make use of TouchRect -- Add left and right arrow images

    • -62
    • +0
    ./gui/qml/components/CircleButton.qml
    • -0
    • +99
    ./gui/qml/components/SliderArrows.qml
  1. … 3 more files in changeset.
DEN-14912: Quick Start - Arrows - Update logic to increment/decrement on button press

DEN-14912: Quick Start - Arrows - Add implementation for value increment/decrement buttons

    • -0
    • +62
    ./gui/qml/components/CircleButton.qml
  1. … 1 more file in changeset.
DEN-14912 Quick Start : Sliders - Refinement of the rangeSlider's look for quick start

    • -3
    • +10
    ./gui/qml/components/RangeSlider.qml
DEN-14912: Quick Start Sliders -Improvement to the rangeSlider's look and feel for quick start

    • -3
    • +10
    ./gui/qml/components/RangeSlider.qml
DEN-14912: Quick Start - Sliders - Improvements to the sliders look and feel for the quick start

    • -18
    • +72
    ./gui/qml/components/TickMarks.qml
DEN-13971 Adjust handle behavior on first drag

DEN-14838 Revert PretreatmentCreate file again due to miscommit

DEN-13971 Remove unused/commented out code

DEN-14838 Revert changes from QuickStart WIP

DEN-13971 Refinement to activation of slider handle and value setting

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
DEN-14838 Remove debugging printout

DEN-14838 CR Comment changes

DEN-5281 Fix NaN value shown on click without value selection; Moving slider behavior; centering of min/max labels

DEN-13781 Fix text padding when a label overlap occurs

DEN-14876 Add code to prevent jumping of min/max handles on click without selection

    • -12
    • +22
    ./gui/qml/components/RangeSlider.qml
DEN-14838 Revert PreTreatmentCreate.qml file changes

DEN-13975 Add code to prevent moving of handle without user drag

    • -25
    • +40
    ./gui/qml/components/RangeSlider.qml