Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r038d30c2f22add13830b92a9775d70c9615861b2 -r8f53c579291988cf29fce189d95f77a0bb7679f0 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 038d30c2f22add13830b92a9775d70c9615861b2) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8f53c579291988cf29fce189d95f77a0bb7679f0) @@ -185,8 +185,8 @@ ID_AdjustUltrafiltrationInitReq = 0x4F0F, // 79 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 // Pre-Treatment Patient Connection Confirm - ID_AdjustPatientConnectionConfirmReq = 0x6600, // 102 - ID_AdjustPatientConnectionConfirmRsp = 0x6700, // 103 + ID_AdjustPatientConnectionConfirmReq = 0x660F, // 102 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPatientConnectionConfirmRsp = 0x670F, // 103 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Start Treatment ID_AdjustStartTreatmentReq = 0x7100, // 113 ID_AdjustStartTreatmentRsp = 0x7200, // 114 @@ -247,8 +247,8 @@ ID_AdjustUltrafiltrationEditReq = 0x4100, // 65 //// ----- @LEAHIZED ID_AdjustUltrafiltrationEditRsp = 0x4200, // 66 //// ----- @LEAHIZED - ID_AdjustUltrafiltrationConfirmReq = 0x150F, // 21 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 + ID_AdjustUltrafiltrationConfirmReq = 0x6600, // 102 //// ----- @LEAHIZED + ID_AdjustUltrafiltrationConfirmRsp = 0x6700, // 103 //// ----- @LEAHIZED // End-Treatment // Rinseback Index: sources/gui/qml/components/StoppedSlider.qml =================================================================== diff -u -r018005dc067da01f25899ce83e4ce8f14e5013ae -r8f53c579291988cf29fce189d95f77a0bb7679f0 --- sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision 018005dc067da01f25899ce83e4ce8f14e5013ae) +++ sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision 8f53c579291988cf29fce189d95f77a0bb7679f0) @@ -91,11 +91,11 @@ top : parent.top bottom : parent.bottom left : parent.left - right : _removedMarker.right + right : _lowMarker.right // adjust margin so fill completely covers the underlying slider leftMargin : -1 } - z : _removedMarker.z - 1 + z : _lowMarker.z - 1 color : Colors.ufProgressBarFill radius : height / 2 @@ -105,23 +105,23 @@ bottom : parent.bottom right : parent.right } - width : Math.min(parent.radius, _removedMarker.x) + width : Math.min(parent.radius, _lowMarker.x) color : parent.color } } - RangeMarker { id: _removedMarker - x : (_slider.width * (_slider.minStop / _slider.maximum)) - ((width+1)/2) + RangeMarker { id: _lowMarker + x : (_slider.width * ((value - _slider.minimum) / (_slider.maximum - _slider.minimum))) - ((width+1)/2) z : _slider.handler.z - 1 width : Variables.ultrafiltrationRangeMarkerWidth height : Variables.rangeMarkerHeight hasHandle : true valueOnTop : true decimal : Variables.ultrafiltrationPrecision - value : _root.minStop + value : Math.max(_root.minStop, _root.minimum) handle.width : Variables.ultrafiltrationRangeMarkerHandleWidth text { - anchors.bottomMargin: _removedMarker.valueOnTop ? 15 : 0 + anchors.bottomMargin: _lowMarker.valueOnTop ? 15 : 0 font { pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker weight: Font.DemiBold Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -r038d30c2f22add13830b92a9775d70c9615861b2 -r8f53c579291988cf29fce189d95f77a0bb7679f0 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 038d30c2f22add13830b92a9775d70c9615861b2) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 8f53c579291988cf29fce189d95f77a0bb7679f0) @@ -122,7 +122,6 @@ Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { - vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationConfirm.volume _treatmentAdjustmentUltrafiltrationConfirm.close() _treatmentAdjustmentUltrafiltrationEdit .close() _treatmentAdjustmentUltrafiltrationStart .open() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r018005dc067da01f25899ce83e4ce8f14e5013ae -r8f53c579291988cf29fce189d95f77a0bb7679f0 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 018005dc067da01f25899ce83e4ce8f14e5013ae) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 8f53c579291988cf29fce189d95f77a0bb7679f0) @@ -32,7 +32,7 @@ property string titleText: "" property bool closeVisible: true - property bool confirmVisible: true + property bool confirmVisible: false property bool backVisible: false property alias information: _information Index: sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h =================================================================== diff -u -ra9fd14aeaeb67cfe02dcb6ae4eb88cd3bcf376d4 -r8f53c579291988cf29fce189d95f77a0bb7679f0 --- sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h (.../VTreatmentUltrafiltrationData.h) (revision a9fd14aeaeb67cfe02dcb6ae4eb88cd3bcf376d4) +++ sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h (.../VTreatmentUltrafiltrationData.h) (revision 8f53c579291988cf29fce189d95f77a0bb7679f0) @@ -36,9 +36,6 @@ { Q_OBJECT - PROPERTY( float , minimum , 0.000) // no message to update this value and is 0 for now. - PROPERTY( float , maximum , 0.800) - PROPERTY( float , setVolume , 0) PROPERTY( float , targetRate , 0) PROPERTY( float , volumeRemoved , 0)