application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -10
    • +35
    /sources/model/dg/data/MDGConductivityData.h
    • -0
    • +8
    /sources/view/dg/data/VDGConductivityData.h
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

- Added the Dialysis subState to TreatmentStates, message 0x0F

DEN-14853 UI Out Of Sync With Firmware On Handled Messages

- MSG_ID 0x0B

- Added the keepAlive/UI-CheckIn to the list of AckRequired so if HD won't ack UI, the Alarm, "HD Communication Failure" will be displayed.

DEN-14955 TXCreateRejection - Add property *Accepted to handle validation status from FW - Add label color logic to rangeSlider for invalid parameter - Add setting of valid/accepted states in VTreatmentCreate on response handling

    • -6
    • +24
    /sources/gui/qml/components/RangeSlider.qml
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-14955 Quick Start - Pre Tx Screen - Remove debug value set for value of ultrafiltration slider max

DEN-14955 Quick Start - PreTx Screen - Add SliderArrows to the pre treatment ultrafiltration screen - correct coloring of rangeSlider tick colors for inactive / active state - Add bool property to Slider to enable centering of tickMarks on the slider - Correct the placement of tickmarks for center on rangeSlider

    • -4
    • +4
    /sources/gui/qml/components/RangeSlider.qml
    • -21
    • +32
    /sources/gui/qml/components/Slider.qml
DEN-14955 Quick Start - Arrows - Add a enable property to enable pressAndHold signaling for arrows

    • -4
    • +10
    /sources/gui/qml/components/SliderArrows.qml
DEN-14955 Quick Start Sliders - Fix slider to show initial value property set - Add visibility logic to show only one text tag of min/max when they are the same

    • -1
    • +1
    /sources/gui/qml/components/RangeBar.qml
    • -2
    • +2
    /sources/gui/qml/components/Slider.qml
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -32
    • +0
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -25
    • +0
    /sources/model/hd/data/MHDBloodLeakData.h
    • -8
    • +0
    /sources/view/hd/data/VHDBloodLeakData.cpp
  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -2
    • +2
    /sources/gui/qml/components/ConfirmButton.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressRect.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeRect.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeSlider.qml
    • -2
    • +2
    /sources/gui/qml/components/ScrollBar.qml
    • -2
    • +2
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/gui/qml/components/SliderArrows.qml
    • -2
    • +2
    /sources/gui/qml/components/TextRect.qml
    • -1
    • +1
    /sources/gui/qml/components/TickMarks.qml
    • -2
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
  1. … 12 more files in changeset.
Merge branch 'DEN-14937-UI-VD-S93' into staging

DEN-14955 Quick Start - Arrows - Re-instate the press and hold automatic increment/decrement of the sliderArrows

    • -31
    • +23
    /sources/gui/qml/components/SliderArrows.qml
    • -0
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
Merge branch 'DEN-14937-UI-VD-S93' of ssh://dvm-linux02:7999/ui/application into DEN-14937-UI-VD-S93

    • -4
    • +22
    /sources/gui/qml/components/RangeSlider.qml
DEN-14955 Quick Start Arrows - Fix Arrow +/- to follow non-arrow control logic for RangeSlider - Fix missed removed _private object in Slider

    • -2
    • +16
    /sources/gui/qml/components/RangeSlider.qml
    • -3
    • +3
    /sources/gui/qml/components/Slider.qml
DEN-14955 Quick Start - sliders - Clean up of code to remove displayedValue and also the valueUpdateComplete signal

    • -36
    • +29
    /sources/gui/qml/components/Slider.qml
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14866-UI-BN-S92-3' into staging

DEN-14955 Quick Start Sliders

- RangeSliders : Added an if block in case for the first time (not adjusted yet) the value is not changed (still on def value), to force the valueChanged emit.

- Fixed the PreTreatmentConfirm display value for the Blood Pressure interval OFF state.

    • -4
    • +22
    /sources/gui/qml/components/RangeSlider.qml
DEN-14955 Quick Start Sliders - Re-add back the negating of the check state

DEN-14955 Quick Start Sliders - Correct label for switch state on slider

DEN-14955 Quick Start Sliders - Add signal to set values when using arrows

    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-14955 Quick Start - Sliders - Update placement and color of the range slider of pressure screen

    • -2
    • +3
    /sources/gui/qml/components/RangeSlider.qml
DEN-14955 Quick Start - Sliders - Add arrows to rangeSliders for pressure screen

    • -2
    • +47
    /sources/gui/qml/components/RangeSlider.qml
    • -0
    • +2
    /sources/gui/qml/components/TextRect.qml
DEN-14955 Quick Start - Sliders - Correct slider handle sizing inconsistency between range and single sliders - Add property to set tickmark location to slider

    • -9
    • +17
    /sources/gui/qml/components/RangeSlider.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
DEN-14955 Quick Start - Sliders - Correct switch and slider active state - Correct the spelling of a color variable

    • -6
    • +8
    /sources/gui/qml/components/Slider.qml
DEN-14955 Quick Start - Sliders - Remove UF slider's dark background - Update Flow slider behavior to be active when arrow changes value - Change look of InTx Pressure sliders to be rounded

    • -1
    • +1
    /sources/gui/qml/components/RangeSlider.qml
    • -9
    • +12
    /sources/gui/qml/components/Slider.qml