leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated GuiGlobal.h to fix whitespacing.

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

update message id for blodd pressure

    • -20
    • +19
    /sources/gui/qml/components/NumPad.qml
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated GuiGlobals.h to update IDs for ID_AdjustPatientConnectionConfirmReq, ID_AdjustPatientConnectionConfirmRsp, ID_AdjustUltrafiltrationConfirmReq, and ID_AdjustUltrafiltrationConfirmRsp.

- Updated StoppedSlider.qml to rename component _removeMarker to _lowMarker.

- Updated VTreatmentUltrafiltrationData.h to remove minimum and maximum properties and removed references to the properties in TreatmentUltrafiltrationItem.qml.

- Updated TreatmentAdjustmentBase.qml to make confirm button invisible by default.

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

- Updated GuiGlobals.h to update IDs for ID_AdjustPatientConnectionConfirmReq, ID_AdjustPatientConnectionConfirmRsp, ID_AdjustUltrafiltrationConfirmReq, and ID_AdjustUltrafiltrationConfirmRsp.

- Updated StoppedSlider.qml to rename component _removeMarker to _lowMarker.

- Updated VTreatmentUltrafiltrationData.h to remove minimum and maximum properties and removed references to the properties in TreatmentUltrafiltrationItem.qml.

- Updated TreatmentAdjustmentBase.qml to make confirm button invisible by default.

    • -7
    • +7
    /sources/gui/qml/components/StoppedSlider.qml
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

fix cosmetic issue with numpad popping out

    • -0
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -24
    • +18
    /sources/gui/qml/components/NumPad.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

allow hep time to show Off for 0

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

remove popup gradient

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

- Updated GuiGlobals to change IDs for messages MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE and MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE.

- Updated Slider.qml to calculate minimum slider value based on precision rounding and not step rounding.

- Updated TreatmentUltrafiltrationItem.qml to updated flow between edit, confirm, and start screens.

- Updated TreatmentAdjustmentUltrafiltrationStart.qml and TreatmentUltrafiltration.qml to get UF minimum and maximum from Treatment Ranges view.

    • -3
    • +9
    /sources/gui/qml/components/Slider.qml
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated GuiGlobals to change IDs for messages MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE and MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE.

- Updated Slider.qml to calculate minimum slider value based on precision rounding and not step rounding.

- Updated TreatmentUltrafiltrationItem.qml to updated flow between edit, confirm, and start screens.

- Updated TreatmentAdjustmentUltrafiltrationStart.qml and TreatmentUltrafiltration.qml to get UF minimum and maximum from Treatment Ranges view.

    • -3
    • +9
    /sources/gui/qml/components/Slider.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

renamed compound component

    • -0
    • +90
    /sources/gui/qml/compounds/LabelUnitContainer.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address CR commetns

    • -2
    • +2
    /sources/gui/qml/components/BaseComboBox.qml
    • -8
    • +0
    /sources/gui/qml/components/ModalDialog.qml
    • -184
    • +0
    /sources/gui/qml/components/ValueControl.qml
    • -0
    • +196
    /sources/gui/qml/compounds/ValueAdjuster.qml
    • -1
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -3
    • +4
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -0
    • +1
    /sources/view/hd/data/VTreatmentRanges.h
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address cr comments

    • -2
    • +18
    /sources/gui/qml/components/ValueControl.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address cr comments

    • -7
    • +13
    /sources/gui/qml/components/ValueControl.qml
    • -0
    • +90
    /sources/gui/qml/compounds/PreTreatmentCreateItem.qml
    • -1
    • +9
    /sources/gui/qml/globals/Variables.qml
    • -14
    • +0
    /sources/model/settings/MSettings.cpp
    • -23
    • +14
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -0
    • +2
    /sources/view/hd/data/VTreatmentRanges.h
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltrationStart.qml to move position of progress bar marker label to above.

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

- Updated TreatmentAdjustmentUltrafiltrationStart.qml to move position of progress bar marker label to above.

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

- Updated TreatmentAdjustmentUltrafiltrationStart.qml to move UF pause note to above pause button.

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

- Updated TreatmentAdjustmentUltrafiltrationStart.qml to move UF pause note to above pause button.

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

- Updated TreatmentUltrafiltrationItem.qml to prevent showing start dialog if ultrafiltration edit is not alredy up.

- Updated TreatmentUltrafiltrationItem.qml to properly show pause rejection reason on start dialog.

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

- Updated TreatmentUltrafiltrationItem.qml to prevent showing start dialog if ultrafiltration edit is not alredy up.

- Updated TreatmentUltrafiltrationItem.qml to properly show pause rejection reason on start dialog.

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

cleanup

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

code cleanup

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

- Updated message ID enums for ID_AdjustPressuresLimitsReq, ID_AdjustPressuresLimitsRsp, ID_AdjustUltrafiltrationStateReq, ID_AdjustUltrafiltrationStateRsp, and ID_AdjustUltrafiltrationConfirmReq for leahi.

- Updated message sizes calculations for ID_AdjustUltrafiltrationStateRsp and ID_AdjustUltrafiltrationConfirmReq.

- Updated VTreatmentAdjustmentUltrafiltrationConfirm, MTreatmentAdjustUltrafiltrationStateResponse, MTreatmentAdjustUltrafiltrationStateResponse, and MTreatmentAdjustRequests for changes to messages for leahi.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml and TreatmentUltrafiltrationItem.qml for UI design updates for UF volume settings chnage confirmation.

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

- Updated message ID enums for ID_AdjustPressuresLimitsReq, ID_AdjustPressuresLimitsRsp, ID_AdjustUltrafiltrationStateReq, ID_AdjustUltrafiltrationStateRsp, and ID_AdjustUltrafiltrationConfirmReq for leahi.

- Updated message sizes calculations for ID_AdjustUltrafiltrationStateRsp and ID_AdjustUltrafiltrationConfirmReq.

- Updated VTreatmentAdjustmentUltrafiltrationConfirm, MTreatmentAdjustUltrafiltrationStateResponse, MTreatmentAdjustUltrafiltrationStateResponse, and MTreatmentAdjustRequests for changes to messages for leahi.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml and TreatmentUltrafiltrationItem.qml for UI design updates for UF volume settings chnage confirmation.

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

functionality working.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'staging' into develop

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

Fix messaging issue

LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

Fixed issue of message sending out to sim

    • -2
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +0
    /sources/gui/qml/components/ModalDialog.qml
    • -59
    • +13
    /sources/gui/qml/components/NumPad.qml
    • -77
    • +63
    /sources/gui/qml/compounds/BPHREntry.qml
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

Wip. finishing up qml side

    • -10
    • +25
    /sources/gui/qml/components/HeaderBar.qml
    • -8
    • +8
    /sources/gui/qml/components/ModalDialog.qml
    • -24
    • +90
    /sources/gui/qml/components/NumPad.qml
    • -0
    • +11
    /sources/gui/qml/compounds/BPHREntry.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -5
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp