Index: shared/scripts/names.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a --- shared/scripts/names.py (.../names.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ shared/scripts/names.py (.../names.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) @@ -152,27 +152,21 @@ # Pressure Adjustment o_treatmentAdjustmentPressures_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentPressures", "type": "ContentItem"} # arterial pressure range slider -o_arterial_range_slider = {"container": o_treatmentAdjustmentPressures_Screen, "id": "_arterialPressure", "type": "PressureRangeSlider"} -# arterial progress -o_arterial_progress = {"container": o_arterial_range_slider , "id": "_pressureRangeBar", "type": "RangeBar"} -o_arterial_marker = {"container": o_arterial_progress, "id": "_rangeMarkerValue", "type": "RangeMarker"} -o_arterial_progress_text_value = {"container": o_arterial_marker, "id": "_textValue", "type": "Text"} +o_arterial_range_slider = {"container": o_treatmentAdjustmentPressures_Screen, "id": "_arterialWindow", "type": "SliderPressure"} + # arterial slider -o_arterial_slider = {"container": o_arterial_range_slider, "id": "_pressureSlider" , "type": "RangeSlider"} +o_arterial_slider = {"container": o_arterial_range_slider, "id": "_slider" , "type": "Slider"} +o_arterial_slider_handle = {"container": o_arterial_slider, "id": "_handler", "type": "Rectangle"} # arterial limits bar -o_arterial_limitbar = {"container": o_arterial_range_slider, "id": "_rangeRect", "type": "RangeRect"} +o_arterial_limitbar = {"container": o_arterial_range_slider, "id": "_progressRect", "type": "ProgressRect"} # venous pressure range slider -o_venous_range_slider= {"container": o_treatmentAdjustmentPressures_Screen, "id": "_venousPressure", "type": "PressureRangeSlider"} -o_venous_progress = {"container": o_venous_range_slider , "id": "_pressureRangeBar", "type": "RangeBar"} -o_venous_marker = {"container": o_venous_progress , "id": "_rangeMarkerValue", "type": "RangeMarker" } -o_venous_progress_text_value = {"container": o_venous_marker , "id": "_textValue", "type": "Text"} +o_venous_range_slider= {"container": o_treatmentAdjustmentPressures_Screen, "id": "_venousWindow", "type": "SliderPressure"} # venous progress -o_venous_slider = {"container": o_venous_range_slider , "id": "_pressureSlider" , "type": "RangeSlider" } -o_venous_limitbar = {"container": o_venous_range_slider, "id": "_rangeRect" , "type": "RangeRect"} +o_venous_slider = {"container": o_venous_range_slider , "id": "_slider" , "type": "Slider" } +o_venous_limitbar = {"container": o_venous_range_slider, "id": "_progressRect" , "type": "ProgressRect"} #arterial adjustment low slider title text -o_arterial_text_low = {"container": o_Overlay, "text": "LOW", "type": "Text", "unnamed": 1, "visible": True} +o_venous_slider_handle = {"container": o_venous_slider, "id": "_handler", "type": "Rectangle"} #venous adjustment low slider title text -o_venous_text_low = {"container": o_Overlay, "occurrence": 2, "text": "LOW", "type": "Text", "unnamed": 1, "visible": True} o_MainHome_Create_Treatment_Button = {"container": o_MainHome_MainHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1, "visible": True} # Ultrafiltration Section