Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r4c97ffb2e5adabe830edf99cb185879e2543da3f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) @@ -34,9 +34,9 @@ property real valAdjust : _volumeSlider.value property real maxAdjust : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max - property real min : vTreatmentUltrafiltration.minimum + property real min : 0 property real val : vTreatmentUltrafiltration.volumeRemoved - property real max : vTreatmentUltrafiltration.maximum + property real max : vTreatmentUltrafiltration.setVolume } signal nextClicked(real vVolume) Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r4c97ffb2e5adabe830edf99cb185879e2543da3f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) @@ -29,8 +29,8 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationPaused" //SquishQt testability QtObject { id: _private - property real minimum: vTreatmentUltrafiltration.minimum - property real maximum: vTreatmentUltrafiltration.maximum + property real minimum: 0 + property real maximum: vTreatmentUltrafiltration.setVolume property real value : vTreatmentUltrafiltration.volumeRemoved } signal editClicked() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r4c97ffb2e5adabe830edf99cb185879e2543da3f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) @@ -30,8 +30,8 @@ contentItem.objectName: "TreatmentAdjustmentUltrafiltrationStart" //SquishQt testability QtObject { id: _private - property real minimum: vTreatmentUltrafiltration.minimum - property real maximum: vTreatmentUltrafiltration.maximum + property real minimum: 0 + property real maximum: vTreatmentUltrafiltration.setVolume property real value : vTreatmentUltrafiltration.volumeRemoved } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -r4c97ffb2e5adabe830edf99cb185879e2543da3f --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) @@ -28,8 +28,8 @@ */ TreatmentSection { id: _root - readonly property real minimum : vTreatmentUltrafiltration.minimum - readonly property real maximum : vTreatmentUltrafiltration.maximum + readonly property real minimum : 0 + readonly property real maximum : vTreatmentUltrafiltration.setVolume readonly property real value : vTreatmentUltrafiltration.volumeRemoved readonly property int topTextFontSize : 25 readonly property int bottomTextFontSize : 60 @@ -44,7 +44,7 @@ leftPadding : Variables.defaultMargin Column { id: _leftColumn - spacing : Variables.defaultMargin * 7 + spacing : Variables.defaultMargin * 6 width : contentItem.width * 0.2 height : _root.height @@ -86,7 +86,6 @@ width : contentItem.width height : _root.height - ProgressBar { id: _progressbar enabled : ! isSBInProgress width : contentItem.width * 0.6 @@ -138,8 +137,6 @@ font.pixelSize : 20 font.weight : Font.Medium } - - Behavior on marker.text.anchors.rightMargin { NumberAnimation {duration: 200} } } } } Index: sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h =================================================================== diff -u -raf8bb591eccf566715f239cb54d2a68626a1a09d -r4c97ffb2e5adabe830edf99cb185879e2543da3f --- sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h (.../VTreatmentUltrafiltrationData.h) (revision af8bb591eccf566715f239cb54d2a68626a1a09d) +++ sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h (.../VTreatmentUltrafiltrationData.h) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) @@ -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)