leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated to use common LabelUnitContainer height in UF screens.

    • -1
    • +0
    /sources/gui/qml/globals/Variables.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to use StackItem.page function to push edit screen.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to always push confirm screen when UF settings change response is received and use StackItem.page function to push new screen.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated Variables.qml to add width and height of UF new value containers in confirmation screen.

- Updated TreatmentAdjustmentUltrafiltration.qml to allow adjustments to be processed no matter what screen it is currently displaying, remove title text binding, and fix/add objectNames.

- Updated UF start, edit, and confirm screens to add objectNames.

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml to update slots.

    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated LabelUnitContainer.qml to remove textPixelSize and showUnit properties. Unit visiblity is now based on unitText length.

- Updated TreatmentAdjustmentBase.qml to remove customization of notification banner and rely on defaults.

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml so LabelUnitContainer height matches metrics height.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated ValueAdjuster.qml to calculate canIncrement and canDecrement to round to the next lower step for maximum and next higher step for minimum.

    • -3
    • +17
    /sources/gui/qml/compounds/ValueAdjuster.qml
LDT-2669: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 03: SDD - Design Diagram

- Updated treatment adjustment ultrafiltration layout diagrams based on code updates.

    • binary
    /SDDs/TreatmentAdjustmentUltrafiltrationLayout.png
    • -55
    • +58
    /SDDs/TreatmentAdjustmentUltrafiltrationLayout.puml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to parent Start, Edit, and Confirm screens in stack.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to prevent trying to push confirm screen when edit screen is not active.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated LabelUnitContainer.qml to update text anchoring to align on baselines.

- Updated TreatmentAdjustmentUltrafiltrationMetrics.qml, TreatmentAdjustmentBase.qml, TreatmentAdjustmentUltrafiltrationMetrics.qml, TreatmentAdjustmentUltrafiltrationEdit.qml, and TreatmentAdjustmentUltrafiltrationStart.qml for changes to UI design.

- Updated ValueAdjuster.qml to change increment and decrement functions to handle when value is not on step increment.

- Updated TreatmentAdjustmentUltrafiltration.qml to fix handling of notification text for adjustment rejection reasons.

    • -42
    • +62
    /sources/gui/qml/compounds/ValueAdjuster.qml
    • -10
    • +9
    /sources/gui/qml/globals/Variables.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Removed StoppedlSlider.qml

- Updated LabelUnitContainer.qml to allow adjustable text size and to show blank if unit text is blank.

- Updated ValueAdjuster.qml to allow changing text color and make increment and decrement stop on step increments if current value is not.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml to use LabelUnitContainers to show values.

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml for changes to UI design (removed StoppedSlider and use ValueAdjuster).

- Updated TreatmentUltrafiltration.qml to use UF set volume for maximum value in progress bar.

    • -146
    • +0
    /sources/gui/qml/compounds/StoppedSlider.qml
    • -12
    • +21
    /sources/gui/qml/compounds/ValueAdjuster.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Moved TreatmentUltrafiltrationItem.qml to TreatmentAdjustmentUltrafiltration.qml.

- Updated TreatmentAdjustmentUltrafiltration.qml to make it derive from TreatmentAdjustmentBase.qml and internally create a stack to handle the Start, Edit, and Confirm screens.

- Updated TreatmentAdjustmentUltrafiltrationStart.qml, TreatmentAdjustmentUltrafiltrationEdit.qml, and TreatmentAdjustmentUltrafiltrationConfirm.qml to change to derive from Item instead of TreatmentAdjustmentBase.qml.

- Updated TreatmentStack.qml to move some properties to components where they are being used and removed some unused propties.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -8
    • +8
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-1440-ultrafiltration' into staging

    • -16
    • +71
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +146
    /sources/gui/qml/compounds/StoppedSlider.qml
    • -4
    • +13
    /sources/gui/qml/globals/Variables.qml
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -8
    • +8
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-2264-patient-vitals' into staging

    • -1
    • +3
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/components/CloseButton.qml
    • -10
    • +14
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +17
    /sources/gui/qml/components/TextEntry.qml
    • -2
    • +16
    /sources/gui/qml/globals/Variables.qml
  1. … 3 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

code cleanup and make numpad slide animation smoother

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentUltrafiltrationItem.qml to update visible based on whether Start, Edit, or Confirm screens are visible.

- Updated TreatmentUltrafiltrationItem.qml to only allow the Confirm screen to be shown if UF treatment item is already open.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml to send confirmed UF request volume with proper precision.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MainHome.qml to remove Start Treatment button.

    • -20
    • +7
    /sources/gui/qml/pages/MainHome.qml
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- UpdateTreatmentAdjustmentUltrafiltrationStart.qml to remove icon from pause button.

- Updated leahi.qrc to remove PauseDarkBlue.png since it is no longer being used.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Removed LabelUnitContainer.qml.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated NotificationBarSmall.qml to only expose individual properties and not entire component.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MTreatmentAdjustRequests.h to remove Box/M.Box columns from doxygen headers.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated VTreatmentRanges to change ultrafiltrationVolume to RANGESET and added comments regarding missing Def, Min, Max, Res for all sets.

    • -0
    • +5
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -1
    • +1
    /sources/view/hd/data/VTreatmentRanges.h
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

address CR comments

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml to fix precision issue with ultrafiltration volume resolution.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated to move StoppedSlider.qml from components to compounds.

    • -146
    • +0
    /sources/gui/qml/components/StoppedSlider.qml
    • -0
    • +146
    /sources/gui/qml/compounds/StoppedSlider.qml
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated for changes to UI design.

    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -1
    • +4
    /sources/gui/qml/globals/Variables.qml
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml to use UF volume resolution from config file.

- Updated VTreatmentRanges.h/cpp to add UF volume resolution property from config file.

    • -0
    • +2
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -0
    • +3
    /sources/view/hd/data/VTreatmentRanges.h
LDT-2267 Patient Vitals - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

update SDD diagram