Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into DEN-4860_BLE

  1. … 10 more files in changeset.
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

  1. … 5 more files in changeset.
DEN-5753: Update Design Documents

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

  1. … 1 more file in changeset.
DEN-6359: Addressed code review comments

DEN-4867: Addressed code review comments

  1. … 3 more files in changeset.
DEN-6359: Addressed code review comments

    • -76
    • +0
    ./qml/components/DenaliTextInput.qml
    • -0
    • +76
    ./qml/components/TextEntry.qml
  1. … 6 more files in changeset.
DEN-5754: Implementation

- Removed not used SliderDoubleCreateTreatment.qml component.

  1. … 1 more file in changeset.
DEN-5754: Implementation

- code refactoring and clean up

    • -0
    • +55
    ./qml/components/TitleBarCreateTreatment.qml
    • -0
    • +55
    ./qml/pages/pretreatment/create/PreTreatmentBase.qml
    • -0
    • +88
    ./qml/pages/pretreatment/create/PreTreatmentConfirm.qml
    • -0
    • +660
    ./qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -0
    • +124
    ./qml/pages/pretreatment/create/PreTreatmentPrime.qml
    • -144
    • +0
    ./qml/pages/treatment/TreatmentBegin.qml
    • -108
    • +0
    ./qml/pages/treatment/TreatmentConfirm.qml
    • -670
    • +0
    ./qml/pages/treatment/TreatmentCreate.qml
    • -140
    • +0
    ./qml/pages/treatment/TreatmentPrime.qml
    • -11
    • +12
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
DEN-6359: Removed styling, moved keyboard to the bottom of the screen, updated text input functionality.

    • -0
    • +76
    ./qml/components/DenaliTextInput.qml
    • -0
    • +45
    ./qml/components/Keyboard.qml
    • -23
    • +0
    ./qml/keyboard/images/backspace-868482.svg
    • -8
    • +0
    ./qml/keyboard/images/check-868482.svg
    • -13
    • +0
    ./qml/keyboard/images/enter-868482.svg
    • -28
    • +0
    ./qml/keyboard/images/globe-868482.svg
    • -18
    • +0
    ./qml/keyboard/images/handwriting-868482.svg
    • -55
    • +0
    ./qml/keyboard/images/hidekeyboard-868482.svg
    • -14
    • +0
    ./qml/keyboard/images/search-868482.svg
    • -201
    • +0
    ./qml/keyboard/images/selectionhandle-bottom.svg
    • -12
    • +0
    ./qml/keyboard/images/shift-80c342.svg
  1. … 8 more files in changeset.
DEN-5754: Implementation

- Code clean up

    • -71
    • +0
    ./qml/components/CircleWithText.qml
    • -0
    • +66
    ./qml/components/StepBullet.qml
    • -0
    • +86
    ./qml/components/StepIndicator.qml
    • -5
    • +5
    ./qml/pages/treatment/TreatmentBegin.qml
    • -10
    • +10
    ./qml/pages/treatment/TreatmentConfirm.qml
    • -8
    • +9
    ./qml/pages/treatment/TreatmentCreate.qml
    • -9
    • +9
    ./qml/pages/treatment/TreatmentPrime.qml
    • -10
    • +10
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
DEN-6349: Updated Keyboard style and positioning

DEN-6352: Numeric keyboard styling adjustments

  1. … 1 more file in changeset.
DEN-6352: Added Qt virtualkeyboard

    • -0
    • +23
    ./qml/keyboard/images/backspace-868482.svg
    • -0
    • +8
    ./qml/keyboard/images/check-868482.svg
    • -0
    • +13
    ./qml/keyboard/images/enter-868482.svg
    • -0
    • +28
    ./qml/keyboard/images/globe-868482.svg
    • -0
    • +18
    ./qml/keyboard/images/handwriting-868482.svg
    • -0
    • +55
    ./qml/keyboard/images/hidekeyboard-868482.svg
    • -0
    • +14
    ./qml/keyboard/images/search-868482.svg
    • -0
    • +201
    ./qml/keyboard/images/selectionhandle-bottom.svg
    • -0
    • +12
    ./qml/keyboard/images/shift-80c342.svg
    • -0
    • +12
    ./qml/keyboard/images/shift-868482.svg
    • -0
    • +12
    ./qml/keyboard/images/shift-c5d6b6.svg
    • -0
    • +33
    ./qml/keyboard/images/textmode-868482.svg
    • -0
    • +1036
    ./qml/keyboard/style.qml
  1. … 2 more files in changeset.
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

  1. … 5 more files in changeset.
DEN-6352, DEN-6353: Displaying the numeric keyboard under text input fields.

  1. … 1 more file in changeset.
DEN-6353, DEN-6354: Added vitals manual entry page.

    • -0
    • +51
    ./qml/components/FieldInput.qml
    • -0
    • +121
    ./qml/dialogs/VitalsEntry.qml
  1. … 5 more files in changeset.
DEN-4964: Addressed code review comments.

  1. … 6 more files in changeset.
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

  1. … 5 more files in changeset.
DEN-4964: Addressed code review comments.

  1. … 8 more files in changeset.
DEN-4863, DEN-4865: Code Coverage and Unit Tests

  1. … 8 more files in changeset.
DEN-4865, DEN-5642: Checking BLE connection before sending UF volume, fixed unit test errors and added object names to support squishqt tests

    • -0
    • +2
    ./qml/pages/treatment/TreatmentBegin.qml
    • -0
    • +4
    ./qml/pages/treatment/TreatmentCreate.qml
    • -1
    • +7
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 9 more files in changeset.
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

DEN-5833: Implementation

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

  1. … 4 more files in changeset.
DEN-5833: Implementation

- added a touch expanding area for the TouchArea so regardless of its visual size it can have expanded touchable area.

- the touch expanding for the mute button set to 25 so it can have a bigger touch area that its size which is little.

DEN-6022: The ultrafiltration inconsistency

- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix and if that happens it would be the FW bug.

- The modification is that the main progress bar will always has VTreatmentUltratiltration.minimum as minimum (current;y always zero) and VTreatmentUltratiltration.maximum as maximum.

- The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to eachother.

- Removed the precision from VTreatmentUltrafiltration and moved into the Variables.

    • -2
    • +2
    ./qml/pages/treatment/TreatmentBegin.qml
  1. … 1 more file in changeset.
DEN-5754: Implementation

- Fixed a bug caused by a typo

    • -1
    • +1
    ./qml/pages/treatment/TreatmentStack.qml
DEN-5515, DEN-5516: Moved bluetooth setup before UI application start in run.sh, fixed start treatment messaging

    • -1
    • +1
    ./qml/pages/treatment/TreatmentCreate.qml
    • -5
    • +2
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

  1. … 8 more files in changeset.
Merge DEN-4860_BLE into 2020_EOY_DEMO

    • -1
    • +2
    ./qml/pages/treatment/TreatmentBegin.qml
    • -0
    • +1
    ./qml/pages/treatment/TreatmentConfirm.qml
    • -2
    • +5
    ./qml/pages/treatment/TreatmentCreate.qml
    • -0
    • +2
    ./qml/pages/treatment/TreatmentPrime.qml
    • -1
    • +5
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 12 more files in changeset.
Merge master into DEN-4860_BLE

    • -1
    • +0
    ./qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +0
    ./qml/pages/treatment/TreatmentCreate.qml
    • -1
    • +0
    ./qml/pages/treatment/TreatmentPrime.qml
    • -1
    • +57
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 15 more files in changeset.