Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -43,9 +43,10 @@ y: row(0) title: qsTr(" ROPmp ") model: [ - vDGROPump.pressure , + vDGROPump.pressure .toFixed(2) , vDGROPump.flowRate .toFixed(2) , - vDGROPump.pwm .toFixed(2) + vDGROPump.pwm .toFixed(2) , + vDGROPump.state ] textObjectName: "_DGROPumpData" } @@ -55,8 +56,10 @@ y: row(0) title: qsTr(" DRPmp ") model: [ - vDGDrainPump.rpm , - vDGDrainPump.dac , + vDGDrainPump.rpmi , + vDGDrainPump.dac , + vDGDrainPump.state , + vDGDrainPump.rpmo ] textObjectName: "_DGDrainPumpData" } @@ -152,55 +155,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(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" } DebugDataColumn { id: _HDPressureOcclusionColumn x: col(3.6) - y: row(3) + y: row(2.8) title: qsTr(" Prsr Oc ") model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , @@ -213,7 +218,7 @@ } DebugDataColumn { id: _HDOperationModeColumn - x: col(3) + x: col(3.2) y: row(2) title: qsTr(" HD Mode ") model: [ vHDOperationMode.text ] @@ -231,13 +236,84 @@ font.pixelSize: 38 } + 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 : _mouseEventCountText x: col(2) y: row(6) visible: true text: String("Touch Count: %1,%2") - .arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) - .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) + .arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) + .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) horizontalAlignment: Text.AlignLeft color: Colors.textMain font.pixelSize: 38