Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -697,8 +697,26 @@ case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; // ----- Calibration - case Gui::GuiActionType::ID_DDCalibrationPressureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationPressureRsp ); break; - case Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp); break; + case Gui::GuiActionType::ID_DDCalibrationPressureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationPressureRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationTemperatureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationTemperatureRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp ); break; default: break; //FIXME later enabled } Index: sources/model/MModel.h =================================================================== diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/MModel.h (.../MModel.h) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) +++ sources/model/MModel.h (.../MModel.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -103,8 +103,26 @@ #include "MTDInstitutionalRecordResponse.h" #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" #include "MTDAdvancedInstitutionalRecordResponse.h" +#include "MDDCalibrationAccelerometerSensorRecordResponse.h" +#include "MDDCalibrationAcidConcentratesRecordResponse.h" +#include "MDDCalibrationBicarbConcentratesRecordResponse.h" +#include "MDDCalibrationBloodLeakSensorRecordResponse.h" +#include "MDDCalibrationConcentratePumpRecordResponse.h" +#include "MDDCalibrationConductivitySensorRecordResponse.h" +#include "MDDCalibrationD12DialysatePumpRecordResponse.h" +#include "MDDCalibrationD48DialysatePumpRecordResponse.h" #include "MDDCalibrationPressureRecordResponse.h" +#include "MDDCalibrationTemperatureRecordResponse.h" +#include "MAdjustDDCalibrationAccelerometerSensorRecordResponse.h" +#include "MAdjustDDCalibrationAcidConcentratesRecordResponse.h" +#include "MAdjustDDCalibrationBicarbConcentratesRecordResponse.h" +#include "MAdjustDDCalibrationBloodLeakSensorRecordResponse.h" +#include "MAdjustDDCalibrationConcentratePumpRecordResponse.h" +#include "MAdjustDDCalibrationConductivitySensorRecordResponse.h" +#include "MAdjustDDCalibrationD12DialysatePumpRecordResponse.h" +#include "MAdjustDDCalibrationD48DialysatePumpRecordResponse.h" #include "MAdjustDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationTemperatureRecordResponse.h" // DD Data Messages #include "MDGDrainPumpData.h" @@ -601,8 +619,26 @@ REGISTER_METATYPE( AdjustDDCalibrationBloodLeakSensorRequestData ) \ REGISTER_METATYPE( DDCalibrationConductivityRequestData ) \ REGISTER_METATYPE( AdjustDDCalibrationConductivityRequestData ) \ + REGISTER_METATYPE( DDCalibrationAccelerometerSensorResponseData ) \ + REGISTER_METATYPE( DDCalibrationAcidConcentratesResponseData ) \ + REGISTER_METATYPE( DDCalibrationBicarbConcentratesResponseData ) \ + REGISTER_METATYPE( DDCalibrationBloodLeakSensorResponseData ) \ + REGISTER_METATYPE( DDCalibrationConcentratePumpResponseData ) \ + REGISTER_METATYPE( DDCalibrationConductivitySensorResponseData ) \ + REGISTER_METATYPE( DDCalibrationD12DialysatePumpResponseData ) \ + REGISTER_METATYPE( DDCalibrationD48DialysatePumpResponseData ) \ REGISTER_METATYPE( DDCalibrationPressureResponseData ) \ + REGISTER_METATYPE( DDCalibrationTemperatureResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAccelerometerSensorResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAcidConcentratesResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBicarbConcentratesResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBloodLeakSensorResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConcentratePumpResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConductivitySensorResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD12DialysatePumpResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD48DialysatePumpResponseData ) \ REGISTER_METATYPE( AdjustDDCalibrationPressureResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationTemperatureResponseData ) \ /* HD reset in service mode */ \ REGISTER_METATYPE( AdjustHDResetInSrvcRequestData ) \ @@ -785,8 +821,26 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRecordResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationTemperatureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,AdjustDDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationTemperatureResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ @@ -1068,8 +1122,26 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdvancedInstitutionalRecordResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationPressureResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationTemperatureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationTemperatureResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -1534,8 +1606,26 @@ ACTION_RECEIVE_SIGNAL( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdvancedInstitutionalRecordResponseData ) \ - ACTION_RECEIVE_SIGNAL( DDCalibrationPressureResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationTemperatureResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationTemperatureResponseData ) \ //--------------------------------------------------------------------------------// Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h (.../MAdjustDDCalibrationConcentratePumpRecordResponse.h) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h (.../MAdjustDDCalibrationConcentratePumpRecordResponse.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -57,9 +57,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("AdjustDDalibrationPressure") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("AdjustDDCalibrationConcentratePump") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h (.../MAdjustDDCalibrationTemperatureRecordResponse.h) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h (.../MAdjustDDCalibrationTemperatureRecordResponse.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -59,7 +59,7 @@ Type_Enum typeText () const override { return Type_Enum::eEvent ; } Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("AdjustDDalibrationPressure") ; } + QString infoText () const override { return QString("AdjustDDCalibrationTemperature") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h =================================================================== diff -u -r242f311d48e57e738383d3b1d6881dee5747be4a -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h (.../MDDCalibrationAcidConcentratesRecordResponse.h) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) +++ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h (.../MDDCalibrationAcidConcentratesRecordResponse.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -63,7 +63,7 @@ Type_Enum typeText () const override { return Type_Enum::eEvent ; } Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("DDalibrationAcidConcentrates") ; } + QString infoText () const override { return QString("DDCalibrationAcidConcentrates") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp =================================================================== diff -u -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp (.../MDDCalibrationBicarbConcentratesRecordResponse.cpp) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) +++ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp (.../MDDCalibrationBicarbConcentratesRecordResponse.cpp) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -40,7 +40,7 @@ * \details Provides model's Data from the received messages data values * \return Data */ -BicarbConcentrates MDDCalibrationBicarbConcentratesRecordResponse::data() const { +DDCalibrationBicarbConcentratesResponseData MDDCalibrationBicarbConcentratesRecordResponse::data() const { Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; Index: sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h =================================================================== diff -u -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h (.../MDDCalibrationBicarbConcentratesRecordResponse.h) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) +++ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h (.../MDDCalibrationBicarbConcentratesRecordResponse.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -61,9 +61,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("DDalibrationBicarbConcentrates") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("DDCalibrationBicarbConcentrates") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.h =================================================================== diff -u -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.h (.../MDDCalibrationBloodLeakSensorRecordResponse.h) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) +++ sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.h (.../MDDCalibrationBloodLeakSensorRecordResponse.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -55,7 +55,7 @@ Type_Enum typeText () const override { return Type_Enum::eEvent ; } Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("DDalibrationBloodLeakSensor") ; } + QString infoText () const override { return QString("DDCalibrationBloodLeakSensor") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h (.../MDDCalibrationConcentratePumpRecordResponse.h) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h (.../MDDCalibrationConcentratePumpRecordResponse.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -57,9 +57,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("DDalibrationPressure") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("DDalibrationConcentratePumpR") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp =================================================================== diff -u -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp (.../MDDCalibrationConductivitySensorRecordResponse.cpp) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) +++ sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp (.../MDDCalibrationConductivitySensorRecordResponse.cpp) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -30,7 +30,7 @@ if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; if ( ! GetValue(vByteArray, index, _data.mK_high )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mAlpha_hig)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAlpha_high)) goto lError; if ( ! GetValue(vByteArray, index, _data.mEta_high )) goto lError; if ( ! GetValue(vByteArray, index, _data.mZeta_high)) goto lError; if ( ! GetValue(vByteArray, index, _data.mK_low )) goto lError; Index: sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.h =================================================================== diff -u -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.h (.../MDDCalibrationTemperatureRecordResponse.h) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) +++ sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.h (.../MDDCalibrationTemperatureRecordResponse.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -57,9 +57,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("DDalibrationTemperature") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("DDCalibrationTemperature") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -r57fdcc6fcd4d91311544c2085cee41108293b6f6 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -31,11 +31,27 @@ ADJUST_VIEW_CONNECTION( DDCalibrationConductivityRequestData) ADJUST_VIEW_CONNECTION( AdjustDDCalibrationConductivityRequestData) + ACTION_VIEW_CONNECTION(DDCalibrationAccelerometerSensorResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationAcidConcentratesResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationBicarbConcentratesResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationBloodLeakSensorResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationConcentratePumpResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationConductivitySensorResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationD12DialysatePumpResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationD48DialysatePumpResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationPressureResponseData ) + ACTION_VIEW_CONNECTION(DDCalibrationTemperatureResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationAccelerometerSensorResponseData) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationAcidConcentratesResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationBicarbConcentratesResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationBloodLeakSensorResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationConcentratePumpResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationConductivitySensorResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationD12DialysatePumpResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationD48DialysatePumpResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationPressureResponseData ) + ACTION_VIEW_CONNECTION(AdjustDDCalibrationTemperatureResponseData ) - - ACTION_VIEW_CONNECTION(DDCalibrationPressureResponseData) - ACTION_VIEW_CONNECTION(AdjustDDCalibrationPressureResponseData) - _calibrationList.setRoleNames({ { eRole_Title , "title" }, { eRole_Component , "component" }, @@ -207,13 +223,26 @@ data.mIndex = i; emit didAdjustment(data); } - break; } case eTemperature : + { + for (int i = 0; i < GuiDDCalibrationTemperature::NUM_OF_TEMPERATURE_SENSORS; i++) { + DDCalibrationTemperatureRequestData data; + data.mIndex = i; + emit didAdjustment(data); + } break; + } case eConcentratePump : + { + for (int i = 0; i < GuiDDCalibrationConcentratePump::NUM_OF_CONCENTRATE_PUMPS; i++) { + DDCalibrationConcentratePumpRequestData data; + data.mIndex = i; + emit didAdjustment(data); + } break; + } case eDialysatePumpD12 : break; case eDialysatePumpD48 : @@ -337,3 +366,309 @@ emit didModelChange(); adjustment ( true ); } + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of temp getter response + * \param vData - DDCalibrationTemperatureResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationTemperatureResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + vData.mOffset, + vData.mCalTime })); + _calibrationList.updateData( vData.mIndex, eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of conc pump setter response + * \param vData - AdjustDDCalibrationTemperatureResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationTemperatureResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + vData.mOffsetRejectReason, + vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of temp getter response + * \param vData - DDCalibrationConcentratePumpResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationConcentratePumpResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + vData.mOffset, + vData.mCalTime })); + _calibrationList.updateData( vData.mIndex, eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of conc pump setter response + * \param vData - AdjustDDCalibrationConcentratePumpResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationConcentratePumpResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + vData.mOffsetRejectReason, + vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of d12 pump getter response + * \param vData - DDCalibrationD12DialysatePumpResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationD12DialysatePumpResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); +// _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, +// vData.mOffset, +// vData.mCalTime })); + _calibrationList.updateData( 0 , eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of d12 pump setter response + * \param vData - AdjustDDCalibrationD12DialysatePumpResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationD12DialysatePumpResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + +// _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, +// vData.mOffsetRejectReason, +// vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of d48 pump getter response + * \param vData - DDCalibrationD48DialysatePumpResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationD48DialysatePumpResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + // _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + // vData.mOffset, + // vData.mCalTime })); + _calibrationList.updateData( 0 , eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of d48 pump setter response + * \param vData - AdjustDDCalibrationD48DialysatePumpResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationD48DialysatePumpResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + // vData.mOffsetRejectReason, + // vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of acid concentrate getter response + * \param vData - DDCalibrationAcidConcentratesResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationAcidConcentratesResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + // _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + // vData.mOffset, + // vData.mCalTime })); + _calibrationList.updateData( 0 , eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of acid concentrate setter response + * \param vData - AdjustDDCalibrationAcidConcentratesResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationAcidConcentratesResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + // vData.mOffsetRejectReason, + // vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of bicarb concentrate getter response + * \param vData - DDCalibrationBicarbConcentratesResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationBicarbConcentratesResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + // _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + // vData.mOffset, + // vData.mCalTime })); + _calibrationList.updateData( 0 , eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of bicarb concentrate setter response + * \param vData - AdjustDDCalibrationBicarbConcentratesResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationBicarbConcentratesResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + // vData.mOffsetRejectReason, + // vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of bicarb concentrate getter response + * \param vData - DDCalibrationAccelerometerSensorResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationAccelerometerSensorResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + // _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + // vData.mOffset, + // vData.mCalTime })); + _calibrationList.updateData( 0 , eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of accelerometer sensor setter response + * \param vData - AdjustDDCalibrationAccelerometerSensorResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationAccelerometerSensorResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + // vData.mOffsetRejectReason, + // vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of blood leak sensor getter response + * \param vData - DDCalibrationBloodLeakSensorResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationBloodLeakSensorResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + // _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + // vData.mOffset, + // vData.mCalTime })); + _calibrationList.updateData( 0 , eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of blood leak sensor setter response + * \param vData - AdjustDDCalibrationBloodLeakSensorResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationBloodLeakSensorResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + // vData.mOffsetRejectReason, + // vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of conductivity sensor getter response + * \param vData - DDCalibrationConductivitySensorResponseData + */ +void View::VCalibrationSettings::onActionReceive(const DDCalibrationConductivitySensorResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + // _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, + // vData.mOffset, + // vData.mCalTime })); + _calibrationList.updateData( 0 , eRole_Received, true ); + + adjustment ( true ); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of conductivity sensor setter response + * \param vData - AdjustDDCalibrationConductivitySensorResponseData + */ +void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationConductivitySensorResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + // vData.mOffsetRejectReason, + // vData.mCalibrationTimeRejectReason })); + emit didModelChange(); + adjustment ( true ); +} Index: sources/view/settings/VCalibrationSettings.h =================================================================== diff -u -r57fdcc6fcd4d91311544c2085cee41108293b6f6 -r10f525ba53f0248265eaaee6c511444a0c4cc495 --- sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) +++ sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) @@ -8,8 +8,26 @@ #include "VAdjustmentResponseBase.h" #include "MListModel.h" +#include "MDDCalibrationAccelerometerSensorRecordResponse.h" +#include "MDDCalibrationAcidConcentratesRecordResponse.h" +#include "MDDCalibrationBicarbConcentratesRecordResponse.h" +#include "MDDCalibrationBloodLeakSensorRecordResponse.h" +#include "MDDCalibrationConcentratePumpRecordResponse.h" +#include "MDDCalibrationConductivitySensorRecordResponse.h" +#include "MDDCalibrationD12DialysatePumpRecordResponse.h" +#include "MDDCalibrationD48DialysatePumpRecordResponse.h" #include "MDDCalibrationPressureRecordResponse.h" +#include "MDDCalibrationTemperatureRecordResponse.h" +#include "MAdjustDDCalibrationAccelerometerSensorRecordResponse.h" +#include "MAdjustDDCalibrationAcidConcentratesRecordResponse.h" +#include "MAdjustDDCalibrationBicarbConcentratesRecordResponse.h" +#include "MAdjustDDCalibrationBloodLeakSensorRecordResponse.h" +#include "MAdjustDDCalibrationConcentratePumpRecordResponse.h" +#include "MAdjustDDCalibrationConductivitySensorRecordResponse.h" +#include "MAdjustDDCalibrationD12DialysatePumpRecordResponse.h" +#include "MAdjustDDCalibrationD48DialysatePumpRecordResponse.h" #include "MAdjustDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationTemperatureRecordResponse.h" namespace View { @@ -57,8 +75,26 @@ VIEW_DEC_CLASS(VCalibrationSettings); + VIEW_DEC_SLOT(DDCalibrationAccelerometerSensorResponseData ) + VIEW_DEC_SLOT(DDCalibrationAcidConcentratesResponseData ) + VIEW_DEC_SLOT(DDCalibrationBicarbConcentratesResponseData ) + VIEW_DEC_SLOT(DDCalibrationBloodLeakSensorResponseData ) + VIEW_DEC_SLOT(DDCalibrationConcentratePumpResponseData ) + VIEW_DEC_SLOT(DDCalibrationConductivitySensorResponseData ) + VIEW_DEC_SLOT(DDCalibrationD12DialysatePumpResponseData ) + VIEW_DEC_SLOT(DDCalibrationD48DialysatePumpResponseData ) VIEW_DEC_SLOT(DDCalibrationPressureResponseData ) + VIEW_DEC_SLOT(DDCalibrationTemperatureResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationAccelerometerSensorResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationAcidConcentratesResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationBicarbConcentratesResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationBloodLeakSensorResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationConcentratePumpResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationConductivitySensorResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationD12DialysatePumpResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationD48DialysatePumpResponseData ) VIEW_DEC_SLOT(AdjustDDCalibrationPressureResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationTemperatureResponseData ) private: