application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
CR: Addressing Code Review comment UI-DEN-14936-1#c16985

http://devapps.diality.us:8060/cru/UI-DEN-14936-1#c16985

CR: Addressing Code Review comment UI-DEN-14936-1#c16983

http://devapps.diality.us:8060/cru/UI-DEN-14936-1#c16983

    • -40
    • +40
    /sources/model/dg/data/MDGConductivityData.cpp
    • -1
    • +1
    /sources/model/dg/data/MDGConductivityData.h
DEN-15017 Ultrafiltration Volume Cannot Be Set to 0 L

revert back the commit e454ad

    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -6
    • +46
    /sources/model/dg/data/MDGValvesStatesData.h
    • -21
    • +15
    /sources/view/dg/data/VDGValvesStatesData.cpp
    • -7
    • +14
    /sources/view/dg/data/VDGValvesStatesData.h
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -13
    • +21
    /sources/model/dg/data/MDGROPumpData.cpp
    • -12
    • +18
    /sources/model/dg/data/MDGROPumpData.h
    • -5
    • +7
    /sources/view/dg/data/VDGROPumpData.cpp
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -10
    • +58
    /sources/model/dg/data/MDGReservoirData.cpp
    • -11
    • +46
    /sources/model/dg/data/MDGReservoirData.h
    • -3
    • +15
    /sources/view/dg/data/VDGReservoirData.cpp
    • -3
    • +15
    /sources/view/dg/data/VDGReservoirData.h
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

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

    • -12
    • +24
    /sources/model/dg/data/MDGDrainPumpData.cpp
    • -12
    • +22
    /sources/model/dg/data/MDGDrainPumpData.h
    • -4
    • +7
    /sources/view/dg/data/VDGDrainPumpData.cpp
    • -4
    • +7
    /sources/view/dg/data/VDGDrainPumpData.h
DEN-15017 Ultrafiltration Volume Cannot Be Set to 0 L

- Talked with Sean and to use the 0x1A00 message | #3:(F32) | \ref Data::mUltrafiltration_Volume_Min |.

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

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

    • -1
    • +1
    /sources/gui/qml/components/RangeRect.qml
    • -1
    • +1
    /sources/gui/qml/components/RangeSlider.qml
    • -1
    • +1
    /sources/gui/qml/components/Slider.qml
    • -3
    • +3
    /sources/gui/qml/components/SliderArrows.qml
    • -2
    • +2
    /sources/gui/qml/components/TickMarks.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14909-UI-VD-S92-QS-Sliders' into staging

    • -1
    • +6
    /sources/gui/qml/components/RangeRect.qml
    • -3
    • +18
    /sources/gui/qml/components/RangeSlider.qml
    • -21
    • +24
    /sources/gui/qml/components/Slider.qml
    • -2
    • +8
    /sources/gui/qml/globals/Variables.qml
Merge branch 'DEN-14909-UI-VD-S92-QS-Arrows' into staging

    • binary
    /resources/images/chevron-right.png
    • -0
    • +37
    /sources/gui/qml/components/Slider.qml
Merge branch 'DEN-14838-UI-VD-S91' into staging

DEN-14912 Quick Start- Sliders - Change default bool value for rounding rangeSlider to true based on CR comment

    • -1
    • +1
    /sources/gui/qml/components/RangeSlider.qml
DEN-14912 Quick Start : Sliders - Remove Component and Loaders from TickMarks and changed to Rectangle - Made additional fixes based on CR comments

    • -2
    • +2
    /sources/gui/qml/components/RangeRect.qml
    • -1
    • +1
    /sources/gui/qml/components/RangeSlider.qml
    • -9
    • +4
    /sources/gui/qml/components/Slider.qml
    • -68
    • +24
    /sources/gui/qml/components/TickMarks.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.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

    • binary
    /resources/images/chevron-right.png
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
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

    • binary
    /resources/images/chevron-left.png
    • binary
    /resources/images/chevron-right.png
    • -62
    • +0
    /sources/gui/qml/components/CircleButton.qml
    • -0
    • +99
    /sources/gui/qml/components/SliderArrows.qml
    • -2
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-14912: Quick Start - Arrows - Update logic to increment/decrement on button press

    • -6
    • +10
    /sources/gui/qml/components/Slider.qml
DEN-14912: Quick Start - Arrows - Add implementation for value increment/decrement buttons

    • -0
    • +62
    /sources/gui/qml/components/CircleButton.qml
    • -0
    • +33
    /sources/gui/qml/components/Slider.qml
    • -0
    • +7
    /sources/gui/qml/globals/Variables.qml
DEN-14912 Quick Start : Sliders - Refinement of the rangeSlider's look for quick start

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

    • -1
    • +1
    /sources/gui/qml/components/RangeRect.qml
    • -3
    • +10
    /sources/gui/qml/components/RangeSlider.qml
    • -1
    • +1
    /sources/gui/qml/components/TickMarks.qml
    • -1
    • +0
    /sources/gui/qml/globals/Variables.qml
DEN-14912: Quick Start - Sliders - Improvements to the sliders look and feel for the quick start

    • -4
    • +6
    /sources/gui/qml/components/RangeRect.qml
    • -29
    • +29
    /sources/gui/qml/components/Slider.qml
    • -18
    • +72
    /sources/gui/qml/components/TickMarks.qml
    • -2
    • +6
    /sources/gui/qml/globals/Variables.qml
DEN-13971 Adjust handle behavior on first drag

    • -16
    • +1
    /sources/gui/qml/components/Slider.qml
DEN-14838 Revert PretreatmentCreate file again due to miscommit