Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -rb421c6c45a7e2c173565968657a2f76139200c8f -re2c906a7b5fde31d48d168f097fe6a5a2ab0afea
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision b421c6c45a7e2c173565968657a2f76139200c8f)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision e2c906a7b5fde31d48d168f097fe6a5a2ab0afea)
@@ -2,37 +2,61 @@
 
 from objectmaphelper import *
 
+AUT_NAME ="leahi"
+
 # Top Parents
-o_QQuickView                = {                                                                             "type": "QQuickView"                        }
-o_Overlay                   = {"container": o_QQuickView,                                                   "type": "Overlay"                           }
-o_Gui_MainView              = {                                                                             "type": "Gui::MainView",    "unnamed": 1    }
+o_Gui_MainView                              = {                                                                                                                             "type": "Gui::MainView",        "unnamed": 1    }                                                                                                        
+o_QQuickView                                = {                                                                                                                             "type": "QQuickView"                            }                                                                                                                                                                                                    
+o_Overlay                                   = {"container": o_QQuickView,                                                                                                   "type": "Overlay"                               }                                                                                                                                                                            
 
-#Solution Infusion
-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    }
+# Solution Infusion
+o_standByScreen_MainHome                    = {"container": o_Gui_MainView,                                                                                                 "type": "MainHome"                              }
+treatmentStack                              = {"container": o_Gui_MainView,                                                                                                 "type": "TreatmentStack"                        }
+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    }
 
+# Main Treatment
+o_arterial_RangeBar                         = {"container": mainTreatmentScreen,                        "id": "_arterialRangeBar",                                          "type": "TreatmentPressureComponent", "unnamed": 1  }
+o_venous_RangeBar                           = {"container": mainTreatmentScreen,                        "id": "_venousRangeBar",                                            "type": "TreatmentPressureComponent", "unnamed": 1  }
+o_tmp_RangeBar                              = {"container": mainTreatmentScreen,                        "id": "_tmpRangeBar",                                               "type": "TreatmentPressureComponent", "unnamed": 1  }
+o_treatmentUltrafiltration                  = {"container": mainTreatmentScreen,                                                "objectName": "treatmentUltrafiltration",   "type": "TreatmentUltrafiltration"              }                    
+o_UF_Volume_Text                            = {"container": mainTreatmentScreen,                        "id": "_ufVolume",                                                  "type": "LabelValue",           "unnamed": 1    }
+o_UF_Rate_Text                              = {"container": mainTreatmentScreen,                        "id": "_ufRate",                                                    "type": "LabelValue",           "unnamed": 1    }
+o_treatment_duration                        = {"container": mainTreatmentScreen,                                                "objectName": "treatmentTime",              "type": "TreatmentTime"                         }                    
+o_UF_Volume_LabelValue                      = {"container": mainTreatmentScreen,                        "id": "_ufVolume",                                                  "type": "LabelValue",           "unnamed": 1    }
+o_UF_Rate_LabelValue                        = {"container": mainTreatmentScreen,                        "id": "_ufRate",                                                    "type": "LabelValue",           "unnamed": 1    }
+o_Volume_Delivered                          = {"container": mainTreatmentScreen,                        "id": "_valueText",                                                 "type": "Text",                 "unnamed": 1    }
+o_blood_flow_value                          = {"container": mainTreatmentScreen,                        "id": "_bloodFlow",     "objectName": "bloodFlowComponent",         "type": "TreatmentFlowsComponent"               }
+o_dial_flow_value                           = {"container": mainTreatmentScreen,                                                "objectName": "dialysateFlowComponent",     "type": "TreatmentFlowsComponent"               }
+o_dial_tmp_value                            = {"container": mainTreatmentScreen,                        "id": "_dialysateTemp", "objectName": "dialysateTempComponent",     "type": "TreatmentFlowsComponent"               }
+o_dial_cond_value                           = {"container": mainTreatmentScreen,                        "id": "_dialysateCond", "objectName": "dialysateCondComponent",     "type": "TreatmentFlowsComponent"               }
+o_blood_flow_title_Text                     = {"container": mainTreatmentScreen,                        "id": "_bloodFlow",     "objectName": "bloodFlowComponent",         "type": "TreatmentFlowsComponent"               }
+o_dialyste_flow_title_Text                  = {"container": mainTreatmentScreen,                                                "objectName": "dialysateFlowComponent",     "type": "TreatmentFlowsComponent"               }
+o_dialyste_tmp_title_Text                   = {"container": mainTreatmentScreen,                        "id": "_dialysateTemp", "objectName": "dialysateTempComponent",     "type": "TreatmentFlowsComponent"               }
+o_dialyste_cond_title_Text                  = {"container": mainTreatmentScreen,                        "id": "_dialysateCond", "objectName": "dialysateCondComponent",     "type": "TreatmentFlowsComponent"               }
+o_treatmentTimeNotificationBarSmall         = {"container": mainTreatmentScreen,                                                "objectName": "notification",               "type": "NotificationBarSmall"                  } 
+
+
 # settings_service_export_logs
