diff --git a/build.txt b/build.txt index 325e316634374c8bc76f611614dcbb41e4d95d11..39359b5e87934870a301a01eba95335c93a1ec26 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -14842 \ No newline at end of file +14843 \ No newline at end of file diff --git a/modeling/test/testTag.xml b/modeling/test/testTag.xml index bf43bae65c9d5acc2a02fb639d5f76c73051c2b3..75b9cb4090d32a5bb7913297d1513dddc3c1df90 100644 --- a/modeling/test/testTag.xml +++ b/modeling/test/testTag.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<TURTLEGMODELING version="3.0 beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="3" LAST_SELECTED_SUB_TAB="0" TAGS="deactivated root stream1 colomarreuh" SHOW_TAGS="true"> +<TURTLEGMODELING version="3.0 beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="4" LAST_SELECTED_SUB_TAB="0" TAGS="deactivated root stream1 colomarreuh" SHOW_TAGS="true"> <Modeling type="AVATAR Design" nameTab="Design1" tabs="Block Diagram$Block" > <AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0000000000000002" > @@ -8,7 +8,7 @@ <MainCode value="}"/> <Optimized value="true" /> <considerTimingOperators value="true" /> -<Validated value="Block;" /> +<Validated value="" /> <Ignored value="" /> <COMPONENT type="5000" id="41" index="0" uid="326e9b21-d9cd-4484-9942-cc07d03166ac" > @@ -1702,7 +1702,7 @@ <MainCode value="}"/> <Optimized value="true" /> <considerTimingOperators value="true" /> -<Validated value="Receiver;Sender;" /> +<Validated value="" /> <Ignored value="" /> <CONNECTOR type="5002" id="777" index="0" uid="d8e3926f-dd9d-4f9a-834f-26a201193e6b" > @@ -2864,7 +2864,7 @@ <MainCode value="}"/> <Optimized value="true" /> <considerTimingOperators value="true" /> -<Validated value="Receiver;Sender;" /> +<Validated value="" /> <Ignored value="" /> <CONNECTOR type="5002" id="1303" index="0" uid="b1e18f5c-44e5-49b5-9217-e928d63cff05" > @@ -4020,4 +4020,1167 @@ +<Modeling type="AVATAR Design" nameTab="Design5" tabs="Block Diagram$Sender$Receiver" > +<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0000000000000002" > +<MainCode value="void __user_init() {"/> +<MainCode value="}"/> +<Optimized value="true" /> +<considerTimingOperators value="true" /> +<Validated value="Receiver;Sender;" /> +<Ignored value="" /> + +<CONNECTOR type="5002" id="1829" index="0" uid="7794a83e-1803-4d8e-b90e-569846c19119" > +<cdparam x="435" y="289" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="" /> +<TGConnectingPoint num="0" id="1828" /> +<P1 x="435" y="289" id="1875" /> +<P2 x="699" y="289" id="1833" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +<extraparam> +<isd value="in sig1()" /> +<oso value="out sig1()" /> +<FIFOType asynchronous="false" synchronousCH="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" /> +</extraparam> +</CONNECTOR> +<COMPONENT type="5000" id="1870" index="1" uid="5d537ea9-fd47-4522-a7f6-c466a4abe93c" > +<cdparam x="699" y="189" /> +<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="9" maxX="2499" minY="9" maxY="1499" /> +<infoparam name="Block0" value="Receiver" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1830" /> +<TGConnectingPoint num="1" id="1831" /> +<TGConnectingPoint num="2" id="1832" /> +<TGConnectingPoint num="3" id="1833" /> +<TGConnectingPoint num="4" id="1834" /> +<TGConnectingPoint num="5" id="1835" /> +<TGConnectingPoint num="6" id="1836" /> +<TGConnectingPoint num="7" id="1837" /> +<TGConnectingPoint num="8" id="1838" /> +<TGConnectingPoint num="9" id="1839" /> +<TGConnectingPoint num="10" id="1840" /> +<TGConnectingPoint num="11" id="1841" /> +<TGConnectingPoint num="12" id="1842" /> +<TGConnectingPoint num="13" id="1843" /> +<TGConnectingPoint num="14" id="1844" /> +<TGConnectingPoint num="15" id="1845" /> +<TGConnectingPoint num="16" id="1846" /> +<TGConnectingPoint num="17" id="1847" /> +<TGConnectingPoint num="18" id="1848" /> +<TGConnectingPoint num="19" id="1849" /> +<TGConnectingPoint num="20" id="1850" /> +<TGConnectingPoint num="21" id="1851" /> +<TGConnectingPoint num="22" id="1852" /> +<TGConnectingPoint num="23" id="1853" /> +<TGConnectingPoint num="24" id="1854" /> +<TGConnectingPoint num="25" id="1855" /> +<TGConnectingPoint num="26" id="1856" /> +<TGConnectingPoint num="27" id="1857" /> +<TGConnectingPoint num="28" id="1858" /> +<TGConnectingPoint num="29" id="1859" /> +<TGConnectingPoint num="30" id="1860" /> +<TGConnectingPoint num="31" id="1861" /> +<TGConnectingPoint num="32" id="1862" /> +<TGConnectingPoint num="33" id="1863" /> +<TGConnectingPoint num="34" id="1864" /> +<TGConnectingPoint num="35" id="1865" /> +<TGConnectingPoint num="36" id="1866" /> +<TGConnectingPoint num="37" id="1867" /> +<TGConnectingPoint num="38" id="1868" /> +<TGConnectingPoint num="39" id="1869" /> +<tags value="deactivated" /> +<extraparam> +<blockType data="block" color="-4072719" /> +<CryptoBlock value="false" /> +<Signal value="in sig1()" attached="true" /> +</extraparam> +</COMPONENT> + +<COMPONENT type="5000" id="1911" index="2" uid="7b2e001a-1e7d-4945-84bd-64ea02d5afb2" > +<cdparam x="185" y="189" /> +<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="9" maxX="2499" minY="9" maxY="1499" /> +<infoparam name="Block" value="Sender" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1871" /> +<TGConnectingPoint num="1" id="1872" /> +<TGConnectingPoint num="2" id="1873" /> +<TGConnectingPoint num="3" id="1874" /> +<TGConnectingPoint num="4" id="1875" /> +<TGConnectingPoint num="5" id="1876" /> +<TGConnectingPoint num="6" id="1877" /> +<TGConnectingPoint num="7" id="1878" /> +<TGConnectingPoint num="8" id="1879" /> +<TGConnectingPoint num="9" id="1880" /> +<TGConnectingPoint num="10" id="1881" /> +<TGConnectingPoint num="11" id="1882" /> +<TGConnectingPoint num="12" id="1883" /> +<TGConnectingPoint num="13" id="1884" /> +<TGConnectingPoint num="14" id="1885" /> +<TGConnectingPoint num="15" id="1886" /> +<TGConnectingPoint num="16" id="1887" /> +<TGConnectingPoint num="17" id="1888" /> +<TGConnectingPoint num="18" id="1889" /> +<TGConnectingPoint num="19" id="1890" /> +<TGConnectingPoint num="20" id="1891" /> +<TGConnectingPoint num="21" id="1892" /> +<TGConnectingPoint num="22" id="1893" /> +<TGConnectingPoint num="23" id="1894" /> +<TGConnectingPoint num="24" id="1895" /> +<TGConnectingPoint num="25" id="1896" /> +<TGConnectingPoint num="26" id="1897" /> +<TGConnectingPoint num="27" id="1898" /> +<TGConnectingPoint num="28" id="1899" /> +<TGConnectingPoint num="29" id="1900" /> +<TGConnectingPoint num="30" id="1901" /> +<TGConnectingPoint num="31" id="1902" /> +<TGConnectingPoint num="32" id="1903" /> +<TGConnectingPoint num="33" id="1904" /> +<TGConnectingPoint num="34" id="1905" /> +<TGConnectingPoint num="35" id="1906" /> +<TGConnectingPoint num="36" id="1907" /> +<TGConnectingPoint num="37" id="1908" /> +<TGConnectingPoint num="38" id="1909" /> +<TGConnectingPoint num="39" id="1910" /> +<tags value="root" /> +<extraparam> +<blockType data="block" color="-4072719" /> +<CryptoBlock value="false" /> +<Attribute access="0" var="0" id="x" value="" type="8" typeOther="" /> +<Signal value="out sig1()" attached="true" /> +</extraparam> +</COMPONENT> + + +</AVATARBlockDiagramPanel> + +<AVATARStateMachineDiagramPanel name="Sender" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > +<CONNECTOR type="5102" id="1918" index="0" uid="733278a9-ef9f-43aa-990e-b025687d8d62" > +<cdparam x="795" y="371" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1917" /> +<P1 x="795" y="371" id="1991" /> +<P2 x="795" y="492" id="1988" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1916" index="19" uid="05cfdbc5-9e18-4fd9-bfc2-1db9e18f8701" > +<father id="1918" num="0" /> +<cdparam x="795" y="431" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1912" /> +<TGConnectingPoint num="1" id="1913" /> +<TGConnectingPoint num="2" id="1914" /> +<TGConnectingPoint num="3" id="1915" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1925" index="1" uid="b2f23f9b-9036-48fa-9d49-f5b240808fa2" > +<cdparam x="246" y="340" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1924" /> +<P1 x="246" y="339" id="1978" /> +<P2 x="234" y="394" id="1975" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1923" index="20" uid="6e9db5b9-1ece-45b5-a37a-8e04e27cc740" > +<father id="1925" num="0" /> +<cdparam x="240" y="367" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1919" /> +<TGConnectingPoint num="1" id="1920" /> +<TGConnectingPoint num="2" id="1921" /> +<TGConnectingPoint num="3" id="1922" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1932" index="2" uid="f517909f-1d1d-4fa1-a4c3-c6ffbdc00de7" > +<cdparam x="375" y="213" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1931" /> +<P1 x="375" y="213" id="2141" /> +<P2 x="246" y="309" id="1977" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1930" index="21" uid="53aa5684-fc45-4ebc-ba73-25284b0b2539" > +<father id="1932" num="0" /> +<cdparam x="374" y="254" /> +<sizeparam width="63" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1926" /> +<TGConnectingPoint num="1" id="1927" /> +<TGConnectingPoint num="2" id="1928" /> +<TGConnectingPoint num="3" id="1929" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +<actions value="x = x + 1" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1939" index="3" uid="fe585417-9a7a-405d-994e-da152d1bc9da" > +<cdparam x="659" y="306" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1938" /> +<P1 x="659" y="306" id="2019" /> +<P2 x="795" y="341" id="1990" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1937" index="22" uid="566675fa-7fed-4b1f-a5bf-a62025189fbe" > +<father id="1939" num="0" /> +<cdparam x="727" y="323" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1933" /> +<TGConnectingPoint num="1" id="1934" /> +<TGConnectingPoint num="2" id="1935" /> +<TGConnectingPoint num="3" id="1936" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1946" index="4" uid="4d443174-8eba-4d8a-812a-6ab5b5760020" > +<cdparam x="604" y="414" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1945" /> +<P1 x="604" y="414" id="2004" /> +<P2 x="595" y="441" id="2001" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1944" index="23" uid="d18062cb-62c8-43c0-9a1e-39d08f14b5fe" > +<father id="1946" num="0" /> +<cdparam x="599" y="427" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1940" /> +<TGConnectingPoint num="1" id="1941" /> +<TGConnectingPoint num="2" id="1942" /> +<TGConnectingPoint num="3" id="1943" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1953" index="5" uid="a7ab2da6-c692-415b-a1ce-b80254abd7f7" > +<cdparam x="596" y="319" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1952" /> +<P1 x="596" y="319" id="2067" /> +<P2 x="604" y="384" id="2003" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1951" index="24" uid="eb2e2fbc-329e-4591-be36-908744b61093" > +<father id="1953" num="0" /> +<cdparam x="600" y="351" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1947" /> +<TGConnectingPoint num="1" id="1948" /> +<TGConnectingPoint num="2" id="1949" /> +<TGConnectingPoint num="3" id="1950" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1960" index="6" uid="51c76588-38c6-49e4-bfa2-543ac9634bec" > +<cdparam x="463" y="213" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1959" /> +<P1 x="463" y="213" id="2120" /> +<P2 x="584" y="269" id="2046" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1958" index="25" uid="c75a9907-eadd-4895-86a6-9e3ffd4d3cd6" > +<father id="1960" num="0" /> +<cdparam x="464" y="238" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1954" /> +<TGConnectingPoint num="1" id="1955" /> +<TGConnectingPoint num="2" id="1956" /> +<TGConnectingPoint num="3" id="1957" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1967" index="7" uid="ff0099c0-640a-4713-8fc3-32a43058525e" > +<cdparam x="413" y="213" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1966" /> +<P1 x="413" y="213" id="2119" /> +<P2 x="348" y="447" id="2079" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1965" index="26" uid="dd7722f3-bdad-419d-a462-69b7c147cf50" > +<father id="1967" num="0" /> +<cdparam x="414" y="231" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1961" /> +<TGConnectingPoint num="1" id="1962" /> +<TGConnectingPoint num="2" id="1963" /> +<TGConnectingPoint num="3" id="1964" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="1974" index="8" uid="5edd7c38-cb1c-481d-a071-9074b4e00c93" > +<cdparam x="375" y="103" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="1973" /> +<P1 x="375" y="103" id="2154" /> +<P2 x="375" y="163" id="2129" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="1972" index="27" uid="ed26a985-197f-4588-b7d9-ae7ac874366b" > +<father id="1974" num="0" /> +<cdparam x="375" y="133" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1968" /> +<TGConnectingPoint num="1" id="1969" /> +<TGConnectingPoint num="2" id="1970" /> +<TGConnectingPoint num="3" id="1971" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<COMPONENT type="5101" id="1976" index="9" uid="69aa4b03-b2e6-4276-b82a-6f732aac274e" > +<cdparam x="224" y="399" /> +<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="stop state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1975" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5103" id="1987" index="10" uid="c1a738cf-7120-4b65-b878-e4e1c9d6fbd0" > +<cdparam x="225" y="314" /> +<sizeparam width="42" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="Send signal" value="sig1()" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1977" /> +<TGConnectingPoint num="1" id="1978" /> +<TGConnectingPoint num="2" id="1979" /> +<TGConnectingPoint num="3" id="1980" /> +<TGConnectingPoint num="4" id="1981" /> +<TGConnectingPoint num="5" id="1982" /> +<TGConnectingPoint num="6" id="1983" /> +<TGConnectingPoint num="7" id="1984" /> +<TGConnectingPoint num="8" id="1985" /> +<TGConnectingPoint num="9" id="1986" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5101" id="1989" index="11" uid="af3fb94c-8a53-45ab-96e0-e83607ddbf25" > +<cdparam x="785" y="497" /> +<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="stop state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1988" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5103" id="2000" index="12" uid="69d34293-1c42-4b93-995e-f54edf6cc306" > +<cdparam x="774" y="346" /> +<sizeparam width="42" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="Send signal" value="sig1()" /> +<new d="false" /> +<TGConnectingPoint num="0" id="1990" /> +<TGConnectingPoint num="1" id="1991" /> +<TGConnectingPoint num="2" id="1992" /> +<TGConnectingPoint num="3" id="1993" /> +<TGConnectingPoint num="4" id="1994" /> +<TGConnectingPoint num="5" id="1995" /> +<TGConnectingPoint num="6" id="1996" /> +<TGConnectingPoint num="7" id="1997" /> +<TGConnectingPoint num="8" id="1998" /> +<TGConnectingPoint num="9" id="1999" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5101" id="2002" index="13" uid="1217c87a-6752-4b01-b603-1832e96e8cd5" > +<cdparam x="585" y="446" /> +<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="stop state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2001" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5108" id="2005" index="14" uid="bd830a0a-6f12-412c-a38c-5b5969334c94" > +<cdparam x="534" y="389" /> +<sizeparam width="140" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="TGComponent" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2003" /> +<TGConnectingPoint num="1" id="2004" /> +<tags value="" /> +<extraparam> +<Data variable="x" minValue="0" maxValue="10" functionId="0" extraAttribute1="" extraAttribute2="" /> +</extraparam> +</COMPONENT> + +<COMPONENT type="5106" id="2078" index="15" uid="3d9357d1-e4a2-496a-8f4c-99c02614a537" > +<cdparam x="559" y="269" /> +<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="state0" value="rausState" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2006" /> +<TGConnectingPoint num="1" id="2007" /> +<TGConnectingPoint num="2" id="2008" /> +<TGConnectingPoint num="3" id="2009" /> +<TGConnectingPoint num="4" id="2010" /> +<TGConnectingPoint num="5" id="2011" /> +<TGConnectingPoint num="6" id="2012" /> +<TGConnectingPoint num="7" id="2013" /> +<TGConnectingPoint num="8" id="2014" /> +<TGConnectingPoint num="9" id="2015" /> +<TGConnectingPoint num="10" id="2016" /> +<TGConnectingPoint num="11" id="2017" /> +<TGConnectingPoint num="12" id="2018" /> +<TGConnectingPoint num="13" id="2019" /> +<TGConnectingPoint num="14" id="2020" /> +<TGConnectingPoint num="15" id="2021" /> +<TGConnectingPoint num="16" id="2022" /> +<TGConnectingPoint num="17" id="2023" /> +<TGConnectingPoint num="18" id="2024" /> +<TGConnectingPoint num="19" id="2025" /> +<TGConnectingPoint num="20" id="2026" /> +<TGConnectingPoint num="21" id="2027" /> +<TGConnectingPoint num="22" id="2028" /> +<TGConnectingPoint num="23" id="2029" /> +<TGConnectingPoint num="24" id="2030" /> +<TGConnectingPoint num="25" id="2031" /> +<TGConnectingPoint num="26" id="2032" /> +<TGConnectingPoint num="27" id="2033" /> +<TGConnectingPoint num="28" id="2034" /> +<TGConnectingPoint num="29" id="2035" /> +<TGConnectingPoint num="30" id="2036" /> +<TGConnectingPoint num="31" id="2037" /> +<TGConnectingPoint num="32" id="2038" /> +<TGConnectingPoint num="33" id="2039" /> +<TGConnectingPoint num="34" id="2040" /> +<TGConnectingPoint num="35" id="2041" /> +<TGConnectingPoint num="36" id="2042" /> +<TGConnectingPoint num="37" id="2043" /> +<TGConnectingPoint num="38" id="2044" /> +<TGConnectingPoint num="39" id="2045" /> +<TGConnectingPoint num="40" id="2046" /> +<TGConnectingPoint num="41" id="2047" /> +<TGConnectingPoint num="42" id="2048" /> +<TGConnectingPoint num="43" id="2049" /> +<TGConnectingPoint num="44" id="2050" /> +<TGConnectingPoint num="45" id="2051" /> +<TGConnectingPoint num="46" id="2052" /> +<TGConnectingPoint num="47" id="2053" /> +<TGConnectingPoint num="48" id="2054" /> +<TGConnectingPoint num="49" id="2055" /> +<TGConnectingPoint num="50" id="2056" /> +<TGConnectingPoint num="51" id="2057" /> +<TGConnectingPoint num="52" id="2058" /> +<TGConnectingPoint num="53" id="2059" /> +<TGConnectingPoint num="54" id="2060" /> +<TGConnectingPoint num="55" id="2061" /> +<TGConnectingPoint num="56" id="2062" /> +<TGConnectingPoint num="57" id="2063" /> +<TGConnectingPoint num="58" id="2064" /> +<TGConnectingPoint num="59" id="2065" /> +<TGConnectingPoint num="60" id="2066" /> +<TGConnectingPoint num="61" id="2067" /> +<TGConnectingPoint num="62" id="2068" /> +<TGConnectingPoint num="63" id="2069" /> +<TGConnectingPoint num="64" id="2070" /> +<TGConnectingPoint num="65" id="2071" /> +<TGConnectingPoint num="66" id="2072" /> +<TGConnectingPoint num="67" id="2073" /> +<TGConnectingPoint num="68" id="2074" /> +<TGConnectingPoint num="69" id="2075" /> +<TGConnectingPoint num="70" id="2076" /> +<TGConnectingPoint num="71" id="2077" /> +<tags value="deactivated" /> +<extraparam> +</extraparam> +</COMPONENT> + +<COMPONENT type="5101" id="2080" index="16" uid="01cc2ab9-dc01-4858-a4b4-e392bd3bcb32" > +<cdparam x="338" y="452" /> +<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="stop state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2079" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5106" id="2153" index="17" uid="87b2bd03-dc4b-4bba-810e-c727c24f3c90" > +<cdparam x="363" y="163" /> +<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="state" value="state" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2081" /> +<TGConnectingPoint num="1" id="2082" /> +<TGConnectingPoint num="2" id="2083" /> +<TGConnectingPoint num="3" id="2084" /> +<TGConnectingPoint num="4" id="2085" /> +<TGConnectingPoint num="5" id="2086" /> +<TGConnectingPoint num="6" id="2087" /> +<TGConnectingPoint num="7" id="2088" /> +<TGConnectingPoint num="8" id="2089" /> +<TGConnectingPoint num="9" id="2090" /> +<TGConnectingPoint num="10" id="2091" /> +<TGConnectingPoint num="11" id="2092" /> +<TGConnectingPoint num="12" id="2093" /> +<TGConnectingPoint num="13" id="2094" /> +<TGConnectingPoint num="14" id="2095" /> +<TGConnectingPoint num="15" id="2096" /> +<TGConnectingPoint num="16" id="2097" /> +<TGConnectingPoint num="17" id="2098" /> +<TGConnectingPoint num="18" id="2099" /> +<TGConnectingPoint num="19" id="2100" /> +<TGConnectingPoint num="20" id="2101" /> +<TGConnectingPoint num="21" id="2102" /> +<TGConnectingPoint num="22" id="2103" /> +<TGConnectingPoint num="23" id="2104" /> +<TGConnectingPoint num="24" id="2105" /> +<TGConnectingPoint num="25" id="2106" /> +<TGConnectingPoint num="26" id="2107" /> +<TGConnectingPoint num="27" id="2108" /> +<TGConnectingPoint num="28" id="2109" /> +<TGConnectingPoint num="29" id="2110" /> +<TGConnectingPoint num="30" id="2111" /> +<TGConnectingPoint num="31" id="2112" /> +<TGConnectingPoint num="32" id="2113" /> +<TGConnectingPoint num="33" id="2114" /> +<TGConnectingPoint num="34" id="2115" /> +<TGConnectingPoint num="35" id="2116" /> +<TGConnectingPoint num="36" id="2117" /> +<TGConnectingPoint num="37" id="2118" /> +<TGConnectingPoint num="38" id="2119" /> +<TGConnectingPoint num="39" id="2120" /> +<TGConnectingPoint num="40" id="2121" /> +<TGConnectingPoint num="41" id="2122" /> +<TGConnectingPoint num="42" id="2123" /> +<TGConnectingPoint num="43" id="2124" /> +<TGConnectingPoint num="44" id="2125" /> +<TGConnectingPoint num="45" id="2126" /> +<TGConnectingPoint num="46" id="2127" /> +<TGConnectingPoint num="47" id="2128" /> +<TGConnectingPoint num="48" id="2129" /> +<TGConnectingPoint num="49" id="2130" /> +<TGConnectingPoint num="50" id="2131" /> +<TGConnectingPoint num="51" id="2132" /> +<TGConnectingPoint num="52" id="2133" /> +<TGConnectingPoint num="53" id="2134" /> +<TGConnectingPoint num="54" id="2135" /> +<TGConnectingPoint num="55" id="2136" /> +<TGConnectingPoint num="56" id="2137" /> +<TGConnectingPoint num="57" id="2138" /> +<TGConnectingPoint num="58" id="2139" /> +<TGConnectingPoint num="59" id="2140" /> +<TGConnectingPoint num="60" id="2141" /> +<TGConnectingPoint num="61" id="2142" /> +<TGConnectingPoint num="62" id="2143" /> +<TGConnectingPoint num="63" id="2144" /> +<TGConnectingPoint num="64" id="2145" /> +<TGConnectingPoint num="65" id="2146" /> +<TGConnectingPoint num="66" id="2147" /> +<TGConnectingPoint num="67" id="2148" /> +<TGConnectingPoint num="68" id="2149" /> +<TGConnectingPoint num="69" id="2150" /> +<TGConnectingPoint num="70" id="2151" /> +<TGConnectingPoint num="71" id="2152" /> +<tags value="root stream1" /> +<extraparam> +</extraparam> +</COMPONENT> + +<COMPONENT type="5100" id="2155" index="18" uid="8cb70440-902a-4ff0-a4bf-5740ae279056" > +<cdparam x="368" y="83" /> +<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="start state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2154" /> +<tags value="root" /> +</COMPONENT> + + +</AVATARStateMachineDiagramPanel> + +<AVATARStateMachineDiagramPanel name="Receiver" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > +<CONNECTOR type="5102" id="2162" index="0" uid="3a681413-9f44-432e-8842-ed07a25e9e87" > +<cdparam x="457" y="428" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="2161" /> +<P1 x="457" y="428" id="2194" /> +<P2 x="463" y="457" id="2191" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="2160" index="11" uid="01560caf-80db-455d-a6f3-011c89831b04" > +<father id="2162" num="0" /> +<cdparam x="460" y="442" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2156" /> +<TGConnectingPoint num="1" id="2157" /> +<TGConnectingPoint num="2" id="2158" /> +<TGConnectingPoint num="3" id="2159" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="2169" index="1" uid="cafef4b0-da15-49a1-8e0b-2f5b5ea90c2b" > +<cdparam x="400" y="371" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="2168" /> +<P1 x="400" y="371" id="2245" /> +<P2 x="457" y="398" id="2193" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="2167" index="12" uid="2c3c85e3-93fa-4298-8c9b-335a9c828748" > +<father id="2169" num="0" /> +<cdparam x="428" y="384" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2163" /> +<TGConnectingPoint num="1" id="2164" /> +<TGConnectingPoint num="2" id="2165" /> +<TGConnectingPoint num="3" id="2166" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="2176" index="2" uid="9e990fc0-a62a-40e8-b08e-48fdda84d784" > +<cdparam x="337" y="371" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="2175" /> +<P1 x="337" y="371" id="2267" /> +<P2 x="332" y="452" id="2204" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="2174" index="13" uid="088ea582-eff4-405c-a922-8a08ec520b99" > +<father id="2176" num="0" /> +<cdparam x="334" y="411" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2170" /> +<TGConnectingPoint num="1" id="2171" /> +<TGConnectingPoint num="2" id="2172" /> +<TGConnectingPoint num="3" id="2173" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="2183" index="3" uid="07d5d341-e07a-43a0-9d0b-3f76d96526e2" > +<cdparam x="421" y="192" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="2182" /> +<P1 x="421" y="192" id="2293" /> +<P2 x="350" y="321" id="2207" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="2181" index="14" uid="cf7881de-1568-40ff-95c3-4c3a970eb719" > +<father id="2183" num="0" /> +<cdparam x="385" y="256" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2177" /> +<TGConnectingPoint num="1" id="2178" /> +<TGConnectingPoint num="2" id="2179" /> +<TGConnectingPoint num="3" id="2180" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<CONNECTOR type="5102" id="2190" index="4" uid="7a9ea02f-e4f9-41bc-bead-634f4b3eeeef" > +<cdparam x="407" y="70" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="2189" /> +<P1 x="407" y="70" id="2352" /> +<P2 x="408" y="142" id="2327" /> +<AutomaticDrawing data="true" /> +<new d="false" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="2188" index="15" uid="28d2e1d7-2710-4e5a-ad35-42d94c0da074" > +<father id="2190" num="0" /> +<cdparam x="407" y="106" /> +<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2184" /> +<TGConnectingPoint num="1" id="2185" /> +<TGConnectingPoint num="2" id="2186" /> +<TGConnectingPoint num="3" id="2187" /> +<tags value="" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<COMPONENT type="5101" id="2192" index="5" uid="14afbeb5-4e1d-4d1e-bd25-52187d6843ce" > +<cdparam x="453" y="462" /> +<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="stop state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2191" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5104" id="2203" index="6" uid="cbfa851a-ffce-4ffb-bdb8-9eab7aafeeef" > +<cdparam x="432" y="403" /> +<sizeparam width="50" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="Receive signal" value="sig1()" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2193" /> +<TGConnectingPoint num="1" id="2194" /> +<TGConnectingPoint num="2" id="2195" /> +<TGConnectingPoint num="3" id="2196" /> +<TGConnectingPoint num="4" id="2197" /> +<TGConnectingPoint num="5" id="2198" /> +<TGConnectingPoint num="6" id="2199" /> +<TGConnectingPoint num="7" id="2200" /> +<TGConnectingPoint num="8" id="2201" /> +<TGConnectingPoint num="9" id="2202" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5101" id="2205" index="7" uid="6e3e7f28-bb9c-4963-ac2b-442f0fef2b2c" > +<cdparam x="322" y="457" /> +<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="stop state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2204" /> +<tags value="" /> +</COMPONENT> + +<COMPONENT type="5106" id="2278" index="8" uid="d6e6e539-d53c-4b11-be02-5e876cf4f180" > +<cdparam x="300" y="321" /> +<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="state" value="state22" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2206" /> +<TGConnectingPoint num="1" id="2207" /> +<TGConnectingPoint num="2" id="2208" /> +<TGConnectingPoint num="3" id="2209" /> +<TGConnectingPoint num="4" id="2210" /> +<TGConnectingPoint num="5" id="2211" /> +<TGConnectingPoint num="6" id="2212" /> +<TGConnectingPoint num="7" id="2213" /> +<TGConnectingPoint num="8" id="2214" /> +<TGConnectingPoint num="9" id="2215" /> +<TGConnectingPoint num="10" id="2216" /> +<TGConnectingPoint num="11" id="2217" /> +<TGConnectingPoint num="12" id="2218" /> +<TGConnectingPoint num="13" id="2219" /> +<TGConnectingPoint num="14" id="2220" /> +<TGConnectingPoint num="15" id="2221" /> +<TGConnectingPoint num="16" id="2222" /> +<TGConnectingPoint num="17" id="2223" /> +<TGConnectingPoint num="18" id="2224" /> +<TGConnectingPoint num="19" id="2225" /> +<TGConnectingPoint num="20" id="2226" /> +<TGConnectingPoint num="21" id="2227" /> +<TGConnectingPoint num="22" id="2228" /> +<TGConnectingPoint num="23" id="2229" /> +<TGConnectingPoint num="24" id="2230" /> +<TGConnectingPoint num="25" id="2231" /> +<TGConnectingPoint num="26" id="2232" /> +<TGConnectingPoint num="27" id="2233" /> +<TGConnectingPoint num="28" id="2234" /> +<TGConnectingPoint num="29" id="2235" /> +<TGConnectingPoint num="30" id="2236" /> +<TGConnectingPoint num="31" id="2237" /> +<TGConnectingPoint num="32" id="2238" /> +<TGConnectingPoint num="33" id="2239" /> +<TGConnectingPoint num="34" id="2240" /> +<TGConnectingPoint num="35" id="2241" /> +<TGConnectingPoint num="36" id="2242" /> +<TGConnectingPoint num="37" id="2243" /> +<TGConnectingPoint num="38" id="2244" /> +<TGConnectingPoint num="39" id="2245" /> +<TGConnectingPoint num="40" id="2246" /> +<TGConnectingPoint num="41" id="2247" /> +<TGConnectingPoint num="42" id="2248" /> +<TGConnectingPoint num="43" id="2249" /> +<TGConnectingPoint num="44" id="2250" /> +<TGConnectingPoint num="45" id="2251" /> +<TGConnectingPoint num="46" id="2252" /> +<TGConnectingPoint num="47" id="2253" /> +<TGConnectingPoint num="48" id="2254" /> +<TGConnectingPoint num="49" id="2255" /> +<TGConnectingPoint num="50" id="2256" /> +<TGConnectingPoint num="51" id="2257" /> +<TGConnectingPoint num="52" id="2258" /> +<TGConnectingPoint num="53" id="2259" /> +<TGConnectingPoint num="54" id="2260" /> +<TGConnectingPoint num="55" id="2261" /> +<TGConnectingPoint num="56" id="2262" /> +<TGConnectingPoint num="57" id="2263" /> +<TGConnectingPoint num="58" id="2264" /> +<TGConnectingPoint num="59" id="2265" /> +<TGConnectingPoint num="60" id="2266" /> +<TGConnectingPoint num="61" id="2267" /> +<TGConnectingPoint num="62" id="2268" /> +<TGConnectingPoint num="63" id="2269" /> +<TGConnectingPoint num="64" id="2270" /> +<TGConnectingPoint num="65" id="2271" /> +<TGConnectingPoint num="66" id="2272" /> +<TGConnectingPoint num="67" id="2273" /> +<TGConnectingPoint num="68" id="2274" /> +<TGConnectingPoint num="69" id="2275" /> +<TGConnectingPoint num="70" id="2276" /> +<TGConnectingPoint num="71" id="2277" /> +<tags value="" /> +<extraparam> +</extraparam> +</COMPONENT> + +<COMPONENT type="5106" id="2351" index="9" uid="f686541c-4fb9-4084-b047-b70ea385c8cd" > +<cdparam x="396" y="142" /> +<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="state" value="state21" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2279" /> +<TGConnectingPoint num="1" id="2280" /> +<TGConnectingPoint num="2" id="2281" /> +<TGConnectingPoint num="3" id="2282" /> +<TGConnectingPoint num="4" id="2283" /> +<TGConnectingPoint num="5" id="2284" /> +<TGConnectingPoint num="6" id="2285" /> +<TGConnectingPoint num="7" id="2286" /> +<TGConnectingPoint num="8" id="2287" /> +<TGConnectingPoint num="9" id="2288" /> +<TGConnectingPoint num="10" id="2289" /> +<TGConnectingPoint num="11" id="2290" /> +<TGConnectingPoint num="12" id="2291" /> +<TGConnectingPoint num="13" id="2292" /> +<TGConnectingPoint num="14" id="2293" /> +<TGConnectingPoint num="15" id="2294" /> +<TGConnectingPoint num="16" id="2295" /> +<TGConnectingPoint num="17" id="2296" /> +<TGConnectingPoint num="18" id="2297" /> +<TGConnectingPoint num="19" id="2298" /> +<TGConnectingPoint num="20" id="2299" /> +<TGConnectingPoint num="21" id="2300" /> +<TGConnectingPoint num="22" id="2301" /> +<TGConnectingPoint num="23" id="2302" /> +<TGConnectingPoint num="24" id="2303" /> +<TGConnectingPoint num="25" id="2304" /> +<TGConnectingPoint num="26" id="2305" /> +<TGConnectingPoint num="27" id="2306" /> +<TGConnectingPoint num="28" id="2307" /> +<TGConnectingPoint num="29" id="2308" /> +<TGConnectingPoint num="30" id="2309" /> +<TGConnectingPoint num="31" id="2310" /> +<TGConnectingPoint num="32" id="2311" /> +<TGConnectingPoint num="33" id="2312" /> +<TGConnectingPoint num="34" id="2313" /> +<TGConnectingPoint num="35" id="2314" /> +<TGConnectingPoint num="36" id="2315" /> +<TGConnectingPoint num="37" id="2316" /> +<TGConnectingPoint num="38" id="2317" /> +<TGConnectingPoint num="39" id="2318" /> +<TGConnectingPoint num="40" id="2319" /> +<TGConnectingPoint num="41" id="2320" /> +<TGConnectingPoint num="42" id="2321" /> +<TGConnectingPoint num="43" id="2322" /> +<TGConnectingPoint num="44" id="2323" /> +<TGConnectingPoint num="45" id="2324" /> +<TGConnectingPoint num="46" id="2325" /> +<TGConnectingPoint num="47" id="2326" /> +<TGConnectingPoint num="48" id="2327" /> +<TGConnectingPoint num="49" id="2328" /> +<TGConnectingPoint num="50" id="2329" /> +<TGConnectingPoint num="51" id="2330" /> +<TGConnectingPoint num="52" id="2331" /> +<TGConnectingPoint num="53" id="2332" /> +<TGConnectingPoint num="54" id="2333" /> +<TGConnectingPoint num="55" id="2334" /> +<TGConnectingPoint num="56" id="2335" /> +<TGConnectingPoint num="57" id="2336" /> +<TGConnectingPoint num="58" id="2337" /> +<TGConnectingPoint num="59" id="2338" /> +<TGConnectingPoint num="60" id="2339" /> +<TGConnectingPoint num="61" id="2340" /> +<TGConnectingPoint num="62" id="2341" /> +<TGConnectingPoint num="63" id="2342" /> +<TGConnectingPoint num="64" id="2343" /> +<TGConnectingPoint num="65" id="2344" /> +<TGConnectingPoint num="66" id="2345" /> +<TGConnectingPoint num="67" id="2346" /> +<TGConnectingPoint num="68" id="2347" /> +<TGConnectingPoint num="69" id="2348" /> +<TGConnectingPoint num="70" id="2349" /> +<TGConnectingPoint num="71" id="2350" /> +<tags value="" /> +<extraparam> +</extraparam> +</COMPONENT> + +<COMPONENT type="5100" id="2353" index="10" uid="462effb1-7700-43dd-a45d-2c77a7fff199" > +<cdparam x="400" y="50" /> +<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="start state" value="null" /> +<new d="false" /> +<TGConnectingPoint num="0" id="2352" /> +<tags value="" /> +</COMPONENT> + + +</AVATARStateMachineDiagramPanel> + +</Modeling> + + + + </TURTLEGMODELING> \ No newline at end of file diff --git a/src/main/java/avatartranslator/AvatarBlock.java b/src/main/java/avatartranslator/AvatarBlock.java index b259abbfca0de53ab2855d68773b831b378edd91..31f8a7403312936229a29a6545a3c585629b69c0 100644 --- a/src/main/java/avatartranslator/AvatarBlock.java +++ b/src/main/java/avatartranslator/AvatarBlock.java @@ -1113,6 +1113,9 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne for (AvatarAttribute aa : attributes) { av.addAttribute(aa.advancedClone(av)); } + for (AvatarAttribute aa : originalAttributes) { + av.addOriginalAttribute(aa.advancedClone(av)); + } for (AvatarMethod am : methods) { av.addMethod(am.advancedClone(av)); } diff --git a/src/main/java/avatartranslator/AvatarCompactDependencyGraph.java b/src/main/java/avatartranslator/AvatarCompactDependencyGraph.java index de639e7721152fdd40cc20b09cfe6c2332541f52..c80012f09602750d7fb88b91f310300e4bac887a 100644 --- a/src/main/java/avatartranslator/AvatarCompactDependencyGraph.java +++ b/src/main/java/avatartranslator/AvatarCompactDependencyGraph.java @@ -725,6 +725,13 @@ public class AvatarCompactDependencyGraph { newBlock.addAttribute(newA); TraceManager.addDev("\t Adding attribute: " + newA.getName()); } + for (AvatarAttribute aa : ab.getOriginalAttributes()) { + AvatarAttribute newA = aa.advancedClone(newBlock); + newA.clearReferenceObject(); + newA.setReferenceObject(this); + newBlock.addOriginalAttribute(newA); + TraceManager.addDev("\t Adding original attribute: " + newA.getName()); + } for (AvatarMethod am : ab.getMethods()) { AvatarMethod newAm = am.advancedClone(newBlock); newAm.clearReferenceObject(); diff --git a/src/main/java/ui/AvatarPanelDrawer.java b/src/main/java/ui/AvatarPanelDrawer.java index ff503bc9f09ad78dead203cb5dcf06712751fd4e..7554999c215cdc748d5907c71245fcd2c6a3bc11 100644 --- a/src/main/java/ui/AvatarPanelDrawer.java +++ b/src/main/java/ui/AvatarPanelDrawer.java @@ -931,7 +931,10 @@ public class AvatarPanelDrawer { TraceManager.addDev("Setting name of block: " + bl.getBlockName()); if (useOriginalValues) { + TraceManager.addDev("** Attributes: Using original attributes"); for (AvatarAttribute attr : ab.getOriginalAttributes()) { + TraceManager.addDev("Handling original attributes"); + TraceManager.addDev("\tHandling attribute: " + attr); if (attr.isDataType()) { bl.addAttribute(new TAttribute(0, attr.getName(), attr.getProvidedInitialValue(), attr.getDataType().getName())); } else { @@ -958,7 +961,9 @@ public class AvatarPanelDrawer { } } } else { + TraceManager.addDev("** Handling regular attributes"); for (AvatarAttribute attr : ab.getAttributes()) { + TraceManager.addDev("\tHandling attribute: " + attr); int type = TAttribute.OTHER; if (attr.getType() == AvatarType.BOOLEAN) { type = TAttribute.BOOLEAN; diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java index 95a94a86e5f17d6b817c03ddd6726d600b9801a9..467f3fd6052b30aa872cf7033687967585a2abb1 100755 --- a/src/main/java/ui/util/DefaultText.java +++ b/src/main/java/ui/util/DefaultText.java @@ -50,8 +50,8 @@ package ui.util; */ public class DefaultText { - public static String BUILD = "14841"; - public static String DATE = "2024/07/17 03:22:26 CET"; + public static String BUILD = "14842"; + public static String DATE = "2024/10/02 21:18:55 CET"; public static StringBuffer sbAbout = makeAbout();