application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-8533 & DEN-8693

Merge and support

    • -14
    • +22
    /sources/ApplicationController.cpp
    • -39
    • +54
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +475
    /sources/device/DeviceController.cpp
    • -0
    • +171
    /sources/device/DeviceController.h
    • -0
    • +58
    /sources/device/DeviceGlobals.h
    • -0
    • +26
    /sources/device/DeviceModels.cpp
    • -0
    • +105
    /sources/device/DeviceModels.h
  1. … 30 more files in changeset.
Merge DEN-8514_UI_DEV_Alarms_Active_List into DEN-8252_POST

    • -17
    • +48
    /sources/canbus/MessageInterpreter.cpp
    • -151
    • +153
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8258, DEN-8257, DEN-8256: Updated UI POST tests, DH/DG final result tests, and in progress screen.

    • -0
    • +25
    /scripts/checksums.conf
    • -0
    • +83
    /scripts/files_check.py
    • -0
    • +58
    /sources/gui/qml/pages/post/PostInProgress.qml
    • -2
    • +116
    /sources/view/VUIPostSingleResultData.cpp
    • -2
    • +10
    /sources/view/VUIPostSingleResultData.h
DEN-8519: Implementations [MVC]

    • -0
    • +4
    /sources/view/hd/alarm/VAlarmActiveList.cpp
Update Alarm Mapping

    • -156
    • +147
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8519: Implementations [MVC]

- Fixed the list if there are some 0 ids in the list.

    • -5
    • +5
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -72
    • +42
    /sources/view/hd/alarm/VAlarmActiveList.cpp
DEN-8519: Implementations [MVC]

- made each row high a little taller and made it scrollable.

    • -1
    • +4
    /sources/gui/qml/compounds/TouchGrid.qml
    • -19
    • +42
    /sources/gui/qml/dialogs/AlarmListDialog.qml
DEN-8519: Implementations [MVC]

    • -6
    • +6
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +23
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -6
    • +9
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +136
    /sources/view/hd/alarm/VAlarmActiveList.cpp
    • -0
    • +91
    /sources/view/hd/alarm/VAlarmActiveList.h
Alarm Mapping updates.

    • -2
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Register DG acknow as known message

- we currently receive the acknow from DG for some messages so needed to add it as known message from DG.

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

    • -1
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -5
    • +5
    /sources/gui/qml/pages/UserConfirmation.qml
DEN-8319: TxLog: Code Review 0

    • -1
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -5
    • +5
    /sources/gui/qml/pages/UserConfirmation.qml
    • -0
    • +15
    /sources/model/settings/MWifiNetwork.h
DEN-8504: Svc: Code Review 0

DEN-8494: Implementation [ Service Log in & About ]

    • -0
    • +9
    /scripts/brightness_set.sh
    • -2
    • +18
    /sources/canbus/MessageDispatcher.cpp
    • -12
    • +32
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +8
    /sources/gui/qml/pages/settings/SettingsDG.qml
  1. … 5 more files in changeset.
DEN-8494: Implementation: Merge the Service Login & About into the code.

- Added Service login

- Added having the comment capability in settings .conf files.

- Performance improvement in settings reader.

    • -0
    • +5
    /resources/settings/Service.conf
    • -0
    • +2
    /sources/gui/qml/compounds/TouchGrid.qml
    • -2
    • +4
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -1
    • +5
    /sources/gui/qml/pages/UserConfirmation.qml
    • -2
    • +3
    /sources/gui/qml/pages/settings/SettingsDG.qml
A little optimization

    • -5
    • +2
    /sources/gui/qml/pages/settings/SettingsDG.qml
Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

DEN-8319: Code Review 0

    • -1
    • +7
    /sources/gui/qml/components/FooterStatic.qml
DEN-8319: Code Review 0

    • -1
    • +5
    /sources/gui/qml/components/Footer.qml
Removing test data.

    • -1
    • +1
    /sources/gui/qml/pages/settings/SettingsDG.qml
