Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r8ad91bd76ffd6aa405cec91f2e51042a87c6fbe0 -r51936e788b311fec39d28c387e5026f50e06c165 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 8ad91bd76ffd6aa405cec91f2e51042a87c6fbe0) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -7,7 +7,7 @@ * * \file ManagerHome.qml * \author (last) Peman Montazemi - * \date (last) 10-Dec-2020 + * \date (last) 14-Dec-2020 * \author (original) Behrouz NematiPour * \date (original) 21-Oct-2019 * @@ -152,23 +152,24 @@ // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn x: col(0) - y: row(3.2) + y: row(2.8) title: qsTr(" Blood ") model: [ - vTreatmentBloodFlow.bloodFlow_FlowSetPoint , + 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_PWMDutyCycle .toFixed(2) , + "%" + vTreatmentBloodFlow.bloodFlow_SigStrength .toFixed(2) ] textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn x: col(1.2) - y: row(3.2) + y: row(2.8) title: qsTr(" Dlyst I ") model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , @@ -177,14 +178,15 @@ vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent .toFixed(2) , - "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) + "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , + "%" + vTreatmentDialysateFlow.dialysateFlow_SigStrength .toFixed(2) ] textObjectName: "_HDInletFlowData" } DebugDataColumn { id: _HDDialysateOutletFlowColumn x: col(2.4) - y: row(3.2) + y: row(2.8) title: qsTr(" Dlyst O ") model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , @@ -200,7 +202,7 @@ DebugDataColumn { id: _HDPressureOcclusionColumn x: col(3.6) - y: row(3.2) + y: row(2.8) title: qsTr(" Prsr Oc ") model: [ vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure .toFixed(2) , @@ -278,22 +280,14 @@ y: row(5.4) title: qsTr(" DG Ver ") model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(0) - .arg(4) - .arg(5) - .arg(1034) - .arg(254) - .arg(0) - .arg(1) - .arg(255) - //.arg(vTreatmentAdjustmentDGVersions.verMajor) - //.arg(vTreatmentAdjustmentDGVersions.verMinor) - //.arg(vTreatmentAdjustmentDGVersions.verMicro) - //.arg(vTreatmentAdjustmentDGVersions.verBuild) - //.arg(vTreatmentAdjustmentDGVersions.verFPGAId) - //.arg(vTreatmentAdjustmentDGVersions.verFPGAMajor) - //.arg(vTreatmentAdjustmentDGVersions.verFPGAMinor) - //.arg(vTreatmentAdjustmentDGVersions.verFPGALab) + .arg(vTreatmentAdjustmentDGVersions.verMajor) + .arg(vTreatmentAdjustmentDGVersions.verMinor) + .arg(vTreatmentAdjustmentDGVersions.verMicro) + .arg(vTreatmentAdjustmentDGVersions.verBuild) + .arg(vTreatmentAdjustmentDGVersions.verFPGAId) + .arg(vTreatmentAdjustmentDGVersions.verFPGAMajor) + .arg(vTreatmentAdjustmentDGVersions.verFPGAMinor) + .arg(vTreatmentAdjustmentDGVersions.verFPGALab) ] textObjectName: "_DGVersions" }