Index: shared/scripts/names.py =================================================================== diff -u -r92a813d62f26a3e5ddf77b3b58b5c965fadeffb5 -rd53166805a654f22111b6af975018b61520dfdba --- shared/scripts/names.py (.../names.py) (revision 92a813d62f26a3e5ddf77b3b58b5c965fadeffb5) +++ shared/scripts/names.py (.../names.py) (revision d53166805a654f22111b6af975018b61520dfdba) @@ -68,14 +68,17 @@ o_treatmentStart_0_Text_2 = {"container": o_treatmentStart_TreatmentStart, "occurrence": 2, "text": 0, "type": "Text", "unnamed": 1, "visible": True} o_treatmentStart_mL_min_Text_2 = {"container": o_treatmentStart_TreatmentStart, "occurrence": 2, "text": "mL/min", "type": "Text", "unnamed": 1, "visible": True} + + + # Treatment Parameter Range o_dialysateFlowSlider_Slider = {"container": o_Overlay, "id": "_dialysateFlowSlider", "type": "Slider", "unnamed": 1, "visible": True} o_bloodFlowSlider_Slider = {"container": o_Overlay, "id": "_bloodFlowSlider", "type": "Slider", "unnamed": 1, "visible": True} o_treatmentStart_225_Text = {"container": o_treatmentStart_TreatmentStart, "text": 225, "type": "Text", "unnamed": 1, "visible": True} o_treatmentStart_200_Text = {"container": o_treatmentStart_TreatmentStart, "text": 200, "type": "Text", "unnamed": 1, "visible": True} -o_TouchRect = {"container": o_Overlay, "type": "TouchRect", "unnamed": 1, "visible": True} + # Treatment Time o_treatmentStart_01_Text = {"container": o_treatmentStart_TreatmentStart, "text": "01", "type": "Text", "unnamed": 1, "visible": True} o_treatmentStart_00_Text = {"container": o_treatmentStart_TreatmentStart, "occurrence": 2, "text": "00", "type": "Text", "unnamed": 1, "visible": True} @@ -104,9 +107,14 @@ # Reviewed Objects # Global Objects -o_backButton = {"container": o_Overlay, "id": "_backButton" , "type": "BackButton" } -o_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton" } +o_backButton = {"container": o_Overlay, "id": "_backButton" , "type": "BackButton" } +o_closeButton = {"container": o_Overlay, "id": "_closeButton" , "type": "CloseButton" } +o_confirmButton = {"container": o_Overlay, "id": "_confirmButton" , "type": "TouchRect" } +# Treatment Adjustment Duration +o_treatmentAdjustmentDuration_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentDuration" , "type": "ContentItem" } + + # Treatment Adjustment Ultrafiltration ## Start Screen o_treatmentAdjustmentUltrafiltrationStart_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationStart" , "type": "ContentItem" }