DEN-8501: Svc: Implementation [Navigation]

    • -1
    • +3
    /sources/gui/qml/components/MainMenu.qml
    • -12
    • +23
    /sources/gui/qml/pages/disinfect/DisinfectStack.qml
    • -9
    • +23
    /sources/gui/qml/pages/settings/SettingsDG.qml
DEN-8252: Updated POST Views

- Fixed setData

- Added baseline UI view classes

    • -0
    • +1
    /sources/gui/qml/pages/post/PostInProgress.qml
    • -0
    • +162
    /sources/view/VUIPostSingleResultData.cpp
    • -0
    • +67
    /sources/view/VUIPostSingleResultData.h
DEN-8252: Updated POST Views

- Using QAbstractListModel to store the name and result for each HD, DG, and UI test

- Using global settings to read the list of tests from the filesystem

    • -0
    • +2
    /sources/gui/qml/pages/post/PostInProgress.qml
    • -2
    • +161
    /sources/view/dg/data/VDGPostSingleResultData.cpp
    • -4
    • +32
    /sources/view/dg/data/VDGPostSingleResultData.h
    • -2
    • +162
    /sources/view/hd/data/VHDPostSingleResultData.cpp
    • -4
    • +32
    /sources/view/hd/data/VHDPostSingleResultData.h
DEN-8256: Added power on self test in progress screen

    • binary
    /resources/images/RedCross.png
    • -1
    • +11
    /sources/gui/qml/components/WaitDone.qml
    • -0
    • +84
    /sources/gui/qml/compounds/CheckListScrollView.qml
    • -1
    • +2
    /sources/gui/qml/compounds/CheckListView.qml
    • -0
    • +117
    /sources/gui/qml/pages/post/PostInProgress.qml
DEN-8500: Svc: Implementation [Screen]

    • -0
    • +33
    /sources/gui/qml/components/Label.qml
    • -5
    • +8
    /sources/gui/qml/components/TextEntry.qml
    • -0
    • +79
    /sources/gui/qml/components/TimeEntry.qml
    • -0
    • +139
    /sources/gui/qml/pages/settings/SettingsDG.qml
Updated the Alarms Mapping

    • -1
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp
Last minute modification request to remove timestamps

- It seems reasonable to remove the timestamps and let UI set timestamp upon receiving the messages fro each of the average(data)/Alarm/Event.

DEN-8454: Added HD/DG Messaging for POST

    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +43
    /sources/model/dg/data/MDGPostFinalResultData.cpp
    • -0
    • +81
    /sources/model/dg/data/MDGPostFinalResultData.h
    • -0
    • +47
    /sources/model/dg/data/MDGPostSingleResultData.cpp
    • -0
    • +84
    /sources/model/dg/data/MDGPostSingleResultData.h
    • -0
    • +43
    /sources/model/hd/data/MHDPostFinalResultData.cpp
    • -0
    • +81
    /sources/model/hd/data/MHDPostFinalResultData.h
    • -0
    • +47
    /sources/model/hd/data/MHDPostSingleResultData.cpp
    • -0
    • +84
    /sources/model/hd/data/MHDPostSingleResultData.h
    • -0
    • +24
    /sources/view/dg/data/VDGPostFinalResultData.cpp
  1. … 7 more files in changeset.
DEN-8318: TxLog: Code Analysis & AlarmMapping

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8490: Meetings & Support - General Support

- Support : Instruction for the Usability test support

- Support : SW team support and adding the second DGOpMode parameter (SubMode) fro logging.

- Support : SW team support, changed the Alarm Status log to be data from event.

- Added another parameter for treatment log - alarm

- Removed the initialization logging from the event logs which are all CANBus messages, in to the debug log .

- Added a header for the event log to be easier export in the excel sheet (the header doesn't have timestamp)

-

    • binary
    /resources/settings/Instructions/Twist shunt_temp.png
  1. … 37 more files in changeset.