Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -rb2a0a682b4f9bcf52352e6cb6206ba10f09c7847 --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision b2a0a682b4f9bcf52352e6cb6206ba10f09c7847) @@ -19,10 +19,17 @@ { eRole_Title , "title" }, { eRole_Component , "component" }, { eRole_Payload , "payload" }, - { eRole_Received , "received" }, + { eRole_Rejections , "rejections" }, + { eRole_Received , "received" }, }); } +/*! + * \brief VCalibrationSettings::initList + * \details Initializes the list for the payload and rejection reasons + * \param vTitles - list of column titles + * \return returns empty list the size of the number of columns +*/ QVariantList View::VCalibrationSettings::initList(const QStringList &vTitles) { columnTitle ( vTitles ) ; @@ -34,17 +41,25 @@ mInitValues.append(0.0); } - rejectionReasons(mInitValues); - return mInitValues; } +/*! + * \brief VCalibrationSettings::getEpochUTC + * \details Gets current time as UTC epoch + * \return returns epoch +*/ quint32 View::VCalibrationSettings::getEpochUTC() { const QDateTime currentDateTimeUTC = QDateTime::currentDateTime(); return currentDateTimeUTC.toSecsSinceEpoch(); } +/*! + * \brief VCalibrationSettings::refreshList + * \details Refresh model with current selected index of calibration records + * \param vIndex - calibration record index to recreate the model +*/ void View::VCalibrationSettings::refreshList (int vIndex) { _columnTitle.clear(); @@ -55,18 +70,18 @@ { QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; // DD Pressure sensors - _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")}, { eRole_Component, tr("D9" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")}, { eRole_Component, tr("D66")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pressure")}, { eRole_Component, tr("D51")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pressure")}, { eRole_Component, tr("D15")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Transmembrane Pressure")}, { eRole_Component, tr("D41")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("D87 Pressure Sensor")}, { eRole_Component, tr("D87")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")}, { eRole_Component, tr("D9" )}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")}, { eRole_Component, tr("D66")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pressure")}, { eRole_Component, tr("D51")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pressure")}, { eRole_Component, tr("D15")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Transmembrane Pressure")}, { eRole_Component, tr("D41")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("D87 Pressure Sensor")}, { eRole_Component, tr("D87")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); // FP Pressure sensors - _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before regulator")}, { eRole_Component, tr("M3") }, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure after regulator")}, { eRole_Component, tr("P8") }, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")}, { eRole_Component, tr("P13")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Pressure before the RO filter")}, { eRole_Component, tr("P17")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Pressure after the RO filter")}, { eRole_Component, tr("P46")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before regulator")}, { eRole_Component, tr("M3") }, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure after regulator")}, { eRole_Component, tr("P8") }, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")}, { eRole_Component, tr("P13")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Pressure before the RO filter")}, { eRole_Component, tr("P17")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Pressure after the RO filter")}, { eRole_Component, tr("P46")}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); break; } case eTemperature : @@ -141,14 +156,23 @@ doRequestRecords(vIndex); } +/*! + * \brief VCalibrationSettings::refreshList + * \details Helper method to request all the sensors per calibration record + * \param vIndex - calibration record index +*/ void View::VCalibrationSettings::doRequestRecords(int vIndex) { switch (vIndex) { case ePressure : { - DDCalibrationPressureRequestData data; - data.mIndex = 2; - emit didAdjustment(data); + // TODO Update 10 weit hFEW ENUM + for (int i = 0; i <= 10; i++) { + DDCalibrationPressureRequestData data; + data.mIndex = i; + emit didAdjustment(data); + } + break; } case eTemperature : @@ -172,6 +196,13 @@ } } +/*! + * \brief VCalibrationSettings::doAdjustment + * \details Adjustment to update calibration record + * \param vIndex - calibration record index + * \param vSensorIndex - sensor index + * \param index - payload +*/ void View::VCalibrationSettings::doAdjustment(int vIndex, int vSensorIndex, QVariantList vPayload) @@ -197,7 +228,7 @@ if (vPayload.size() < 3) { goto invalid; } AdjustDDCalibrationPressureRequestData data; - data.mIndex = vIndex ; + data.mIndex = vSensorIndex ; data.mGain = vPayload[eGain] .toFloat(&result) ; ok &= result; data.mOffset = vPayload[eOffset] .toFloat(&result) ; @@ -234,33 +265,56 @@ return; invalid: - qWarning() << "Invalid calibration payload:" << vPayload; + qWarning() << "Invalid calibration payload: " << vPayload; } +/*! + * \brief VCalibrationSettings::clearRejectionReason + * \details Slot to clear rejection reason when user is editing a rejected parameter + * \param vIndex - rejection reason index + * \param vSensorIndex - sensor index + */ +void View::VCalibrationSettings::clearRejectionReason(int vIndex, int vSensorIndex) +{ + if (vIndex < 0 || vIndex >= _columnTitle.size()) + return; + + QVariantList rejectionList = _calibrationList.data( _calibrationList.index(vSensorIndex,0) ,eRole_Rejections).toList(); + rejectionList[vIndex] = 0; + _calibrationList.updateData( vSensorIndex, eRole_Rejections, rejectionList); + emit didModelChange(); +} + +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of pressure getter response + * \param vData - DDCalibrationPressureResponseData + */ void View::VCalibrationSettings::onActionReceive(const DDCalibrationPressureResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mGain, vData.mOffset, vData.mCalTime })); - qDebug() << "DDCalibrationPressureResponseData" ; - qDebug() << vData.mIndex ; - qDebug() << vData.mGain ; + _calibrationList.updateData( vData.mIndex, eRole_Received, true ); + adjustment ( true ); } +/*! + * \brief VCalibrationSettings::onActionReceive + * \details Slot of pressure setter response + * \param vData - AdjustDDCalibrationPressureResponseData + */ void View::VCalibrationSettings::onActionReceive(const AdjustDDCalibrationPressureResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - qDebug() << "AdjustDDCalibrationPressureResponseData" ; - qDebug() << vData.mIndex ; - - rejectionReasons ({ vData.mGainRejectReason , - vData.mOffsetRejectReason , - vData.mCalibrationTimeRejectReason }) ; - + _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + vData.mOffsetRejectReason, + vData.mCalibrationTimeRejectReason })); + emit didModelChange(); adjustment ( true ); }