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 ); +}