application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

    • -2
    • +2
    /sources/gui/qml/components/RangeBar.qml
    • -2
    • +6
    /sources/gui/qml/components/RangeRect.qml
    • -2
    • +2
    /sources/gui/qml/components/TickMarks.qml
    • -39
    • +48
    /sources/gui/qml/globals/Colors.qml
    • -8
    • +18
    /sources/gui/qml/globals/Variables.qml
    • -26
    • +64
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
DEN-4598, DEN-4609, DEN-4607: Added VTreatmentEnd.cpp/.h, Added end treatment button to settings page, misc. cleanup.

    • -0
    • +17
    /sources/gui/qml/pages/SettingsHome.qml
    • -2
    • +2
    /sources/model/MEndTreatmentResponse.h
    • -0
    • +15
    /sources/view/VTreatmentBegin.cpp
    • -0
    • +37
    /sources/view/VTreatmentBegin.h
    • -0
    • +40
    /sources/view/VTreatmentEnd.cpp
    • -0
    • +40
    /sources/view/VTreatmentEnd.h
    • -20
    • +0
    /sources/view/hd/alarm/VAlarmStatus.cpp
Merge branch 'DEN-5282_UltrafiltrationStopState'

DEN-4598, DEN-4609, DEN-4607, DEN-4605: Updated unit tests and code coverage. Made changes requested in code review.

    • -0
    • +55
    /sources/storage/FileSaver.cpp
    • -0
    • +50
    /sources/storage/FileSaver.h
    • -0
    • +20
    /sources/view/hd/alarm/VAlarmStatus.cpp
  1. … 7 more files in changeset.
DEN-4964: Formatted file.

DEN-5341: Code Analysis

- Found an unused code and removed.

DEN-5520: Updated mSignalStrengthPct comment to match the variable.

    • -8
    • +8
    /sources/model/hd/data/MTreatmentFlowsData.h
DEN-5341: Code Analysis

- some dox updated as well.

DEN-5340 Code Coverage [100%]

- Coverage to 100%

- Added "Profile" build setup for Code Coverage Instrumentation and build in the workspace_UI with the output name of denaliSquish

- Modified the Pressure/Occlusion message to have new structure (last 3 of 5 fields changed to U32 from F32)

    • -3
    • +3
    /sources/gui/qml/pages/ManagerHome.qml
DEN-4964: Formatted file.

DEN-5340 Code Coverage [99.953%]

- Covered the sbOff/sbIdle

DEN-5340 Code Coverage [99.881%]

- removed unused codes.

- commented unused codes.

    • -25
    • +0
    /sources/canbus/MessageInterpreter.cpp
DEN-4605: Updated unit tests

Merge branch 'DEN-4598-Confirm-Priming-Begin' of ssh://dvm-linux02:7999/ui/application into DEN-4598-Confirm-Priming-Begin

5338: Unit Testing

DEN-5339: Integration Testing

- Debugging, Refactoring, Testing

    • -18
    • +13
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -1
    • +2
    /sources/gui/qml/components/TouchArea.qml
    • -20
    • +24
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
  1. … 19 more files in changeset.
DEN-4601, DEN-4607, DEN-5169: Improve Create Treatment page usability, Support latest SquishQt Tests, - Widened Create Treatment Parameters - Removed get and set prefix from the treatment parameter macro

    • -2
    • +3
    /sources/gui/qml/components/GridSelection.qml
    • -11
    • +11
    /sources/gui/qml/components/Slider.qml
    • -0
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
DEN-5169: Removed get and set prefix from the treatment parameter macro.

DEN-5169: Continue refactoring

DEN-5169: Cleanup and refactoring.

    • -28
    • +28
    /sources/view/VTreatmentCreate.cpp
    • -16
    • +16
    /sources/view/VTreatmentCreate.h
DEN-5337: Implementation

Fixed the issue in the unit test but we had a discussion with FW and we had an agreement:

1 - Adding a third field for the message 65 (What was the accepted requested state, or what state to remain in if requested state is rejected.) which will be used for logging only and the message "15: treatment States" will be used to get the actual states.

2 - After the responses to any messages involving the UF_State, Saline_State, Treatment_State immediately message 15 will be sent to update the UI.

So the next step/commit is to apply this decision.

DEN-4964: Formatted file.

    • -32
    • +32
    /sources/gui/qml/pages/ManagerHome.qml
Merge master into DEN-4598-Confirm-Priming-Begin

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmStatusData.h
DEN-4601: Priming view improvements

- Replaced priming circle with check with check inside the existing circle

- Increased create treatment scrolling deceleration

- Updated create treatment variable names

    • -2
    • +1
    /sources/gui/qml/components/PrimingTimer.qml
    • -76
    • +75
    /sources/gui/qml/globals/Variables.qml
DEN-5337: Implementation

    • -0
    • +18
    /remove-exra-emptylines.sh
    • binary
    /resources/images/Done.png
    • binary
    /resources/images/OffGray.png
    • -1
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -16
    • +25
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
  1. … 5 more files in changeset.
DEN-4964: Fixed DG Accelerometer spacing issue with HD Accelerometer data.

    • -5
    • +5
    /sources/gui/qml/pages/ManagerHome.qml
DEN-4964: Fixed DG Accelerometer spacing issue with HD Accelerometer data.

    • -1
    • +1
    /sources/gui/qml/pages/ManagerHome.qml
DEN-4964: Added DG Accelerometer definition.

DEN-4964: Removed extra spaces.

    • -18
    • +18
    /sources/gui/qml/pages/ManagerHome.qml
DEN-4964: Added DG Accelerometer to the UI app.

    • -35
    • +19
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +18
    /sources/gui/qml/pages/ManagerHome.qml
    • -0
    • +68
    /sources/model/dg/data/MDGAccelerometerData.cpp
    • -0
    • +75
    /sources/model/dg/data/MDGAccelerometerData.h
    • -0
    • +32
    /sources/view/dg/data/VDGAccelerometerData.cpp
    • -0
    • +42
    /sources/view/dg/data/VDGAccelerometerData.h