Index: SDDs/Main_Treatment/FinalDiagram.dot =================================================================== diff -u -rce88b5cc93b1fa7fcb26534ca4c7fa1cd48bd249 -re35626298b657eeef3db1373c287765046955063 --- SDDs/Main_Treatment/FinalDiagram.dot (.../FinalDiagram.dot) (revision ce88b5cc93b1fa7fcb26534ca4c7fa1cd48bd249) +++ SDDs/Main_Treatment/FinalDiagram.dot (.../FinalDiagram.dot) (revision e35626298b657eeef3db1373c287765046955063) @@ -525,8 +525,8 @@ qvalueText [shape=ellipse, label="Text\nvTreatmentUltrafiltration.volumeRemoved", fontsize="30pt"]; qProgressBarProgressMin [shape=ellipse, label="Text\nid: _textMinimum\n'visible: false'", fontsize="30pt"]; qProgressBarProgressMax [shape=ellipse, label="Text\nid: _textMaximum\n'visible: false'", fontsize="30pt"]; - qProgressBarMin [shape=ellipse, label="Text\nvTreatmentUltrafiltration.minimum", fontsize="30pt"]; - qProgressBarMax [shape=ellipse, label="Text\nvTreatmentUltrafiltration.maximum", fontsize="30pt"]; + qProgressBarMin [shape=ellipse, label="Text\n0.00", fontsize="30pt"]; + qProgressBarMax [shape=ellipse, label="Text\nvTreatmentUltrafiltration.setVolume", fontsize="30pt"]; // Diagram Layout subgraph cluster_one { Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -re35626298b657eeef3db1373c287765046955063 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision e35626298b657eeef3db1373c287765046955063) @@ -129,7 +129,7 @@ Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit function onAdjustmentTriggered ( vValue ) { // the maximum ultrafiltration volume has to be set/revert regardless - vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume + vTreatmentUltrafiltration.setVolume = vPreTreatmentAdjustmentUltrafiltrationInit.volume _preTreatmentUltrafiltration.reset ( vPreTreatmentAdjustmentUltrafiltrationInit.volume ) // but only if it has been accepted it will navigate Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rb76f43fffe933994819e03930c6ad4dd0f0e2fca -re35626298b657eeef3db1373c287765046955063 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision b76f43fffe933994819e03930c6ad4dd0f0e2fca) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e35626298b657eeef3db1373c287765046955063) @@ -174,7 +174,7 @@ Connections { target: vTreatmentAdjustmentDuration function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) { - vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentDuration.ultrafiltration + vTreatmentUltrafiltration.setVolume = vTreatmentAdjustmentDuration.ultrafiltration _treatmentAdjustmentDuration.accept() } else { _treatmentAdjustmentDuration.setDurationValue(vTreatmentAdjustmentDuration.duration); Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -re35626298b657eeef3db1373c287765046955063 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision e35626298b657eeef3db1373c287765046955063) @@ -140,7 +140,7 @@ Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { - vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationConfirm.volume + vTreatmentUltrafiltration.setVolume = vTreatmentAdjustmentUltrafiltrationConfirm.volume _treatmentAdjustmentUltrafiltrationConfirm.close() } else { _treatmentAdjustmentUltrafiltrationConfirm.notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.text()