Index: leahi.qrc
===================================================================
diff -u -r18e4634800357ac1d8bc1da1cad04836ba85d33c -rd59edcf7fa2a0f096e22d330012dbaefa4bda374
--- leahi.qrc (.../leahi.qrc) (revision 18e4634800357ac1d8bc1da1cad04836ba85d33c)
+++ leahi.qrc (.../leahi.qrc) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
@@ -200,7 +200,6 @@
sources/gui/qml/components/SubStepIndicator.qml
sources/gui/qml/components/SDCInfo.qml
sources/gui/qml/components/BaseChart.qml
- sources/gui/qml/components/HelpNotification.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r18e4634800357ac1d8bc1da1cad04836ba85d33c -rd59edcf7fa2a0f096e22d330012dbaefa4bda374
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 18e4634800357ac1d8bc1da1cad04836ba85d33c)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
@@ -315,16 +315,16 @@
// Post-Treatment
// Patient Disconnect
ID_AdjustPatientDisconnectNotifyReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
- ID_AdjustPatientDisconnectConfirmReq = 0xA800, // 168
- ID_AdjustPatientDisconnectConfirmRsp = 0xA900, // 169
+ ID_AdjustPatientDisconnectConfirmReq = 0xAB00, // 168
+ ID_AdjustPatientDisconnectConfirmRsp = 0xAC00, // 169
// Disposables Removal
ID_AdjustDisposablesRemovalConfirmReq = 0x9400, // 148
ID_AdjustDisposablesRemovalConfirmRsp = 0x9500, // 149
// Treatment Log Adjs
- ID_AdjustTreatmentLogReq = 0xA600, // 166
- ID_AdjustTreatmentLogRsp = 0xA700, // 167
+ ID_AdjustTreatmentLogReq = 0xA900, // 166
+ ID_AdjustTreatmentLogRsp = 0xAA00, // 167
// Treatment Log Data
ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
Fisheye: Tag d59edcf7fa2a0f096e22d330012dbaefa4bda374 refers to a dead (removed) revision in file `sources/gui/qml/components/HelpNotification.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/dialogs/AlarmDialog.qml
===================================================================
diff -u -r3c0010b123fe25246ec7f040965d0a37e8e9a7cc -rd59edcf7fa2a0f096e22d330012dbaefa4bda374
--- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 3c0010b123fe25246ec7f040965d0a37e8e9a7cc)
+++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
@@ -6,6 +6,7 @@
// Qml imports
import "qrc:/globals"
import "qrc:/components"
+import "qrc:/compounds"
Item { id : _root
@@ -101,18 +102,20 @@
bottom : _timerRect.top
}
- HelpNotification { id: _infoItem
+ AutoStepController { id: _autoStepController
anchors {
left : parent.left
leftMargin : Variables.defaultMargin * 4
top : parent.top
- topMargin : Variables.defaultMargin * 3
+ topMargin : Variables.defaultMargin * 2
}
+
+ onTriggered : _listView.currentIndex = (_listView.currentIndex + 1) % _listView.count
}
ListView {id: _listView
anchors {
- top : _infoItem.bottom
+ top : _autoStepController.bottom
topMargin : Variables.defaultMargin
bottom : parent.bottom
left : parent.left
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
===================================================================
diff -u -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 -rd59edcf7fa2a0f096e22d330012dbaefa4bda374
--- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
@@ -107,12 +107,6 @@
]
}
- Connections { target: stackView
- function onCurrentItemChanged() {
- _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
- }
- }
-
Connections { target: vTDTreatmentStates
function onRcDisconnectChanged ( vValue ) { page( _recirculateDisconnect , vValue )} // set up
function onRcStartedChanged ( vValue ) { page( _recirculateProgress , vValue )} // in progress
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r1286d74bd015276aab604808be2766136091c125 -rd59edcf7fa2a0f096e22d330012dbaefa4bda374
--- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 1286d74bd015276aab604808be2766136091c125)
+++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
@@ -64,8 +64,8 @@
/*0028*/case GuiAlarmID::ALARM_ID_TD_TMP_PRESSURE_LOW : { result = QObject::tr("TD TMP pressure low." ); break; } /* 28*/
/*0029*/case GuiAlarmID::ALARM_ID_TD_TMP_PRESSURE_HIGH : { result = QObject::tr("TD TMP pressure high." ); break; } /* 29*/
/*0030*/case GuiAlarmID::ALARM_ID_TD_VENOUS_BUBBLE_SELF_TEST_FAILURE : { result = QObject::tr("TD venous bubble self-test failure." ); break; } /* 30*/
-/*0031*/case GuiAlarmID::ALARM_ID_AVAILABLE_31 : { result = QObject::tr("Available alarms." ); break; } /* 31*/
-/*0032*/case GuiAlarmID::ALARM_ID_AVAILABLE_32 : { result = QObject::tr("Available alarms." ); break; } /* 32*/
+/*0031*/case GuiAlarmID::ALARM_ID_TD_BLOOD_PRIME_PAUSE_WARNING : { result = QObject::tr("TD blood prime pause warning." ); break; } /* 31*/
+/*0032*/case GuiAlarmID::ALARM_ID_TD_BLOOD_PRIME_PAUSE_TIMEOUT : { result = QObject::tr("TD blood prime pause timeout." ); break; } /* 32*/
/*0033*/case GuiAlarmID::ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE : { result = QObject::tr("TD voltage out of range fault." ); break; } /* 33*/
/*0034*/case GuiAlarmID::ALARM_ID_TD_AC_POWER_LOST : { result = QObject::tr("TD AC power lost." ); break; } /* 34*/
/*0035*/case GuiAlarmID::ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT : { result = QObject::tr("TD AC power lost during treatment." ); break; } /* 35*/
@@ -199,8 +199,28 @@
/*0163*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE : { result = QObject::tr("FP permeate flow low fault." ); break; } /* 163*/
/*0164*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_LOW_RANGE : { result = QObject::tr("FP inlet pressure low fault." ); break; } /* 164*/
/*0165*/case GuiAlarmID::ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT : { result = QObject::tr("TD air trap lower timeout." ); break; } /* 165*/
-/*0166*/case GuiAlarmID::ALARM_ID_TD_AIR_PUMP_STALL : { result = QObject::tr("TD air pump stall detected." ); break; } /* 166*/
-/*0167*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 167*/
+/*0166*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_SELF_TEST_FAILURE : { result = QObject::tr("TD syringe pump self-test failure alarm." ); break; } /* 166*/
+/*0167*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR : { result = QObject::tr("TD syringe pump is running while the BP is off." ); break; } /* 167*/
+/*0168*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_FPGA_ADC_FAULT : { result = QObject::tr("TD syringe pump ADC FPGA fault." ); break; } /* 168*/
+/*0169*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_FAULT : { result = QObject::tr("TD syringe pump fault reported by FPGA." ); break; } /* 169*/
+/*0170*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_DAC_WRITE_ERROR : { result = QObject::tr("TD syringe pump DAC write failure." ); break; } /* 170*/
+/*0171*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_SPEED_ERROR : { result = QObject::tr("TD syringe pump speed check error." ); break; } /* 171*/
+/*0172*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_VOLUME_ERROR : { result = QObject::tr("TD syringe pump volume check error." ); break; } /* 172*/
+/*0173*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_OVER_TRAVEL_ERROR : { result = QObject::tr("TD syringe pump over travel error." ); break; } /* 173*/
+/*0174*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_NOT_STOPPED_ERROR : { result = QObject::tr("TD syringe pump not stopped in off state error." ); break; } /* 174*/
+/*0175*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR : { result = QObject::tr("TD syringe pump direction (from encoder) error." ); break; } /* 175*/
+/*0176*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR : { result = QObject::tr("TD syringe pump direction (from controller) error." ); break; } /* 176*/
+/*0177*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_SYRINGE_EMPTY : { result = QObject::tr("TD syringe empty alarm." ); break; } /* 177*/
+/*0178*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_SYRINGE_REMOVED : { result = QObject::tr("TD syringe pump syringe removed alarm." ); break; } /* 178*/
+/*0179*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_STALL : { result = QObject::tr("TD syringe pump stall alarm." ); break; } /* 179*/
+/*0180*/case GuiAlarmID::ALARM_ID_TD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD : { result = QObject::tr("TD heparin force sensor invalid calibration record." ); break; } /* 180*/
+/*0181*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_DETECTED : { result = QObject::tr("TD syringe detected alarm." ); break; } /* 181*/
+/*0182*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM : { result = QObject::tr("TD syringe pump not enough Heparin alarm." ); break; } /* 182*/
+/*0183*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_OCCLUSION : { result = QObject::tr("TD syringe pump occlusion alarm." ); break; } /* 183*/
+/*0184*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT : { result = QObject::tr("TD syringe pump prime timeout." ); break; } /* 184*/
+/*0185*/case GuiAlarmID::ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT : { result = QObject::tr("FP P9 conductivity sensor fpga fault." ); break; } /* 185*/
+/*0186*/case GuiAlarmID::ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT : { result = QObject::tr("FP P18 conductivity sensor fpga fault." ); break; } /* 186*/
+/*0187*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 187*/
default:
result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));
Index: sources/storage/Settings.cpp
===================================================================
diff -u -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26 -rd59edcf7fa2a0f096e22d330012dbaefa4bda374
--- sources/storage/Settings.cpp (.../Settings.cpp) (revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26)
+++ sources/storage/Settings.cpp (.../Settings.cpp) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
@@ -162,6 +162,7 @@
}
else {
key = line;
+ key = convertToRichText(key);
}
_Settings.add(vDetail.category, group, key, QVariant(value), enableDuplicateKey);
// DEBUG: qDebug() << group << key << value << location << category;