Index: LeahiDryDemoXMLStates.scxml
===================================================================
diff -u -r47baa703592f0e21098cb21c0ed267de4e958b2f -rbec9c9856c333399aa5abaf18d2799f6fbc95da3
--- LeahiDryDemoXMLStates.scxml	(.../LeahiDryDemoXMLStates.scxml)	(revision 47baa703592f0e21098cb21c0ed267de4e958b2f)
+++ LeahiDryDemoXMLStates.scxml	(.../LeahiDryDemoXMLStates.scxml)	(revision bec9c9856c333399aa5abaf18d2799f6fbc95da3)
@@ -2,142 +2,30 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" binding="early" xmlns:qt="http://www.qt.io/2015/02/scxml-ext" name="drydemoXMLstates" qt:editorversion="9.0.1" initial="States">
     <qt:editorinfo initialGeometry="454.92;-189.38;-20;-35.86;40;55.86"/>
     <state id="States">
-        <qt:editorinfo geometry="49.12;-25.53;-220.08;-128.86;1228.42;906.32" scenegeometry="49.12;-25.53;-170.96;-154.39;1228.42;906.32"/>
-        <state id="Idle">
-            <qt:editorinfo geometry="391.25;258.57;-156.77;-50;216.77;100" scenegeometry="440.37;233.04;283.60;183.04;216.77;100"/>
-            <transition type="internal" event="Transition_2_Tx_Parms" target="Tx_Params">
-                <qt:editorinfo movePoint="-8.55;63.50"/>
+        <qt:editorinfo geometry="51.56;-25.53;-220.08;-128.86;1228.42;906.32" scenegeometry="51.56;-25.53;-168.52;-154.39;1228.42;906.32"/>
+        <state id="Standby">
+            <qt:editorinfo geometry="391.25;258.57;-156.77;-50;216.77;100" scenegeometry="442.81;233.04;286.04;183.04;216.77;100"/>
+            <transition type="internal" event="T_SB_2_Pretx" target="Pre_Tx">
+                <qt:editorinfo movePoint="41.50;-17.05" startTargetFactors="50.79;88.78"/>
             </transition>
-            <transition type="external" event="Transition_2_Disinfect" target="Disinfect">
-                <qt:editorinfo movePoint="23.05;67.28" startTargetFactors="74.40;94.46"/>
+            <transition type="internal" event="TimeoutEvent" target="Standby"/>
+            <transition type="external" event="T_SB_2_BP" target="Blood_Prime">
+                <qt:editorinfo endTargetFactors="92.53;51.37" startTargetFactors="94.08;50.94"/>
             </transition>
-            <transition type="external" event="Transition_2_Water_Sample" target="Water_Sample">
-                <qt:editorinfo movePoint="-55.60;54.41"/>
-            </transition>
-            <transition type="external" event="Transition_2_Consumables" target="Consumables">
-                <qt:editorinfo movePoint="-7.95;15.92"/>
-            </transition>
-            <transition type="external" event="Transition_2_Disposables" target="Disposables">
-                <qt:editorinfo movePoint="-27.80;-2.68"/>
-            </transition>
-            <transition type="external" event="Transition_2_Sys_Prime" target="System_Prime">
-                <qt:editorinfo movePoint="-33.16;1.33"/>
-            </transition>
-            <transition type="external" event="Transition_2_BP_HR" target="BP_HR"/>
-            <transition type="external" event="Transition_2_Ultrafiltraion" target="Ultrafiltraion"/>
-            <transition type="external" event="Transition_2_Patient_Connection" target="Connection">
-                <qt:editorinfo movePoint="41.32;5.16"/>
-            </transition>
-            <transition type="external" event="Transition_2_End_Tx" target="End_Tx">
-                <qt:editorinfo movePoint="-15.64;9.12" startTargetFactors="88.35;52.65"/>
-            </transition>
-            <transition type="external" event="Transition_2_Start_Tx" target="Start_Tx">
-                <qt:editorinfo movePoint="86.77;-16.65" endTargetFactors="6.21;66.33"/>
-            </transition>
-            <transition type="internal" event="TimeoutEvent" target="Idle"/>
         </state>
-        <state id="Disinfect">
-            <qt:editorinfo geometry="654.07;572.27;-168.23;-50;188.23;100" scenegeometry="703.19;546.74;534.96;496.74;188.23;100"/>
-            <transition type="internal" event="TimeoutEvent" target="Disinfect"/>
-        </state>
-        <transition type="internal" event="Transition_back_2_idle" target="Idle">
-            <qt:editorinfo movePoint="-20.03;-33.67" startTargetFactors="42.14;22.02"/>
+        <transition type="internal" event="T_Back_2_SB" target="Standby">
+            <qt:editorinfo movePoint="39.78;26.13" startTargetFactors="46.03;29.09"/>
         </transition>
-        <state id="Water_Sample">
-            <qt:editorinfo geometry="187.10;710.04;-171.20;-66.32;191.20;102.32" scenegeometry="236.22;684.51;65.02;618.19;191.20;102.32"/>
-            <transition type="internal" event="TimeoutEvent" target="Water_Sample"/>
-            <transition type="external" event="T_2_Consumables" target="Consumables"/>
-        </state>
-        <state id="Tx_Params">
-            <qt:editorinfo geometry="428.24;598.03;-156.77;-50;185.22;116" scenegeometry="477.36;572.50;320.59;522.50;185.22;116"/>
-            <transition type="internal" event="TimeoutEvent" target="Tx_Params"/>
-            <transition type="internal" event="T_2_Water_Sample" target="Water_Sample">
-                <qt:editorinfo movePoint="55.11;4.46" endTargetFactors="94.17;46.97"/>
+        <state id="Pre_Tx">
+            <qt:editorinfo geometry="407.03;429.59;-156.77;-50;185.22;116" scenegeometry="458.59;404.06;301.82;354.06;185.22;116"/>
+            <transition type="internal" event="TimeoutEvent" target="Pre_Tx"/>
+            <transition type="internal" target="Blood_Prime" event="T_Pretx_2_Tx">
+                <qt:editorinfo movePoint="39.34;-15.13" endTargetFactors="7.39;53.99"/>
             </transition>
         </state>
