Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -r426208cdb707400759bdc663b871ece9d1208aed -r326606dbdcecb69059550bdc4dadeeac78830101 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 426208cdb707400759bdc663b871ece9d1208aed) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 326606dbdcecb69059550bdc4dadeeac78830101) @@ -48,35 +48,22 @@ signal backPressed() // ---------- COLUMN LEFT - TreatmentFlows { id: _flowsTouchArea } + TreatmentFlows { id: _flowsTouchArea } + Line { x: 0; y: row1LineY; length: lineLength } + TreatmentVitals { id: _vitalsTouchArea } + Line { x: 0; y: row2LineY; length: lineLength } + TreatmentPressure { id: _pressureTouchArea } - Line { x: 0; y: row1LineY; length: lineLength } - - TreatmentVitals { id: _vitalsTouchArea } - - Line { x: 0; y: row2LineY; length: lineLength } - - TreatmentPressure { id: _pressureTouchArea } - - // ---------- COLUMN RIGHT - TreatmentUltrafiltration { id: _ultrafiltrationTouchArea - minimum: 0 - maximum: 1000 // TEST : this is a test has to be read form the prescreprion values - value : 0 - valueEx: 0 - } + TreatmentUltrafiltration { id: _ultrafiltrationTouchArea; maximum: 1000 } // TEST : this is a test has to be read form the prescreprion values + Line { x: rightLinesX; y: row1LineY; length: lineLength } + TreatmentFluid { id: _fluidManagementTouchArea } + Line { x: rightLinesX; y: row2LineY; length: lineLength; } + TreatmentInfusion { id: _solutionInfusionTouchArea } - Line { x: rightLinesX; y: row1LineY; length: lineLength } + // ---------- Center + TreatmentTime { id: _treatmentTime } - TreatmentFluid { id: _fluidManagementTouchArea } - - Line { x: rightLinesX; y: row2LineY; length: lineLength; } - - TreatmentInfusion { id: _solutionInfusionTouchArea } - - TreatmentTime { id: _treatmentTime } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r426208cdb707400759bdc663b871ece9d1208aed -r326606dbdcecb69059550bdc4dadeeac78830101 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 426208cdb707400759bdc663b871ece9d1208aed) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 326606dbdcecb69059550bdc4dadeeac78830101) @@ -141,7 +141,7 @@ MouseArea { id: _mouseArea anchors.fill: parent onClicked: { - _root.clicked() + _treatmentTime.clicked() } } } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r426208cdb707400759bdc663b871ece9d1208aed -r326606dbdcecb69059550bdc4dadeeac78830101 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 426208cdb707400759bdc663b871ece9d1208aed) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 326606dbdcecb69059550bdc4dadeeac78830101) @@ -46,6 +46,7 @@ width : parent.width height : Variables.progressbarHeight value : 0 + valueEx : 0 // TEST : simulation code // disabled since the actual values are receiving from HD