--- a/tests/svgui/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/svgui/plc.xml Wed Sep 26 14:20:51 2018 +0300
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="beremiz" productName="Beremiz" productVersion="0.0" creationDateTime="2008-12-14T16:21:19"/>
- <contentHeader name="Beremiz SVGUI Test" modificationDateTime="2018-08-24T13:19:27">
+ <contentHeader name="Beremiz SVGUI Test" modificationDateTime="2018-09-26T13:18:53">
<coordinateInfo>
<pageSize x="1024" y="1024"/>
<fbd>
@@ -46,14 +46,14 @@
<body>
<FBD>
<block localId="32" width="80" height="110" typeName="ADD" executionOrderId="0">
- <position x="649" y="241"/>
+ <position x="649" y="285"/>
<inputVariables>
<variable formalParameter="EN">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="5">
- <position x="649" y="276"/>
- <position x="594" y="276"/>
+ <position x="649" y="320"/>
+ <position x="594" y="320"/>
</connection>
</connectionPointIn>
</variable>
@@ -61,8 +61,8 @@
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="100" formalParameter="OUT">
- <position x="649" y="306"/>
- <position x="474" y="306"/>
+ <position x="649" y="350"/>
+ <position x="474" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -70,12 +70,12 @@
<connectionPointIn>
<relPosition x="0" y="95"/>
<connection refLocalId="33">
- <position x="649" y="336"/>
- <position x="629" y="336"/>
- <position x="629" y="374"/>
- <position x="854" y="374"/>
- <position x="854" y="306"/>
- <position x="839" y="306"/>
+ <position x="649" y="380"/>
+ <position x="629" y="380"/>
+ <position x="629" y="418"/>
+ <position x="854" y="418"/>
+ <position x="854" y="350"/>
+ <position x="839" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -95,12 +95,12 @@
</outputVariables>
</block>
<inOutVariable localId="33" height="35" width="85" executionOrderId="0" negatedOut="false" negatedIn="false">
- <position x="754" y="289"/>
+ <position x="754" y="333"/>
<connectionPointIn>
<relPosition x="0" y="17"/>
<connection refLocalId="32" formalParameter="OUT">
- <position x="754" y="306"/>
- <position x="729" y="306"/>
+ <position x="754" y="350"/>
+ <position x="729" y="350"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -109,56 +109,56 @@
<expression>counter</expression>
</inOutVariable>
<inVariable localId="39" height="35" width="89" executionOrderId="0" negated="false">
- <position x="55" y="289"/>
+ <position x="55" y="333"/>
<connectionPointOut>
<relPosition x="89" y="17"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
<inVariable localId="41" height="30" width="120" executionOrderId="0" negated="false">
- <position x="21" y="575"/>
+ <position x="21" y="619"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'stop_back'</expression>
</inVariable>
<inVariable localId="42" height="30" width="120" executionOrderId="0" negated="false">
- <position x="21" y="617"/>
+ <position x="21" y="661"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'stop_sele'</expression>
</inVariable>
- <inVariable localId="46" height="30" width="121" executionOrderId="0" negated="false">
- <position x="694" y="755"/>
- <connectionPointOut>
- <relPosition x="121" y="15"/>
+ <inVariable localId="46" height="30" width="122" executionOrderId="0" negated="false">
+ <position x="694" y="799"/>
+ <connectionPointOut>
+ <relPosition x="122" y="15"/>
</connectionPointOut>
<expression>'text_counter'</expression>
</inVariable>
<inVariable localId="51" height="30" width="119" executionOrderId="0" negated="false">
- <position x="692" y="568"/>
+ <position x="692" y="612"/>
<connectionPointOut>
<relPosition x="119" y="15"/>
</connectionPointOut>
<expression>'led_stop'</expression>
</inVariable>
<inVariable localId="52" height="30" width="120" executionOrderId="0" negated="false">
- <position x="691" y="604"/>
+ <position x="691" y="648"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'led_start'</expression>
</inVariable>
<block localId="83" width="145" height="60" typeName="INT_TO_STRING" executionOrderId="0">
- <position x="537" y="812"/>
+ <position x="537" y="856"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="40"/>
<connection refLocalId="4">
- <position x="537" y="852"/>
- <position x="504" y="852"/>
+ <position x="537" y="896"/>
+ <position x="504" y="896"/>
</connection>
</connectionPointIn>
</variable>
@@ -173,14 +173,14 @@
</outputVariables>
</block>
<block localId="92" width="187" height="230" typeName="Button" instanceName="Start_Stop" executionOrderId="0">
- <position x="201" y="549"/>
+ <position x="201" y="593"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="41"/>
<connection refLocalId="41">
- <position x="201" y="590"/>
- <position x="141" y="590"/>
+ <position x="201" y="634"/>
+ <position x="141" y="634"/>
</connection>
</connectionPointIn>
</variable>
@@ -188,8 +188,8 @@
<connectionPointIn>
<relPosition x="0" y="83"/>
<connection refLocalId="42">
- <position x="201" y="632"/>
- <position x="141" y="632"/>
+ <position x="201" y="676"/>
+ <position x="141" y="676"/>
</connection>
</connectionPointIn>
</variable>
@@ -197,8 +197,8 @@
<connectionPointIn>
<relPosition x="0" y="125"/>
<connection refLocalId="93">
- <position x="201" y="674"/>
- <position x="141" y="674"/>
+ <position x="201" y="718"/>
+ <position x="141" y="718"/>
</connection>
</connectionPointIn>
</variable>
@@ -223,21 +223,21 @@
</outputVariables>
</block>
<inVariable localId="93" height="30" width="120" executionOrderId="0" negated="false">
- <position x="21" y="659"/>
+ <position x="21" y="703"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
<block localId="94" width="100" height="145" typeName="TextCtrl" instanceName="Counter_TextCtrl" executionOrderId="0">
- <position x="876" y="730"/>
+ <position x="876" y="774"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="40"/>
<connection refLocalId="46">
- <position x="876" y="770"/>
- <position x="815" y="770"/>
+ <position x="876" y="814"/>
+ <position x="816" y="814"/>
</connection>
</connectionPointIn>
</variable>
@@ -245,8 +245,8 @@
<connectionPointIn>
<relPosition x="0" y="81"/>
<connection refLocalId="3">
- <position x="876" y="811"/>
- <position x="815" y="811"/>
+ <position x="876" y="855"/>
+ <position x="815" y="855"/>
</connection>
</connectionPointIn>
</variable>
@@ -254,8 +254,8 @@
<connectionPointIn>
<relPosition x="0" y="122"/>
<connection refLocalId="83" formalParameter="OUT">
- <position x="876" y="852"/>
- <position x="682" y="852"/>
+ <position x="876" y="896"/>
+ <position x="682" y="896"/>
</connection>
</connectionPointIn>
</variable>
@@ -264,21 +264,21 @@
<outputVariables/>
</block>
<inVariable localId="1" height="30" width="88" executionOrderId="0" negated="false">
- <position x="59" y="228"/>
+ <position x="59" y="272"/>
<connectionPointOut>
<relPosition x="88" y="15"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
<block localId="95" width="100" height="130" typeName="Led" instanceName="State_LedCtrl" executionOrderId="0">
- <position x="876" y="545"/>
+ <position x="876" y="589"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="51">
- <position x="876" y="583"/>
- <position x="811" y="583"/>
+ <position x="876" y="627"/>
+ <position x="811" y="627"/>
</connection>
</connectionPointIn>
</variable>
@@ -286,8 +286,8 @@
<connectionPointIn>
<relPosition x="0" y="74"/>
<connection refLocalId="52">
- <position x="876" y="619"/>
- <position x="811" y="619"/>
+ <position x="876" y="663"/>
+ <position x="811" y="663"/>
</connection>
</connectionPointIn>
</variable>
@@ -295,8 +295,8 @@
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="2">
- <position x="876" y="655"/>
- <position x="811" y="655"/>
+ <position x="876" y="699"/>
+ <position x="811" y="699"/>
</connection>
</connectionPointIn>
</variable>
@@ -305,18 +305,18 @@
<outputVariables/>
</block>
<block localId="96" width="80" height="65" typeName="AND" executionOrderId="0">
- <position x="200" y="190"/>
+ <position x="200" y="234"/>
<inputVariables>
<variable formalParameter="IN1" negated="true">
<connectionPointIn>
<relPosition x="0" y="31"/>
<connection refLocalId="96" formalParameter="OUT">
- <position x="200" y="221"/>
- <position x="175" y="221"/>
- <position x="175" y="175"/>
- <position x="305" y="175"/>
- <position x="305" y="221"/>
- <position x="280" y="221"/>
+ <position x="200" y="265"/>
+ <position x="175" y="265"/>
+ <position x="175" y="219"/>
+ <position x="305" y="219"/>
+ <position x="305" y="265"/>
+ <position x="280" y="265"/>
</connection>
</connectionPointIn>
</variable>
@@ -324,8 +324,8 @@
<connectionPointIn>
<relPosition x="0" y="53"/>
<connection refLocalId="1">
- <position x="200" y="243"/>
- <position x="147" y="243"/>
+ <position x="200" y="287"/>
+ <position x="147" y="287"/>
</connection>
</connectionPointIn>
</variable>
@@ -340,53 +340,53 @@
</outputVariables>
</block>
<connector name="CLOCK" localId="97" height="30" width="90">
- <position x="345" y="206"/>
+ <position x="345" y="250"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="96" formalParameter="OUT">
- <position x="345" y="221"/>
- <position x="280" y="221"/>
+ <position x="345" y="265"/>
+ <position x="280" y="265"/>
</connection>
</connectionPointIn>
</connector>
<connector name="COUNT" localId="98" height="30" width="90">
- <position x="461" y="575"/>
+ <position x="461" y="619"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="92" formalParameter="state_out">
- <position x="461" y="590"/>
- <position x="388" y="590"/>
+ <position x="461" y="634"/>
+ <position x="388" y="634"/>
</connection>
</connectionPointIn>
</connector>
<continuation name="COUNT" localId="2" height="30" width="120">
- <position x="691" y="640"/>
+ <position x="691" y="684"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
</continuation>
<inVariable localId="4" height="35" width="85" executionOrderId="0" negated="false">
- <position x="419" y="835"/>
+ <position x="419" y="879"/>
<connectionPointOut>
<relPosition x="85" y="17"/>
</connectionPointOut>
<expression>counter</expression>
</inVariable>
<continuation name="COUNT" localId="5" height="30" width="90">
- <position x="504" y="261"/>
+ <position x="504" y="305"/>
<connectionPointOut>
<relPosition x="90" y="15"/>
</connectionPointOut>
</continuation>
<block localId="99" width="80" height="110" typeName="AND" executionOrderId="0">
- <position x="199" y="264"/>
+ <position x="199" y="308"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="42"/>
<connection refLocalId="39">
- <position x="199" y="306"/>
- <position x="144" y="306"/>
+ <position x="199" y="350"/>
+ <position x="144" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -394,8 +394,8 @@
<connectionPointIn>
<relPosition x="0" y="87"/>
<connection refLocalId="6">
- <position x="199" y="351"/>
- <position x="144" y="351"/>
+ <position x="199" y="395"/>
+ <position x="144" y="395"/>
</connection>
</connectionPointIn>
</variable>
@@ -410,20 +410,20 @@
</outputVariables>
</block>
<continuation name="CLOCK" localId="6" height="30" width="90">
- <position x="54" y="336"/>
+ <position x="54" y="380"/>
<connectionPointOut>
<relPosition x="90" y="15"/>
</connectionPointOut>
</continuation>
<block localId="100" width="125" height="45" typeName="BOOL_TO_INT" executionOrderId="0">
- <position x="349" y="274"/>
+ <position x="349" y="318"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="32"/>
<connection refLocalId="99" formalParameter="OUT">
- <position x="349" y="306"/>
- <position x="279" y="306"/>
+ <position x="349" y="350"/>
+ <position x="279" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -438,13 +438,13 @@
</outputVariables>
</block>
<continuation name="CLOCK" localId="3" height="30" width="122">
- <position x="693" y="796"/>
+ <position x="693" y="840"/>
<connectionPointOut>
<relPosition x="122" y="15"/>
</connectionPointOut>
</continuation>
- <comment localId="101" height="164" width="977">
- <position x="27" y="8"/>
+ <comment localId="101" height="197" width="1001">
+ <position x="11" y="12"/>
<content>
<xhtml:p><![CDATA[This example shows how IEC program in PLC can interact with web interface.
@@ -459,7 +459,7 @@
</content>
</comment>
<comment localId="102" height="126" width="641">
- <position x="17" y="397"/>
+ <position x="17" y="441"/>
<content>
<xhtml:p><![CDATA[In this example basic elements like 'Button', 'Led' and 'Text' are used.
Back_id and sele_id inputs of these blocks are IDs of graphic primitives in SVG file.