Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -rbd76dfd315dcec264e4bbe26e3dd85a276937094 -r597b92143fbd12661fd719f3e8612a1a00802120 --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision bd76dfd315dcec264e4bbe26e3dd85a276937094) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 597b92143fbd12661fd719f3e8612a1a00802120) @@ -355,7 +355,7 @@ const quint32 calTimeEpoch = getEpochUTC(); const QString formattedTime = Format::fromEpoch( calTimeEpoch, "yyyy/MM/dd, HH:mm" ); - bool result = false; + bool ok = false; if ( vPayload.isEmpty() ) { goto invalid; } @@ -366,14 +366,11 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationPressureReq)) { goto invalid; } AdjustDDCalibrationPressureRequestData data; - data.mIndex = vSensorIndex ; - data.mGain = vPayload[eGain] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mOffset = vPayload[eOffset] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mIndex = vSensorIndex ; + data.mGain = vPayload[eGain] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mOffset = vPayload[eOffset] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; - emit didAdjustment(data); break; } @@ -382,12 +379,10 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationTemperatureReq)) { goto invalid; } AdjustDDCalibrationTemperatureRequestData data; - data.mIndex = vSensorIndex ; - data.mGain = vPayload[eGain] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mOffset = vPayload[eOffset] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mIndex = vSensorIndex ; + data.mGain = vPayload[eGain] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mOffset = vPayload[eOffset] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break; @@ -397,12 +392,10 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq)) { goto invalid; } AdjustDDCalibrationConcentratePumpRequestData data; - data.mIndex = vSensorIndex ; - data.mGain = vPayload[eGain] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mOffset = vPayload[eOffset] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mIndex = vSensorIndex ; + data.mGain = vPayload[eGain] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mOffset = vPayload[eOffset] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break; @@ -412,9 +405,8 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq)) { goto invalid; } AdjustDDCalibrationD12DialysatePumpRequestData data; - data.mTargetPumpSpeed = vPayload[0] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mTargetPumpSpeed = vPayload[0] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break; @@ -424,11 +416,9 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq)) { goto invalid; } AdjustDDCalibrationD48DialysatePumpRequestData data; - data.mGain = vPayload[eGain] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mOffset = vPayload[eOffset] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mGain = vPayload[eGain] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mOffset = vPayload[eOffset] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break; @@ -438,16 +428,12 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq)) { goto invalid; } AdjustDDCalibrationAcidConcentratesRequestData data; - data.mIndex = vSensorIndex ; - data.mAcidConcMixRatio = vPayload[ConcMixRatio] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mAcidFullBottleVolumeML = vPayload[FullBottleVolumeML] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mAcidConductivityUSPerCM = vPayload[ConductivityUSPerCM] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mAcidBottleTemperature = vPayload[BottleTemperature] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mIndex = vSensorIndex ; + data.mAcidConcMixRatio = vPayload[ConcMixRatio] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mAcidFullBottleVolumeML = vPayload[FullBottleVolumeML] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mAcidConductivityUSPerCM = vPayload[ConductivityUSPerCM] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mAcidBottleTemperature = vPayload[BottleTemperature] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break; @@ -457,16 +443,12 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq)) { goto invalid; } AdjustDDCalibrationBicarbConcentratesRequestData data; - data.mIndex = vSensorIndex ; - data.mBicarbConcMixRatio = vPayload[ConcMixRatio] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mBicarbStartVolumeML = vPayload[FullBottleVolumeML] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mBicarbConductivityUSPerCM = vPayload[ConductivityUSPerCM] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mBicarbBottleTemperature = vPayload[BottleTemperature] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mIndex = vSensorIndex ; + data.mBicarbConcMixRatio = vPayload[ConcMixRatio] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mBicarbStartVolumeML = vPayload[FullBottleVolumeML] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mBicarbConductivityUSPerCM = vPayload[ConductivityUSPerCM] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mBicarbBottleTemperature = vPayload[BottleTemperature] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break; @@ -476,13 +458,10 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq)) { goto invalid; } AdjustDDCalibrationAccelerometerSensorRequestData data; - data.mAccelXOffset = vPayload[XOffSet] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mAccelYOffset = vPayload[YOffSet] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mAccelZOffset = vPayload[ZOffSet] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mAccelXOffset = vPayload[XOffSet] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mAccelYOffset = vPayload[YOffSet] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mAccelZOffset = vPayload[ZOffSet] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break; @@ -492,8 +471,7 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq)) { goto invalid; } AdjustDDCalibrationBloodLeakSensorRequestData data; - data.mSetPoint = vPayload[0] .toInt(&result) ; - if ( ! result ) goto invalid; + data.mSetPoint = vPayload[0] .toInt(&ok) ; if ( ! ok ) { goto invalid; } data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); @@ -504,32 +482,20 @@ if (vPayload.size() < getPayloadLength(GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq)) { goto invalid; } AdjustDDCalibrationConductivityRequestData data; - data.mIndex = vSensorIndex ; - data.mKHigh = vPayload[KHigh] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mAlphaHigh = vPayload[AlphaHigh] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mEtaHigh = vPayload[EtaHigh] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mZetahigh = vPayload[Zetahigh] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mKLow = vPayload[KLow] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mAlphaLow = vPayload[AlphaLow] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mEtaLow = vPayload[EtaLow] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mZetaLow = vPayload[ZetaLow] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mBeta = vPayload[Beta] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mDelta = vPayload[Delta] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mReserved1 = vPayload[Reserved1] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mReserved2 = vPayload[Reserved2] .toFloat(&result) ; - if ( ! result ) goto invalid; - data.mCalibrationTime = calTimeEpoch ; + data.mIndex = vSensorIndex ; + data.mKHigh = vPayload[KHigh] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mAlphaHigh = vPayload[AlphaHigh] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mEtaHigh = vPayload[EtaHigh] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mZetahigh = vPayload[Zetahigh] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mKLow = vPayload[KLow] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mAlphaLow = vPayload[AlphaLow] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mEtaLow = vPayload[EtaLow] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mZetaLow = vPayload[ZetaLow] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mBeta = vPayload[Beta] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mDelta = vPayload[Delta] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mReserved1 = vPayload[Reserved1] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mReserved2 = vPayload[Reserved2] .toFloat(&ok) ; if ( ! ok ) { goto invalid; } + data.mCalibrationTime = calTimeEpoch ; emit didAdjustment(data); break;