sources

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-5833: Implementation

- Fixed the bug of silence logic which was reverse

- Fixed the bug that length of the silence message payload was incorrectly set to 4 instead of 1.

- changed the name of the MAlarmSilenceReq member variable to silence instead of state which now implies it is silent (1) or not (0).

DEN-5833: Implementation

- made the mute button click optional and currently enabled.

- made minimize on silent on the Notification Dialog optional and is disabled currently.

- made separate slots for each user actions instead of one for all with 4 parameter cause I think it's easier and more convenient to use this way.

- increased the Notification Bar height a little bit more.

    • -2
    • +4
    ./gui/qml/components/NotificationBar.qml
    • -12
    • +45
    ./view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Implementation of the message 64: 'Alarm User Action'

- Cleaned up the VAlarmStatus class.

    • -38
    • +35
    ./view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Added User Action message response model.

  1. … 1 more file in changeset.
DEN-4964: Added DG Versions to Manager page.

DEN-5516, DEN-5514: Ensure connection to BP-Cuff is re-established after power cycle

DEN-4964: Added DG Versions to Manager page.

    • -0
    • +65
    ./model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp
    • -0
    • +71
    ./model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h
    • -0
    • +41
    ./view/dg/adjustment/VTreatmentAdjustmentDGVersions.cpp
    • -0
    • +61
    ./view/dg/adjustment/VTreatmentAdjustmentDGVersions.h
  1. … 2 more files in changeset.
DEN-5833: Implementation

- Fixed a bouncing bug of the message when sent for the first time with silenced flag on to show the alarm not maximized.

    • -1
    • +12
    ./gui/qml/dialogs/NotificationDialog.qml
DEN-5833: Implementation

- Added 3 Alarm buttons

- created Mute Button

- created Up and Down Button (minimize/maximize)

- used FW alarm status flag enum (Alarm_State_Flag_Bit_Positions) instead of the UI version and removed UI one.

Code cleaned up

- modified and cleaned up Notification Dialog and Bar.

- modified Time Text component to be able to show sections with one zero only.

- cleaned up main.qml

    • -0
    • +60
    ./gui/qml/components/MuteButton.qml
    • -37
    • +27
    ./gui/qml/components/NotificationBar.qml
    • -0
    • +37
    ./gui/qml/components/UpDownButton.qml
    • -40
    • +87
    ./gui/qml/dialogs/NotificationDialog.qml
    • -18
    • +0
    ./model/hd/alarm/MAlarmStatusData.h
    • -22
    • +17
    ./view/hd/alarm/VAlarmStatus.cpp
  1. … 7 more files in changeset.
DEN-5754: Implementation

- Added the new MVC for initial UF Volume adjustment messages (79/80).

    • -4
    • +5
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
    • -0
    • +49
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp
    • -0
    • +86
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h
  1. … 4 more files in changeset.
DEN-5754: Implementation

- reviewed the pre-treatment screens and modified

- added the double range slider for Arterial and Venous

- modified the treatmentBegin(ultrafiltration)

- so many other tweaks.

    • -0
    • +1
    ./gui/qml/components/ProgressCircle.qml
    • -4
    • +41
    ./gui/qml/components/RangeSlider.qml
    • -60
    • +77
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentConfirm.qml
    • -131
    • +167
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -102
    • +78
    ./gui/qml/pages/treatment/TreatmentPrime.qml
  1. … 4 more files in changeset.
DEN-4964: Added HDVersions FPGA items to Manager Screen.

DEN-5754: Implementation

- reformat and commented out the message id debug log.

  1. … 1 more file in changeset.
DEN-5514: Checking omron bp service is not null before querying for data, confirmed data populates on treatment monitor page now automatically after a measurement.

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

- Updated the old Alarm model structure to used the notify in the Message Interpreter.

- Updated the Alarm Trigger,Clear,Status to inherit from MAbstract to be able to the above.

- Added a macro to make the request messages handling easier.

    • -172
    • +32
    ./canbus/MessageInterpreter.cpp
    • -12
    • +14
    ./model/hd/alarm/MAlarmCleared.h
    • -88
    • +79
    ./model/hd/alarm/MAlarmStatusData.cpp
    • -24
    • +31
    ./model/hd/alarm/MAlarmStatusData.h
    • -12
    • +15
    ./model/hd/alarm/MAlarmTriggered.h
  1. … 2 more files in changeset.
DEN-5744: Code Review 0

- A typo to change the #3 to #4

    • -1
    • +1
    ./model/hd/data/MTreatmentStatesData.h
DEN-5515: Added VAlert class to support BLE related alerts

    • -0
    • +108
    ./gui/qml/dialogs/Alert.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 10 more files in changeset.
DEN-4964: Added HDVersions major, minor, micro to Manager Screen.

    • -11
    • +12
    ./view/hd/adjustment/VTreatmentAdjustmentHDVersions.h
DEN-5744: Code Review 0

- Fixed some typo

DEN-4964: Added HDVersions major, minor, and micro to Manager Screen.

DEN-5514: Added VVitals.h/cpp view for populating vitals information on treatment monitor page.

  1. … 1 more file in changeset.
DEN-5773: UI Unique Saline Bolus Start/Stop Enumerator

  1. … 1 more file in changeset.
DEN-5742: Code Coverage [100%]

  1. … 5 more files in changeset.
DEN-5741: Integration Testing

    • -0
    • +2
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStart.qml
DEN-5739: Implementation

- Added the response in cpp and qml.

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

- reading the heparin data and connected tot the UI/QML

    • -0
    • +2
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -1
    • +1
    ./model/hd/data/MTreatmentHeparinData.h
    • -4
    • +4
    ./model/hd/data/MTreatmentStatesData.cpp
  1. … 1 more file in changeset.
DEN-5739: Implementation

- Implemented the entire MVC for Heparin request/response/data.

    • -0
    • +49
    ./model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp
    • -0
    • +87
    ./model/hd/adjustment/MTreatmentAdjustHeparinResponse.h
    • -0
    • +41
    ./model/hd/data/MTreatmentHeparinData.cpp
    • -0
    • +82
    ./model/hd/data/MTreatmentHeparinData.h
    • -7
    • +11
    ./model/hd/data/MTreatmentStatesData.cpp
    • -9
    • +12
    ./model/hd/data/MTreatmentStatesData.h
    • -0
    • +56
    ./view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp
  1. … 7 more files in changeset.
DEN-5739: Implementation

- Saline progressBar not moving fixed.

- Ultrafiltration suspected bug has been fixed but commented out since no one complained.

- The Heparin screen created as the skeleton.

    • -10
    • +5
    ./gui/qml/pages/treatment/TreatmentStart.qml
    • -0
    • +77
    ./gui/qml/pages/treatment/sections/TreatmentHeparin.qml
  1. … 2 more files in changeset.
Merge Conflict fix

Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

    • -5
    • +34
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -85
    • +266
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -8
    • +79
    ./gui/qml/pages/treatment/TreatmentPrime.qml
    • -17
    • +20
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 14 more files in changeset.