-        <state id="Consumables">
-            <qt:editorinfo geometry="7.58;548.39;-156.77;-50;216.77;100" scenegeometry="56.70;522.86;-100.07;472.86;216.77;100"/>
-            <transition type="internal" event="TimeoutEvent" target="Consumables"/>
-            <transition type="external" event="T_2_Disposables" target="Disposables"/>
-        </state>
-        <state id="Disposables">
-            <qt:editorinfo geometry="-32.52;403.07;-156.77;-50;216.77;100" scenegeometry="16.60;377.54;-140.17;327.54;216.77;100"/>
-            <transition type="internal" event="TimeoutEvent" target="Disposables"/>
-            <transition type="external" event="T_2_System_Prime" target="System_Prime">
-                <qt:editorinfo movePoint="7.75;5.16"/>
-            </transition>
-        </state>
-        <state id="System_Prime">
-            <qt:editorinfo geometry="-41.45;263.42;-156.77;-50;216.77;100" scenegeometry="7.67;237.89;-149.10;187.89;216.77;100"/>
-            <transition type="internal" event="TimeoutEvent" target="System_Prime"/>
-            <transition type="external" event="T_2_BP_HR" target="BP_HR"/>
-        </state>
-        <state id="BP_HR">
-            <qt:editorinfo geometry="-43.31;143.62;-156.77;-50;216.77;100" scenegeometry="5.81;118.09;-150.96;68.09;216.77;100"/>
-            <transition type="internal" event="TimeoutEvent" target="BP_HR"/>
-            <transition type="external" event="T_2_Ultrafiltration" target="Ultrafiltraion">
-                <qt:editorinfo movePoint="0;19.37"/>
-            </transition>
-        </state>
-        <state id="Ultrafiltraion">
-            <qt:editorinfo geometry="145.22;15.52;-156.77;-50;216.77;100" scenegeometry="194.34;-10.01;37.57;-60.01;216.77;100"/>
-            <transition type="internal" event="TimeoutEvent" target="Ultrafiltraion"/>
-            <transition type="external" event="T_2_Connection" target="Connection">
-                <qt:editorinfo movePoint="1.29;9.04"/>
-            </transition>
-        </state>
-        <state id="Connection">
-            <qt:editorinfo geometry="554.92;24.63;-156.77;-50;216.77;100" scenegeometry="604.04;-0.90;447.27;-50.90;216.77;100"/>
-            <transition type="internal" event="TimeoutEvent" target="Connection"/>
-            <transition type="external" event="T_2_Start_Tx" target="Start_Tx">
-                <qt:editorinfo movePoint="2.58;9.03" endTargetFactors="22.57;59.99"/>
-            </transition>
-            <transition type="external" event="T_Con_2_UF" target="Ultrafiltraion">
-                <qt:editorinfo endTargetFactors="87.84;75.73" startTargetFactors="4.42;68.73"/>
-            </transition>
-        </state>
-        <state id="Start_Tx">
-            <qt:editorinfo geometry="910.70;51.78;-179.19;-74.20;199.19;110.20" scenegeometry="959.82;26.25;780.63;-47.95;199.19;110.20"/>
-            <transition type="internal" event="TimeoutEvent" target="Start_Tx"/>
-            <transition type="external" event="Start_Tx_2_Blood_Prime" target="Blood_Prime">
-                <qt:editorinfo movePoint="-1.29;0"/>
-            </transition>
-        </state>
-        <state id="End_Tx">
-            <qt:editorinfo geometry="875.98;544.39;-156.77;-50;216.77;100" scenegeometry="925.10;518.86;768.33;468.86;216.77;100"/>
-            <transition type="internal" event="TimeoutEvent" target="End_Tx">
-                <qt:editorinfo endTargetFactors="18.50;52.25"/>
-            </transition>
-            <transition type="external" event="Treatment_2_Post_Treatment" target="Post_Tx">
-                <qt:editorinfo movePoint="-26.45;2.64"/>
-            </transition>
-        </state>
         <state id="Blood_Prime">
-            <qt:editorinfo geometry="880.53;185.26;-156.77;-48.40;214.49;140" scenegeometry="929.65;159.73;772.88;111.33;214.49;140"/>
-            <transition type="internal" event="TimeoutEvent" target="Blood_Prime">
-                <qt:editorinfo endTargetFactors="12.48;45.82"/>
-            </transition>
-            <transition type="external" event="Blood_Prime_2_Treatment" target="Treatment">
-                <qt:editorinfo movePoint="-5.17;2.58"/>
-            </transition>
+            <qt:editorinfo geometry="634.93;586.93;-156.77;-50;185.22;116" scenegeometry="686.49;561.40;529.72;511.40;185.22;116"/>
+            <transition type="internal" event="TimeoutEvent" target="Blood_Prime"/>
         </state>
-        <state id="Treatment">
-            <qt:editorinfo geometry="878.01;368.78;-156.77;-50;216.77;116.76" scenegeometry="927.13;343.25;770.36;293.25;216.77;116.76"/>
-            <transition type="internal" event="TimeoutEvent" target="Treatment">
-                <qt:editorinfo endTargetFactors="22.47;52.22"/>
-            </transition>
-            <transition type="external" event="Treatment_2_End_Treatment" target="End_Tx">
-                <qt:editorinfo movePoint="-1.26;-2.61"/>
-            </transition>
-        </state>
-        <state id="Post_Tx">
-            <qt:editorinfo geometry="873.76;702.49;-156.77;-50;225.93;100" scenegeometry="922.88;676.96;766.11;626.96;225.93;100"/>
-            <transition type="internal" event="TimeoutEvent" target="Post_Tx">
-                <qt:editorinfo endTargetFactors="17.37;48.86"/>
-            </transition>
-            <transition type="external" event="Post_treatment_2_disinfect" target="Disinfect">
-                <qt:editorinfo endTargetFactors="86.39;72.21" startTargetFactors="4.93;60.61"/>
-            </transition>
-        </state>
     </state>
 </scxml>