Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -r595ed1fbe8066960afd4c8fea168208e81b173d9 -reea63d68fc0fb269f8dec64d99f488bcad117220 --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 595ed1fbe8066960afd4c8fea168208e81b173d9) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) @@ -14,7 +14,6 @@ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 // Project @@ -26,22 +25,29 @@ * \brief Treatment Screen Flows section */ TouchArea { id: _root + property string unit : qsTr("mL/min") + property alias bloodFlowSetPoint : _bloodFlow.label + property alias dialysateFlowSetPoint : _dialysateInletFlow.label - x: leftColumnX - y: row1Y - title: qsTr("FLOWS") + x : 0 + y : 0 + title : qsTr("FLOWS") + width : 370 + componentsHSpacing: 15 components: [ TextRect { id: _bloodFlow title: qsTr("Blood") - label: vTreatmentBloodFlow.bloodFlow_MeasuredFlow - extra: qsTr("mL") // unit + label: vTreatmentBloodFlow.bloodFlow_FlowSetPoint + extra: unit labelFont.weight: Font.ExtraLight + width: 180 } , TextRect { id: _dialysateInletFlow title: qsTr("Dialysate") - label: vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow - extra: qsTr("mL") // unit + label: vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint + extra: unit labelFont.weight: Font.ExtraLight + width: 180 } ] }