Index: denali.pro.user =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r820a00638e0573a5b0c51ed0b3e38d605d4400be --- denali.pro.user (.../denali.pro.user) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ denali.pro.user (.../denali.pro.user) (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r820a00638e0573a5b0c51ed0b3e38d605d4400be --- denali.qrc (.../denali.qrc) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ denali.qrc (.../denali.qrc) (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) @@ -117,6 +117,7 @@ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml sources/gui/qml/pages/treatment/sections/TreatmentTime.qml sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml + sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -re4a6f98d9a3eefb5226f85d62dfe103867189a4c -r820a00638e0573a5b0c51ed0b3e38d605d4400be --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision e4a6f98d9a3eefb5226f85d62dfe103867189a4c) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) @@ -109,22 +109,17 @@ } Line { x: rightLinesX; y: row1LineY; length: lineLength } TreatmentSaline { id: _SalineTouchArea - x : rightColumnX - y : row2Y + x : rightColumnX + y : row2Y width : areaWidth height : areaHeightRow2 } Line { x: rightLinesX; y: row2LineY; length: lineLength; } - TreatmentFluid { id: _heparinTouchArea - // TODO : Another component should be inherited from this for Heparin - buttonText: qsTr("PAUSE DELIVERY") - - x : rightColumnX - y : row3Y + TreatmentHeparin { id: _heparinTouchArea + x : rightColumnX + y : row3Y width : areaWidth height : areaHeightRow3 - title : qsTr("HEPARIN") - cumulativeVisible: false } // ---------- Center Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r820a00638e0573a5b0c51ed0b3e38d605d4400be --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) @@ -65,6 +65,12 @@ horizontalCenter: parent.horizontalCenter } decimal : _private.decimal + // TODO: I noticed an odd behaviour in UF adjustment and I believe this is the correct fix + // but since noone ever complained about that I'm not going to chane it, + // and I might be wrong and FW is sending correct values and handling it. + // but if anyone ever notice I will use this fix. + // I'm almost 100% sure this needs to be changed to 0. + // minimum : 0 //_private.minimum minimum : _private.minimum maximum : _private.maximum value : _private.value @@ -95,6 +101,11 @@ stepSnap: true ticks : true decimal : _private.decimal + // TODO: I noticed an odd behaviour in UF adjustment and I believe this is the correct fix + // but since noone ever complained about that I'm not going to chane it, + // and I might be wrong and FW is sending correct values and handling it. + // but if anyone ever notice I will use this fix. + // minimum : _private.value /*_private.minimum*/ + minGapValue minimum : _private.minimum + minGapValue maximum : _private.maximum - maxGapValue } Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -r533c771015857845302bcbc58b411ecef2d6ec79 -r820a00638e0573a5b0c51ed0b3e38d605d4400be --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 533c771015857845302bcbc58b411ecef2d6ec79) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) @@ -28,6 +28,8 @@ TouchArea { id: _root property string buttonText : "" property bool cumulativeVisible : true + property bool targetVisible : true + property bool progressBarVisible : true property int rowTextSpacing : 10 property int volumeTextWidth : 60 @@ -64,64 +66,69 @@ } } - ProgressBar { id: _fluidProgressBar + Text { id: _fluidText anchors { top: _startFluidButton.bottom - topMargin: 50 + topMargin: 20 + } + width: parent.width + text: qsTr("Volume Delivered") + font.pixelSize: Fonts.fontPixelFluidText + color: Colors.fluidText + Text { id: _fluidTarget + visible: targetVisible + property real value: 0 + width: volumeTextWidth + anchors { + right: parent.right + baseline: parent.baseline + } + text: qsTr("(%1 %2)").arg(value).arg(_root.unit) + font.pixelSize: Fonts.fontPixelFluidVolume + color: Colors.fluidUnit + } + Text { id: _fluidUnit + anchors { + right: parent.right + rightMargin: volumeTextWidth + rowTextSpacing + baseline: parent.baseline + } + text: _root.unit + font.pixelSize: Fonts.fontPixelFluidUnit + color: Colors.fluidUnit + } + Text { id: _fluidValue + anchors { + right: _fluidUnit.left + rightMargin: rowTextSpacing + baseline: parent.baseline + } + horizontalAlignment: Text.AlignRight + text: _fluidProgressBar.value + width: 60 + font.pixelSize: Fonts.fontPixelFluidValue + color: Colors.fluidText + } + } + + ProgressBar { id: _fluidProgressBar + visible: progressBarVisible + anchors { + left : parent.left + top : _fluidText.bottom + topMargin : 15 + } width : parent.width height : Variables.progressbarFluidHeight minText.visible : false maxText.visible : false marker.visible : false + maximum : _fluidTarget.value value : 0 - - Text { id: _fluidText - anchors { - left : parent.left - bottom : parent.bottom - bottomMargin: 15 - } - width: parent.width - text: qsTr("Volume Delivered") - font.pixelSize: Fonts.fontPixelFluidText - color: Colors.fluidText - Text { id: _fluidTarget - property real value: 0 - width: volumeTextWidth - anchors { - right: parent.right - baseline: parent.baseline - } - text: qsTr("(%1 %2)").arg(value).arg(_root.unit) - font.pixelSize: Fonts.fontPixelFluidVolume - color: Colors.fluidUnit - } - Text { id: _fluidUnit - anchors { - right: parent.right - rightMargin: volumeTextWidth + rowTextSpacing - baseline: parent.baseline - } - text: _root.unit - font.pixelSize: Fonts.fontPixelFluidUnit - color: Colors.fluidUnit - } - Text { id: _fluidValue - anchors { - right: _fluidUnit.left - rightMargin: rowTextSpacing - baseline: parent.baseline - } - horizontalAlignment: Text.AlignRight - text: _fluidProgressBar.value - width: 60 - font.pixelSize: Fonts.fontPixelFluidValue - color: Colors.fluidText - } - } } + Text { id: _cumulativeText visible: cumulativeVisible anchors { @@ -130,7 +137,7 @@ topMargin : 15 } width: parent.width - text: qsTr("Cumulative Delivery") + text: qsTr("Cumulative Delivered") font.pixelSize: Fonts.fontPixelFluidText color: Colors.fluidText Text { id: _cumulativeUnit Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (revision 0) +++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) @@ -0,0 +1,77 @@ +/*! + * + * 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 TreatmentHeparin.qml + * \author (last) Behrouz NematiPour + * \date (last) 17-Nov-2020 + * \author (original) Behrouz NematiPour + * \date (original) 17-Nov-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +//// import VTreatmentHeparin 0.1; + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief Treatment Screen Heparin Management section + */ +TreatmentFluid { id: _root + //// readonly property bool isStarted : vHDTreatmentStates.hpRunnin + //// readonly property bool isOff : vHDTreatmentStates.hp + //// + //// readonly property bool isDisabled : vHDTreatmentStates.sbMaxReached + //// readonly property bool isWaitPump : vHDTreatmentStates.sbWaitPump + + QtObject { id: _private + readonly property string textStart : qsTr("PAUSE DELIVERY") + readonly property string textStop : qsTr("RESUME DELIVERY" ) + readonly property string textVolumeTarget : "(" + valueTarget + unit + ")" + readonly property string mesgDisabled : qsTr("Maximum cumulative heparin bolus volume delivered") + readonly property string mesgWaitForPump : "" // qsTr("Saline Bolus is starting") // Not sure if we shouls show any message at this point + //// readonly property string mesgRejectReason : vTreatmentAdjustmentSaline.adjustment_ReasonText + } + + title : qsTr("HEPARIN") + cumulativeVisible: false + + hasArrow : false + targetVisible: false + progressBarVisible: false + + isTouchable : true //// ! ( _root.isDisabled || _root.isWaitPump ) + buttonText: qsTr("PAUSE DELIVERY") + ////buttonText : ( _root.isDisabled || _root.isWaitPump ) ? _private.textStart : + //// _root.isStarted ? _private.textStop : + //// _private.textStart + unit : Variables.unitTextSaline + + //// valueTarget : vTreatmentHeparin.target || vTreatmentAdjustmentSaline.target + //// valueCumulative: vTreatmentHeparin.cumulative .toFixed(0) + //// valueDelivered : vTreatmentHeparin.delivered .toFixed(0) + //// + //// VTreatmentHeparin { id: vTreatmentHeparin } + //// + //// onClicked: { + //// vTreatmentAdjustmentSaline.doAdjustment() + //// } + //// + //// notification { + //// visible : true + //// text : isIdle ? "" : + //// isDisabled ? _private.mesgDisabled : + //// isWaitPump ? _private.mesgWaitForPump : + //// isStarted ? _private.mesgRejectReason : + //// "" + //// } +}