application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-10153: Treatment Log Comments Investigations

- Fixed the Treatment Review overlapped items.

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

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Let's keep it.

Let's keep it.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

DEN-12121: Adjustments to Dianogistic Dialog to fit new FW versions better. Moved Pressures to have a bit more room for 5 digit values.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

DEN-12121: Updates per code review

    • -3
    • +3
    /sources/model/dg/data/MDGConductivityData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirBubbleData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirTrapData.h
    • -3
    • +3
    /sources/model/hd/data/MHDBloodLeakData.h
RESOLVED.

RESOLVED.

This needs to be updated to 10 * 4 if the change to the "TreatmentStates" is approved by Sean Nash. Also please remove the duplicate.

This needs to be updated to 10 * 4 if the change to the "TreatmentStates" is approved by Sean Nash.
Also please remove the duplicate.

Sean Nash, How the change to the TreatmentState message will affect the Application? This newly added parameter seems redundant to me. The change is the "Dialysis State" addition. 10 - (U32) Dial...

Sean Nash,
How the change to the TreatmentState message will affect the Application?
This newly added parameter seems redundant to me.

The change is the "Dialysis State" addition.

10 - (U32) Dialysis state
Unknown macro: { 0=start, 1=UF, 2=saline bolus }

0x0F00 15 0x040 4 Hz N HD All Treatment State sub-mode (U32-enum) (U32) UF state (U32) saline bolus state (U32) Hep state (U32) Rinseback state (U32) Recirc state 7 - (U32) Bld Prime state 8 - (U32) Tx End state 9 - (U32) Stop state 10 - (U32) Dialysis state
Please remove the box column, we decided not to use it in the Application documentation. Please do this for all the new models added.

Please remove the box column, we decided not to use it in the Application documentation.
Please do this for all the new models added.

It has been defined in the AlarmItem. Expose the VAlarmStatus property from AlarmItem.qml by adding this line: readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID then use the ...

It has been defined in the AlarmItem.
Expose the VAlarmStatus property from AlarmItem.qml by adding this line:

    readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID


then use the AlarmItem object, (which has been defined in the main.qml) to get the alarm id like the line below:

_alarmItem.alarm_AlarmID


Thanks,

Users can not see the alarm screen when the diagnostics screen is visible. This was a request by systems in DEN-12118. Is there another approach to this?

Users can not see the alarm screen when the diagnostics screen is visible. This was a request by systems in DEN-12118. Is there another approach to this?

it has already been defined, this would be a duplicate handler. why do we need to have the top on diagnostics while it has to always be on alarm dialog/bar on screen?

it has already been defined, this would be a duplicate handler.
why do we need to have the top on diagnostics while it has to always be on alarm dialog/bar on screen?

Required to display the Alarm Top on the diagnostic screen

Required to display the Alarm Top on the diagnostic screen

keep one line empty on top of the // HD Data Messages

keep one line empty on top of the // HD Data Messages