Index: denali.pro.user =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -rc1474e48907082e10a2eb03adf40f0acd4af9a63 --- denali.pro.user (.../denali.pro.user) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ denali.pro.user (.../denali.pro.user) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rc1474e48907082e10a2eb03adf40f0acd4af9a63 --- denali.qrc (.../denali.qrc) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ denali.qrc (.../denali.qrc) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -105,7 +105,7 @@ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml - sources/gui/qml/pages/treatment/sections/TreatmentPressuresLimits.qml + sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml sources/gui/qml/pages/treatment/sections/TreatmentTime.qml @@ -119,6 +119,6 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml - sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressures.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -rc1474e48907082e10a2eb03adf40f0acd4af9a63 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -93,7 +93,7 @@ // no page yet } onSectionPressuresClicked: { - _treatmentAdjustmentPressures.open() + _treatmentAdjustmentPressuresLimits.open() } onSectionTimeClicked : { _treatmentAdjustmentDuration.durationValue = vTreatmentTime.time_Total / 60 // minutes => hours @@ -134,7 +134,7 @@ onConfirmClicked : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) } - TreatmentAdjustmentPressures{ id: _treatmentAdjustmentPressures + TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits onCloseClicked : close() //onConfirmClicked : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) // TODO : TEST : values are real regarding PRS but has to be populated my Model. Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rc1474e48907082e10a2eb03adf40f0acd4af9a63 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -78,7 +78,7 @@ } } Line { x: 0; y: row2LineY; length: lineLength } - TreatmentPressuresLimits { id: _pressuresLimitsTouchArea + TreatmentPressures { id: _pressuresTouchArea // TEST : these values are test values. arterialMinimum : -400 arterialLowerBound : -300 Fisheye: Tag c1474e48907082e10a2eb03adf40f0acd4af9a63 refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressures.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (revision 0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -0,0 +1,124 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \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 TreatmentAdjustmentFlow.qml + * \author (last) Behrouz NematiPour + * \date (last) 30-Jul-2020 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" +import "qrc:/compounds" + +/*! + * \brief TreatmentAdjustmentPressures.qml is the screen + * To adjust the treatment inline blood pressure ranges of Arterial and venous + */ +TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentPressures" //SquishQt testability + + property alias arterialPressureMinimum : _arterialPressure.minimum + property alias arterialPressureLowerBound : _arterialPressure.lowerBound + property alias arterialPressureUpperBound : _arterialPressure.upperBound + property alias arterialPressureMaximum : _arterialPressure.maximum + property alias arterialPressureValue : _arterialPressure.value + property real arterialPressureStep : 10 + + property alias venousPressureMinimum : _venousPressure.minimum + property alias venousPressureLowerBound : _venousPressure.lowerBound + property alias venousPressureUpperBound : _venousPressure.upperBound + property alias venousPressureMaximum : _venousPressure.maximum + property alias venousPressureValue : _venousPressure.value + property real venousPressureStep : 10 + + readonly property int textWidth : 200 + + titleText: qsTr("PRESSURES") + + //// Note : The slider values are not bound and will be set by user freely + //// and will be used to be sent for adjustment + //// if accepted will not changed and + //// if rejected then will be reset to the values passed by adjustment response + //// + //// reset the flow values to the current flow values + //// function currentFlows() { + //// _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_FlowSetPoint + //// _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint + //// } + //// + //// // reset the flow values to the values of the adjustment response + //// function resetFlows() { + //// _bloodFlowSlider.value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint + //// _dialysateFlowSlider.value = vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint + //// } + //// + //// onAboutToShow: { + //// // TODO : When Testing data on Setting screen is removed + //// // This needs to be moved into the Treatment______.qml + //// currentFlows() + //// } + //// + //// Connections { target: vTreatmentAdjustmentFlows + //// onAdjustmentTriggered: { + //// if ( vTreatmentAdjustmentFlows.adjustment_Accepted ) { + //// accept() + //// } else { + //// resetFlows() + //// notification.text = vTreatmentAdjustmentFlows.text() + //// } + //// } + //// } + + Column { id : _pressuresColumn + spacing: 100 + anchors.centerIn: parent + PressureRangeSlider { id: _arterialPressure + titleText : qsTr("Arterial") + anchors.horizontalCenter: parent.horizontalCenter + progressColor : Colors.pressuresArterialBar + + minimum : arterialPressureMinimum + minimumMargin : 0 + lowerBound : arterialPressureLowerBound + upperBound : arterialPressureUpperBound + maximumMargin : 25 + maximum : arterialPressureMaximum + value : arterialPressureValue + step : arterialPressureStep + } + + Line { + anchors.horizontalCenter: parent.horizontalCenter + length : _root.width - 100 + color : Colors.separatorLine + } + + PressureRangeSlider { id: _venousPressure + titleText : qsTr("Venous") + anchors.horizontalCenter: parent.horizontalCenter + progressColor : Colors.pressuresVenousBar + + minimum : venousPressureMinimum + minimumMargin : 50 + lowerBound : venousPressureLowerBound + upperBound : venousPressureUpperBound + maximumMargin : 75 + maximum : venousPressureMaximum + value : venousPressureValue + step : venousPressureStep + } + } +} Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (revision 0) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -0,0 +1,104 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \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 TreatmentPressuresLimits.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 + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief Treatment Screen Pressure section + */ +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 : 0 + y : 0 + width : 200 + height : 200 + isTouchable: true + title: qsTr("PRESSURE") + " " + qsTr("(mmHg)") + + RangeBar { id: _arterialRangeBar + x: 0 + y: 80 + width : 175 + height : 15 + rangebar.color: Colors.pressuresArterialBar + markerOutRangeNotify: true + + value : vTreatmentPressureOcclusion.arterialPressure + + minimum : _root.arterialMinimum + lowerBound : _root.arterialLowerBound + upperBound : _root.arterialUpperBound + maximum : _root.arterialMaximum + + Text { id: _arterialText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + } + text: qsTr("Arterial") + font.pixelSize: Fonts.fontPixelPresseuresText + color: Colors.pressuresText + } + onClicked: _root.clicked() + } + + RangeBar { id: _venousRangeBar + x: 200 + y: 80 + width : 175 + height : 15 + rangebar.color: Colors.pressuresVenousBar + markerOutRangeNotify: true + + value : vTreatmentPressureOcclusion.venousPressure + + minimum : _root.venousMinimum + lowerBound : _root.venousLowerBound + upperBound : _root.venousUpperBound + maximum : _root.venousMaximum + + Text { id: _venousText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + } + text: qsTr("Venous") + font.pixelSize: Fonts.fontPixelPresseuresText + color: Colors.pressuresText + } + onClicked: _root.clicked() + } +} Fisheye: Tag c1474e48907082e10a2eb03adf40f0acd4af9a63 refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/sections/TreatmentPressuresLimits.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -rc1474e48907082e10a2eb03adf40f0acd4af9a63 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -276,8 +276,8 @@ * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------:| * | 70 | 0x100 | 9 | Req | Y | UI | HD | A/V BP Limit Change Request | * - * | Payload || - * | || + * | Payload ||| + * | ||| * | #1:(S32) | \ref mArterialLimitLow | (mmHg) | * | #2:(S32) | \ref mArterialLimitHigh | (mmHg) | * | #3:(S32) | \ref mVenousLimitLow | (mmHg) |