-o_listView_ListView         = {"container": o_Gui_MainView,         "id": "_listView",                      "type": "ListView",         "unnamed": 1    }
-o_listView_delegateControl  = {"container": o_listView_ListView,    "index": 2, "objectName": "delegateControl", "type": "Item"                         }
-o_Settings_Menu             = {"container": o_listView_delegateControl,"objectName": "_touchRect2",         "type": "TouchRect"                         }
-o_SettingsHome              = {"container": o_Gui_MainView,         "objectName": "_SettingsHome",          "type": "SettingsHome"                      }
-o_SettingsExportLogs        = {"container": o_Gui_MainView,         "objectName": "_SettingsBase",          "type": "SettingsExportLogs"                }
-o_DeviceSettingsTitleText   = {"container": o_SettingsHome,         "id":"_titleText",                      "type": "Text",             "unnamed": 1    }
-o_SettingsInformation       = {"container": o_Gui_MainView,         "objectName": "_SettingsBase",          "type": "SettingsBase"                      }
-o_USBEjectButton            = {"container": o_SettingsExportLogs,   "id": "_usbEjectButton",                "type": "USBButton",        "unnamed": 1    }
-o_ExportLogsPageTitleText   = {"container": o_SettingsInformation,  "id":"_titleText",                      "type": "Text",             "unnamed": 1    }
-o_LogTypeComboBox           = {"container": o_SettingsInformation,  "id": "_logTypeCombo",                  "type": "ComboBox",         "unnamed": 1    }
-o_OptionComboBox            = {"container": o_Overlay,                                                      "type": "Text",             "unnamed": 1    }
-o_ExportButton              = {"container": o_SettingsExportLogs,   "id": "_logTypeExportButton",           "type": "ExportButton",     "unnamed": 1    }
-o_ExportLogsProgressRect    = {"container": o_SettingsExportLogs,   "id": "_progressRect",                  "type": "ProgressRect",     "unnamed": 1    }
-o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs,   "id": "_information",                   "type": "NotificationBarSmall"              }
-o_DeviceSettingsGrid        = {"container": o_SettingsHome,         "id": "_grid",                          "type": "Grid",                             }
+o_listView_ListView                         = {"container": o_Gui_MainView,                             "id": "_listView",                                                  "type": "ListView",             "unnamed": 1    }
+o_listView_delegateControl                  = {"container": o_listView_ListView,        "index": 2,                             "objectName": "delegateControl",            "type": "Item"                                  }
+o_Settings_Menu                             = {"container": o_listView_delegateControl,                                         "objectName": "_touchRect2",                "type": "TouchRect"                             }
+o_SettingsHome                              = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsHome",              "type": "SettingsHome"                          }
+o_SettingsExportLogs                        = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsExportLogs"                    }
+o_DeviceSettingsTitleText                   = {"container": o_SettingsHome,                             "id":"_titleText",                                                  "type": "Text",                 "unnamed": 1    }
+o_SettingsInformation                       = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsBase"                          }
+o_USBEjectButton                            = {"container": o_SettingsExportLogs,                       "id": "_usbEjectButton",                                            "type": "USBButton",            "unnamed": 1    }
+o_ExportLogsPageTitleText                   = {"container": o_SettingsInformation,                      "id":"_titleText",                                                  "type": "Text",                 "unnamed": 1    }
+o_LogTypeComboBox                           = {"container": o_SettingsInformation,                      "id": "_logTypeCombo",                                              "type": "ComboBox",             "unnamed": 1    }
+o_OptionComboBox                            = {"container": o_Overlay,                                                                                                      "type": "Text",                 "unnamed": 1    }
+o_ExportButton                              = {"container": o_SettingsExportLogs,                       "id": "_logTypeExportButton",                                       "type": "ExportButton",         "unnamed": 1    }
+o_ExportLogsProgressRect                    = {"container": o_SettingsExportLogs,                       "id": "_progressRect",                                              "type": "ProgressRect",         "unnamed": 1    }
+o_ExportLogsNotificationBar                 = {"container": o_SettingsExportLogs,                       "id": "_information",                                               "type": "NotificationBarSmall"                  }
+o_DeviceSettingsGrid                        = {"container": o_SettingsHome,                             "id": "_grid",                                                      "type": "Grid",                                 }
 
 
+