application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-5757: Code Coverage

Merge branch 'master' into DEN-5751_Pre-TreatmentUltrafiltration

    • -3
    • +17
    /sources/canbus/MessageDispatcher.cpp
    • -42
    • +47
    /sources/canbus/MessageInterpreter.cpp
    • -12
    • +55
    /sources/gui/qml/globals/Colors.qml
    • -8
    • +9
    /sources/gui/qml/globals/Variables.qml
Server coverage issue fixed

- This line was not covered on server although it was covered on local.

Tested locally and it is working.

    • -1
    • +3
    /sources/view/hd/alarm/VAlarmStatus.cpp
Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmStatusData.cpp
Merge master into DEN-4860_BLE

    • -34
    • +36
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
Merge branch 'DEN-5830_AlarmDesign'

DEN-4867: Code Review 0 - Requested Modifications

- Removed startBLETimer and killBLETimer so we are not creating and deleting timers. Only one timer will be used

- Added toggleBLETimer

- Logging measurements when they are received instead of using qDebug

- Passing device addr and name to BLEScanner instead of just addr so only a QBluetoothDeviceInfo object is necessary, allowing removal of the macAddress QString

- Removed VBluetoothDeviceInfo static cast in VBluetooth::doSelectDevice

    • -75
    • +57
    /sources/bluetooth/BLEScanner.cpp
    • -2
    • +2
    /sources/gui/qml/pages/SettingsBluetooth.qml
DEN-5753: Update Design Documents

- Fixed comments in some files of the Pre-Treatment Create.

DEN-6359: Addressed code review comments

DEN-6359: Addressed code review comments

DEN-4867: Addressed code review comments

DEN-6359: Addressed code review comments

DEN-4867: Preventing create treatment class from thinking a new treatment profile was saved when the bledevices.conf file is updated.

DEN-4867: Addressed code review comments

    • -20
    • +60
    /sources/bluetooth/BLEScanner.cpp
DEN-6359: Addressed code review comments

DEN-4867: Addressed code review comments

    • -4
    • +0
    /sources/gui/qml/components/ScreenItem.qml
    • -21
    • +8
    /sources/gui/qml/components/SettingsItem.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
DEN-6359: Addressed code review comments

    • -1
    • +6
    /sources/gui/qml/components/Keyboard.qml
    • -0
    • +76
    /sources/gui/qml/components/TextEntry.qml
    • -28
    • +26
    /sources/gui/qml/dialogs/VitalsEntry.qml
    • -2
    • +7
    /sources/gui/qml/globals/Variables.qml
DEN-5754: Implementation

- Removed not used SliderDoubleCreateTreatment.qml component.

DEN-5838: Code Review 0

    • -1
    • +0
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-5754: Implementation

- code refactoring and clean up

    • -0
    • +55
    /sources/gui/qml/components/TitleBarCreateTreatment.qml
    • -0
    • +660
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -0
    • +124
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml
    • -144
    • +0
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
    • -140
    • +0
    /sources/gui/qml/pages/treatment/TreatmentPrime.qml
    • -11
    • +12
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
DEN-6359: Removed styling, moved keyboard to the bottom of the screen, updated text input functionality.

    • -0
    • +76
    /sources/gui/qml/components/DenaliTextInput.qml
    • -50
    • +0
    /sources/gui/qml/components/FieldInput.qml
    • -0
    • +45
    /sources/gui/qml/components/Keyboard.qml
    • -51
    • +35
    /sources/gui/qml/dialogs/VitalsEntry.qml
    • -5
    • +7
    /sources/gui/qml/globals/Variables.qml
  1. … 8 more files in changeset.
DEN-5754: Implementation

- Code clean up

    • -2
    • +1
    /sources/gui/qml/components/GridSelection.qml
    • -0
    • +66
    /sources/gui/qml/components/StepBullet.qml
    • -0
    • +86
    /sources/gui/qml/components/StepIndicator.qml
    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
    • -10
    • +10
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
DEN-5837: Code Analysis

DEN-5836: Code Coverage

- 100.000% (4827/4827)

- added a unit test for the AlarmGenerator private method setBits.

DEN-5836: Code Coverage

- 99.979% (4826/4827)

    • -40
    • +41
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-6349: Updated Keyboard style and positioning

    • -1
    • +1
    /sources/gui/qml/dialogs/VitalsEntry.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-6352: Numeric keyboard styling adjustments

    • -9
    • +16
    /sources/gui/qml/dialogs/VitalsEntry.qml
    • -3
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -13
    • +10
    /sources/gui/qml/keyboard/style.qml
DEN-6352: Added Qt virtualkeyboard

    • -4
    • +6
    /sources/gui/qml/dialogs/VitalsEntry.qml
    • -0
    • +23
    /sources/gui/qml/keyboard/images/backspace-868482.svg
    • -0
    • +8
    /sources/gui/qml/keyboard/images/check-868482.svg
    • -0
    • +13
    /sources/gui/qml/keyboard/images/enter-868482.svg
    • -0
    • +28
    /sources/gui/qml/keyboard/images/globe-868482.svg
    • -0
    • +18
    /sources/gui/qml/keyboard/images/handwriting-868482.svg
    • -0
    • +55
    /sources/gui/qml/keyboard/images/hidekeyboard-868482.svg
    • -0
    • +14
    /sources/gui/qml/keyboard/images/search-868482.svg
    • -0
    • +201
    /sources/gui/qml/keyboard/images/selectionhandle-bottom.svg
    • -0
    • +12
    /sources/gui/qml/keyboard/images/shift-80c342.svg
    • -0
    • +12
    /sources/gui/qml/keyboard/images/shift-868482.svg
    • -0
    • +12
    /sources/gui/qml/keyboard/images/shift-c5d6b6.svg
    • -0
    • +33
    /sources/gui/qml/keyboard/images/textmode-868482.svg
    • -0
    • +1036
    /sources/gui/qml/keyboard/style.qml
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-6352, DEN-6353: Displaying the numeric keyboard under text input fields.

    • -2
    • +1
    /sources/gui/qml/components/FieldInput.qml
    • -0
    • +13
    /sources/gui/qml/dialogs/VitalsEntry.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml