Index: denali.pro.user =================================================================== diff -u -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 -r92864a49013cfffe9d3050f2f081f575916b6b38 --- denali.pro.user (.../denali.pro.user) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) +++ denali.pro.user (.../denali.pro.user) (revision 92864a49013cfffe9d3050f2f081f575916b6b38) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -76,6 +76,7 @@ true Builtin.DefaultTidyAndClazy 1 + false @@ -263,20 +264,18 @@ 1 - true - true - true 2 + false Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro /home/denali/Projects/application/denali.pro -K - false - true + 0 + false true - false - true + 0 + false /home/denali/Projects/tmp/build/build-denali-Desktop_Qt_5_15_10_GCC_64bit-Debug 1 @@ -461,6 +460,7 @@ /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali @@ -471,35 +471,34 @@ /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali 192.168.137.210 192.168.10.159 192.168.10.228 192.168.10.228 192.168.10.138 - 192.168.137.25 192.168.137.30 + 192.168.137.25 192.168.10.186 192.168.10.167 192.168.137.170 192.168.137.3 - 192.168.40.23 - 192.168.137.24 192.168.137.26 192.168.137.170 + 192.168.40.23 + 192.168.137.24 192.168.10.186 - 192.168.137.36 - 192.168.137.125 192.168.137.202 + 192.168.137.125 + 192.168.137.36 192.168.137.247 @@ -549,45 +548,45 @@ 2023-02-02T01:52:20.307 2023-01-24T18:19:13.179 - 2023-01-17T18:06:25.579 2023-01-17T18:18:03.749 + 2023-01-17T18:06:25.579 2023-02-02T09:06:00.862 - 2023-02-02T02:13:54.596 2023-02-02T02:30:48.337 + 2023-02-02T02:13:54.596 2023-01-18T17:47:08.797 2023-02-02T19:40:15.813 2023-01-27T10:15:15.423 2023-02-02T02:40:56.627 - 2023-01-24T17:29:54.849 - 2023-02-02T02:05:29.947 2023-02-01T05:00:56.449 2023-01-27T09:45:11.898 + 2023-01-24T17:29:54.849 + 2023-02-02T02:05:29.947 2023-01-18T20:13:36.296 - 2023-02-01T03:23:15.710 - 2023-02-02T02:07:25.922 2023-02-02T01:46:50.167 + 2023-02-02T02:07:25.922 + 2023-02-01T03:23:15.710 2023-02-02T02:26:33.738 2023-02-02T01:52:16.000 2023-01-24T18:18:58.000 - 2023-01-17T18:05:42.000 2023-01-17T18:17:25.000 + 2023-01-17T18:05:42.000 2023-02-02T09:05:22.000 - 2023-02-02T02:14:08.000 2023-02-02T02:31:01.000 + 2023-02-02T02:14:08.000 2023-01-18T17:47:04.000 2023-02-02T19:39:36.000 2023-01-27T10:15:08.000 2023-02-02T02:41:10.000 - 2023-01-24T17:30:03.000 - 2023-02-02T02:05:42.000 2023-02-01T05:00:51.000 2023-01-27T09:44:58.000 + 2023-01-24T17:30:03.000 + 2023-02-02T02:05:42.000 2023-01-18T20:13:33.000 - 2023-02-01T03:23:28.000 - 2023-02-02T02:07:21.000 2023-02-02T01:47:02.000 + 2023-02-02T02:07:21.000 + 2023-02-01T03:23:28.000 2023-02-02T02:26:46.000 @@ -603,20 +602,16 @@ 1 - true - true - true 1 + false denali (on %{Device:Name}) RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro /home/denali/Projects/application/denali.pro 1 --disable-alarm-no-minimize - false true - false true :0 Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r92864a49013cfffe9d3050f2f081f575916b6b38 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 92864a49013cfffe9d3050f2f081f575916b6b38) @@ -129,8 +129,9 @@ Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit function onAdjustmentTriggered ( vValue ) { // the maximum ultrafiltration volume has to be set/revert regardless - vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume - _preTreatmentUltrafiltration.ufVolume = vPreTreatmentAdjustmentUltrafiltrationInit.volume + vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume + _preTreatmentUltrafiltration.reset ( vPreTreatmentAdjustmentUltrafiltrationInit.volume ) + // but only if it has been accepted it will navigate if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) { page( _preTreatmentPatientConnection ) Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r92864a49013cfffe9d3050f2f081f575916b6b38 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 92864a49013cfffe9d3050f2f081f575916b6b38) @@ -33,6 +33,28 @@ header.confirmEnabled: _volumeSlider.isActive + function reset( vValue ) { + if ( ! handleMinimum( vValue ) ) // if not handled go next + if ( ! handleMaximum( vValue ) ) // if not handled go next + _volumeSlider.reset ( vValue ) + } + + function handleMinimum( vValue ) { + if( _volumeSlider.minimum > vValue ){ + _volumeSlider.reset ( _volumeSlider.minimum ) + return true // handled + } + return false // not handled so check max + } + + function handleMaximum( vValue ) { + if( _volumeSlider.maximum < vValue ){ + _volumeSlider.reset ( _volumeSlider.maximum ) + return true // handled + } + return false // not handled so check min (if max checked first) + } + Text { id: _textLabel visible : true color : Colors.textMain @@ -75,11 +97,24 @@ ticks : true diameter: Variables.sliderCircleDiameter decimal : Variables.ultrafiltrationPrecision - minimum : Variables.ultrafiltrationMinDef + // it can get the minimum from the message + // but some time it has been decided that UI shall always be set to minimum zero. + minimum : Variables.ultrafiltrationMinDef // vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max minText.font.pixelSize: Fonts.fontPixelFluidText maxText.font.pixelSize: Fonts.fontPixelFluidText onPressed: isActive = true + + onMinimumChanged: { + let mValue = vPreTreatmentAdjustmentUltrafiltrationInit.volume + if ( ! _root.handleMinimum ( mValue ) ) // if not handled go next + _volumeSlider.reset ( mValue ) + } + onMaximumChanged: { + let mValue = vPreTreatmentAdjustmentUltrafiltrationInit.volume + if ( ! _root.handleMaximum ( mValue ) ) // if not handled go next + _volumeSlider.reset ( mValue ) + } } SliderArrows{ id:_sliderArrows