Index: shared/scripts/names.py =================================================================== diff -u -rb8421f8bf773ebb4ee24eae717d36c69db8e50ea -r2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24 --- shared/scripts/names.py (.../names.py) (revision b8421f8bf773ebb4ee24eae717d36c69db8e50ea) +++ shared/scripts/names.py (.../names.py) (revision 2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24) @@ -122,7 +122,7 @@ o_treatmentStart_backgroundRect_Rectangle = {"container": o_treatmentStart_TreatmentStart, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_treatmentStart_flowsTouchArea_TreatmentFlows = {"container": o_treatmentStart_TreatmentStart, "id": "_flowsTouchArea", "type": "TreatmentFlows", "unnamed": 1, "visible": True} o_treatmentStart_vitalsTouchArea_TreatmentVitals = {"container": o_treatmentStart_TreatmentStart, "id": "_vitalsTouchArea", "type": "TreatmentVitals", "unnamed": 1, "visible": True} -o_treatmentStart_pressureTouchArea_TreatmentPressure = {"container": o_treatmentStart_TreatmentStart, "id": "_pressureTouchArea", "type": "TreatmentPressure", "unnamed": 1, "visible": True} +o_treatmentStart_pressureTouchArea_TreatmentPressure = {"container": o_treatmentStart_TreatmentStart, "id": "_pressuresTouchArea", "type": "TreatmentPressures", "unnamed": 1, "visible": True} o_treatmentStart_shape_Shape = {"container": o_treatmentStart_TreatmentStart, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True} o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration = {"container": o_treatmentStart_TreatmentStart, "id": "_ultrafiltrationTouchArea", "type": "TreatmentUltrafiltration", "unnamed": 1, "visible": True} o_treatmentStart_fluidManagementTouchArea_TouchArea = {"container": o_treatmentStart_TreatmentStart, "id": "_fluidManagementTouchArea", "type": "TouchArea", "unnamed": 1, "visible": True} @@ -230,10 +230,44 @@ o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageWave = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration, "id": "_diffImageWave" , "type": "ImageWave" } o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageClock = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration, "id": "_diffImageClock", "type": "ImageClock"} +## o_rangeRect_RangeRect = {"container": o_treatmentAdjustmentPressures_Screen, "id": "_rangeRect", "type": "RangeRect"} +# Pressure Adjustment +o_treatmentAdjustmentPressures_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentPressures", "type": "ContentItem"} +o_treatmentAdjustmentPressures_Screen_Title = {"container": o_Overlay, "text": "PRESSURES" , "type": "Text" } +# o_treatmentAdjustmentPressures_Screen_confrim = {"container": o_treatmentAdjustmentPressures_Screen, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +# 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_progress_textMinimum = {"container": o_arterial_progress , "id": "_textMinimum" , "type": "Text" } +o_arterial_progress_textMaximum = {"container": o_arterial_progress , "id": "_textMaximum" , "type": "Text" } +o_arterial_marker = {"container": o_arterial_progress , "id": "_rangeMarkerValue", "type": "RangeMarker" } +o_arterial_progress_textValue = {"container": o_arterial_marker , "id": "_textValue" , "type": "Text" } +# arterial slider +o_arterial_slider = {"container": o_arterial_range_slider , "id": "_pressureSlider" , "type": "RangeSlider" } +# arterial limits bar +o_arterial_limitbar = {"container": o_arterial_range_slider , "id": "_rangeRect" , "type": "RangeRect" } +o_arterial_limitbar_textMinimum = {"container": o_arterial_limitbar , "id": "_textMinimum" , "type": "Text" } +o_arterial_limitbar_textMaximum = {"container": o_arterial_limitbar , "id": "_textMaximum" , "type": "Text" } +# venous pressure range slider +o_venous_range_slider = {"container": o_treatmentAdjustmentPressures_Screen, "id": "_venousPressure" , "type": "PressureRangeSlider"} +# venous progress +o_venous_progress = {"container": o_venous_range_slider , "id": "_pressureRangeBar", "type": "RangeBar" } +o_venous_progress_textMinimum = {"container": o_venous_progress , "id": "_textMinimum" , "type": "Text" } +o_venous_progress_textMaximum = {"container": o_venous_progress , "id": "_textMaximum" , "type": "Text" } +o_venous_marker = {"container": o_venous_progress , "id": "_rangeMarkerValue", "type": "RangeMarker" } +o_venous_progress_textValue = {"container": o_venous_marker , "id": "_textValue" , "type": "Text" } +# venous slider +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_limitbar_textMinimum = {"container": o_venous_limitbar , "id": "_textMinimum" , "type": "Text" } +o_venous_limitbar_textMaximum = {"container": o_venous_limitbar , "id": "_textMaximum" , "type": "Text" } + + # DGROPumpData o_managerHome_DGROPumpData_SetPtPressure = {"container": o_managerHome, "objectName": "_DGROPumpData0", "type": "Text"} o_managerHome_DGROPumpData_FlowRate = {"container": o_managerHome, "objectName": "_DGROPumpData1", "type": "Text"} @@ -345,7 +379,6 @@ o_treatmentStart_SalineStart = {"container": o_treatmentStart_SalineSection , "id": "_startFluidButton", "type": "TouchRect" } o_treatmentStart_SalineNotification = {"container": o_treatmentStart_SalineSection , "objectName": "NotificationBar", "type": "NotificationBarSmall"} - # Setting CANBusFaultCountText o_managerHome_canbusFaultCount = {"container": o_managerHome, "id": "_canbusFaultCountText", "type": "Text" } @@ -372,3 +405,4 @@ o_create_treatment_confirm_container = {"container": o_qquickview_alarm, "objectName": "TreatmentConfirm", "type": "TreatmentConfirm" } o_create_treatment_confirm = {"container": o_create_treatment_confirm_container, "objectName": "_continueRect", "type": "TouchRect"} +