Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml =================================================================== diff -u -r8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6 -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -1,22 +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 // Project -import VTreatmentPressureOcclusion 0.1; // Qml imports import "qrc:/globals" @@ -26,36 +26,34 @@ * \brief Treatment Screen Pressure section */ TouchArea { id: _root - property int arterialMinimum : -400 - property int arterialLowerBound : -300 - property int arterialUpperBound : 100 - property int arterialMaximum : 400 + property int arterialMinimum : 0 + property int arterialLowerBound : 0 + property int arterialUpperBound : 0 + property int arterialMaximum : 0 + property alias arterilPressure : _arterialRangeBar.value - property int venousMinimum : -100 - property int venousLowerBound : -100 - property int venousUpperBound : 500 - property int venousMaximum : 800 + property int venousMinimum : 0 + property int venousLowerBound : 0 + property int venousUpperBound : 0 + property int venousMaximum : 0 + property alias venusPressure : _venousRangeBar.value - clip: false 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 + y: 80 width : 175 height : 15 rangebar.color: Colors.pressuresArterialBar - value : vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure + value : vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure // TEST : simulation code minimum : _root.arterialMinimum @@ -77,14 +75,13 @@ RangeBar { id: _venousRangeBar x: 200 - y: 75 + y: 80 width : 175 height : 15 rangebar.color: Colors.pressuresVenousBar value : vTreatmentPressureOcclusion.pressureocclusion_VenousPressure - // TEST : simulation code minimum : _root.venousMinimum lowerBound : _root.venousLowerBound upperBound : _root.venousUpperBound