Index: leahi.pro
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- leahi.pro (.../leahi.pro) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ leahi.pro (.../leahi.pro) (revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -157,6 +157,8 @@
sources/model/confirm/MDuetConfirmTDi.h \
sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \
sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \
+ sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \
+ sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \
sources/model/dd/data/MDDBloodLeakData.h \
sources/model/dd/data/MDDConcentratePumpData.h \
sources/model/dd/data/MDDConductivityData.h \
@@ -181,7 +183,9 @@
sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
+ sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \
sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
@@ -264,8 +268,10 @@
sources/view/fp/data/VFPROPumpData.h \
sources/view/fp/data/VFPRORejectionPercentageData.h \
sources/view/fp/data/VFPTemperatureData.h \
+ sources/view/settings/VAdjustRoWaterMode.h \
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
sources/view/settings/VAdvancedInstitutionalRecord.h \
+ sources/view/settings/VRoWaterMode.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
sources/view/td/data/VTDAirBubbleData.h \
sources/view/td/data/VTDAirPumpData.h \
@@ -305,6 +311,8 @@
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \
@@ -357,7 +365,6 @@
sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
- sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
\ # ---------- Models - Alarm
sources/model/hd/alarm/MAlarmStatusData.h \
sources/model/hd/alarm/MAlarmTriggered.h \
@@ -368,8 +375,6 @@
\ # ---------- Models - HD - Adjustment
sources/model/hd/adjustment/MAdjustRequestsBase.h \
sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
- \ # ---------- Models - HD - Adjustment - Settings
- sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
\ # ---------- Models - HD - Adjustment - Pre-Treatment
sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \
sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
@@ -452,7 +457,6 @@
sources/view/settings/VAdjustmentServiceMode.h \
sources/view/settings/VAdjustmentServiceDates.h \
sources/view/settings/VAdjustmentDGCleaningUsage.h \
- sources/view/settings/VDuetRoWaterDG.h \
sources/view/settings/VCloudSync.h \
sources/view/settings/VHDUsageInfo.h \
sources/view/settings/VAdjustmentInstitutionalRecord.h \
@@ -530,6 +534,8 @@
sources/model/confirm/MDuetConfirmTDi.cpp \
sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \
sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \
+ sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \
+ sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \
sources/model/dd/data/MDDBloodLeakData.cpp \
sources/model/dd/data/MDDConcentratePumpData.cpp \
sources/model/dd/data/MDDConductivityData.cpp \
@@ -555,6 +561,7 @@
sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
sources/model/td/data/MTDAirBubbleData.cpp \
@@ -653,7 +660,6 @@
sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
- sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
\ # ---------- Models - Alarm
sources/model/hd/alarm/MAlarmStatusData.cpp \
sources/model/hd/alarm/MAlarmMapping.cpp \
@@ -666,6 +672,7 @@
sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \
sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \
+ sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \
\ # ---------- Models - TD - Adjustment - Pre-Treatment
sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
@@ -678,8 +685,6 @@
sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
\ # ---------- Models - DD - Adjustment - Settings
sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \
- \ # ---------- Models - HD - Adjustment - Settings
- sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
\ # ---------- Models - HD - Adjustment - Pre-Treatment
sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
@@ -742,8 +747,10 @@
sources/view/VGeneralEvent.cpp \
sources/device/DeviceView.cpp \
\ # ---------- Views - TD - States Data
+ sources/view/settings/VAdjustRoWaterMode.cpp \
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+ sources/view/settings/VRoWaterMode.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
sources/view/td/data/VTDAirBubbleData.cpp \
sources/view/td/data/VTDAirPumpData.cpp \
@@ -783,6 +790,8 @@
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \
@@ -815,7 +824,6 @@
sources/view/settings/VAdjustmentAlarmVolume.cpp \
sources/view/settings/VAdjustmentServiceMode.cpp \
sources/view/settings/VAdjustmentServiceDates.cpp \
- sources/view/settings/VDuetRoWaterDG.cpp \
sources/view/settings/VCloudSync.cpp \
sources/view/settings/VAdjustmentDGCleaningUsage.cpp \
sources/view/settings/VHDUsageInfo.cpp \
Index: leahi.qrc
===================================================================
diff -u -r00c17b6d803722f8338cc3202257d361bb0ad186 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- leahi.qrc (.../leahi.qrc) (revision 00c17b6d803722f8338cc3202257d361bb0ad186)
+++ leahi.qrc (.../leahi.qrc) (revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -43,7 +43,6 @@
sources/gui/qml/dialogs/UfVolumeAdjustment.qml
sources/gui/qml/dialogs/HeparinRxAdjustment.qml
sources/gui/qml/dialogs/AlarmDialog.qml
- sources/gui/qml/dialogs/PatientIdEntry.qml
sources/gui/qml/dialogs/DryDemoDialog.qml
sources/gui/qml/dialogs/ConfirmPasswordDialog.qml
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -78,10 +78,10 @@
{Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes
{Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes
{Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes
- {Gui::GuiActionType::ID_IsolatedUF , 4 * 4 }, // 4 parameters each 4bytes
- {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes
- {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes
- {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes
+ {Gui::GuiActionType::ID_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes
+ {Gui::GuiActionType::ID_Heparin , 3 * 4 }, // 2 parameters each 4bytes
+ {Gui::GuiActionType::ID_Rinseback , 7 * 4 }, // 6 parameters each 4bytes
+ {Gui::GuiActionType::ID_Recirculate , 1 * 4 }, // 1 parameters each 4bytes
{Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes
{Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes
{Gui::GuiActionType::ID_TDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes
@@ -192,6 +192,10 @@
{Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 2 * 4 }, // 2 parameter each 4bytes
// ----
+ {Gui::GuiActionType::ID_AdjustIsoUFStateReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustIsoUFStateRsp , 2 * 4 }, // 2 parameter each 4bytes
+
+ // ----
{Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 4 * 4 }, // 4 parameters each 4bytes
@@ -330,9 +334,10 @@
{Gui::GuiActionType::ID_AdjustDGCleaningUsageReq , 0 * 4 }, // 0 parameter
{Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp , 10 * 4 }, //10 parameters each 4bytes
// ---- RO Water
- {Gui::GuiActionType::ID_DuetRoWaterStatDGq , 0 * 4 }, // 0 parameter each 4bytes
- {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes
- {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes
+ {Gui::GuiActionType::ID_RoWaterModeReq , 0 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_RoWaterModeRsp , 3 * 4 }, // 3 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustRoWaterModeReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustRoWaterModeRsp , 2 * 4 }, // 2 parameter each 4bytes
// ----
{Gui::GuiActionType::ID_RawData , 255 },
{Gui::GuiActionType::ID_Acknow , 0 },
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -130,7 +130,7 @@
ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED
ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED
ID_DialysateInletFlow = 0x0800,
- ID_DialysateOutletFlow = 0x0B00,
+ ID_DialysateOutletFlow = 0x0B0F, //// ----- @CRAPIZED
ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED
ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED
ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED
@@ -198,7 +198,7 @@
ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication
ID_DDOperationModeData = 0x1300,
ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication
- ID_DGLoadCellReadingsData = 0x0C00, // 12
+ ID_DGLoadCellReadingsData = 0x0C0F, // 12
ID_DGAccelerometerData = 0x340F, // 52 //// ----- @CRAPIZED: had to change to avoid duplication
ID_DDValvesStatesData = 0x1B00, // 27 //// ----- @LEAHIZED
ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED
@@ -302,6 +302,9 @@
ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED
ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @LEAHIZED
+ ID_AdjustIsoUFStateReq = 0xBA00, // 186 //// ----- @LEAHIZED
+ ID_AdjustIsoUFStateRsp = 0xBB00, // 187 //// ----- @LEAHIZED
+
// End-Treatment
// Rinseback
ID_AdjustRinsebackReq = 0x9000, // 144 //// ----- @LEAHIZED
@@ -344,9 +347,10 @@
ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication
// RO Water Input Mode
- ID_DuetRoWaterStatDGq = 0xC300, // 195 DG -> UI // DG initiates Status query
- ID_DuetRoWaterModeUIi = 0xBC00, // 188 UI -> DG // UI initiates Mode Set || responses to status query
- ID_DuetRoWaterModeDGr = 0xC400, // 196 UI <- DG // DG responses Mode Set
+ ID_RoWaterModeReq = 0xEB00, // 235
+ ID_RoWaterModeRsp = 0xEC00, // 236
+ ID_AdjustRoWaterModeReq = 0xED00, // 237
+ ID_AdjustRoWaterModeRsp = 0xEE00, // 238
// Institutional record request and response
ID_InstitutionalRecordReq = 0x8200, // 130 UI -> TD request institutional record
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -r0a5a643c3f4b47de461af259f6b174a9aa609f58 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 0a5a643c3f4b47de461af259f6b174a9aa609f58)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -12,14 +12,16 @@
readonly property int cellWidth : Variables.createRxLabelUnitContainerWidth
readonly property int cellHeight : Variables.createRxLabelUnitContainerHeight
readonly property bool heparinFeatured : vSettings.heparinSyringePump
- property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF
- property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON
+ property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ||
+ vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD_Online_Fluid
+ property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON
property bool editingEnabled : true
property int columnSpacing : 15
spacing : Variables.defaultMargin * 3
+
enum HeparinEnabled {
OFF,
ON
@@ -79,7 +81,6 @@
function clear () {
vTreatmentCreate.patientID = ""
- vTreatmentCreate.secondaryPatientID = ""
_hdfTreatmentModeControl .clear()
_subFluidVolume .clear()
_bloodFlowRate .clear()
@@ -112,15 +113,31 @@
LabelUnitContainer { id: _patientID
text : qsTr("Patient ID")
- showEdit : true
- onEditClicked : _patientIdEntry.open()
- contentItem : Text { id: _patientIDText
- anchors.centerIn : parent
- horizontalAlignment : Text.AlignRight
- font.pixelSize : Fonts.fontPixelValueControl
- color : Colors.offWhite
- text : vTreatmentCreate.patientID !== "" ? vTreatmentCreate.patientID : Variables.emptyEntry
+ contentItem : TextEntry { id: _pretreatmentPatientIDEntry
+ clip : true
+ textInput.width : parent.width - Variables.defaultMargin * 4
+ text : vTreatmentCreate.patientID
+ anchors.centerIn : parent
+ textInput.maximumLength : 20 // LEAHI-PRS-236
+ textInput.rightPadding : Variables.defaultMargin
+ textInput.leftPadding : Variables.defaultMargin * 14
+ textInput.inputMethodHints : Qt.ImhPreferLowercase
+ textInput.echoMode : TextInput.Normal
+ textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID }
+ line.visible : false
+ enabled : _root.editingEnabled
+
+ Text { id: _patientIDPlaceHolderText
+ text : Variables.emptyEntry
+ anchors.fill : parent
+ rightPadding : 125
+ horizontalAlignment : Text.AlignRight
+ font.pixelSize : Fonts.fontPixelValueControl
+ color : Colors.offWhite
+ visible : _pretreatmentPatientIDEntry.textInput.text.length === 0 &&
+ ! _pretreatmentPatientIDEntry.textInput.activeFocus
+ }
}
}
@@ -138,6 +155,9 @@
currentIndex : vTreatmentCreate.treatmentModality
model : vTreatmentRanges.treatmentModalityOptions
centerHorizontally : true
+ itemsEnabled : [ vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD , // Mode_HD
+ vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD , // Mode_HDF
+ vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD ] // Mode_HD_Online_Fluid
onActivated : {
if ( ! _treatmentModality.valid ) { vTreatmentCreate.treatmentModalityRejectReason = Variables.noRejectReason }
Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -75,7 +75,7 @@
*/
void View::VAlarmStatus::doUserActionTemporaryBreak() {
AlarmUserActionRequestData data;
- data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_TEMPOARY_BREAK;
+ data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_TEMPORARY_BREAK;
emit didAdjustment(data);
}