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