Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r7531a232c5e7aee8444a236f74aeba8cb9257b60 -r4cf54c5196ae804cd1454d83d853bcd43d497b3d
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 7531a232c5e7aee8444a236f74aeba8cb9257b60)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 4cf54c5196ae804cd1454d83d853bcd43d497b3d)
@@ -2,42 +2,50 @@
 
 from objectmaphelper import *
 
-o_Gui_MainView              = {                                                                             "type": "Gui::MainView",    "unnamed": 1    }
-standByScreen_MainHome      = {"container": o_Gui_MainView,                                                 "type": "MainHome"                          }
-treatmentStack              = {"container": o_Gui_MainView,                                                 "type": "TreatmentStack"                    }
-startTreatmentButton        = {"container": standByScreen_MainHome, "id": "_startTreatmentRect",            "type": "TouchRect",        "unnamed": 1    }
-mainTreatmentScreen         = {"container": treatmentStack,         "id": "_treatmentHome",                 "type": "TreatmentHome",    "unnamed": 1    }
-startFluidButton            = {"container": mainTreatmentScreen,    "id": "_startFluidButton",              "type": "TouchRect",        "unnamed": 1    }
-salineDeliveredText         = {"container": mainTreatmentScreen,    "objectName": "salineDescriptionText",  "type": "Text"                              }
-currentBolusVolume          = {"container": mainTreatmentScreen,                                            "type": "Label",            "unnamed": 1    }
-treatmentSaline             = {"container": mainTreatmentScreen,    "objectName": "treatmentSaline",        "type": "TreatmentSaline"                   }
-salineProgressBar           = {"container": mainTreatmentScreen,    "id": "_fluidProgressBar",              "type": "ProgressBar",      "unnamed": 1    }
+# AUT_NAME = "leahiSquish"
+AUT_DEBUG = "leahi"
 
+
+# # Top Parents
+o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1}
+o_QQuickView = { "type": "QQuickView"}
+o_Overlay = {"container": o_QQuickView, "type": "Overlay"}
+o_treatmentHome = {"container": o_QQuickView   , "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1}
+
+standByScreen_MainHome      = {"container": o_Gui_MainView,"type": "MainHome","visible": True}
+treatmentStack              = {"container": o_Gui_MainView,"type": "TreatmentStack", "visible": True}
+startTreatmentButton        = {"container": standByScreen_MainHome, "id": "_startTreatmentRect","type": "TouchRect","unnamed": 1}
+mainTreatmentScreen         = {"container": treatmentStack,         "id": "_treatmentHome", "type": "TreatmentHome","unnamed": 1}
+
 #treatment screen - pressures
-mainTreatmentScreen_arterialRangeBar_RangeBar           = {"container": mainTreatmentScreen, "id": "_arterialRangeBar", "type": "RangeBar", "unnamed": 1, "visible": True}
-mainTreatmentScreen_arterialRangeBar_RangeBar_marker    = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1, "visible": True}
-o_treatmentHome_pressure_arterial_marker_text           = {"container": mainTreatmentScreen, "id": "_textValue", "type": "Text", "unnamed": 1, "visible": True}
-mainTreatmentScreen_venousRangeBar_RangeBar             = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1, "visible": True}
-mainTreatmentScreen_venousRangeBar_RangeBar_marker      = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1, "visible": True}
-o_treatmentHome_pressure_venous_marker_text             = {"container": mainTreatmentScreen, "id": "_textValue", "type": "Text", "unnamed": 1, "occurrence": 2,"visible": True}
-mainTreatmentScreen_tempRangeBar_RangeBar               = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1, "visible": True}
-mainTreatmentScreen_tempRangeBar_RangeBar_marker        = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1, "visible": True}
-o_treatmentHome_pressure_temp_marker_text               = {"container": mainTreatmentScreen, "id": "_textValue", "type": "Text", "unnamed": 1, "occurrence": 3,"visible": True}
-o_treatmentHome_rangeBar_RangeBar                       = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1, "visible": True}
-o_treatmentHome_rangeBar_RangeBar_2                     = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 2, "type": "RangeBar", "unnamed": 1, "visible": True}
-o_treatmentHome_rangeBar_RangeBar_3                     = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 3, "type": "RangeBar", "unnamed": 1, "visible": True}
-o_pressure_text_obj                                     = {"container": mainTreatmentScreen, "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration", "visible": True}
-o_treatmentHome_UF_Volume_Text                          = {"container": mainTreatmentScreen, "text": "UF Volume","type": "Text", "unnamed": 1, "visible": True}
-o_treatmentHome_UF_Rate_Text                            = {"container": mainTreatmentScreen, "text": "UF Rate", "type": "Text", "unnamed": 1, "visible": True}
-o_treatment_duration                                    = {"container": mainTreatmentScreen, "objectName": "treatmentTime", "type": "TreatmentTime", "visible": True}
-o_treatmentHome_Treatment_Paused_Text                   = {"container": mainTreatmentScreen, "text": "Treatment Paused", "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentHome_UF_Volume_LabelValue                    = {"container": mainTreatmentScreen, "id": "_ufVolume","type": "LabelValue", "unnamed": 1, "visible": True}
-o_treatmentHome_UF_Rate_LabelValue                      ={"container": mainTreatmentScreen, "id": "_ufRate","type": "LabelValue", "unnamed": 1, "visible": True}
-o_treatmentHome_Volume_Delivered                        = {"container": mainTreatmentScreen, "id": "_valueText", "type": "Text", "unnamed": 1, "visible": True}
-o_treatment_blood_flow_value                            = {"container": mainTreatmentScreen, "objectName": "bloodFlowComponent", "type": "TreatmentFlowsComponent", "id": "_bloodFlow","visible": True}
-o_treatment_dial_flow_value                             = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateFlow","visible": True}
-o_treatment_dial_temp_value                             = {"container": mainTreatmentScreen, "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateTemp","visible": True}
-o_treatment_dial_cond_value                             = {"container": mainTreatmentScreen, "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateCond","visible": True}
+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}
+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}
+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}
+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}
+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}
 
-o_treatmentHome_Treatment_Parameters_Text               = {"container": mainTreatmentScreen, "text": "Treatment Parameters", "type": "Text", "unnamed": 1, "visible": True}
+treatment_duration = {"container": mainTreatmentScreen, "objectName": "treatmentTime", "type": "TreatmentTime"}
+# o_treatmentHome_Treatment_Paused_Text = {"container": mainTreatmentScreen, "text": "Treatment Paused", "type": "Text", "unnamed": 1}
+
+UF_Volume_LabelValue= {"container": mainTreatmentScreen, "id": "_ufVolume","type": "LabelValue", "unnamed": 1}
+UF_Rate_LabelValue ={"container": mainTreatmentScreen, "id": "_ufRate","type": "LabelValue", "unnamed": 1}
+Volume_Delivered = {"container": mainTreatmentScreen, "id": "_valueText", "type": "Text", "unnamed": 1}
+
+blood_flow_value = {"container": mainTreatmentScreen, "objectName": "bloodFlowComponent", "type": "TreatmentFlowsComponent", "id": "_bloodFlow"}
+dial_flow_value = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateFlow"}
+dial_temp_value = {"container": mainTreatmentScreen, "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateTemp"}
+dial_cond_value = {"container": mainTreatmentScreen, "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateCond"}
+
+Treatment_Parameters_Text = {"container": mainTreatmentScreen, "text": "Treatment Parameters", "type": "Text", "unnamed": 1}
+