Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments

    • -6
    • +2
    ./gui/qml/components/AlarmButtonRow.qml
    • -26
    • +18
    ./gui/qml/dialogs/AlarmListDialog.qml
    • -28
    • +28
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

Update alarm dialog list with new (not imeplemened) scheme of how the alarms.conf file will be

    • -16
    • +16
    ./gui/qml/dialogs/NotificationDialog.qml
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

-Implement DD blood Leak message

    • -0
    • +13
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -0
    • +41
    ./model/dd/data/MDDBloodLeakData.cpp
    • -0
    • +78
    ./model/dd/data/MDDBloodLeakData.h
    • -0
    • +24
    ./view/dd/data/VDDBloodLeakData.cpp
    • -0
    • +42
    ./view/dd/data/VDDBloodLeakData.h
  1. … 1 more file in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Move DG Valves to DD and rename to DD

- Implement the following DD messages:

Dialysate Pump, Concentrate pump

- Cleanup Saloine bolus enum in VTDTretamentSattesData.cpp

- Minor comment cleanup in MDDTemperatures

    • -123
    • +237
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -0
    • +119
    ./model/dd/data/MDDConcentratePumpData.cpp
    • -0
    • +152
    ./model/dd/data/MDDConcentratePumpData.h
    • -0
    • +104
    ./model/dd/data/MDDDialysatePumpData.cpp
    • -0
    • +138
    ./model/dd/data/MDDDialysatePumpData.h
    • -44
    • +15
    ./model/dd/data/MDDTemperaturesData.h
    • -0
    • +87
    ./model/dd/data/MDDValvesStatesData.cpp
    • -0
    • +186
    ./model/dd/data/MDDValvesStatesData.h
  1. … 13 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

***** TEMPORY FOR DEMO *****

- Adjusted headerbar to easier touch the SD-card for diagnostics screen.

Merge remote-tracking branch 'origin/feature/LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD-2' into develop

    • -140
    • +178
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -38
    • +37
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
LDT-1785: Update SW (UI)

- Fixed the issue with the heparin slider explained in the LDT-1753.

- Fixed the issue found in one of the merges that missed some qml import.

- Fixed the issue with the VTDTreatmentStates mismatch missing SalineMax Enum in common repo.

- Removed unused def, max, res properties of the heparin stop time from the VTreatmentRanges.

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

clean up and fix alignments

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

Update to alarm dialods

    • -0
    • +64
    ./gui/qml/components/AlarmButtonRow.qml
    • -27
    • +29
    ./gui/qml/components/MuteButton.qml
    • -75
    • +29
    ./gui/qml/components/NotificationBar.qml
    • -38
    • +0
    ./gui/qml/components/UpDownButton.qml
    • -76
    • +86
    ./gui/qml/dialogs/AlarmListDialog.qml
    • -90
    • +287
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.