Adding connector test in example
authorlaurent
Fri, 07 Aug 2009 15:35:41 +0200
changeset 392 546053de1426
parent 391 07447ee3538e
child 393 323c8d76f6f2
Adding connector test in example
examples/example.xml
--- a/examples/example.xml	Fri Jul 24 17:12:59 2009 +0200
+++ b/examples/example.xml	Fri Aug 07 15:35:41 2009 +0200
@@ -2,17 +2,17 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://www.plcopen.org/xml/tc6.xsd"
          xmlns:xhtml="http://www.w3.org/1999/xhtml"
-         xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd http://www.plcopen.org/xml/tc6.xsd">
+         xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
   <fileHeader companyName="Lolitech"
               companyURL="www.lolitech.net"
               productName="PLCOpenEditorExample"
               productVersion="1.0"
               productRelease="rc1"
-              creationDateTime="2006-09-07 18:52:43"
+              creationDateTime="2006-09-07T18:52:43"
               contentDescription="Example of PLCOpenEditor usage"/>
   <contentHeader name="Test"
                  version="1"
-                 modificationDateTime="2008-06-19 11:14:11"
+                 modificationDateTime="2009-07-24T16:17:59"
                  author="Laurent Bessard"
                  language="en-US">
     <coordinateInfo>
@@ -99,6 +99,22 @@
           <simpleValue value="0"/>
         </initialValue>
       </dataType>
+      <dataType name="MyType5">
+        <baseType>
+          <struct>
+            <variable name="x">
+              <type>
+                <REAL/>
+              </type>
+            </variable>
+            <variable name="y">
+              <type>
+                <REAL/>
+              </type>
+            </variable>
+          </struct>
+        </baseType>
+      </dataType>
     </dataTypes>
     <pous>
       <pou name="FBDTest" pouType="functionBlock">
@@ -203,13 +219,6 @@
                 </variable>
               </outputVariables>
             </block>
-            <inVariable localId="7" height="32" width="88">
-              <position x="64" y="336"/>
-              <connectionPointOut>
-                <relPosition x="88" y="16"/>
-              </connectionPointOut>
-              <expression>IN3</expression>
-            </inVariable>
             <block localId="8" width="104" height="88" typeName="OR" executionOrderId="4">
               <position x="232" y="240"/>
               <inputVariables>
@@ -227,11 +236,9 @@
                 <variable formalParameter="IN2">
                   <connectionPointIn>
                     <relPosition x="0" y="72"/>
-                    <connection refLocalId="7">
+                    <connection refLocalId="5">
                       <position x="232" y="312"/>
-                      <position x="192" y="312"/>
-                      <position x="192" y="352"/>
-                      <position x="152" y="352"/>
+                      <position x="160" y="312"/>
                     </connection>
                   </connectionPointIn>
                 </variable>
@@ -286,6 +293,29 @@
                 </variable>
               </outputVariables>
             </block>
+            <inVariable localId="1" height="32" width="88">
+              <position x="64" y="416"/>
+              <connectionPointOut>
+                <relPosition x="88" y="16"/>
+              </connectionPointOut>
+              <expression>IN3</expression>
+            </inVariable>
+            <connector name="Input3" localId="12" height="32" width="104">
+              <position x="208" y="416"/>
+              <connectionPointIn>
+                <relPosition x="0" y="16"/>
+                <connection refLocalId="1">
+                  <position x="208" y="432"/>
+                  <position x="152" y="432"/>
+                </connection>
+              </connectionPointIn>
+            </connector>
+            <continuation name="Input3" localId="5" height="32" width="104">
+              <position x="56" y="296"/>
+              <connectionPointOut>
+                <relPosition x="104" y="16"/>
+              </connectionPointOut>
+            </continuation>
           </FBD>
         </body>
       </pou>
@@ -884,7 +914,7 @@
                 </connection>
               </connectionPointIn>
             </jumpStep>
-            <actionBlock localId="13" height="30" width="100">
+            <actionBlock localId="13" width="100" height="30">
               <position x="175" y="127"/>
               <connectionPointIn>
                 <relPosition x="0" y="15"/>
@@ -893,7 +923,8 @@
                   <position x="131" y="142"/>
                 </connection>
               </connectionPointIn>
-              <action>
+              <action localId="0">
+                <relPosition x="0" y="0"/>
                 <reference name="ACT1"/>
               </action>
             </actionBlock>
@@ -967,7 +998,7 @@
                 </connection>
               </connectionPointIn>
             </jumpStep>
-            <actionBlock localId="20" height="90" width="237">
+            <actionBlock localId="20" width="237" height="90">
               <position x="582" y="237"/>
               <connectionPointIn>
                 <relPosition x="0" y="15"/>
@@ -976,13 +1007,16 @@
                   <position x="526" y="252"/>
                 </connection>
               </connectionPointIn>
-              <action indicator="IN5">
+              <action localId="0" indicator="IN5">
+                <relPosition x="0" y="0"/>
                 <reference name="ACT1"/>
               </action>
-              <action qualifier="D" duration="T#10s">
+              <action localId="0" qualifier="D" duration="T#10s">
+                <relPosition x="0" y="0"/>
                 <reference name="IN1"/>
               </action>
-              <action qualifier="P">
+              <action localId="0" qualifier="P">
+                <relPosition x="0" y="0"/>
                 <inline>
                   <ST>
 <![CDATA[IN2 := TRUE;]]>
@@ -1116,7 +1150,7 @@
       <configuration name="ConfigTest">
         <resource name="ResourceTest">
           <task name="Toto" single="Tutu" priority="6">
-            <pouInstance name="Program1" type="SFCTest"/>
+            <pouInstance name="Program1" typeName="SFCTest"/>
           </task>
           <globalVars>
             <variable name="Titi" address="%MW30">