Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r036d378b4b89db03c812584c1d0f682494d81568 -r7b514a9fc7fa77c7e084c6023c49859d95cbcd5a --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 036d378b4b89db03c812584c1d0f682494d81568) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 7b514a9fc7fa77c7e084c6023c49859d95cbcd5a) @@ -15,7 +15,6 @@ // Qt import QtQuick 2.12 - // Project import Gui.Actions 0.1 @@ -32,164 +31,395 @@ title: "Dialysate Delivery" - DebugDataColumn { id: _DDLevelColumn - textObjectName :"_DDLevelData" - title : qsTr(" Levels ") - x: col(0) + DebugDataColumn { id: _DDConcentratePumpColumn + textObjectName :"_DDConcentratePumpData" + title : qsTr(" Conc Pump ") + x: col(0) + y: row(0) + model: [ + vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D10PumpTargetRevCount , + vDDConcentratePump.D10PumpMeasuredRevCount , + vDDConcentratePump.D10PumpState , + vDDConcentratePump.D10PumpPulseUS .toFixed(2) , + vDDConcentratePump.D10PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpParked , + vDDConcentratePump.D10PumpParkFault , + vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D11PumpTargetRevCount , + vDDConcentratePump.D11PumpMeasuredRevCount , + vDDConcentratePump.D11PumpState , + vDDConcentratePump.D11PumpPulseUS .toFixed(2) , + vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpParked , + vDDConcentratePump.D11PumpParkFault , + vDDConcentratePump.D76PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D76PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D76PumpTargetRevCount , + vDDConcentratePump.D76PumpMeasuredRevCount , + vDDConcentratePump.D76PumpState , + vDDConcentratePump.D76PumpPulseUS .toFixed(2) , + vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , + ] + label: [ + "sSpd (D10) ", + "mSpd (D10) ", + "rCnt (D10) ", + "mCnt (D10) ", + "State (D10) ", + "Plse (D10) ", + "tSpd (D10) ", + "park (D10) ", + "pfault (D10) ", + "sSpd (D11) ", + "mSpd (D11) ", + "rCnt (D11) ", + "mCnt (D11) ", + "State (D11) ", + "Plse (D11) ", + "tSpd (D11) ", + "park (D11) ", + "pfault (D11) ", + "sSpd (D76) ", + "mSpd (D76) ", + "rCnt (D76) ", + "mCnt (D76) ", + "State (D76) ", + "Plse (D76) ", + "tSpd (D76) ", + ] + } + + DebugDataColumn { id: _DDDialysatePumpColumn + textObjectName :"_DDDialysatePumpData" + title : qsTr(" Dial Pump ") + x: col(1.5) + y: row(0) + model: [ + vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D12PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D12PumpState , + vDDDialysatePump.D12PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D12PumpControl , + vDDDialysatePump.D12PumpDirErrCnt , + vDDDialysatePump.D12PumpMeasuredDir , + vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D48PumpState , + vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D48PumpControl , + vDDDialysatePump.D48PumpDirErrCnt , + vDDDialysatePump.D48PumpMeasuredDir , + ] + label: [ + "tRPM (D12) ", + "mSpd (D12) ", + "cSpd (D12) ", + "State (D12) ", + "tPres (D12) ", + "mPres (D12) ", + "Ctrl (D12) ", + "eCnt (D12) ", + "mCurr (D12) ", + "mDir (D12) ", + "tRPM (D48) ", + "mSpd (D48) ", + "cSpd (D48) ", + "State (D48) ", + "tPres (D48) ", + "mPres (D48) ", + "mCurr (D48) ", + "Ctrl (D48) ", + "eCnt (D48) ", + "mDir (D48) ", + ] + } + + DebugDataColumn { id: _DDHeatersColumn + textObjectName :"_DDHeatersData" + title : qsTr(" Heaters ") + x: col(3) + y: row(0) + model: [ + vDDHeaters.mainPrimayHeaterDC .toFixed(2) , + vDDHeaters.primaryTargetTemp .toFixed(2) , + vDDHeaters.primaryHeaterState , + vDDHeaters.primaryHeaterIntervalCount , + vDDHeaters.trimmerHeaterDC .toFixed(2) , + vDDHeaters.trimmerTargetTemp .toFixed(2) , + vDDHeaters.trimmerHeaterState , + vDDHeaters.trimmerHeaterIntervalCount , + vDDHeaters.dbg1 .toFixed(2) , + vDDHeaters.dbg2 .toFixed(2) , + vDDHeaters.dbg3 .toFixed(2) , + vDDHeaters.dbg4 .toFixed(2) , + vDDHeaters.dbg5 .toFixed(2) , + vDDHeaters.dbg6 .toFixed(2) , + vDDHeaters.dbg7 .toFixed(2) , + vDDHeaters.dbg8 .toFixed(2) , + vDDHeaters.dbg9 .toFixed(2) , + ] + label: [ + "pHeat (D5) ", + "pTemp (D5) ", + "pState (D5) ", + "pIC (D5) ", + "tHeat (D45) ", + "tTemp (D45) ", + "tstate (D45) ", + "tIC (D45) ", + "dbg1 ", + "dbg2 ", + "dbg3 ", + "dbg4 ", + "dbg5 ", + "dbg6 ", + "dbg7 ", + "dbg8 ", + "dbg9 ", + ] + } + + DebugDataColumn { id: _DDTemperatureColumn + textObjectName :"_DDTemperatureData" + title : qsTr(" Temp ") + x: col(4.5) + y: row(0) + model: [ + vDDTemperatures.inletHeatExchanger .toFixed(2) , + vDDTemperatures.outletHeatExchanger .toFixed(2) , + vDDTemperatures.hydraulicsPrimaryHeater .toFixed(2) , + vDDTemperatures.trimmerHeater .toFixed(2) , + vDDTemperatures.boardTemperature .toFixed(2) , + vDDTemperatures.barometricTemperature .toFixed(2) , + vDDTemperatures.D16Conductivity .toFixed(2) , + vDDTemperatures.D28Conductivity .toFixed(2) , + vDDTemperatures.D30Conductivity .toFixed(2) , + vDDTemperatures.D44Conductivity .toFixed(2) , + vDDTemperatures.D75Conductivity .toFixed(2) , + vDDTemperatures.D4MovingAverage .toFixed(2) , + vDDTemperatures.D50MovingAverage .toFixed(2) , + vDDTemperatures.D28MovingAverage .toFixed(2) , + vDDTemperatures.D30MovingAverage .toFixed(2) , + ] + label: [ + "inHE (D1) ", + "outHE (X6) ", + "hydr (D4) ", + "trim (D50) ", + "board ", + "baro ", + "Cond (D16) ", + "Cond (D28) ", + "Cond (D30) ", + "Cond (D44) ", + "Cond (D75) ", + "mAvg (D4) ", + "mAvg (D50) ", + "mAvg (D28) ", + "mAvg (D30) ", + ] + } + + DebugDataColumn { id: _DDPressureColumn + textObjectName :"_DDPressureData" + title : qsTr(" Pressure ") + x: col(6) y: row(0) model: [ - vDDLevel.floaterLevel , - vDDLevel.bicarbLevel , - vDDLevel.spentDialysateLevel , + vDDPressures.waterInletPSI .toFixed(2), + vDDPressures.waterOutletPSI .toFixed(2), + vDDPressures.hydrolicOutletPSI .toFixed(2), + vDDPressures.bicarbBagPSI .toFixed(2), + vDDPressures.spentDialysatePSI .toFixed(2), + vDDPressures.freshDialysatePSI .toFixed(2), + vDDPressures.transmembranePSI .toFixed(2), + vDDPressures.waterInletTemp .toFixed(2), + vDDPressures.waterOutletTemp .toFixed(2), + vDDPressures.hydrolicOutletTemp .toFixed(2), + vDDPressures.bicarbBagTemp .toFixed(2), + vDDPressures.spentDialysateTemp .toFixed(2), + vDDPressures.freshDialysateTemp .toFixed(2), + vDDPressures.transmembraneTemp .toFixed(2), ] label: [ - "float ", - "bicarb ", - "sptDial ", + "WInPSI (M1) ", + "WOutPSI (M3) ", + "HOutPSI (D9) ", + "BBagPSI (D66) ", + "SDialPSI (D51) ", + "FDialPSI (D18) ", + "TransPSI (D41) ", + "WInTmp (M1) ", + "WOutTmp (M3) ", + "HOutTmp (D9) ", + "BBagTmp (D66) ", + "SDialTmp (D51) ", + "FDialTmp (D18) ", + "TransTmp (D41) ", ] } -// DebugDataColumn { id: _TDAirTrapCoulumn -// textObjectName :"_TDAirTrapData" -// title : qsTr(" Air Trap ") -// x: col(1.5) -// y: row(0) -// model: [ -// vTDAirTrap.lowLevel , -// vTDAirTrap.upLevel , -// vTDAirTrap.lowLevelRaw , -// vTDAirTrap.upLevelRaw , -// vTDAirTrap.valveState , -// vTDAirTrap.controlling , -// ] -// label: [ -// "ATL", -// "ATU", -// "rATL", -// "rATU", -// "state", -// "ctrl", -// ] -// } + DebugDataColumn { id: _DDGenDialColumn + textObjectName :"_DDGenDialData" + title : qsTr(" GenDial ") + x: col(7.5) + y: row(0) -// DebugDataColumn { id: _TDValvesColumn -// textObjectName :"_TDValvesData" -// title : qsTr(" Vlv ") -// x: col(3) -// y: row(0) -// model: [ -// vTDValves.valveId , -// vTDValves.state , -// vTDValves.posName , -// vTDValves.posCount , -// vTDValves.nextPos , + model: [ + vDDGenDialysate.genDialysateExec , + vDDGenDialysate.ddInProgress , + vDDGenDialysate.isDialGood , + vDDGenDialysate.fltLevel1 , + vDDGenDialysate.bicarbLevel , + vDDGenDialysate.spentLevel , + vDDGenDialysate.hydNegativePressure .toFixed(2), + vDDGenDialysate.hydPositivePressure .toFixed(2), + vDDGenDialysate.spentPressure .toFixed(2), + ] + label: [ + "Exec ", + "inProg ", + "isGood ", + "fltLvL (D6) ", + "bicarbLvL (D63)", + "sptLvL (D46) ", + "hydNeg (D19) ", + "hydPos (D18) ", + "sptPres (D51) ", + ] + } -// ] -// label: [ -// "ID ", -// "state ", -// "Name ", -// "Cnt ", -// "nPos ", -// ] -// } + DebugDataColumn { id: _DDHydraulicsValveColumn + textObjectName :"_DDHydraulicValveData" + title : qsTr(" Hyd Valve ") + x: col(7.8) + y: row(3.1) -// DebugDataColumn { id: _TDEjectorColumn -// textObjectName :"_TDEjectorData" -// title : qsTr(" Ejt ") -// x: col(4.5) -// y: row(0) -// model: [ -// vTDEjector.state , -// vTDEjector.setSpeed .toFixed(2) , + model: [ + Number(vDDValvesStates.hydraulicsOutletValve ) , + Number(vDDValvesStates.thermalDisinfectValve ) , + Number(vDDValvesStates.HydraulicsBypassValve ) , + Number(vDDValvesStates.rinsePortValve ) , + Number(vDDValvesStates.drainValve ) , + Number(vDDValvesStates.dialyzerBypassValve ) , + Number(vDDValvesStates.purgeValve1 ) , + Number(vDDValvesStates.pressureTestValve ) , + Number(vDDValvesStates.dryBicarbInletValve ) , + Number(vDDValvesStates.dialyzerInletValve ) , + Number(vDDValvesStates.dialyzerOutletValve ) , + Number(vDDValvesStates.purgeValve2 ) , + Number(vDDValvesStates.hydraulicsInletValve ) , + Number(vDDValvesStates.waterInletValve ) , + ] + label: [ + "HydOut (D14) ", + "ThemD (D52) ", + "HydByP (D8) ", + "RinseP (D54) ", + "Drain (D53) ", + "DialByP (D34) ", + "PurgV1 (D64) ", + "PresT (D31) ", + "DryBic (D65) ", + "DialIn (D35) ", + "DialOut (D40) ", + "PurgV2 (D47) ", + "HydIn (D3) ", + "WaterIn (M4) ", + ] + } -// ] -// label: [ -// "state ", -// "Spd " , -// ] -// } + DebugDataColumn { id: _DDCondColumn + textObjectName :"_DDCondlData" + title : qsTr(" Cond ") + x: col(9) + y: row(0) + model: [ + vDDConductivity.bicarbCondutivity1 .toFixed(2), + vDDConductivity.acidBicarbCondutivity1 .toFixed(2), + vDDConductivity.acidBicarbCondutivity2 .toFixed(2), + vDDConductivity.spentCondutivity1 .toFixed(2), + vDDConductivity.bicarbCondutivity2 .toFixed(2), + ] + label: [ + "bicarb1 (D17) ", + "acidb1 (D27) ", + "acidb1 (D29) ", + "spent (D43) ", + "bicarb2 (D74) ", + ] + } -// DebugDataColumn { id: _TDSwitchesColumn -// textObjectName :"_TDSwitchesData" -// title : qsTr(" Switches ") -// x: col(6) -// y: row(0) -// model: [ -// vTDSwitches.door , + DebugDataColumn { id: _DDLevelColumn + textObjectName :"_DDLevelData" + title : qsTr(" Levels ") + x: col(9) + y: row(2) + model: [ + vDDLevel.floaterLevel , + vDDLevel.bicarbLevel , + vDDLevel.spentDialysateLevel , + ] + label: [ + "floater (D6) ", + "bicarb (D63) ", + "sptDial (D46) ", + ] + } -// ] -// label: [ -// "door ", -// ] -// } + DebugDataColumn { id: _DDBCValvesColumn + textObjectName :"_DDBCValvesData" + title : qsTr(" BC Valves ") + x: col(9.5) + y: row(3.3) + model: [ + Number(vDDValvesStates.balancingChamberValve1 ) , + Number(vDDValvesStates.balancingChamberValve2 ) , + Number(vDDValvesStates.balancingChamberValve3 ) , + Number(vDDValvesStates.balancingChamberValve7 ) , + Number(vDDValvesStates.balancingChamberValve5 ) , + Number(vDDValvesStates.balancingChamberValve6 ) , + Number(vDDValvesStates.balancingChamberValve4 ) , + Number(vDDValvesStates.balancingChamberValve8 ) , + ] + label: [ + "BC1 (D23) ", + "BC2 (D19) ", + "BC3 (D25) ", + "BC7 (D26) ", + "BC5 (D24) ", + "BC6 (D20) ", + "BC4 (D21) ", + "BC8 (D22) ", + ] + } + DebugDataColumn { id: _DDBloodLeakColumn + textObjectName :"_DDBloodLeakData" + title : qsTr(" Blood Leak ") + x: col(10.5) + y: row(0) + model: [ + vDDBloodLeak.bloodLeak , + ] + label: [ + "BL ", + ] + } -// DebugDataColumn { id: _TDBatteryCoulumn -// textObjectName :"_TDBatterypData" -// title : qsTr(" Battery ") -// x: col(0) -// y: row(3.5) -// model: [ -// vTDBattery.aCPower , -// vTDBattery.capacity , -// ] -// label: [ -// "AC ", -// "cap ", -// ] -// } - -// DebugDataColumn { id: _TDVoltageCoulumn -// textObjectName :"_TDVoltageData" -// title : qsTr(" Vol ") -// x: col(1.5) -// y: row(3.5) -// model: [ -// vTDVoltage.line_1_2V .toFixed(2) , -// vTDVoltage.line_3_3V .toFixed(2) , -// vTDVoltage.logic5V .toFixed(2) , -// vTDVoltage.sensors5V .toFixed(2) , -// vTDVoltage.line_24V .toFixed(2) , -// vTDVoltage.regen24V .toFixed(2) , -// vTDVoltage.fpgaAdcRef .toFixed(2) , -// vTDVoltage.presRef .toFixed(2) , -// vTDVoltage.fpgaVcc .toFixed(2) , -// vTDVoltage.fpgaVaux .toFixed(2) , -// vTDVoltage.fpgaVpvn .toFixed(2) -// ] -// label: [ -// "1.2V", -// "3.3V" , -// "L5V" , -// "S5V" , -// "24V" , -// "R24V" , -// "ADC" , -// "Ref" , -// "VCC" , -// "Vaux" , -// "VPN" -// ] -// } - -// DebugDataColumn { id: _TDTemperatureCoulumn -// textObjectName :"_TDTemperatureData" -// title : qsTr(" Temp ") -// x: col(3) -// y: row(3.5) -// model: [ -// vTDTemperature.boardTemp .toFixed(2) -// ] -// label: [ -// "board", -// ] -// } - - // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. + // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. TouchRect { - x : col(6.0) - y : row(6.4) + x : col(9.0) + y : row(8.0) width : 425 height : 80 onClicked : vAdjustmentVersions.doAdjustment() Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r036d378b4b89db03c812584c1d0f682494d81568 -r7b514a9fc7fa77c7e084c6023c49859d95cbcd5a --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 036d378b4b89db03c812584c1d0f682494d81568) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 7b514a9fc7fa77c7e084c6023c49859d95cbcd5a) @@ -15,7 +15,6 @@ // Qt import QtQuick 2.12 - // Project import Gui.Actions 0.1 @@ -87,10 +86,42 @@ ] } + DebugDataColumn { id: _TDAirPumpColumn + textObjectName :"_TDAirPumpData" + title : qsTr(" Air Pumps ") + x: col(3) + y: row(0) + model: [ + vTDAirPump.airPumpState , + vTDAirPump.airPumpPower , + + ] + label: [ + "state (H12) ", + "power (H12) ", + ] + } + + DebugDataColumn { id: _TDAirBubblesColumn + textObjectName :"_TDAirBubblesData" + title : qsTr(" Bubbles ") + x: col(3) + y: row(1.5) + model: [ + vTDAirBubble.venousAirBubbleStatus , + vTDAirBubble.venousAirBubbleState , + + ] + label: [ + "status (H18) ", + "state (H18) ", + ] + } + DebugDataColumn { id: _TDValvesColumn textObjectName :"_TDValvesData" - title : qsTr(" Vlv ") - x: col(3) + title : qsTr(" Valves ") + x: col(4.5) y: row(0) model: [ vTDValves.valveId , @@ -111,8 +142,8 @@ DebugDataColumn { id: _TDEjectorColumn textObjectName :"_TDEjectorData" - title : qsTr(" Ejt ") - x: col(4.5) + title : qsTr(" Ejector ") + x: col(6) y: row(0) model: [ vTDEjector.state , @@ -128,7 +159,7 @@ DebugDataColumn { id: _TDSwitchesColumn textObjectName :"_TDSwitchesData" title : qsTr(" Switches ") - x: col(6) + x: col(7.5) y: row(0) model: [ vTDSwitches.door , @@ -139,25 +170,55 @@ ] } - - DebugDataColumn { id: _TDBatteryCoulumn - textObjectName :"_TDBatterypData" - title : qsTr(" Battery ") + DebugDataColumn { id: _TDTXStatesColumn + textObjectName :"_TDTxStatesData" + title : qsTr(" TXStates ") x: col(0) y: row(3.5) model: [ - vTDBattery.acPower , - vTDBattery.capacity , + Number(vTDTreatmentStates.subMode ), + Number(vTDTreatmentStates.txBloodPrime ), + Number(vTDTreatmentStates.txDialysis ), + Number(vTDTreatmentStates.ufState ), + Number(vTDTreatmentStates.txStop ), + Number(vTDTreatmentStates.txRinseback ), + Number(vTDTreatmentStates.txRecirculate ), + Number(vTDTreatmentStates.txEnd ), + Number(vTDTreatmentStates.salineState ), + Number(vTDTreatmentStates.heparin ), ] label: [ - "AC ", - "cap ", + "subMode " , + "BPrime " , + "Dial " , + "UF " , + "Stop " , + "RB " , + "Recirc " , + "End " , + "Saline " , + "Hep " , ] } + DebugDataColumn { id: _TDOpModeColumn + textObjectName :"_TDOpmodeData" + title : qsTr(" Opmode ") + x: col(0) + y: row(7) + model: [ + vTDOpMode.opMode , + vTDOpMode.subMode + ] + label: [ + "opMode " , + "subMode " + ] + } + DebugDataColumn { id: _TDVoltageCoulumn textObjectName :"_TDVoltageData" - title : qsTr(" Vol ") + title : qsTr(" Volume ") x: col(1.5) y: row(3.5) model: [ @@ -188,10 +249,45 @@ ] } + DebugDataColumn { id: _TDPressureOcclusionCoulumn + textObjectName :"_TDPressureData" + title : qsTr(" Pressure ") + x: col(3) + y: row(3.5) + model: [ + vTreatmentPressureOcclusion.arterialPressure .toFixed(2), + vTreatmentPressureOcclusion.venousPressure , + vTreatmentPressureOcclusion.limitState , + vTreatmentPressureOcclusion.arterialMin , + vTreatmentPressureOcclusion.arterialMax , + vTreatmentPressureOcclusion.venousMin , + vTreatmentPressureOcclusion.venousMax , + vTreatmentPressureOcclusion.arterialLongFilter .toFixed(2), + vTreatmentPressureOcclusion.venousLongFilter .toFixed(2), + vTreatmentPressureOcclusion.tmpPressure .toFixed(2), + vTreatmentPressureOcclusion.tmpMin .toFixed(2), + vTreatmentPressureOcclusion.tmpMax .toFixed(2) + ] + label: [ + "Arterial (H12) " , + "Venous (H14) " , + "limit " , + "artMin (H12) " , + "artMax (H12) " , + "venMin (H14) " , + "venMax (H14) " , + "aLong (H12) " , + "vLong (H14) " , + "TMP " , + "tmpMin " , + "tmpMax " , + ] + } + DebugDataColumn { id: _TDTemperatureCoulumn textObjectName :"_TDTemperatureData" title : qsTr(" Temp ") - x: col(3) + x: col(4.5) y: row(3.5) model: [ vTDTemperature.boardTemp .toFixed(2) @@ -201,43 +297,26 @@ ] } - - DebugDataColumn { id: _TDTXStatesColumn - textObjectName :"_TDTxStatesData" - title : qsTr(" TXStates ") - x: col(0) - y: row(7) + DebugDataColumn { id: _TDBatteryCoulumn + textObjectName :"_TDBatteryData" + title : qsTr(" Battery ") + x: col(6) + y: row(3.5) model: [ - vTDTreatmentStates.subMode , - vTDTreatmentStates.txBloodPrime , - vTDTreatmentStates.txDialysis , - vTDTreatmentStates.ufState , - vTDTreatmentStates.txStop , - vTDTreatmentStates.txRinseback , - vTDTreatmentStates.txRecirculate, - vTDTreatmentStates.txEnd , - vTDTreatmentStates.salineState , - vTDTreatmentStates.heparin , + vTDBattery.acPower , + vTDBattery.capacity , ] label: [ - "subMode " , - "BPrime " , - "Dial " , - "UF " , - "Stop " , - "RB " , - "Recirc " , - "End " , - "Saline " , - "Hep " , + "AC ", + "cap ", ] } - // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. + // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. TouchRect { - x : col(6.0) - y : row(6.4) + x : col(9.0) + y : row(8.0) width : 425 height : 80 onClicked : vAdjustmentVersions.doAdjustment() Index: sources/gui/qml/main.qml =================================================================== diff -u -rea51c0546c7061d225e7b9d8b754554c65f0d1b1 -r7b514a9fc7fa77c7e084c6023c49859d95cbcd5a --- sources/gui/qml/main.qml (.../main.qml) (revision ea51c0546c7061d225e7b9d8b754554c65f0d1b1) +++ sources/gui/qml/main.qml (.../main.qml) (revision 7b514a9fc7fa77c7e084c6023c49859d95cbcd5a) @@ -26,7 +26,8 @@ import VHDAccelerometer 0.1 import VHDSyringePump 0.1 import VHDBloodLeak 0.1 -import VHDAirBubble 0.1 +import VTDAirBubble 0.1 +import VTDAirPump 0.1 import VTDAirTrap 0.1 import VTDVoltage 0.1 import VTDValves 0.1 @@ -90,19 +91,22 @@ import VPreTreatmentAdjustmentStartTreatment 0.1 // --- import VDGDrainPump 0.1 -import VDGHeaters 0.1 +import VDDHeaters 0.1 import VDGLoadCellReadings 0.1 import VDGOperationMode 0.1 -import VDGPressures 0.1 +import VDDPressures 0.1 import VDGROPump 0.1 import VDGReservoir 0.1 -import VDGTemperatures 0.1 -import VDGValvesStates 0.1 +import VDDConcentratePump 0.1 +import VDDTemperatures 0.1 +import VDDDialysatePump 0.1 +import VDDValvesStates 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 import VDDConductivity 0.1 import VDDGenDialysate 0.1 import VDDLevel 0.1 +import VDDBloodLeak 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -190,7 +194,8 @@ VGeneralEvent { id: vGeneralEvent } VHDAccelerometer { id: vHDAccelerometer } VHDSyringePump { id: vHDSyringePump } - VHDAirBubble { id: vHDAirBubble } + VTDAirBubble { id: vTDAirBubble } + VTDAirPump { id: vTDAirPump } VHDBloodLeak { id: vHDBloodLeak } VTDAirTrap { id: vTDAirTrap } VTDVoltage { id: vTDVoltage } @@ -211,18 +216,21 @@ VTreatmentStop { id: vTreatmentStop } // ---- DG VDGDrainPump { id: vDGDrainPump } - VDGHeaters { id: vDGHeaters } + VDDHeaters { id: vDDHeaters } VDGLoadCellReadings { id: vDGLoadCellReadings } VDGOperationMode { id: vDGOperationMode } - VDGPressures { id: vDGPressures } + VDDPressures { id: vDDPressures } VDGROPump { id: vDGROPump } VDGReservoir { id: vDGReservoir } - VDGTemperatures { id: vDGTemperatures } - VDGValvesStates { id: vDGValvesStates } + VDDConcentratePump { id: vDDConcentratePump } + VDDTemperatures { id: vDDTemperatures } + VDDDialysatePump { id: vDDDialysatePump } + VDDValvesStates { id: vDDValvesStates } VDGAccelerometer { id: vDGAccelerometer } VDDConductivity { id: vDDConductivity } VDDGenDialysate { id: vDDGenDialysate } VDDLevel { id: vDDLevel } + VDDBloodLeak { id: vDDBloodLeak } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush }