Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml =================================================================== diff -u -r9e57e4c990afab0996def98521d4f9fee83f96d8 -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 9e57e4c990afab0996def98521d4f9fee83f96d8) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -1,23 +1,22 @@ /*! * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. - * \copyright \n - * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n - * IN PART OR IN WHOLE, \n - * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file TreatmentPressure.qml - * \date 2020/01/27 - * \author Behrouz NematiPour + * \file TreatmentPressure.qml + * \author (last) Behrouz NematiPour + * \date (last) 16-Oct-2020 + * \author (original) Behrouz NematiPour + * \date (original) 27-Jan-2020 * */ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 // Project -import Gui.Actions 0.1; // Qml imports import "qrc:/globals" @@ -26,35 +25,42 @@ /*! * \brief Treatment Screen Pressure section */ -TouchArea { id: _pressureTouchArea +TouchArea { id: _root + property int arterialMinimum : 0 + property int arterialLowerBound : 0 + property int arterialUpperBound : 0 + property int arterialMaximum : 0 + property alias arterilPressure : _arterialRangeBar.value + + property int venousMinimum : 0 + property int venousLowerBound : 0 + property int venousUpperBound : 0 + property int venousMaximum : 0 + 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)") + RangeBar { id: _arterialRangeBar x: 0 - y: 75 + y: 80 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 @@ -69,25 +75,18 @@ RangeBar { id: _venousRangeBar x: 200 - y: 75 + y: 80 width : 175 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