Index: leahi.pro
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rdf61c476838011a343a6930fd5b30404629379bc
--- leahi.pro (.../leahi.pro) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ leahi.pro (.../leahi.pro) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -180,6 +180,10 @@
sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
@@ -196,6 +200,7 @@
sources/model/td/data/MWaterSampleData.h \
sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
+ sources/model/td/data/treatment/MTreatmentHDFData.h \
sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h \
sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \
sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \
@@ -266,8 +271,11 @@
sources/view/fp/data/VFPTemperatureData.h \
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
sources/view/settings/VAdvancedInstitutionalRecord.h \
+ sources/view/settings/VCalibrationSettings.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h \
- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
sources/view/td/data/VTDAirBubbleData.h \
sources/view/td/data/VTDAirPumpData.h \
sources/view/td/data/VTDAirTrapData.h \
@@ -285,6 +293,7 @@
sources/view/td/data/treatment/VTDTreatmentStatesData.h \
sources/view/td/data/treatment/VTreatmentBloodFlow.h \
sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \
+ sources/view/td/data/treatment/VTreatmentHDFData.h \
sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h \
sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \
sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \
@@ -306,6 +315,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 \
@@ -556,6 +567,10 @@
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/MTreatmentAdjustAutoSubResponse.cpp \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
@@ -572,6 +587,7 @@
sources/model/td/data/MTDSyringePumpData.cpp \
sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
+ sources/model/td/data/treatment/MTreatmentHDFData.cpp \
sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp \
sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \
sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \
@@ -747,8 +763,11 @@
\ # ---------- Views - TD - States Data
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+ sources/view/settings/VCalibrationSettings.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp \
- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
sources/view/td/data/VTDAirBubbleData.cpp \
sources/view/td/data/VTDAirPumpData.cpp \
sources/view/td/data/VTDAirTrapData.cpp \
@@ -766,6 +785,7 @@
sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \
+ sources/view/td/data/treatment/VTreatmentHDFData.cpp \
sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \
sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \
sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
@@ -787,6 +807,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 \
Index: leahi.qrc
===================================================================
diff -u -r290835d1a861d8fe7a716d061f0b079d9cfff75a -rdf61c476838011a343a6930fd5b30404629379bc
--- leahi.qrc (.../leahi.qrc) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a)
+++ leahi.qrc (.../leahi.qrc) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -30,6 +30,7 @@
sources/gui/qml/pages/settings/SettingsAdvancedMode.qml
sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml
sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml
+ sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml
sources/gui/qml/dialogs/ConfirmDialog.qml
@@ -46,6 +47,7 @@
sources/gui/qml/dialogs/PatientIdEntry.qml
sources/gui/qml/dialogs/DryDemoDialog.qml
sources/gui/qml/dialogs/ConfirmPasswordDialog.qml
+ sources/gui/qml/dialogs/CalibrationDialog.qml
sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml
@@ -343,6 +345,7 @@
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentEndIsolatedUF.qml
sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee)
+++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -385,6 +385,19 @@
/*!
* \brief MessageDispatcher::onAdjustment
+ * \details This method transmits the Isolated Ultrafiltration State Adjustment Denali message.
+ * \param vData - Data model contains treatment ultrafiltration state adjustment
+ * \return void
+ */
+void MessageDispatcher::onAdjustment(const AdjustIsolatedUFStateRequestData &vData)
+{
+ QVariantList mData;
+ mData += vData.requestedState;
+ actionTransmit(GuiActionType::ID_AdjustIsoUFStateReq, mData);
+}
+
+/*!
+ * \brief MessageDispatcher::onAdjustment
* \details This method transmits the Ultrafiltration Adjustment Denali message.
* \param vData - Data model contains treatment ultrafiltration adjustment volume
* \return void
@@ -671,6 +684,46 @@
/*!
* \brief MessageDispatcher::onAdjustment
+ * \details This method transmits the HDF state
+ * \param vData - Data model contains hdf state adjustment.
+ * \return void
+ */
+ void MessageDispatcher::onAdjustment(const AdjustHDFStateRequestData &vData)
+{
+ QVariantList mData;
+ mData += vData.state ;
+ actionTransmit(GuiActionType::ID_AdjustHDFStateReq, mData);
+}
+
+/*!
+ * \brief MessageDispatcher::onAdjustment
+ * \details This method transmits the HDF auto sub state
+ * \param vData - Data model contains hdf auto sub state adjustment.
+ * \return void
+ */
+ void MessageDispatcher::onAdjustment(const AdjustAutoSubRequestData &vData)
+{
+ QVariantList mData;
+ mData += vData.state ;
+ actionTransmit(GuiActionType::ID_AdjustAutoSubReq, mData);
+}
+
+/*!
+ * \brief MessageDispatcher::onAdjustment
+ * \details This method transmits the HDF adjustment
+ * \param vData - Data model contains hdf adjustment.
+ * \return void
+ */
+ void MessageDispatcher::onAdjustment(const AdjustHDFRequestData &vData)
+{
+ QVariantList mData;
+ mData += vData.treatmentMode ;
+ mData += vData.subFluidVolume ;
+ actionTransmit(GuiActionType::ID_AdjustHDFReq, mData);
+}
+
+/*!
+ * \brief MessageDispatcher::onAdjustment
* \details This method transmits the InitTreatment request message.
* \param vData - Data model contains the init treatment request information.
* \return void
Index: sources/canbus/MessageDispatcher.h
===================================================================
diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee)
+++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -145,11 +145,15 @@
GuiActionType::ID_AdjustIsolatedUFDurationEditReq ,
GuiActionType::ID_AdjustIsolatedUFVolumeEditReq ,
GuiActionType::ID_AdjustIsolatedUFConfirmReq ,
+ GuiActionType::ID_AdjustIsoUFStateReq ,
GuiActionType::ID_AdjustSalineReq ,
GuiActionType::ID_AdjustVitalsReq ,
GuiActionType::ID_AdjustHeparinReq ,
GuiActionType::ID_AdjustPressuresLimitsReq ,
GuiActionType::ID_AdjustPressuresWideningReq ,
+ GuiActionType::ID_AdjustHDFStateReq ,
+ GuiActionType::ID_AdjustAutoSubReq ,
+ GuiActionType::ID_AdjustHDFReq ,
GuiActionType::ID_AdjustDryBicartDisconnectReq ,
// End-Treatment
GuiActionType::ID_AdjustRinsebackReq ,
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r814f897483a2ea7369e5e924ac92cf7914c52fa4 -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 814f897483a2ea7369e5e924ac92cf7914c52fa4)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -78,7 +78,7 @@
{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_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes
{Gui::GuiActionType::ID_Heparin , 2 * 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
@@ -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
@@ -283,6 +287,15 @@
{Gui::GuiActionType::ID_AdjustRecirculateReq , 1 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustRecirculateRsp , 2 * 4 }, // 2 parameters each 4bytes
+ // ---- HDF
+ {Gui::GuiActionType::ID_HDF , 9 * 4 }, // 9 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustHDFStateReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjsutHDFStateRsp , 2 * 4 }, // 2 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustAutoSubReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustAutoSubRsp , 2 * 4 }, // 2 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustHDFReq , 2 * 4 }, // 2 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustHDFRsp , 3 * 4 }, // 3 parameter each 4bytes
+
// ---- Treatment End
{Gui::GuiActionType::ID_AdjustTreatmentEndReq , 0 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -260,6 +260,10 @@
case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break;
case Gui::GuiActionType::ID_AdjustVitalsReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData ); break;
case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustHDFStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFStateRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustAutoSubReq : INTERPRET_TRANSMIT_MESSAGE(AdjustAutoSubRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustHDFReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFRequestData ); break;
+
case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData ); break;
// in-treatment - ultrafiltration
case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData ); break;
@@ -268,6 +272,7 @@
case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFDurationEditRequestData ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeEditRequestData ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustIsolatedUFConfirmRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustIsoUFStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFStateRequestData ); break;
// End-Treatment
case Gui::GuiActionType::ID_AdjustRinsebackReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData ); break;
case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData ); break;
@@ -531,6 +536,7 @@
case Gui::GuiActionType::ID_DialysateOutletFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow ); break;
case Gui::GuiActionType::ID_PressureOcclusion : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion ); break;
case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break;
+ case Gui::GuiActionType::ID_HDF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDF ); break;
case Gui::GuiActionType::ID_Vitals : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Vitals ); break;
case Gui::GuiActionType::ID_Heparin : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Heparin ); break;
case Gui::GuiActionType::ID_Rinseback : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Rinseback ); break;
@@ -557,13 +563,17 @@
case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break;
case Gui::GuiActionType::ID_AdjustVitalsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVitalsRsp ); break;
case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break;
+ case Gui::GuiActionType::ID_AdjustIsoUFStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsoUFStateRsp ); break;
case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break;
case Gui::GuiActionType::ID_AdjustRinsebackRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp ); break;
case Gui::GuiActionType::ID_AdjustRecirculateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp ); break;
case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp ); break;
+ case Gui::GuiActionType::ID_AdjsutHDFStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjsutHDFStateRsp ); break;
+ case Gui::GuiActionType::ID_AdjustAutoSubRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustAutoSubRsp ); break;
+ case Gui::GuiActionType::ID_AdjustHDFRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDFRsp ); break;
case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp ); break;
// ----- Post-Treatment Adjust
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -56,6 +56,7 @@
#include "VInstitutionalRecord.h"
#include "VAdjustmentAdvancedInstitutionalRecord.h"
#include "VAdvancedInstitutionalRecord.h"
+#include "VCalibrationSettings.h"
// states data
#include "VTDOpModeData.h"
#include "VPreTreatmentStatesData.h"
@@ -106,6 +107,7 @@
#include "VTreatmentTrends.h"
#include "VTreatmentDryBicartDisconnect.h"
#include "VWaterSampleData.h"
+#include "VTreatmentHDFData.h"
// DG data
#include "VDGDrainPumpData.h"
#include "VDDHeatersData.h"
@@ -159,8 +161,12 @@
#include "VTreatmentAdjustmentIsolatedUFConfirm.h"
#include "VTreatmentAdjustmentIsolatedUFDurationEdit.h"
#include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h"
+#include "VTreatmentAdjustmentIsolatedUFState.h"
#include "VTreatmentAdjustmentSetPoints.h"
#include "VTreatmentAdjustmentVitalsAlarmLimits.h"
+#include "VTreatmentAdjustmentAutoSub.h"
+#include "VTreatmentAdjustmentHDFState.h"
+#include "VTreatmentAdjustmentHDF.h"
#include "VTreatmentAdjustmentDryBicartDisconnect.h"
// ----- Post-Treatment Adjustments
#include "VPostTreatmentAdjustPatientDisconnectionConfirm.h"
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -306,6 +306,21 @@
ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED
ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @LEAHIZED
+ ID_AdjustIsoUFStateReq = 0xBA00, // 186 //// ----- @LEAHIZED
+ ID_AdjustIsoUFStateRsp = 0xBB00, // 187 //// ----- @LEAHIZED
+
+ // HDF
+ ID_HDF = 0xBC00, // 188 //// ----- @LEAHIZED
+
+ ID_AdjustHDFStateReq = 0xBD00, // 189 //// ----- @LEAHIZED
+ ID_AdjsutHDFStateRsp = 0xBE00, // 190 //// ----- @LEAHIZED
+
+ ID_AdjustAutoSubReq = 0xBF00, // 191 //// ----- @LEAHIZED
+ ID_AdjustAutoSubRsp = 0xC000, // 192 //// ----- @LEAHIZED
+
+ ID_AdjustHDFReq = 0xC100, // 193 //// ----- @LEAHIZED
+ ID_AdjustHDFRsp = 0xC200, // 194 //// ----- @LEAHIZED
+
// End-Treatment
// Rinseback
ID_AdjustRinsebackReq = 0x9000, // 144 //// ----- @LEAHIZED
@@ -349,7 +364,7 @@
// 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_DuetRoWaterModeUIi = 0xBC0F, // 188 UI -> DG // UI initiates Mode Set || responses to status query
ID_DuetRoWaterModeDGr = 0xC40F, // 196 //// ----- @CRAPIZED: had to change to avoid duplication
@@ -487,6 +502,9 @@
// Ultrafiltration
typedef GuiActions::UF_Commands GuiUFCommands;
typedef GuiActions::UF_Adjustments GuiUFAdjustment;
+ // Isolated UF
+ typedef GuiActions::ISO_UF_Commands GuiIsoUFCommands;
+ typedef GuiActions::Isolated_UF_States GuiIsoUfState;
// Saline
typedef GuiActions::Fluid_Bolus_States GuiSalineStates;
typedef GuiActions::Fluid_Bolus_Commands GuiSalineCommands;
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/gui/qml/main.qml (.../main.qml) (revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a)
+++ sources/gui/qml/main.qml (.../main.qml) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -58,6 +58,7 @@
import VCloudSync 0.1
import VHDUsageInfo 0.1
import VInstitutionalRecord 0.1
+import VCalibrationSettings 0.1
import VAdjustmentInstitutionalRecord 0.1
import VAdvancedInstitutionalRecord 0.1
import VAdjustmentAdvancedInstitutionalRecord 0.1
@@ -86,6 +87,7 @@
import VTreatmentRanges 0.1
import VTreatmentHeparin 0.1
import VTreatmentTrends 0.1
+import VTreatmentHDF 0.1
import VTreatmentDryBicartDisconnect 0.1
// Pre-Treatment
@@ -144,6 +146,7 @@
import VTreatmentAdjustmentIsolatedUFVolumeEdit 0.1
import VTreatmentAdjustmentIsolatedUFConfirm 0.1
import VTreatmentAdjustmentUltrafiltrationState 0.1
+import VTreatmentAdjustmentIsolatedUFState 0.1
import VTreatmentAdjustmentUltrafiltrationEdit 0.1
import VTreatmentAdjustmentUltrafiltrationConfirm 0.1
import VTreatmentAdjustmentPressuresLimits 0.1
@@ -154,6 +157,9 @@
import VTreatmentAdjustmentRinseback 0.1
import VTreatmentAdjustmentRecirculate 0.1
import VTreatmentAdjustmentEnd 0.1
+import VTreatmentAdjustmentAutoSub 0.1
+import VTreatmentAdjustmentHDFState 0.1
+import VTreatmentAdjustmentHDF 0.1
import VTreatmentAdjustmentDryBicartDisconnect 0.1
// Post-Treatmnt
import VPostTreatmentAdjustmentPatientDisconnectionConfirm 0.1
@@ -205,6 +211,8 @@
VInstitutionalRecord { id: vInstitutionalRecord }
VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord }
VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord }
+ VCalibrationSettings { id: vCalibrationSettings }
+
//VAdjustIn
// ---- States
VTDOpMode { id: vTDOpMode
@@ -260,6 +268,7 @@
VTreatmentRecirculate { id: vTreatmentRecirculate }
VTreatmentStop { id: vTreatmentStop }
VTreatmentHeparin { id: vTreatmentHeparin }
+ VTreatmentHDF { id: vTreatmentHDF }
VTreatmentDryBicartDisconnect { id: vTreatmentDryBicartDisconnect }
// ---- DD
@@ -322,6 +331,7 @@
VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit }
VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit }
VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm }
+ VTreatmentAdjustmentIsolatedUFState { id: vTreatmentAdjustmentIsolatedUFState }
VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline }
VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals }
VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState }
@@ -333,6 +343,9 @@
VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback }
VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate }
VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd }
+ VTreatmentAdjustmentAutoSub { id: vTreatmentAdjustmentAutoSub }
+ VTreatmentAdjustmentHDFState { id: vTreatmentAdjustmentHDFState }
+ VTreatmentAdjustmentHDF { id: vTreatmentAdjustmentHDF }
VTreatmentAdjustmentDryBicartDisconnect { id: vTreatmentAdjustmentDryBicartDisconnect }
// --- Post Treatment
Index: sources/model/MModel.h
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/model/MModel.h (.../MModel.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/model/MModel.h (.../MModel.h) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -52,6 +52,7 @@
#include "MTreatmentRangesData.h"
#include "MTreatmentSalineData.h"
#include "MTreatmentVitalsData.h"
+#include "MTreatmentHDFData.h"
#include "MTreatmentDryBicartDisconnectData.h"
#include "MTreatmentHeparinData.h"
#include "MTreatmentRinsebackData.h"
@@ -165,6 +166,7 @@
#include "MTreatmentAdjustIsolatedUFDurationEditResponse.h"
#include "MTreatmentAdjustIsolatedUFVolumeEditResponse.h"
#include "MTreatmentAdjustIsolatedUFConfirmResponse.h"
+#include "MTreatmentAdjustIsolatedUFStateResponse.h"
#include "MTreatmentAdjustSalineResponse.h"
#include "MTreatmentAdjustVitalsResponse.h"
#include "MTreatmentAdjustHeparinResponse.h"
@@ -173,6 +175,9 @@
#include "MTreatmentAdjustEndResponse.h"
#include "MTreatmentAdjustPressuresLimitsResponse.h"
#include "MTreatmentAdjustPressuresWideningResponse.h"
+#include "MTreatmentAdjustAutoSubResponse.h"
+#include "MTreatmentAdjustHDFResponse.h"
+#include "MTreatmentAdjustHDFStateResponse.h"
#include "MTreatmentAdjustDryBicartDisconnectResponse.h"
// Post-Treatment
@@ -371,6 +376,7 @@
REGISTER_METATYPE( TreatmentRangesData ) \
REGISTER_METATYPE( TreatmentSalineData ) \
REGISTER_METATYPE( TreatmentVitalsData ) \
+ REGISTER_METATYPE( TreatmentHDFData ) \
REGISTER_METATYPE( TreatmentHeparinData ) \
REGISTER_METATYPE( TreatmentDryBicartDisconnectData ) \
REGISTER_METATYPE( TreatmentRinsebackData ) \
@@ -468,6 +474,9 @@
REGISTER_METATYPE( AdjustBloodPrimeRequestData ) \
REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \
REGISTER_METATYPE( AdjustBolusVolumeRequestData ) \
+ REGISTER_METATYPE( AdjustHDFStateRequestData ) \
+ REGISTER_METATYPE( AdjustAutoSubRequestData ) \
+ REGISTER_METATYPE( AdjustHDFRequestData ) \
REGISTER_METATYPE( AdjustDurationEditRequestData ) \
REGISTER_METATYPE( AdjustDurationConfirmRequestData ) \
REGISTER_METATYPE( AdjustSetPointsRequestData ) \
@@ -476,6 +485,7 @@
REGISTER_METATYPE( AdjustDialysateFlowRateRequestData ) \
REGISTER_METATYPE( AdjustDialysateTemperatureRequestData ) \
REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \
+ REGISTER_METATYPE( AdjustIsolatedUFStateRequestData ) \
REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \
REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \
REGISTER_METATYPE( AdjustIsolatedUFDurationEditRequestData ) \
@@ -529,6 +539,7 @@
REGISTER_METATYPE( AdjustDialysateFlowRateResponseData ) \
REGISTER_METATYPE( AdjustDialysateTemperatureResponseData ) \
REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \
+ REGISTER_METATYPE( AdjustIsolatedUFStateResponseData ) \
REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \
REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \
REGISTER_METATYPE( AdjustIsolatedUFDurationEditResponseData ) \
@@ -543,6 +554,9 @@
REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \
REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \
REGISTER_METATYPE( AdjustPressuresWideningResponseData ) \
+ REGISTER_METATYPE( AdjustHDFResponseData ) \
+ REGISTER_METATYPE( AdjustHDFStateResponseData ) \
+ REGISTER_METATYPE( AdjustAutoSubResponseData ) \
REGISTER_METATYPE( AdjustVersionsTDRequestData ) \
REGISTER_METATYPE( AdjustVersionsTDResponseData ) \
REGISTER_METATYPE( AdjustVersionsDDResponseData ) \
@@ -612,6 +626,7 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentVitalsData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHDFData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentDryBicartDisconnectData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \
@@ -708,6 +723,7 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFStateResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFDurationEditResponseData ) \
@@ -722,6 +738,9 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \
@@ -754,13 +773,16 @@
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodPrimeRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBolusVolumeRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsAlarmLimitsRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodFlowRateRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateRequestData ) \
- ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFStateRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \
@@ -864,6 +886,7 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentVitalsData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHDFData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentDryBicartDisconnectData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \
@@ -960,6 +983,7 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateFlowRateResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateTemperatureResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFStateResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditResponseData ) \
@@ -974,6 +998,9 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresWideningResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFStateResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAutoSubResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \
@@ -1028,6 +1055,9 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodPrimeRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBolusVolumeRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFStateRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAutoSubRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSetPointsRequestData ) \
@@ -1036,6 +1066,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateFlowRateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateTemperatureRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFStateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditRequestData ) \
@@ -1103,6 +1134,9 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodPrimeRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBolusVolumeRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFStateRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAutoSubRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSetPointsRequestData ) \
@@ -1111,6 +1145,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateFlowRateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateTemperatureRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFStateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFDurationEditRequestData ) \
@@ -1178,6 +1213,9 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodPrimeRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBolusVolumeRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFStateRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAutoSubRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSetPointsRequestData ) \
@@ -1186,6 +1224,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateFlowRateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateTemperatureRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFStateRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFDurationEditRequestData ) \
@@ -1250,6 +1289,7 @@
ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \
ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \
ACTION_RECEIVE_SIGNAL( TreatmentVitalsData ) \
+ ACTION_RECEIVE_SIGNAL( TreatmentHDFData ) \
ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \
ACTION_RECEIVE_SIGNAL( TreatmentDryBicartDisconnectData ) \
ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \
@@ -1347,6 +1387,7 @@
ACTION_RECEIVE_SIGNAL( AdjustDialysateFlowRateResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustDialysateTemperatureResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFStateResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFDurationEditResponseData ) \
@@ -1361,6 +1402,9 @@
ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustPressuresWideningResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustHDFResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustHDFStateResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustAutoSubResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \
ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -335,6 +335,33 @@
};
/*!
+ * \brief The MAdjustIsolatedUFStateReq class
+ * \details The Iso UF commands request model
+ *
+ * | MSG | CAN ID | Type | Ack | Src | Dst | Description |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
+ * |0xBA00| 0x041 | Req | Y | UI | HD | Iso UF Pause/Resume/End |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(U32) | \ref requestedState |
+ *
+ */
+class MAdjustIsolatedUFStateReq : public MModel {
+public:
+
+// GuiUFCommands requestedState = GuiUFCommands::UF_CMD_PAUSE; // the requested state. Initially it's running => paused.
+// TODO UPDATE
+ quint32 requestedState = 0; // Pause/ resume/ end
+ QString toString() {
+ return toString({requestedState});
+ }
+ static QString toString(const QVariantList &vParameters) {
+ return MModel::toString("AdjustIsoUFState", vParameters);
+ }
+};
+
+/*!
* \brief The MAdjustUltrafiltrationEditReq class
* \details The ultrafiltration volume change request model
*
@@ -807,6 +834,84 @@
}
};
+/*!
+ * \brief The MAdjustHDFStateReq class
+ * \details The model to request the HDF state
+ *
+ * | MSG | CAN ID | Type | Ack | Src | Dest | Description |
+ * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: |
+ * |0xBD00| 0x100 | Req | Y | UI | TD | HDF State Request |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(U32) | \ref state |
+ *
+ */
+class MAdjustHDFStateReq : public MModel {
+public:
+ quint32 state = 0;
+
+ QString toString() {
+ return toString({state});
+ }
+ static QString toString(const QVariantList &vParameters) {
+ return MModel::toString("AdjustHDFState", vParameters);
+ }
+};
+
+/*!
+ * \brief The MAdjustAutoSubReq class
+ * \details The model to request the auto sub state
+ *
+ * | MSG | CAN ID | Type | Ack | Src | Dest | Description |
+ * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: |
+ * |0xBD00| 0x100 | Req | Y | UI | TD | auto sub State Req |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(U32) | \ref state |
+ *
+ */
+class MAdjustAutoSubReq : public MModel {
+public:
+ quint32 state = 0;
+
+ QString toString() {
+ return toString({state});
+ }
+ static QString toString(const QVariantList &vParameters) {
+ return MModel::toString("AdjustAutoSub", vParameters);
+ }
+};
+
+/*!
+ * \brief The MAdjustAutoSubReq class
+ * \details The model to request the auto sub state
+ *
+ * | MSG | CAN ID | Type | Ack | Src | Dest | Description |
+ * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: |
+ * |0xBD00| 0x100 | Req | Y | UI | TD | auto sub State Req |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(U32) | \ref treatmetnModali |
+ * | #2:(F32) | \ref state |
+ *
+ */
+class MAdjustHDFReq : public MModel {
+public:
+ quint32 treatmentMode = 0;
+ float subFluidVolume = 0;
+
+ QString toString() {
+ return toString({treatmentMode,
+ subFluidVolume});
+ }
+ static QString toString(const QVariantList &vParameters) {
+ return MModel::toString("AdjustHDF", vParameters);
+ }
+};
+
}
typedef Model:: MDuetConfirmUIr DuetConfirmUIrData;
@@ -819,6 +924,7 @@
typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData;
typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData;
typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData;
+typedef Model:: MAdjustIsolatedUFStateReq AdjustIsolatedUFStateRequestData;
typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData;
typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData;
typedef Model::MAdjustIsolatedUFDurationEditReq AdjustIsolatedUFDurationEditRequestData;
@@ -834,6 +940,9 @@
typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData;
typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData;
typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData;
+typedef Model:: MAdjustHDFStateReq AdjustHDFStateRequestData;
+typedef Model:: MAdjustAutoSubReq AdjustAutoSubRequestData;
+typedef Model:: MAdjustHDFReq AdjustHDFRequestData;
typedef Model:: MAdjustryBicartDisconnectReq AdjustDryBicartDisconnectRequestData;
// Alarms
typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData;
Index: sources/view/VView.h
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rdf61c476838011a343a6930fd5b30404629379bc
--- sources/view/VView.h (.../VView.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/view/VView.h (.../VView.h) (revision df61c476838011a343a6930fd5b30404629379bc)
@@ -146,6 +146,7 @@
REGISTER_TYPE( VInstitutionalRecord ) \
REGISTER_TYPE( VAdjustmentAdvancedInstitutionalRecord ) \
REGISTER_TYPE( VAdvancedInstitutionalRecord ) \
+ REGISTER_TYPE( VCalibrationSettings ) \
/* Alarm */ \
REGISTER_TYPE( VAlarmStatus ) \
REGISTER_TYPE( VAlarmActiveList ) \
@@ -249,8 +250,13 @@
REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFConfirm ) \
REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFDurationEdit ) \
REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit ) \
+ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFState ) \
REGISTER_TYPE( VTreatmentAdjustmentSetPoints ) \
REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits ) \
+ REGISTER_TYPE( VTreatmentHDF ) \
+ REGISTER_TYPE( VTreatmentAdjustmentAutoSub ) \
+ REGISTER_TYPE( VTreatmentAdjustmentHDFState ) \
+ REGISTER_TYPE( VTreatmentAdjustmentHDF ) \
REGISTER_TYPE( VTreatmentAdjustmentDryBicartDisconnect ) \
REGISTER_TYPE( VTreatmentCreate ) \
REGISTER_TYPE( VTreatmentIsolatedUF ) \