Index: shared/scripts/names.py
===================================================================
diff -u -rf24d9f0bfc30fa024ceef73cb8b25efb86a70f70 -ref981744e6899b22a40fef4a8d74db9a4e930575
--- shared/scripts/names.py	(.../names.py)	(revision f24d9f0bfc30fa024ceef73cb8b25efb86a70f70)
+++ shared/scripts/names.py	(.../names.py)	(revision ef981744e6899b22a40fef4a8d74db9a4e930575)
@@ -449,6 +449,10 @@
 o_PreTreatmentCreate_rangeRect_RangeRect_Venous = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rangeRect", "occurrence": 2, "type": "RangeRect", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_rangeRect_RangeRect_Artery = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rangeRect", "occurrence": 1, "type": "RangeRect", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_Heparin_Type_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "Heparin Type", "type": "Text", "unnamed": 1, "visible": True}
+
+o_PreTreatmentCreate_DecrementButton = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id":"_decrementValueButton", "type": "TouchRect", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_IncrementButton = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id":"_incrementValueButton", "type": "TouchRect", "unnamed": 1, "visible": True}
+
 # operating parameters object property's
 o_PreTreatmentCreate_heparinTypeRect0_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_heparinTypeRect0", "type": "TouchRect", "visible": True}
 o_PreTreatmentCreate_acidConcentrateRect0_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_acidConcentrateRect0", "type": "TouchRect", "visible": True}
@@ -690,25 +694,37 @@
 o_PreTreatmentBase_swipeview_SwipeView_WaterSample = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"}
 o_PreTreatmentBase_swipeview_SwipeView_Consumables = {"container": o_preTreatmentConsumablesStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"}
 
-o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeInstallation"}
+o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"}
 o_preTreatmentDisposablesCartridgeInstallation_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"}
 
-o_next_button_cartridge_installation = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "text": "NEXT", "type": "Text"}
-o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeConnetion", "type": "TreatmentFlowBase"}
-o_preTreatmentDisposablesCartridgeConnetion_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"}
-o_next_button_cartridge_connection = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "text": "NEXT", "type": "Text"}
+
+o_next_button_cartridge_installation = {"container": {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeInstallation", "type": "PreTreatmentBase"}, "type":"ConfirmButton", "id":"_confirmButton"}
+o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id":"_preTreatmentDisposablesCartridgeConnetion", "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase"}
+#PreTreatment Disposables stack
+o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_PreTreatmentBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeConnetion", "type": "PreTreatmentBase", "visible": True}
+o_preTreatmentDisposablesStack_swipeView = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_swipeview", "type": "SwipeView"}
+o_preTreatmentDisposablesCartridgeConnection_instrView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1, "visible": True}
+
+o_next_button_cartridge_connection = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_PreTreatmentBase, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True}
 o_next_button_heparinsyringe = {"container": o_Gui_MainView, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True}
+
 o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase"}
+o_preTreatmentDisposablesSalineBag_TreatmentFlowBase_instrView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1, "visible": True}
 o_preTreatmentDisposablesSalineBag_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"}
-o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"}
-o_PreTreatmentBase_swipeview_SwipeView_3 = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
+
+o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_preTreatmentPatientConnection", "type": "PreTreatmentBase"}
+o_PreTreatmentBaseConnection_instrView = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1, "visible": True}
+o_PreTreatmentBaseStartTx_flowBase = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "type": "PreTreatmentBase", "visible": True}
+o_PreTreatmentBaseStartTx_instrView = {"container": o_PreTreatmentBaseStartTx_flowBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1, "visible": True}
 o_skip_button = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True}
 o_interval_obj = {"container":o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Rectangle", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateSwitch", "type": "Switch", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeSwitch", "type": "Switch", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_OFF_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_OFF_Text_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "occurrence": 2, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_BPInterval_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodPressureIntervalSwitch", "type": "Switch", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_BPInterval_OFF_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
 
 # instructions for rinseback setup
 o_EndTreatmentRinsebackInit_swipeview_SwipeView = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
@@ -730,9 +746,10 @@
 o_disposablesRemovalConfirm_swipeview_SwipeView = {"container": o_PostTreatmentStack_disposablesRemovalConfirm_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
 
 # instructions for recirculate screen
-o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRecirculateStack", "type": "EndTreatmentRecirculateStack", "visible": True}
-o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "objectName": "_EndTreatmentBase", "type": "EndTreatmentBase", "visible": True}
+o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack = {"container": o_Gui_MainView, "objectName": "_recirculateRecirculateStack", "type": "EndTreatmentRecirculateStack", "visible": True}
+o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "objectName": "_EndTreatmentBase", "type": "RecirculateBase", "visible": True}
 o_EndTreatmentBase_swipeview_SwipeView = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
+
 o_instruction = {"type": "Text", "unnamed": 1, "visible": True}
 o_right_arrow = {"id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
 o_image_path = {"type": "Image", "id": "_image"}
@@ -1054,4 +1071,6 @@
 o_SettingsBase_Failed_to_set_subnet_mask_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Failed to set subnet mask.", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsBase_Failed_to_set_DNS_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Failed to set DNS.", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsBase_TextField = {"container": o_SettingsBase_SettingsExportLogs, "echoMode": 0, "type": "TextField", "unnamed": 1, "visible": True}
+o_preTreatmentDisposablesStack_preTreatmentDisposablesHeparinSyringe_PreTreatmentBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesHeparinSyringe", "type": "PreTreatmentBase", "visible": True}
+o_preTreatmentDisposablesHeparinSyringe_instructionView_InstructionView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesHeparinSyringe_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1, "visible": True}