Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r4cf54c5196ae804cd1454d83d853bcd43d497b3d -r1547724bb70c688198d577634a0e433dae410831 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 4cf54c5196ae804cd1454d83d853bcd43d497b3d) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 1547724bb70c688198d577634a0e433dae410831) @@ -20,17 +20,17 @@ #treatment screen - pressures mainTreatmentScreen_arterialRangeBar_RangeBar = {"container": mainTreatmentScreen, "id": "_arterialRangeBar", "type": "RangeBar", "unnamed": 1} mainTreatmentScreen_arterialRangeBar_RangeBar_marker = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1} -pressure_arterial_marker_text = {"container": mainTreatmentScreen, "id": "_textValue", "type": "Text", "unnamed": 1} +# pressure_arterial_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "type": "RangeMarker", "unnamed": 1} mainTreatmentScreen_venousRangeBar_RangeBar = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1} mainTreatmentScreen_venousRangeBar_RangeBar_marker = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1} -pressure_venous_marker_text = {"container": mainTreatmentScreen, "id": "_textValue", "type": "Text", "unnamed": 1, "occurrence": 2} +pressure_venous_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 2, "type": "RangeMarker", "unnamed": 1} mainTreatmentScreen_tempRangeBar_RangeBar = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1} mainTreatmentScreen_tempRangeBar_RangeBar_marker = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1} -pressure_temp_marker_text = {"container": mainTreatmentScreen, "id": "_textValue", "type": "Text", "unnamed": 1, "occurrence": 3} +pressure_temp_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 3, "type": "RangeMarker", "unnamed": 1} arterial_RangeBar = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1} venous_rangeBar = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 2, "type": "RangeBar", "unnamed": 1} temp_rangeBar = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 3, "type": "RangeBar", "unnamed": 1} -pressure_text_obj = {"container": mainTreatmentScreen, "type": "Text", "unnamed": 1} +pressure_text_obj = {"container": mainTreatmentScreen, "type": "Text", "unnamed": 1,"visible": True} treatmentUltrafiltration = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration"} UF_Volume_Text = {"container": mainTreatmentScreen, "text": "UF Volume","type": "Text", "unnamed": 1} UF_Rate_Text = {"container": mainTreatmentScreen, "text": "UF Rate", "type": "Text", "unnamed": 1} @@ -49,3 +49,14 @@ Treatment_Parameters_Text = {"container": mainTreatmentScreen, "text": "Treatment Parameters", "type": "Text", "unnamed": 1} +pressure_arterial_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "type": "RangeMarker", "unnamed": 1} +blood_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Blood Flow"} +dialyste_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Flow"} +dialyste_temp_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Temp."} +dialyste_cond_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Cond."} + +# o_treatmentHome_rangeMarkerValue_RangeMarker = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 3, "type": "RangeMarker", "unnamed": 1, "visible": True} +# o_treatmentHome_treatmentPressures_TreatmentPressures = {"container": mainTreatmentScreen, "objectName": "treatmentPressures", "type": "TreatmentPressures", "visible": True} + + +