Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r9075bb6c82856b3d5cce9f8976dbe47607804624 -r58eb4b64f5f9af9676b19fa923f0e56534a45937 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 9075bb6c82856b3d5cce9f8976dbe47607804624) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 58eb4b64f5f9af9676b19fa923f0e56534a45937) @@ -116,18 +116,18 @@ y: row(0) title: qsTr(" Tmprtr ") model: [ - vDGTemperatures.inletPrimaryHeater .toFixed(2) , - vDGTemperatures.outletPrimaryHeater .toFixed(2) , - vDGTemperatures.conductivitySensor1 .toFixed(2) , - vDGTemperatures.conductivitySensor2 .toFixed(2) , - vDGTemperatures.outletRedundancy .toFixed(2) , - vDGTemperatures.inletDialysate .toFixed(2) , - vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , - vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) , - vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , - vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , - vDGTemperatures.primaryHeaterInternal .toFixed(2) , - vDGTemperatures.trimmerHeaterInternal .toFixed(2) + vDGTemperatures.inletPrimaryHeater .toFixed(2) , + vDGTemperatures.outletPrimaryHeater .toFixed(2) , + vDGTemperatures.conductivitySensor1 .toFixed(2) , + vDGTemperatures.conductivitySensor2 .toFixed(2) , + vDGTemperatures.outletRedundancy .toFixed(2) , + vDGTemperatures.inletDialysate .toFixed(2) , + vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , + vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) , + vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , + vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , + vDGTemperatures.primaryHeaterInternal .toFixed(2) , + vDGTemperatures.trimmerHeaterInternal .toFixed(2) ] textObjectName: "_DGTemperaturesData" } @@ -156,12 +156,12 @@ title: qsTr(" Blood ") model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , - vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , - "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) + vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , + "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) ] textObjectName: "_HDBloodFlowData" } @@ -171,13 +171,13 @@ y: row(3.2) title: qsTr(" Dlyst I ") model: [ - vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) , - "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) + vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent .toFixed(2) , + "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) ] textObjectName: "_HDInletFlowData" } @@ -187,13 +187,13 @@ y: row(3.2) title: qsTr(" Dlyst O ") model: [ - vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , - vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , - vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , - "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) + vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , + vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , + vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent .toFixed(2) , + "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) ] textObjectName: "_HDOutletFlowData" }