application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-13645: IMP: General Implementation

DEN-13447: UI able to send its final POST result to HD by request

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +38
    /sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp
    • -0
    • +78
    /sources/model/hd/data/post/MUIPostFinalResultHDRequest.h
DEN-13488 SCA: Code Analysis

Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-13489 IMP: General Implementation

DEN-13035: Update alarm body messages

- Removed the exclamation mark icon form the Alarm Dialog.

- Removed the exclamation mark icon form the Alarm Bar.

- Made the whole AlarmDialog title bar doubleClick and diagnostics opener if the alarm is not minimizable.

- Moved the Alarm ID from title to the bottom left of the dialog with format: "ID:<id>".

- Clipped the AlarmDialon body message area, crop the text if longer than dialog area.

- Changed the "settings" property name of the VSettings to "instructions".

- Changed the date/time formats keys to simplify the code and conf file.

- Implemented the Alarm Body messages, to load from Alams/Alarms.conf, instead of the FW.

- The FW texts/documents will still being used if the Alarms.conf doesn't have a definition.

- A instruction base capability has also been added to the MVC, but UI still not supporting it.

    • -3
    • +3
    /sources/canbus/MessageInterpreter.cpp
    • -8
    • +6
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -3
    • +3
    /sources/gui/qml/pages/settings/SettingsDG.qml
    • -293
    • +293
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 4 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
updates model unit tests

    • -791
    • +2572
    /unittests/tst_models.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -293
    • +293
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

Fixed the issue on the PatientID confirm text

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-13489: IMP: General Implementation for any bugs and any other implementations

- Enable Dialin logging CL switch has changed to disable dialin logging, to make the dialin logging as enabled by default and removed -d from run.sh. [Sean's Request]

- Added log unhandled as error to the unhandled reader as well.

- Implemented the NoCANBus to be used when no CANBus enabled. For now it is only bypassing the create treatment button command and helps to get to the treatment parameters for the touchscreen test. [EEMN's Support]

- Fixed a bug on the Volume Adjustment on post, sending to HD to update HD alarm volume with previous, adjusted value, which was sending a request one again receiving HD response, and it was a potential crash loop.

- Added disable acknowledgment logs (req,bak) CL switch, -K : --disable-acknow-log [Sean's Request]

    • -1
    • +3
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -9
    • +22
    /sources/view/settings/VSettings.cpp
DEN-13489: IMP: General Implementation for any bugs and any other implementations

DEN-13163: Pressing Settings and Treatment goes back to Blood Priming

- The issue was the test codes of the trending screen wasn't commented out.

DEN-13489 IMP: General Implementation

DEN-12838: UI shall store the latest alarm volume and resend that to HD on POST

DEN-11539: Service password initial setup

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -11
    • +39
    /sources/view/settings/VSettings.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-12838: UI shall store the latest alarm volume and resend that to HD on POST

- The save ability has been added to the Settings.

- Note: the design of the settings need to change: 1- singleton class should be the controller not the mode, 2 - The column based keyvalue has to change to tree(map).

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -26
    • +41
    /sources/view/settings/VSettings.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-13049: UI Treatment Parameters Entry: Some values for treatment parameter entry on treatment parameter entry screen in create treatment do not match SRS/PRS

- A bug found on multiple, ON,OFF toggle, slider sends minimum instead of '0' while ON.

- Slider improved.

- Added float rounding of the request message logs to 3.

    • -18
    • +20
    /sources/gui/qml/components/RangeSlider.qml
    • -10
    • +20
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmTriggered.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
tst_model updates

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1390
    • +887
    /unittests/tst_models.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-13049 - UI Treatment Parameters Entry: Some values for treatment parameter entry on treatment parameter entry screen in create treatment do not match SRS/PRS

- There was a bug in the fix which was related to the validation and caused to fail the treatment parameters validation.

- also removed the disable if the SD is not detected correctly. (QStorageInfo is not sending DeviceReady correctly)

- enabled the float rounding to 3 in the log

- Enabled the Create Treatment button rejection notification, since it seems it is not being handled by alarms as presumed.

- Fixed the BloodPressure interval value to display OFF when set to zero.

Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-9129: Unable to proceed past "Create a Custom Treatment" when Arterial and Venous Pressure (High) Limits maximum values are initially selected

Also modified the SliderCreateTreatment.qml to show by the default the zero value not the OFF since it is only two Heparin Bolus/Dispensing which display OFF for zero value.

    • -0
    • +2
    /sources/gui/qml/components/GridSelection.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-13049: UI Treatment Parameters Entry: Some values for treatment parameter entry on treatment parameter entry screen in create treatment do not match SRS/PRS

    • -1
    • +1
    /sources/gui/qml/components/Slider.qml
    • -3
    • +4
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -19
    • +19
    /sources/view/VTreatmentCreate.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp