Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -r5538544e140f0b36ad6711adfe53643b76de1272 -rd560d600cc99ff145bee8a14ce5be183e14450da --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 5538544e140f0b36ad6711adfe53643b76de1272) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision d560d600cc99ff145bee8a14ce5be183e14450da) @@ -150,9 +150,9 @@ case eConcentratePump : { QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D11_PUMP, {{ eRole_Title, tr("Acid")}, { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D10_PUMP, {{ eRole_Title, tr("Bicarbonate")}, { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D76_PUMP, {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D11_PUMP, {{ eRole_Title, tr("Acid")}, { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D10_PUMP, {{ eRole_Title, tr("Bicarbonate")}, { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D76_PUMP, {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76" )}, {eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }}); break; } case eDialysatePumpD12 : @@ -500,7 +500,7 @@ if (vPayload.size() < 2) { goto invalid; } AdjustDDCalibrationBloodLeakSensorRequestData data; - data.mSetPoint = vPayload[0] .toFloat(&result) ; + data.mSetPoint = vPayload[0] .toInt(&result) ; ok &= result; data.mCalibrationTime = calTimeEpoch ; @@ -548,8 +548,9 @@ } } - vPayload[eCalibrationTime] = formattedTime; + vPayload[vPayload.size() - 1] = formattedTime; _calibrationList.updateData(vSensorIndex, eRole_Payload, vPayload); + return; invalid: