leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated to fix additional QML warnings. QML now complains about capitalization for uncreatable types.

LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated to fix additional QML errors and warnings.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated to fix QML warnings and errors.

LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated to change path '/home/denali' to '/home/leahi'.

LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated for Qt 6.12 port.

    • -17
    • +17
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +4
    /sources/gui/qml/components/BaseChart.qml
    • -6
    • +2
    /sources/gui/qml/components/ModalDialog.qml
    • -6
    • +2
    /sources/gui/qml/dialogs/AlarmDialog.qml
    • -2
    • +2
    /sources/gui/qml/dialogs/PatientIdEntry.qml
  1. … 10 more files in changeset.
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated build files for merge from staging.

    • -0
    • +1016
    /CMakeLists.txt
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Pulled staging and fixed Qt6 build issues.

Merge branch 'feature/LDT-4852-Remove-Old-Messaging-Logic' into staging

Merge branch 'feature/LDT-4810-device-settings-enhancement' into staging

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

update to set variable on completed script

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

fix placement of property in device view

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

PUSH REVERT

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert changes in message dispather

    • -0
    • +16
    /sources/canbus/MessageDispatcher.cpp
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

push revert

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert

    • -0
    • +1
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -1
    • +0
    /sources/model/hd/alarm/MAlarmTriggered.h
Merge remote-tracking branch 'origin/staging' into feature/LDT-4852-Remove-Old-Messaging-Logic

    • -5
    • +1
    /sources/canbus/MessageInterpreter.cpp
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert changes that broke checkin

    • -29
    • +0
    /sources/canbus/MessageInterpreter.cpp
Merge remote-tracking branch 'origin/staging' into feature/LDT-4810-device-settings-enhancement

Merge branch 'feature/LDT-4787-enhancement-power-off' into staging

Merge branch 'feature/LDT-4747-fp-diagnostics' into staging

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

    • -0
    • +50
    /sources/gui/qml/dialogs/ConfirmPasswordDialog.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

final tweak to wifi network liost height

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finish export logs

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

add missing notifys to dispathcer

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

add USB progress

    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finalize export lgos screen

    • -51
    • +24
    /sources/gui/qml/SDCProgressItem.qml
    • -49
    • +23
    /sources/gui/qml/USBProgressItem.qml
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

update osbolete onActionTransmit to actionTransmit and removed signal tracing of actionTransmit from GUI -> APp -> MsgDispathcer

    • -78
    • +59
    /sources/canbus/MessageDispatcher.cpp
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

update export logs screen

    • -0
    • +80
    /sources/gui/qml/compounds/ExportLogsHeaderData.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml