Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rc6a08131766a8f9db5f38266b7323dbca8022baf --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file ManagerHome.qml - * \author (last) Behrouz NematiPour - * \date (last) 25-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 14-Dec-2020 * \author (original) Behrouz NematiPour * \date (original) 21-Oct-2019 * @@ -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" } @@ -152,55 +152,57 @@ // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn x: col(0) - y: row(3) + y: row(2.8) 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_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_SigStrength .toFixed(2) ] textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn x: col(1.2) - y: row(3) + y: row(2.8) 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) , + "%" + vTreatmentDialysateFlow.dialysateFlow_SigStrength .toFixed(2) ] textObjectName: "_HDInletFlowData" } DebugDataColumn { id: _HDDialysateOutletFlowColumn x: col(2.4) - y: row(3) + y: row(2.8) title: qsTr(" Dlyst O ") model: [ - vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(2) , - 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" } DebugDataColumn { id: _HDPressureOcclusionColumn x: col(3.6) - y: row(3) + y: row(2.8) title: qsTr(" Prsr Oc ") model: [ vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure .toFixed(2) , @@ -213,13 +215,83 @@ } DebugDataColumn { id: _HDOperationModeColumn - x: col(3) + x: col(3.2) y: row(2) title: qsTr(" HD Mode ") model: [ vHDOperationMode.text ] textObjectName: "_HDOperationModeData" } + DebugDataColumn { id: _HDAccelerometerColumn + x: col(7) + y: row(3.2) + title: qsTr(" HD Acc ") + model: [ + vHDAccelerometer.x .toFixed(3) , + vHDAccelerometer.y .toFixed(3) , + vHDAccelerometer.z .toFixed(3) , + vHDAccelerometer.xMax .toFixed(3) , + vHDAccelerometer.yMax .toFixed(3) , + vHDAccelerometer.zMax .toFixed(3) , + vHDAccelerometer.xTilt .toFixed(3) , + vHDAccelerometer.yTilt .toFixed(3) , + vHDAccelerometer.zTilt .toFixed(3) + ] + textObjectName: "_HDAccelerometerData" + } + + DebugDataColumn { id: _DGAccelerometerColumn + x: col(7) + y: row(0) + title: qsTr(" DG Acc ") + model: [ + vDGAccelerometer.x .toFixed(3) , + vDGAccelerometer.y .toFixed(3) , + vDGAccelerometer.z .toFixed(3) , + vDGAccelerometer.xMax .toFixed(3) , + vDGAccelerometer.yMax .toFixed(3) , + vDGAccelerometer.zMax .toFixed(3) , + vDGAccelerometer.xTilt .toFixed(3) , + vDGAccelerometer.yTilt .toFixed(3) , + vDGAccelerometer.zTilt .toFixed(3) + ] + textObjectName: "_DGAccelerometerData" + } + + DebugDataColumn { id: _HDVersionsColumn + x: col(6.3) + y: row(4.5) + title: qsTr(" HD Ver ") + model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + .arg(vTreatmentAdjustmentVersions.HDVerMajor) + .arg(vTreatmentAdjustmentVersions.HDVerMinor) + .arg(vTreatmentAdjustmentVersions.HDVerMicro) + .arg(vTreatmentAdjustmentVersions.HDVerBuild) + .arg(vTreatmentAdjustmentVersions.HDVerFPGAId) + .arg(vTreatmentAdjustmentVersions.HDVerFPGAMajor) + .arg(vTreatmentAdjustmentVersions.HDVerFPGAMinor) + .arg(vTreatmentAdjustmentVersions.HDVerFPGALab) + ] + textObjectName: "_HDVersions" + } + + DebugDataColumn { id: _DGVersionsColumn + x: col(6.3) + y: row(5.4) + title: qsTr(" DG Ver ") + model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + .arg(vTreatmentAdjustmentVersions.DGVerMajor) + .arg(vTreatmentAdjustmentVersions.DGVerMinor) + .arg(vTreatmentAdjustmentVersions.DGVerMicro) + .arg(vTreatmentAdjustmentVersions.DGVerBuild) + .arg(vTreatmentAdjustmentVersions.DGVerFPGAId) + .arg(vTreatmentAdjustmentVersions.DGVerFPGAMajor) + .arg(vTreatmentAdjustmentVersions.DGVerFPGAMinor) + .arg(vTreatmentAdjustmentVersions.DGVerFPGALab) + ] + textObjectName: "_DGVersions" + } + Text { id : _canbusFaultCountText x: col(0) y: row(6)