Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated MAlarmMapping.cpp

    • -29
    • +29
    ./model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD-2' into staging

    • -146
    • +376
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -45
    • +124
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Add back refresh trigger in VDDValvesStatesData

    • -1
    • +1
    ./view/dd/data/VDDValvesStatesData.cpp
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comment and move instantiating wifi dialog to main.qml

    • -55
    • +22
    ./gui/qml/components/HeaderBar.qml
    • -0
    • +14
    ./gui/qml/components/HeaderBarPopup.qml
    • -0
    • +2
    ./gui/qml/dialogs/headerbar/WiFiDialog.qml
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

    • -63
    • +129
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -48
    • +93
    ./model/dd/data/MDDValvesStatesData.cpp
    • -93
    • +60
    ./model/dd/data/MDDValvesStatesData.h
    • -27
    • +59
    ./view/dd/data/VDDValvesStatesData.cpp
    • -27
    • +57
    ./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

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

add drop shadow

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

address CR comments

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

create shared method to open dialogs

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

fix positioning of popups

    • -1
    • +0
    ./gui/qml/dialogs/headerbar/WiFiDialog.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
    ./model/MListModel.cpp
    • -0
    • +39
    ./model/MListModel.h
    • -117
    • +0
    ./view/hd/alarm/VAlarmInstructionsModel.cpp
    • -42
    • +0
    ./view/hd/alarm/VAlarmInstructionsModel.h
  1. … 1 more file in changeset.
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

USe Variables isntead of hard coded vvalues

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

organize headerbar dialogs into nested folder inside of dialogs folder

    • -0
    • +37
    ./gui/qml/dialogs/headerbar/WiFiDialog.qml
  1. … 1 more file in changeset.
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

  1. … 4 more files in changeset.
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

push build fix

    • -1
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

remove obsolete Q_PROPERTY calls

    • -1
    • +0
    ./gui/qml/dialogs/NotificationDialog.qml
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
    • +5
    ./gui/qml/dialogs/NotificationDialog.qml
    • -7
    • +16
    ./view/hd/alarm/VAlarmInstructionsModel.cpp
    • -8
    • +4
    ./view/hd/alarm/VAlarmInstructionsModel.h
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

code cleanup

    • -1
    • +0
    ./gui/qml/dialogs/NotificationDialog.qml
    • -4
    • +4
    ./view/hd/alarm/VAlarmInstructionsModel.h
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

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

    • -18
    • +12
    ./gui/qml/dialogs/NotificationDialog.qml
    • -32
    • +30
    ./view/hd/alarm/VAlarmInstructionsModel.cpp
    • -2
    • +2
    ./view/hd/alarm/VAlarmInstructionsModel.h
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

    • -3
    • +9
    ./gui/qml/components/AlarmButtonRow.qml
    • -3
    • +2
    ./gui/qml/components/NotificationBar.qml
    • -25
    • +16
    ./gui/qml/dialogs/NotificationDialog.qml
    • -0
    • +111
    ./view/hd/alarm/VAlarmInstructionsModel.cpp
    • -0
    • +46
    ./view/hd/alarm/VAlarmInstructionsModel.h
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Finished wifi indicator popup to display SSD and IP address

    • -37
    • +13
    ./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

    • -1
    • +3
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
    • -18
    • +99
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -23
    • +23
    ./model/dd/data/MDDDialysatePumpData.h
    • -13
    • +13
    ./model/dd/data/MDDHeatersData.h
    • -15
    • +7
    ./model/dd/data/MDDValvesStatesData.h
    • -12
    • +12
    ./model/td/data/MTDAirBubbleData.cpp
  1. … 15 more files in changeset.
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

fix build error

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

Update wifi popup component

    • -30
    • +13
    ./gui/qml/components/HeaderBar.qml
    • -0
    • +14
    ./gui/qml/components/HeaderBarPopup.qml
    • -0
    • +61
    ./gui/qml/dialogs/WiFiDialog.qml
  1. … 1 more file in changeset.
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
    ./model/hd/data/MHDAirBubbleData.cpp
    • -0
    • +49
    ./model/td/data/MTDAirBubbleData.cpp
    • -0
    • +84
    ./model/td/data/MTDAirBubbleData.h
    • -25
    • +0
    ./view/hd/data/VHDAirBubbleData.cpp
    • -0
    • +25
    ./view/td/data/VTDAirBubbleData.cpp
    • -0
    • +43
    ./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

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
    ./gui/qml/components/HeaderBar.qml