Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -rfd13750406289b7fd9d49c7827ad143fe246278f -r7f62ca31bd7823affed99cda268e1e93c9caec3d --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision fd13750406289b7fd9d49c7827ad143fe246278f) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 7f62ca31bd7823affed99cda268e1e93c9caec3d) @@ -47,7 +47,7 @@ switch (vIndex) { case ePressure : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + 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 }}); _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")}, { eRole_Component, tr("D66")}, {eRole_Payload, initPayloadValues }}); @@ -65,7 +65,7 @@ } case eTemperature : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Inlet")}, { eRole_Component, tr("D1" )}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Outlet")}, { eRole_Component, tr("D78")}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Primary Heater")}, { eRole_Component, tr("D4" )}, {eRole_Payload, initPayloadValues }}); @@ -76,21 +76,21 @@ } case eConcentratePump : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Acid")}, { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Bicarbonate")}, { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76" )}, {eRole_Payload, initPayloadValues }}); break; } case eDialysatePumpD12 : { - QVariantList initPayloadValues = initList ( { tr("Target Speed"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Target Pump Speed"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")}, { eRole_Component, tr("D12" )}, {eRole_Payload, initPayloadValues }}); break; } case eDialysatePumpD48 : { - QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")}, { eRole_Component, tr("D48" )}, {eRole_Payload, initPayloadValues }}); break; } @@ -122,7 +122,7 @@ } case eConductivity : { - QVariantList initPayloadValues = initList ( { tr("1"),tr("2"),tr("3"),tr("4"),tr("5"),tr("6"),tr("7"), tr("8"),tr("9"),tr("10"),tr("11"),tr("12"),tr("Cal Time") } ) ; + QVariantList initPayloadValues = initList ( { tr("Coeff 1"),tr("Coeff 2"),tr("Coeff 3"),tr("Coeff 4"),tr("Coeff 5"),tr("Coeff 6"),tr("Coeff 7"), tr("Coeff 8"),tr("Coeff 9"),tr("Coeff 10"),tr("Coeff 11"),tr("Coeff 12"),tr("Cal Time") } ) ; _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D17")}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D27")}, {eRole_Payload, initPayloadValues }}); _calibrationList.appendRow( {{ eRole_Title, tr("Water, Bicarbonate, and Acid")}, { eRole_Component, tr("D29")}, {eRole_Payload, initPayloadValues }}); @@ -139,9 +139,10 @@ // static int test = 0; // rejectionReasons ({0,0,0,0,test = ! test,0}); + // epoch for fw payload quint32 calTime = getEpochUTC(); - // set cal time to payload. + // set cal time epoch to readble for UI if ( ! vPayload.isEmpty()) { vPayload.last() = Format::fromEpoch( calTime, "yyyy/MM/dd, HH:mm" );