Index: sources/gui/qml/dialogs/CalibrationDialog.qml =================================================================== diff -u -r25fec42483af3397ccd9306da1c5b19f5d950164 -r447964ddb04f1b355add08cb81f3a6ce2fa81c7a --- sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision 25fec42483af3397ccd9306da1c5b19f5d950164) +++ sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision 447964ddb04f1b355add08cb81f3a6ce2fa81c7a) @@ -25,6 +25,10 @@ x : Math.round((Variables.applicationWidth - width) / 2) - 200 radius : Variables.adjustmentDialogRadius + notification.textfontSize : 20 + notification.visible : vCalibrationSettings.adjustment_ReasonText + notification.anchors.rightMargin: 10 + backgroundItem : [ NumPad { id: _numPad x : _root.width y : 0 @@ -227,10 +231,21 @@ right : undefined margins : 0 bottom : _root.contentItem.bottom - bottomMargin : Variables.defaultMargin * 2 + bottomMargin : Variables.defaultMargin * 3.5 horizontalCenter: _root.contentItem.horizontalCenter } onClicked : _root.confirmClicked() } + + Connections { target: vCalibrationSettings + function onAdjustmentTriggered ( vValue ) { + if ( vCalibrationSettings.adjustment_Accepted ) { + notificationText = "" + } + else { + notificationText = vCalibrationSettings.adjustment_ReasonText + } + } + } } Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h =================================================================== diff -u -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 -r447964ddb04f1b355add08cb81f3a6ce2fa81c7a --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h (.../MAdjustDDCalibrationBicarbConcentratesRecordResponse.h) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h (.../MAdjustDDCalibrationBicarbConcentratesRecordResponse.h) (revision 447964ddb04f1b355add08cb81f3a6ce2fa81c7a) @@ -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("AdjustDDalibrationBicarbConcentrates") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("AdjustDDCalibrationBicarbConcentrates") ; } struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h =================================================================== diff -u -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 -r447964ddb04f1b355add08cb81f3a6ce2fa81c7a --- sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h (.../MDDCalibrationConductivitySensorRecordResponse.h) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) +++ sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h (.../MDDCalibrationConductivitySensorRecordResponse.h) (revision 447964ddb04f1b355add08cb81f3a6ce2fa81c7a) @@ -25,18 +25,18 @@ * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | * | #3:(U32) | \ref Data::mIndex | - * | #4:(U32) | \ref Data::mK_high | - * | #5:(U32) | \ref Data::mAlpha_high | - * | #6:(U32) | \ref Data::mEta_high | - * | #7:(U32) | \ref Data::mZeta_high | - * | #8:(U32) | \ref Data::mK_low | - * | #9:(U32) | \ref Data::mAlpha_low | - * | #10:(U32)| \ref Data::mEta_low | - * | #11:(U32)| \ref Data::mZeta_low | - * | #12:(U32)| \ref Data::mBeta | - * | #13:(U32)| \ref Data::mDelta | - * | #14:(U32)| \ref Data::mReserved1 | - * | #15:(U32)| \ref Data::mReserved2 | + * | #4:(F32) | \ref Data::mK_high | + * | #5:(F32) | \ref Data::mAlpha_high | + * | #6:(F32) | \ref Data::mEta_high | + * | #7:(F32) | \ref Data::mZeta_high | + * | #8:(F32) | \ref Data::mK_low | + * | #9:(F32) | \ref Data::mAlpha_low | + * | #10:(F32)| \ref Data::mEta_low | + * | #11:(F32)| \ref Data::mZeta_low | + * | #12:(F32)| \ref Data::mBeta | + * | #13:(F32)| \ref Data::mDelta | + * | #14:(F32)| \ref Data::mReserved1 | + * | #15:(F32)| \ref Data::mReserved2 | * | #16:(U32)| \ref Data::mCalTime | * * \sa Data @@ -60,18 +60,18 @@ Types::U32 mAccepted ; Types::U32 mReason ; Types::U32 mIndex ; - Types::U32 mK_high ; - Types::U32 mAlpha_high ; - Types::U32 mEta_high ; - Types::U32 mZeta_high ; - Types::U32 mK_low ; - Types::U32 mAlpha_low ; - Types::U32 mEta_low ; - Types::U32 mZeta_low ; - Types::U32 mBeta ; - Types::U32 mDelta ; - Types::U32 mReserved1 ; - Types::U32 mReserved2 ; + Types::F32 mK_high ; + Types::F32 mAlpha_high ; + Types::F32 mEta_high ; + Types::F32 mZeta_high ; + Types::F32 mK_low ; + Types::F32 mAlpha_low ; + Types::F32 mEta_low ; + Types::F32 mZeta_low ; + Types::F32 mBeta ; + Types::F32 mDelta ; + Types::F32 mReserved1 ; + Types::F32 mReserved2 ; Types::U32 mCalTime ; } _data; @@ -85,18 +85,18 @@ quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ quint32 mIndex = 0; - quint32 mK_high = 0; - quint32 mAlpha_high = 0; - quint32 mEta_high = 0; - quint32 mZeta_high = 0; - quint32 mK_low = 0; - quint32 mAlpha_low = 0; - quint32 mEta_low = 0; - quint32 mZeta_low = 0; - quint32 mBeta = 0; - quint32 mDelta = 0; - quint32 mReserved1 = 0; - quint32 mReserved2 = 0; + float mK_high = 0; + float mAlpha_high = 0; + float mEta_high = 0; + float mZeta_high = 0; + float mK_low = 0; + float mAlpha_low = 0; + float mEta_low = 0; + float mZeta_low = 0; + float mBeta = 0; + float mDelta = 0; + float mReserved1 = 0; + float mReserved2 = 0; quint32 mCalTime = 0; }; Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -r25fec42483af3397ccd9306da1c5b19f5d950164 -r447964ddb04f1b355add08cb81f3a6ce2fa81c7a --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 25fec42483af3397ccd9306da1c5b19f5d950164) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 447964ddb04f1b355add08cb81f3a6ce2fa81c7a) @@ -669,9 +669,8 @@ { 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_Payload, QVariantList ({ vData.mTargetPumpSpeed, + Format::fromEpoch( vData.mCalTime, "yyyy/MM/dd, HH:mm" )})); _calibrationList.updateData( 0 , eRole_Received, true ); adjustment ( true ); @@ -687,9 +686,8 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); -// _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, -// vData.mOffsetRejectReason, -// vData.mCalibrationTimeRejectReason })); + _calibrationList.updateData( 0, eRole_Rejections, QVariantList ({ vData.mTargetPumpSpeedRejectReason, + vData.mCalibrationTimeRejectReason })); emit didModelChange(); adjustment ( true ); } @@ -703,9 +701,9 @@ { 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_Payload, QVariantList ({ vData.mGain, + vData.mOffset, + Format::fromEpoch( vData.mCalibrationTime, "yyyy/MM/dd, HH:mm" ) })); _calibrationList.updateData( 0 , eRole_Received, true ); adjustment ( true ); @@ -721,9 +719,9 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, - // vData.mOffsetRejectReason, - // vData.mCalibrationTimeRejectReason })); + _calibrationList.updateData( 0, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, + vData.mOffsetRejectReason, + vData.mCalibrationTimeRejectReason })); emit didModelChange(); adjustment ( true ); } @@ -737,10 +735,12 @@ { 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 ); + _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mAcidConcMixRatio, + vData.mAcidFullBottleVolumeML, + vData.mAcidConductivityUSPerCM, + vData.mAcidBottleTemperature, + Format::fromEpoch( vData.mCalTime, "yyyy/MM/dd, HH:mm" ) })); + _calibrationList.updateData( vData.mIndex , eRole_Received, true ); adjustment ( true ); } @@ -755,9 +755,11 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, - // vData.mOffsetRejectReason, - // vData.mCalibrationTimeRejectReason })); + _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mAcidConcMixRatioRejectReason, + vData.mAcidFullBottleVolumeMLRejectReason, + vData.mAcidConductivityUSPerCMRejectReason, + vData.mAcidBottleTemperatureRejectReason, + vData.mCalibrationTimeRejectReason })); emit didModelChange(); adjustment ( true ); } @@ -771,10 +773,12 @@ { 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 ); + _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mBicarbConcMixRatio, + vData.mBicarbStartVolumeML, + vData.mBicarbConductivityUSPerCM, + vData.mBicarbBottleTemperature, + Format::fromEpoch( vData.mCalTime, "yyyy/MM/dd, HH:mm" ) })); + _calibrationList.updateData( vData.mIndex , eRole_Received, true ); adjustment ( true ); } @@ -789,9 +793,11 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, - // vData.mOffsetRejectReason, - // vData.mCalibrationTimeRejectReason })); + _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mBicarbConcMixRatioRejectReason, + vData.mBicarbStartVolumeMLRejectReason, + vData.mBicarbConductivityUSPerCMRejectReason, + vData.mBicarbBottleTemperatureRejectReason, + vData.mCalibrationTimeRejectReason })); emit didModelChange(); adjustment ( true ); } @@ -805,9 +811,10 @@ { 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_Payload, QVariantList ({ vData.mAccelXOffset, + vData.mAccelYOffset, + vData.mAccelZOffset, + Format::fromEpoch( vData.mCalTime, "yyyy/MM/dd, HH:mm" ) })); _calibrationList.updateData( 0 , eRole_Received, true ); adjustment ( true ); @@ -823,9 +830,10 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, - // vData.mOffsetRejectReason, - // vData.mCalibrationTimeRejectReason })); + _calibrationList.updateData( 0, eRole_Rejections, QVariantList ({ vData.accelXOffsetRejectReason, + vData.accelYOffsetRejectReason, + vData.accelZOffsetRejectReason, + vData.mCalibrationTimeRejectReason })); emit didModelChange(); adjustment ( true ); } @@ -839,9 +847,8 @@ { 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_Payload, QVariantList ({ vData.mSetPoint, + Format::fromEpoch( vData.mCalTime, "yyyy/MM/dd, HH:mm" ) })); _calibrationList.updateData( 0 , eRole_Received, true ); adjustment ( true ); @@ -857,9 +864,8 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, - // vData.mOffsetRejectReason, - // vData.mCalibrationTimeRejectReason })); + _calibrationList.updateData( 0, eRole_Rejections, QVariantList ({ vData.mSetPointRejectReason, + vData.mCalibrationTimeRejectReason })); emit didModelChange(); adjustment ( true ); } @@ -873,10 +879,20 @@ { 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 ); + _calibrationList.updateData( vData.mIndex, eRole_Payload, QVariantList ({ vData.mK_high , + vData.mAlpha_high, + vData.mEta_high , + vData.mZeta_high , + vData.mK_low , + vData.mAlpha_low , + vData.mEta_low , + vData.mZeta_low , + vData.mBeta , + vData.mDelta , + vData.mReserved1 , + vData.mReserved2 , + Format::fromEpoch( vData.mCalTime, "yyyy/MM/dd, HH:mm" ) })); + _calibrationList.updateData( vData.mIndex , eRole_Received, true ); adjustment ( true ); } @@ -891,9 +907,19 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - // _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mGainRejectReason, - // vData.mOffsetRejectReason, - // vData.mCalibrationTimeRejectReason })); + _calibrationList.updateData( vData.mIndex, eRole_Rejections, QVariantList ({ vData.mK_highRejectReason , + vData.mAlpha_higRejectReason , + vData.mEta_highRejectReason , + vData.mZeta_highRejectReason , + vData.mK_lowRejectReason , + vData.mAlpha_lowRejectReason , + vData.mEta_lowRejectReason , + vData.mZeta_lowRejectReason , + vData.mBetaRejectReason , + vData.mDeltaRejectReason , + vData.mReserved1RejectReason , + vData.mReserved2RejectReason , + vData.mCalibrationTimeRejectReason })); emit didModelChange(); adjustment ( true ); }