leahi-application

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

address CR comments

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

address CR commetns and fix qml errors

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

remove figure test

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

fix build error

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

address CR comment

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

address pr comments

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

address CR comments

    • -3
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
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-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-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-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
LDT-1791 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 03: SDD - Design Diagram - plantuml

remove extra file

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

Added alarm instructions compoennets SDD to project

    • -0
    • +62
    /SDDs/AlarmInstructions/AlarmBar.dot
    • -0
    • +88
    /SDDs/AlarmInstructions/AlarmDialog.dot
    • -0
    • +84
    /SDDs/AlarmInstructions/AlarmListDialog.dot
    • -0
    • +306
    /SDDs/AlarmInstructions/FinalDiagram.dot
    • binary
    /SDDs/AlarmInstructions/images/AlarmListColon.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListContent.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListDialog.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListHeaderBar.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListHour.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListList.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListMin.png
  1. … 41 more files in changeset.
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

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

clean up and fix alignments

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

Update to alarm dialods

    • -0
    • +64
    /sources/gui/qml/components/AlarmButtonRow.qml
    • -3
    • +0
    /sources/gui/qml/components/ArrowButton.qml
    • -27
    • +29
    /sources/gui/qml/components/MuteButton.qml
    • -38
    • +0
    /sources/gui/qml/components/UpDownButton.qml
    • -49
    • +0
    /sources/gui/qml/compounds/Fader.qml
    • -0
    • +2
    /sources/gui/qml/compounds/TouchGrid.qml
    • -76
    • +86
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
Merge branch 'feature/LDT-1516-headerbar-component' into staging

    • -1
    • +1
    /sources/gui/qml/components/Circle.qml
    • -1
    • +2
    /sources/gui/qml/components/ModalDialog.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -18
    • +15
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
LDT-1521 HeaderBar - SW - 01 - Component & Placement - R&I - 05: DEV - Feature Implementation

Update progress circle from ShapePath.RoundCap to

ShapePath.FlatCap

    • -1
    • +1
    /sources/gui/qml/components/Circle.qml
LDT-1521 HeaderBar - SW - 01 - Component & Placement - R&I - 05: DEV - Feature Implementation

address CR comments

    • -2
    • +3
    /sources/gui/qml/components/HeaderBar.qml
    • -6
    • +1
    /sources/gui/qml/components/MainMenu.qml
Merge branch 'bugfix/LDT-1733-ui-main-tx-screen--Conductivity-Display-Resolution-Incorrect' into staging

LDT-1521 HeaderBar - SW - 01 - Component & Placement - R&I - 05: DEV - Feature Implementation

address CR comments

    • -9
    • +8
    /sources/gui/qml/components/HeaderBar.qml
LDT-1521 HeaderBar - SW - 01 - Component & Placement - R&I - 05: DEV - Feature Implementation

address CR comments and removed Thumbs.db