leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation - Adjust DD Valves payload length - Implement Model and View format for DD Valves - Add DD Valves Enum to Gui Globals - Add DD Valves to Diagnostics Screen

    • -48
    • +93
    /sources/model/dd/data/MDDValvesStatesData.cpp
    • -93
    • +60
    /sources/model/dd/data/MDDValvesStatesData.h
    • -27
    • +59
    /sources/view/dd/data/VDDValvesStatesData.cpp
    • -27
    • +57
    /sources/view/dd/data/VDDValvesStatesData.h
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Simplify auto sizing dialogs using the existing property of contentItem.implicitWidth.height from Dialog. and Fix positioning

    • -7
    • +3
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -12
    • +4
    /sources/gui/qml/dialogs/headerbar/WiFiDialog.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

add drop shadow

    • -0
    • +14
    /sources/gui/qml/components/ModalDialog.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments

    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

create shared method to open dialogs

    • -5
    • +6
    /sources/gui/qml/components/HeaderBar.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

fix positioning of popups

    • -7
    • +3
    /sources/gui/qml/components/HeaderBar.qml
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

update alarmlistmodel to a resuable list model. Parse for listTitle and populate alarm list title dialog

    • -0
    • +118
    /sources/model/MListModel.cpp
    • -0
    • +39
    /sources/model/MListModel.h
    • -117
    • +0
    /sources/view/hd/alarm/VAlarmInstructionsModel.cpp
    • -4
    • +12
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -5
    • +14
    /sources/view/hd/alarm/VAlarmStatus.h
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

USe Variables isntead of hard coded vvalues

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

organize headerbar dialogs into nested folder inside of dialogs folder

    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
    • -37
    • +0
    /sources/gui/qml/dialogs/WiFiDialog.qml
    • -0
    • +37
    /sources/gui/qml/dialogs/headerbar/WiFiDialog.qml
LDT-1539 HeaderBar - SW - 01 - WiFi indicator - R&I - 03: SDD - Design Diagram - plantuml

add SDD for wifi headerbar wifi ndicator. make a common folder to share common diagrams

    • binary
    /SDDs/Wifi_Popup.png
    • -0
    • +47
    /SDDs/Wifi_Popup.puml
    • -0
    • +60
    /SDDs/common_puml/WiFi_Info.puml
    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

push build fix

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

remove obsolete Q_PROPERTY calls

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

remove message from alarm struct

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Remove messages from alarmstatus and qml. Update QAbstractList model to optomize performance of changing models

    • -7
    • +16
    /sources/view/hd/alarm/VAlarmInstructionsModel.cpp
    • -12
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

code cleanup

    • -6
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

reduce spacing by 10 of header bar icons

    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address final cr comments

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments. QAbstractlistmodel working

    • -32
    • +30
    /sources/view/hd/alarm/VAlarmInstructionsModel.cpp
    • -4
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments and almost finished updated the alarm model to a c++ QAbstractlistmodel

    • -2
    • +0
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -2
    • +0
    /sources/gui/qml/globals/Variables.qml
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +111
    /sources/view/hd/alarm/VAlarmInstructionsModel.cpp
    • -0
    • +46
    /sources/view/hd/alarm/VAlarmInstructionsModel.h
    • -3
    • +15
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Finished wifi indicator popup to display SSD and IP address

    • -22
    • +26
    /sources/device/DeviceController.cpp
    • -37
    • +13
    /sources/gui/qml/dialogs/WiFiDialog.qml
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

- Address imports for diagnostics QML files

- Generate png files for all SDD items

    • binary
    /SDDs/DiagnosticsScreen.png
    • binary
    /SDDs/MainTreatmentScreen.png
    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
  1. … 15 more files in changeset.
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

fix build error

    • -11
    • +0
    /sources/device/DeviceController.cpp
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Update wifi popup component

    • -0
    • +44
    /sources/device/DeviceController.cpp
    • -30
    • +13
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +14
    /sources/gui/qml/components/HeaderBarPopup.qml
    • -5
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +61
    /sources/gui/qml/dialogs/WiFiDialog.qml
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

    • -49
    • +0
    /sources/model/hd/data/MHDAirBubbleData.cpp
    • -84
    • +0
    /sources/model/hd/data/MHDAirBubbleData.h
    • -0
    • +49
    /sources/model/td/data/MTDAirBubbleData.cpp
    • -0
    • +84
    /sources/model/td/data/MTDAirBubbleData.h
    • -25
    • +0
    /sources/view/hd/data/VHDAirBubbleData.cpp
    • -43
    • +0
    /sources/view/hd/data/VHDAirBubbleData.h
    • -0
    • +25
    /sources/view/td/data/VTDAirBubbleData.cpp
    • -0
    • +43
    /sources/view/td/data/VTDAirBubbleData.h
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments

    • -4
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

add modal dialog to go under wifi button and align as arequested. Added click away to close

    • -18
    • +34
    /sources/gui/qml/components/HeaderBar.qml
    • -2
    • +6
    /sources/gui/qml/components/ModalDialog.qml
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments

    • -26
    • +18
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -5
    • +5
    /sources/view/hd/alarm/VAlarmStatus.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'bugfix/LDT-1753-ui-heparin-stop-time-slider' into staging

LDT-1791 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 03: SDD - Design Diagram - plantuml

remove extra file