Index: shared/scripts/configuration/config.py =================================================================== diff -u -r44765c1ac1f4bd2fe890a30449bf72a746d7577c -rda2bb58d8d1efb41706ffc2d7025491809f54f3a --- shared/scripts/configuration/config.py (.../config.py) (revision 44765c1ac1f4bd2fe890a30449bf72a746d7577c) +++ shared/scripts/configuration/config.py (.../config.py) (revision da2bb58d8d1efb41706ffc2d7025491809f54f3a) @@ -1322,9 +1322,14 @@ BLOOD_FLOW_MINIMUM_VALUE = 100 BLOOD_FLOW_BUFFER = 25 FLOW_SLIDER_WIDTH_BUFFER = 37 + +DIALYSATE_FLOW_MINIMUM_VALUE = 100 +DIALYSATE_FLOW_BUFFER = 50 +DIALYSATE_FLOW_SLIDER_WIDTH_BUFFER = 60 + BLOOD_FLOW_MAXIMUM_VALUE = 500 -DIALYSATE_FLOW_MINIMUM_VALUE = 0 -DIALYSATE_FLOW_MAXIMUM_VALUE = 0 # Seems to be bug. need change +DIALYSATE_FLOW_MINIMUM_VALUE = 100 +DIALYSATE_FLOW_MAXIMUM_VALUE = 600 FLOW_UNIT = "mL/min" BLOOD_FLOW_TEXT = "blood" DIALYSATE_FLOW_TEXT = "dialysate" Index: shared/scripts/names.py =================================================================== diff -u -r986f128a9dc75561e9d1f199d442f7a3c047f6ee -rda2bb58d8d1efb41706ffc2d7025491809f54f3a --- shared/scripts/names.py (.../names.py) (revision 986f128a9dc75561e9d1f199d442f7a3c047f6ee) +++ shared/scripts/names.py (.../names.py) (revision da2bb58d8d1efb41706ffc2d7025491809f54f3a) @@ -231,12 +231,6 @@ o_treatment_notification_bar = {"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} o_dialysateFlowSlider_Slider = {"container": o_Overlay, "id": "_dialysateFlowSlider", "type": "Slider", "unnamed": 1, "visible": True} o_blood_flow_slider = {"container": o_Overlay, "id": "_bloodFlowSlider", "type": "Slider", "unnamed": 1, "visible": True} -o_blood_flow_minimum_value = {"container": o_Overlay, "text": "100mL/min", "type": "Text", "unnamed": 1, "visible": True} -o_blood_flow_maximum_value = {"container": o_Overlay, "text": "500mL/min", "type": "Text", "unnamed": 1, "visible": True} -o_dialysate_flow_minimum_value = {"container": o_Overlay, "text": "0mL/min", "type": "Text", "unnamed": 1, "visible": True} -o_dialysate_flow_maximum_value = {"container": o_Overlay, "occurrence": 2, "text": "0mL/min", "type": "Text", "unnamed": 1, "visible": True} -o_handler_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True} -o_treatment_saline_notification_msg = {"container": o_treatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True} o_treatmentHome_NotificationBar_NotificationBarSmall = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} @@ -361,9 +355,9 @@ o_target_value = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "occurrence": 2, "type": "Text", "unnamed": 1, "visible": True} o_treatmentHome_backgroundRect_Rectangle = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_treatmentHome_TimeText_timeSeparator_Text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "objectName": "_TimeText_timeSeparator", "type": "Text", "visible": True} -o_confirmButton_TouchRect_2 = {"container": o_Overlay, "gradient": 0, "id": "_confirmButton", "type": "TouchRect", "unnamed": 1, "visible": True} +o_confirmButton_TouchRect_2 = {"container": o_Overlay,"id": "_confirmButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_timeText = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "gradient": 0, "objectName": "_TimeText", "type": "TimeText", "visible": True} - +o_dialysate_flow_slider = {"container": o_Overlay, "id": "_dialysateFlowSlider", "type": "Slider", "unnamed": 1, "visible": True} o_initialModeScreen_ScreenItem = {"container": o_Gui_MainView, "id": "_initialModeScreen", "type": "ScreenItem", "unnamed": 1, "visible": True} #Water Sample Pretreatment @@ -703,7 +697,7 @@ o_blood_flow_maximum_value = {"container": o_Overlay, "text": "500mL/min", "type": "Text", "unnamed": 1, "visible": True} o_dialysate_flow_minimum_value = {"container": o_Overlay, "text": "0mL/min", "type": "Text", "unnamed": 1, "visible": True} o_dialysate_flow_maximum_value = {"container": o_Overlay, "occurrence": 2, "text": "0mL/min", "type": "Text", "unnamed": 1, "visible": True} -o_handler_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True} +o_handler_Rectangle = {"container": o_Overlay, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True} o_treatment_saline_notification_msg = {"container": o_treatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True} @@ -826,7 +820,6 @@ o_target_value = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "occurrence": 2, "type": "Text", "unnamed": 1, "visible": True} o_treatmentHome_backgroundRect_Rectangle = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_treatmentHome_TimeText_timeSeparator_Text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "objectName": "_TimeText_timeSeparator", "type": "Text", "visible": True} -o_confirmButton_TouchRect_2 = {"container": o_Overlay, "gradient": 0, "id": "_confirmButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_timeText = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "gradient": 0, "objectName": "_TimeText", "type": "TimeText", "visible": True} o_initialModeScreen_ScreenItem = {"container": o_Gui_MainView, "id": "_initialModeScreen", "type": "ScreenItem", "unnamed": 1, "visible": True} @@ -1150,7 +1143,6 @@ o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True} o_PreTreatmentbase_skip_text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_CONFIRM_Text_2 = {"container":o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} - o_interval_obj = {"container":o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}