application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-6635: Update Design Documents

- During the document update figured the "end treatment" button link to the "treatment time" is missing and put that SAME FOR "BACK TO TREATMENT"

DEN-6635: Update Design Documents

- During the document update figured the "end treatment" button link to the "treatment time" is missing and put that.

DEN-6637: Code Analysis

DEN-6867: ptTx-RB: Implementation [Navigation] (2/2)

- Moved each category of the post treatment screen into its own screen manager stack.

- It helps to organize the code better and later manage the screen easier when the message 37 (HD: OpMode) being used.

    • -0
    • +1
    /sources/gui/qml/components/StackItem.qml
DEN-6638: ptTx-RB: Code Review 0

During the code clean up some codes has been incorrectly removed that reverted back,

DEN-6635: Update Design Documents

- Code has been updated while the SDDUI was written.

- DEN-6638: Code Review 0

    • -0
    • +20
    /sources/gui/qml/components/StackItem.qml
    • -16
    • +16
    /sources/gui/qml/pages/ManagerHome.qml
    • -2
    • +2
    /sources/view/hd/data/VHDAccelerometerData.h
DEN-6869: Added Version Dialin API and a Simulator plugin

- After adding the simulator plugin find out a bug in the code and fixed.

    • -3
    • +11
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +3
    /sources/gui/qml/pages/ManagerHome.qml
DEN-6869: Added Accelerometer Dialin API and a Simulator plugin

- After adding the simulator plugin find out a bug in the code and fixed.

    • -1
    • +1
    /sources/view/dg/data/VDGROPumpData.cpp
DEN-6877: Merging the Versions/Acceleration

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -32
    • +108
    /sources/gui/qml/pages/ManagerHome.qml
    • -0
    • +101
    /sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h
    • -0
    • +68
    /sources/model/dg/data/MDGAccelerometerData.cpp
  1. … 28 more files in changeset.
DEN-6876: Cleaned up the code to start the versions cherry pick

- Messages 60,61 which was Treatment End has been removed (FW is not using it anymore).

    • -14
    • +0
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +0
    /sources/canbus/MessageInterpreter.cpp
    • -17
    • +0
    /sources/gui/qml/pages/SettingsHome.qml
    • -23
    • +0
    /sources/model/MEndTreatmentResponse.cpp
    • -70
    • +0
    /sources/model/MEndTreatmentResponse.h
DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added Model/View for the messages "Treatment End" Req/Res (87/88)

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +5
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +45
    /sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp
    • -0
    • +84
    /sources/model/hd/adjustment/MTreatmentAdjustEndResponse.h
    • -0
    • +46
    /sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp
    • -0
    • +64
    /sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h
DEN-6863 , DEN-6865 , DEN-6866 : psTx

- Added Recirculate timeout Model/View.

- Added Rinseback timeout to the Model/View.

- Added three more parameter to the Treatment State Message 15 for the "Blood Prime", "Treatment End", "Treatment Stop"

- Renamed the StackItem method "back" to "page".

- Renamed the "End" button label to "End Treatment"

- Renamed the "TreatmentComplete" Screen to "TreatmentEnd" to be more consistent with the states.

- Added the "TreatmentEndPause" screen for "Treatment End Pause" state

- Added the recirculate timeout to the screens.

- Added the rinseback timeout to the screens.

- Refactored the "txDialysisRunning" to "txDialysis" to match the state with the same name.

-

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/components/StackItem.qml
  1. … 27 more files in changeset.
DEN-6862 , DEN-6865 : Blood Prime && Rinseback && Ricirculate

- Moved all the the imports into the main.qml since find out it doesn't make any difference until the module is loaded dynamically at runtime which we don't since it is slow.

- Added PostTreatmentAdditional for Additional Rinseback.

- Added RinsebackInit for Rinseback setup

- Code Clean up & refactoring

    • -105
    • +49
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +45
    /sources/model/hd/data/MTreatmentBloodPrimeData.cpp
    • -0
    • +83
    /sources/model/hd/data/MTreatmentBloodPrimeData.h
  1. … 3 more files in changeset.
DEN-6862: ptTx-RB: Implementation [Screens] Rinseback Complete

- DEN-6864: ptTx-RB: Implementation [Messaging] (1/2)

- DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added ImageText Componenet for the rinseback in progress screen

- Added Flow rate as well to the message ID_Rinseback as 3rd parameter.

- Connected Recirculate message to the Recirculate screen in progress.

- Connected Rinseback (Adj/Data) messages to the Rinseback screen in progress.

- Updated TreatmentStack Screen navigation for the Rinseback, Recirculate, TreatmentComplete and so on.

    • -0
    • +52
    /sources/gui/qml/components/ImageText.qml
  1. … 4 more files in changeset.
DEN-6864: Implementation [Messaging] (1/2)

    • -0
    • +24
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +5
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +45
    /sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp
  1. … 14 more files in changeset.
- Added PostTreatmentComplete.qml screen - Added PostTreatmentRinsebackComplete.qml - Removed '_' from Dialisate state property name - fixed the Alarm enum name change on AlarmDefs

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-4964: Added unit tests for DG/HD acceleration and versions.

DEN-4964: Added unit tests for DG/HD acceleration and versions.

DEN-4964: Added unit tests for DG/HD acceleration and versions.

DEN-4964: Added unit tests for DG/HD acceleration and versions.

Merge branch 'DEN-5777_UI_DEV_ConvertLogging_From_hrs_to_%' into staging

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

DEN-5759: Code Review 0

- Added a TODO for the DoubleSlider component to add a validation and active feature to be able to use it for PreTreatmentCreate.

DEN-6621: Code Review 0

DEN-6621: Code Review 0

    • -14
    • +14
    /sources/storage/FileHandler.cpp
DEN-5759: prTx: Code Review 0

Merge DEN-4860_BLE into master

    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
Merge master into DEN-6349_bp_hr_manual_entry

    • -32
    • +34
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
6636: ptTx_Rinseback: Implementation

- Added the PostTreatmentRinseback.qml

- Added the PostTreatmentRecirculate.qml

- Improved the StackItem.qml

- Added Rinseback/Recirculate Navigation

- Removed Diagnostics screen since it's not one screen anymore and is too old.

-

    • binary
    /resources/images/Accelerate.png
    • binary
    /resources/images/Decelerate.png
    • binary
    /resources/images/End.png
    • binary
    /resources/images/PauseDarkBlue.png
    • binary
    /resources/images/PauseLightBlue.png
    • -1
    • +1
    /sources/gui/qml/components/CheckListItem.qml
    • -5
    • +36
    /sources/gui/qml/components/StackItem.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -301
    • +0
    /sources/gui/qml/pages/Diagnostics.qml
  1. … 9 more files in changeset.