Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -r4a6abe765f03feae8100ec660aa04aa218d4dfa3 -r8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6) @@ -14,10 +14,8 @@ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 // Project -import Gui.Actions 0.1; // Qml imports import "qrc:/globals" @@ -47,19 +45,60 @@ signal backPressed() + signal sectionFlowClicked() + // ---------- COLUMN LEFT - TreatmentFlows { id: _flowsTouchArea } + TreatmentFlows { id: _flowsTouchArea + x : leftColumnX + y : row1Y + onClicked: { + sectionFlowClicked() + } + } Line { x: 0; y: row1LineY; length: lineLength } - TreatmentVitals { id: _vitalsTouchArea } + TreatmentVitals { id: _vitalsTouchArea + x : leftColumnX + y : row2Y + } Line { x: 0; y: row2LineY; length: lineLength } - TreatmentPressure { id: _pressureTouchArea } + TreatmentPressure { id: _pressureTouchArea + arterialMinimum : -400 + arterialLowerBound : -300 + arterialUpperBound : 100 + arterialMaximum : 400 + venousMinimum : -100 + venousLowerBound : -100 + venousUpperBound : 500 + venousMaximum : 800 + + x : leftColumnX + y : row3Y + width : _flowsTouchArea.width + } + // ---------- COLUMN RIGHT - TreatmentUltrafiltration { id: _ultrafiltrationTouchArea; maximum: 1000 } // TEST : this is a test has to be read form the prescreprion values + TreatmentUltrafiltration { id: _ultrafiltrationTouchArea; + x : rightColumnX + y : row1Y + width : _flowsTouchArea.width + minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min.toFixed(2) + maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) + value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); + valueEx : 0 + } Line { x: rightLinesX; y: row1LineY; length: lineLength } - TreatmentFluid { id: _fluidManagementTouchArea } + TreatmentFluid { id: _fluidManagementTouchArea + x : rightColumnX + y : row2Y + width : _flowsTouchArea.width + } Line { x: rightLinesX; y: row2LineY; length: lineLength; } - TreatmentInfusion { id: _solutionInfusionTouchArea } + TreatmentInfusion { id: _solutionInfusionTouchArea + x : rightColumnX + y : row3Y + width : _flowsTouchArea.width + } // ---------- Center TreatmentTime { id: _treatmentTime } @@ -80,6 +119,5 @@ backPressed() } } - } }