Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -59,6 +59,7 @@ color: Colors.textMain font.pixelSize: fontPixelSizeText font.family: Fonts.fontFamilyFixed + font.weight: Font.Light Text { objectName : _root.textObjectName + "L" + index Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -61,7 +61,7 @@ DebugDataColumn { id: _TDBloodPumpColumn textObjectName :"_TDBloodPumpData" - title : qsTr(" BP ") + title : qsTr(" BP(H4)") x: col(0) y: row(0) model: [ @@ -81,7 +81,7 @@ "mFlow ", "rSpd ", "mSpd ", - "cMot ", + "mCurr ", "RPM ", "rCnt ", "pFlow ", @@ -99,15 +99,17 @@ vTDAirTrap.upLevel , vTDAirTrap.lowLevelRaw , vTDAirTrap.upLevelRaw , - vTDAirTrap.valveState , + vTDAirTrap.valveStateH13 , + vTDAirTrap.valveStateH20 , vTDAirTrap.controlling , ] label: [ "ATL", "ATU", "rATL", "rATU", - "state", + "H13", + "H20", "ctrl", ] } @@ -157,10 +159,12 @@ y: row(0) model: [ vTDSwitches.door , + vTreatmentBloodFlow.rotorHall, ] label: [ - "door ", + "door(H9) ", + "rot1(H6) ", ] } Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -86,8 +86,8 @@ readonly property int fontPixelCircleButtonLabel: 50 readonly property int fontPixelDebugTitle : 25 - readonly property int fontPixelDebugText : 28 - readonly property int fontPixelDebugLabel : 15 - readonly property string fontFamilyFixed : "Noto Sans CJK SC" + readonly property int fontPixelDebugText : 32 + readonly property int fontPixelDebugLabel : 20 + readonly property string fontFamilyFixed : "Barlow" } Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -61,7 +61,7 @@ horizontalCenter: parent.horizontalCenter } color: Colors.textMain - text: vTreatmentBloodFlow.bloodFlow_FlowSetPoint.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate) + text: vTreatmentBloodFlow.flowSetPoint.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate) font.pixelSize: 23 } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -35,7 +35,7 @@ property real maxAdjust : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max property real min : vTreatmentUltrafiltration.minimum - property real val : vTreatmentUltrafiltration.ultrafiltration_RefUFVol + property real val : vTreatmentUltrafiltration.volumeRemoved property real max : vTreatmentUltrafiltration.maximum } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -31,9 +31,8 @@ QtObject { id: _private property real minimum: vTreatmentUltrafiltration.minimum property real maximum: vTreatmentUltrafiltration.maximum - property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol + property real value : vTreatmentUltrafiltration.volumeRemoved } - signal editClicked() signal resumeClicked() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -32,7 +32,7 @@ QtObject { id: _private property real minimum: vTreatmentUltrafiltration.minimum property real maximum: vTreatmentUltrafiltration.maximum - property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol + property real value : vTreatmentUltrafiltration.volumeRemoved } signal pauseClicked() Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -32,15 +32,14 @@ property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin property int venousMaximum : vTreatmentRanges.venousPressureMonitorMax - property int arterialLowerBound : vTreatmentPressureOcclusion.arterialPressureLimitLowerBound - property int arterialUpperBound : vTreatmentPressureOcclusion.arterialPressureLimitUpperBound - property int venousLowerBound : vTreatmentPressureOcclusion.venousPressureLimitLowerBound - property int venousUpperBound : vTreatmentPressureOcclusion.venousPressureLimitUpperBound + property int arterialLowerBound : vTreatmentPressureOcclusion.arterialMin + property int arterialUpperBound : vTreatmentPressureOcclusion.arterialMax + property int venousLowerBound : vTreatmentPressureOcclusion.venousMin + property int venousUpperBound : vTreatmentPressureOcclusion.venousMax property int arterialPressure : vTreatmentPressureOcclusion.arterialPressure property int venousPressure : vTreatmentPressureOcclusion.venousPressure - property bool valueOutRangeNotify : true - + property bool valueOutRangeNotify : true clip: false x : 0 y : 0 Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -28,7 +28,7 @@ TouchArea { id: _root readonly property real minimum : vTreatmentUltrafiltration.minimum readonly property real maximum : vTreatmentUltrafiltration.maximum - readonly property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol + readonly property real value : vTreatmentUltrafiltration.volumeRemoved clip : false @@ -55,7 +55,7 @@ verticalAlignment : Text.AlignVCenter height : Variables.arrowHeight - text: qsTr("(%1 %2)").arg(vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate.toFixed(0)) + text: qsTr("(%1 %2)").arg(vTreatmentUltrafiltration.targetRate.toFixed(0) ) .arg(Variables.unitTextUltrafiltrationRate ) font.pixelSize: Fonts.fontPixelUltrafiltrationRateUnit color: Colors.touchTextAreaTitle Index: sources/model/hd/data/MTDAirTrapData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/model/hd/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -22,7 +22,8 @@ _data.mUpLevel .value, _data.mLowLevelRaw .value, _data.mUpLevelRaw .value, - _data.mValveState .value, + _data.mValveStateH13.value, + _data.mValveStateH20.value, _data.mControlling .value, }; } @@ -33,7 +34,8 @@ if ( ! GetValue(vByteArray, index, _data.mUpLevel )) goto lError; if ( ! GetValue(vByteArray, index, _data.mLowLevelRaw )) goto lError; if ( ! GetValue(vByteArray, index, _data.mUpLevelRaw )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mValveState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mValveStateH13)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mValveStateH20)) goto lError; if ( ! GetValue(vByteArray, index, _data.mControlling )) goto lError; return true ; @@ -51,11 +53,12 @@ */ MTDAirTrapData::Data MTDAirTrapData::data() const{ Data data; - data.mLowLevel = _data.mLowLevel .value; - data.mUpLevel = _data.mUpLevel .value; - data.mLowLevelRaw = _data.mLowLevelRaw .value; - data.mUpLevelRaw = _data.mUpLevelRaw .value; - data.mValveState = _data.mValveState .value; - data.mControlling = _data.mControlling .value; + data.mLowLevel = _data.mLowLevel .value; + data.mUpLevel = _data.mUpLevel .value; + data.mLowLevelRaw = _data.mLowLevelRaw .value; + data.mUpLevelRaw = _data.mUpLevelRaw .value; + data.mValveStateH13 = _data.mValveStateH13 .value; + data.mValveStateH20 = _data.mValveStateH20 .value; + data.mControlling = _data.mControlling .value; return data; } Index: sources/model/hd/data/MTDAirTrapData.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/model/hd/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/model/hd/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -39,8 +39,9 @@ * | #2:(U32) | \ref Data::mUpLevel | * | #3:(U32) | \ref Data::mLowLevelRaw | * | #4:(U32) | \ref Data::mUpLevelRaw | - * | #5:(U32) | \ref Data::mValveState | - * | #6:(U32) | \ref Data::mControlling | + * | #5:(U32) | \ref Data::mValveStateH13 | + * | #6:(U32) | \ref Data::mValveStateH20 | + * | #7:(U32) | \ref Data::mControlling | * * \sa Data * @@ -64,7 +65,8 @@ Types::U32 mUpLevel ; Types::U32 mLowLevelRaw ; Types::U32 mUpLevelRaw ; - Types::U32 mValveState ; + Types::U32 mValveStateH13 ; + Types::U32 mValveStateH20 ; Types::U32 mControlling ; } _data; @@ -80,7 +82,8 @@ quint32 mUpLevel = 0; ///< upper level value quint32 mLowLevelRaw = 0; ///< lower level raw value quint32 mUpLevelRaw = 0; ///< upper level raw value - quint32 mValveState = 0; ///< air valve state + quint32 mValveStateH13 = 0; ///< air valve H13 state + quint32 mValveStateH20 = 0; ///< air valve H20 state quint32 mControlling = 0; ///< air control }; Index: sources/view/hd/data/VTDAirTrapData.cpp =================================================================== diff -u -r5f69bb944ed9b2186528f726def2630544bd0de6 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/view/hd/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) +++ sources/view/hd/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -24,6 +24,7 @@ upLevel (vData.mUpLevel ); lowLevelRaw (vData.mLowLevelRaw ); upLevelRaw (vData.mUpLevelRaw ); - valveState (vData.mValveState ); + valveStateH13 (vData.mValveStateH13 ); + valveStateH20 (vData.mValveStateH20 ); controlling (vData.mControlling ); } Index: sources/view/hd/data/VTDAirTrapData.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/view/hd/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/view/hd/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -39,7 +39,8 @@ PROPERTY( quint32 , upLevel , 0) PROPERTY( quint32 , lowLevelRaw , 0) PROPERTY( quint32 , upLevelRaw , 0) - PROPERTY( quint32 , valveState , 0) + PROPERTY( quint32 , valveStateH20 , 0) + PROPERTY( quint32 , valveStateH13 , 0) PROPERTY( quint32 , controlling , 0) VIEW_DEC(VTDAirTrap, TDAirTrapData)