Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml =================================================================== diff -u -r9e57e4c990afab0996def98521d4f9fee83f96d8 -reea63d68fc0fb269f8dec64d99f488bcad117220 --- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 9e57e4c990afab0996def98521d4f9fee83f96d8) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) @@ -14,10 +14,9 @@ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 // Project -import Gui.Actions 0.1; +import VTreatmentPressureOcclusion 0.1; // Qml imports import "qrc:/globals" @@ -26,35 +25,46 @@ /*! * \brief Treatment Screen Pressure section */ -TouchArea { id: _pressureTouchArea +TouchArea { id: _root + property int arterialMinimum : -400 + property int arterialLowerBound : -300 + property int arterialUpperBound : 100 + property int arterialMaximum : 400 + property alias arterilPressure : _arterialRangeBar.value + + property int venousMinimum : -100 + property int venousLowerBound : -100 + property int venousUpperBound : 500 + property int venousMaximum : 800 + property alias venusPressure : _venousRangeBar.value + + clip: false - x: leftColumnX - y: row3Y - width: _flowsTouchArea.width + x : 0 + y : 0 + width : 200 height : 200 isTouchable: true orientation: TouchArea.Orientation.Horizontal title: qsTr("PRESSURE") + " " + qsTr("(mmHg)") + + VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } + RangeBar { id: _arterialRangeBar x: 0 y: 75 width : 175 height : 15 rangebar.color: Colors.pressuresArterialBar - value : 0 + value : vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure // TEST : simulation code - minimum : -400 - maximum : 400 - lowerBound: -300 - upperBound: 100 - NumberAnimation on value { - duration: 70000 - from: _arterialRangeBar.minimum - to: _arterialRangeBar.maximum - loops: Animation.Infinite - } + minimum : _root.arterialMinimum + lowerBound : _root.arterialLowerBound + upperBound : _root.arterialUpperBound + maximum : _root.arterialMaximum + Text { id: _arterialText anchors { left: parent.left @@ -74,20 +84,14 @@ height : 15 rangebar.color: Colors.pressuresVenousBar - value : 0 + value : vTreatmentPressureOcclusion.pressureocclusion_VenousPressure // TEST : simulation code - minimum: -100 - maximum: 800 - lowerBound: -100 - upperBound: 500 + minimum : _root.venousMinimum + lowerBound : _root.venousLowerBound + upperBound : _root.venousUpperBound + maximum : _root.venousMaximum - NumberAnimation on value { - duration: 70000 - from : _venousRangeBar.minimum - to : _venousRangeBar.maximum - loops : Animation.Infinite - } Text { id: _venousText anchors { left: parent.left