beremiz

cleanup wxGlade example

2017-06-06, Andrey Skvortsov
cfac9d1c3571
Parents db7fd90d245c
Children 9a42f12a973e
cleanup wxGlade example
2 files changed, 104 insertions(+), 108 deletions(-)
  • +3 -3
    tests/wxGlade/HMIFrame@wxglade_hmi/hmi.wxg
  • +101 -105
    tests/wxGlade/plc.xml
    • --- a/tests/wxGlade/HMIFrame@wxglade_hmi/hmi.wxg Tue Jun 06 13:11:18 2017 +0300
    +++ b/tests/wxGlade/HMIFrame@wxglade_hmi/hmi.wxg Tue Jun 06 13:12:10 2017 +0300
    @@ -1,7 +1,7 @@
    <?xml version="1.0"?>
    -<!-- generated by wxGlade 0.6.3 on Fri Aug 7 18:16:44 2009 -->
    +<!-- generated by wxGlade 0.7.2 on Mon Jun 5 14:18:29 2017 -->
    -<application path="" name="" class="" option="0" language="python" top_window="HMIFrame" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.8" is_template="0">
    +<application class="" encoding="UTF-8" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="" option="0" overwrite="0" path="..py.py" source_extension=".cpp" top_window="HMIFrame" use_gettext="0" use_new_namespace="1">
    <object class="Class_HMIFrame" name="HMIFrame" base="EditFrame">
    <style>wxDEFAULT_FRAME_STYLE</style>
    <title>HMIFrame</title>
    @@ -26,7 +26,7 @@
    <option>0</option>
    <object class="wxStaticText" name="label_1" base="EditStaticText">
    <attribute>1</attribute>
    - <label>GUI modifiée !</label>
    + <label>GUI changed!</label>
    </object>
    </object>
    </object>
    --- a/tests/wxGlade/plc.xml Tue Jun 06 13:11:18 2017 +0300
    +++ b/tests/wxGlade/plc.xml Tue Jun 06 13:12:10 2017 +0300
    @@ -1,14 +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.xsd"
    - xmlns:xhtml="http://www.w3.org/1999/xhtml"
    - xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
    - <fileHeader companyName="beremiz"
    - productName="Beremiz"
    - productVersion="0.0"
    - creationDateTime="2008-12-14T16:21:19"/>
    - <contentHeader name="Beremiz Python Support Tests"
    - modificationDateTime="2009-10-08T10:58:12">
    +<?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 wxHMI test" modificationDateTime="2017-06-05T14:01:40">
    <coordinateInfo>
    <pageSize x="1024" y="1024"/>
    <fbd>
    @@ -28,7 +21,7 @@
    <pou name="main_pytest" pouType="program">
    <interface>
    <localVars>
    - <variable name="python1">
    + <variable name="getCheckBoxState">
    <type>
    <derived name="python_poll"/>
    </type>
    @@ -38,7 +31,7 @@
    <INT/>
    </type>
    </variable>
    - <variable name="Block1">
    + <variable name="setSpinCtrlValue">
    <type>
    <derived name="python_poll"/>
    </type>
    @@ -47,15 +40,15 @@
    </interface>
    <body>
    <FBD>
    - <block localId="24" width="125" height="90" typeName="python_poll" instanceName="python1">
    - <position x="480" y="115"/>
    + <block localId="24" width="125" height="90" typeName="python_poll" instanceName="getCheckBoxState" executionOrderId="0">
    + <position x="480" y="215"/>
    <inputVariables>
    <variable formalParameter="TRIG">
    <connectionPointIn>
    <relPosition x="0" y="35"/>
    <connection refLocalId="25">
    - <position x="480" y="150"/>
    - <position x="420" y="150"/>
    + <position x="480" y="250"/>
    + <position x="420" y="250"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -63,8 +56,8 @@
    <connectionPointIn>
    <relPosition x="0" y="70"/>
    <connection refLocalId="26">
    - <position x="480" y="185"/>
    - <position x="420" y="185"/>
    + <position x="480" y="285"/>
    + <position x="420" y="285"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -83,54 +76,52 @@
    </variable>
    </outputVariables>
    </block>
    - <inVariable localId="25" height="30" width="100">
    - <position x="320" y="135"/>
    + <inVariable localId="25" height="30" width="100" executionOrderId="0" negated="false">
    + <position x="320" y="235"/>
    <connectionPointOut>
    <relPosition x="100" y="15"/>
    </connectionPointOut>
    <expression>BOOL#TRUE</expression>
    </inVariable>
    - <inVariable localId="26" height="30" width="400">
    - <position x="20" y="170"/>
    + <inVariable localId="26" height="30" width="400" executionOrderId="0" negated="false">
    + <position x="20" y="270"/>
    <connectionPointOut>
    <relPosition x="400" y="15"/>
    </connectionPointOut>
    <expression>'int(HMIFrame.checkbox_1.GetValue())'</expression>
    </inVariable>
    - <inVariable localId="27" height="30" width="40">
    - <position x="510" y="355"/>
    + <inVariable localId="27" height="30" width="40" executionOrderId="0" negated="false">
    + <position x="535" y="505"/>
    <connectionPointOut>
    <relPosition x="40" y="15"/>
    </connectionPointOut>
    <expression>')'</expression>
    </inVariable>
    - <inVariable localId="28" height="30" width="330">
    - <position x="125" y="265"/>
    + <inVariable localId="28" height="30" width="330" executionOrderId="0" negated="false">
    + <position x="150" y="415"/>
    <connectionPointOut>
    <relPosition x="330" y="15"/>
    </connectionPointOut>
    <expression>'HMIFrame.spin_ctrl_1.SetValue('</expression>
    </inVariable>
    - <block localId="30" width="145" height="60" typeName="STRING_TO_INT">
    - <position x="670" y="135"/>
    + <block localId="30" width="145" height="85" typeName="STRING_TO_INT" executionOrderId="0">
    + <position x="670" y="215"/>
    <inputVariables>
    <variable formalParameter="EN">
    <connectionPointIn>
    - <relPosition x="0" y="30"/>
    + <relPosition x="0" y="35"/>
    <connection refLocalId="24" formalParameter="ACK">
    - <position x="670" y="165"/>
    - <position x="640" y="165"/>
    - <position x="640" y="150"/>
    - <position x="605" y="150"/>
    + <position x="670" y="250"/>
    + <position x="605" y="250"/>
    </connection>
    </connectionPointIn>
    </variable>
    <variable formalParameter="IN">
    <connectionPointIn>
    - <relPosition x="0" y="50"/>
    + <relPosition x="0" y="70"/>
    <connection refLocalId="24" formalParameter="RESULT">
    - <position x="670" y="185"/>
    - <position x="605" y="185"/>
    + <position x="670" y="285"/>
    + <position x="605" y="285"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -139,29 +130,29 @@
    <outputVariables>
    <variable formalParameter="ENO">
    <connectionPointOut>
    - <relPosition x="145" y="30"/>
    + <relPosition x="145" y="35"/>
    </connectionPointOut>
    </variable>
    <variable formalParameter="OUT">
    <connectionPointOut>
    - <relPosition x="145" y="50"/>
    + <relPosition x="145" y="70"/>
    </connectionPointOut>
    </variable>
    </outputVariables>
    </block>
    - <block localId="32" width="80" height="80" typeName="ADD">
    - <position x="110" y="300"/>
    + <block localId="32" width="80" height="80" typeName="ADD" executionOrderId="0">
    + <position x="135" y="450"/>
    <inputVariables>
    <variable formalParameter="EN">
    <connectionPointIn>
    <relPosition x="0" y="30"/>
    <connection refLocalId="38" formalParameter="OUT">
    - <position x="110" y="330"/>
    + <position x="135" y="480"/>
    + <position x="100" y="480"/>
    <position x="100" y="330"/>
    - <position x="100" y="230"/>
    - <position x="1140" y="230"/>
    - <position x="1140" y="165"/>
    - <position x="1130" y="165"/>
    + <position x="1140" y="330"/>
    + <position x="1140" y="250"/>
    + <position x="1130" y="250"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -169,8 +160,8 @@
    <connectionPointIn>
    <relPosition x="0" y="50"/>
    <connection refLocalId="39">
    - <position x="110" y="350"/>
    - <position x="65" y="350"/>
    + <position x="135" y="500"/>
    + <position x="90" y="500"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -178,12 +169,12 @@
    <connectionPointIn>
    <relPosition x="0" y="70"/>
    <connection refLocalId="33">
    - <position x="110" y="370"/>
    - <position x="100" y="370"/>
    - <position x="100" y="390"/>
    - <position x="315" y="390"/>
    - <position x="315" y="350"/>
    - <position x="295" y="350"/>
    + <position x="135" y="520"/>
    + <position x="125" y="520"/>
    + <position x="125" y="540"/>
    + <position x="340" y="540"/>
    + <position x="340" y="500"/>
    + <position x="320" y="500"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -202,17 +193,17 @@
    </variable>
    </outputVariables>
    </block>
    - <block localId="34" width="80" height="100" typeName="CONCAT">
    - <position x="580" y="280"/>
    + <block localId="34" width="80" height="100" typeName="CONCAT" executionOrderId="0">
    + <position x="605" y="430"/>
    <inputVariables>
    <variable formalParameter="EN">
    <connectionPointIn>
    <relPosition x="0" y="30"/>
    <connection refLocalId="35" formalParameter="ENO">
    - <position x="580" y="310"/>
    - <position x="495" y="310"/>
    - <position x="495" y="330"/>
    - <position x="475" y="330"/>
    + <position x="605" y="460"/>
    + <position x="520" y="460"/>
    + <position x="520" y="480"/>
    + <position x="500" y="480"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -220,10 +211,10 @@
    <connectionPointIn>
    <relPosition x="0" y="50"/>
    <connection refLocalId="28">
    - <position x="580" y="330"/>
    - <position x="537" y="330"/>
    - <position x="537" y="280"/>
    - <position x="455" y="280"/>
    + <position x="605" y="480"/>
    + <position x="562" y="480"/>
    + <position x="562" y="430"/>
    + <position x="480" y="430"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -231,8 +222,8 @@
    <connectionPointIn>
    <relPosition x="0" y="70"/>
    <connection refLocalId="35" formalParameter="OUT">
    - <position x="580" y="350"/>
    - <position x="475" y="350"/>
    + <position x="605" y="500"/>
    + <position x="500" y="500"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -240,8 +231,8 @@
    <connectionPointIn>
    <relPosition x="0" y="90"/>
    <connection refLocalId="27">
    - <position x="580" y="370"/>
    - <position x="550" y="370"/>
    + <position x="605" y="520"/>
    + <position x="575" y="520"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -260,13 +251,13 @@
    </variable>
    </outputVariables>
    </block>
    - <inOutVariable localId="33" height="35" width="85">
    - <position x="210" y="335"/>
    + <inOutVariable localId="33" height="35" width="85" executionOrderId="0" negatedOut="false" negatedIn="false">
    + <position x="235" y="485"/>
    <connectionPointIn>
    <relPosition x="0" y="15"/>
    <connection refLocalId="32" formalParameter="OUT">
    - <position x="210" y="350"/>
    - <position x="190" y="350"/>
    + <position x="235" y="500"/>
    + <position x="215" y="500"/>
    </connection>
    </connectionPointIn>
    <connectionPointOut>
    @@ -274,15 +265,15 @@
    </connectionPointOut>
    <expression>counter</expression>
    </inOutVariable>
    - <block localId="35" width="145" height="60" typeName="INT_TO_STRING">
    - <position x="330" y="300"/>
    + <block localId="35" width="145" height="60" typeName="INT_TO_STRING" executionOrderId="0">
    + <position x="355" y="450"/>
    <inputVariables>
    <variable formalParameter="EN">
    <connectionPointIn>
    <relPosition x="0" y="30"/>
    <connection refLocalId="32" formalParameter="ENO">
    - <position x="330" y="330"/>
    - <position x="190" y="330"/>
    + <position x="355" y="480"/>
    + <position x="215" y="480"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -290,8 +281,8 @@
    <connectionPointIn>
    <relPosition x="0" y="50"/>
    <connection refLocalId="33">
    - <position x="330" y="350"/>
    - <position x="295" y="350"/>
    + <position x="355" y="500"/>
    + <position x="320" y="500"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -310,15 +301,15 @@
    </variable>
    </outputVariables>
    </block>
    - <block localId="36" width="125" height="90" typeName="python_poll" instanceName="Block1">
    - <position x="710" y="275"/>
    + <block localId="36" width="125" height="90" typeName="python_poll" instanceName="setSpinCtrlValue" executionOrderId="0">
    + <position x="735" y="425"/>
    <inputVariables>
    <variable formalParameter="TRIG">
    <connectionPointIn>
    <relPosition x="0" y="35"/>
    <connection refLocalId="34" formalParameter="ENO">
    - <position x="710" y="310"/>
    - <position x="660" y="310"/>
    + <position x="735" y="460"/>
    + <position x="685" y="460"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -326,10 +317,10 @@
    <connectionPointIn>
    <relPosition x="0" y="70"/>
    <connection refLocalId="34" formalParameter="OUT">
    - <position x="710" y="345"/>
    - <position x="690" y="345"/>
    - <position x="690" y="330"/>
    - <position x="660" y="330"/>
    + <position x="735" y="495"/>
    + <position x="715" y="495"/>
    + <position x="715" y="480"/>
    + <position x="685" y="480"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -348,17 +339,15 @@
    </variable>
    </outputVariables>
    </block>
    - <block localId="37" width="125" height="45" typeName="INT_TO_BOOL">
    - <position x="870" y="170"/>
    + <block localId="37" width="125" height="45" typeName="INT_TO_BOOL" executionOrderId="0">
    + <position x="870" y="255"/>
    <inputVariables>
    <variable formalParameter="IN">
    <connectionPointIn>
    <relPosition x="0" y="30"/>
    <connection refLocalId="30" formalParameter="OUT">
    - <position x="870" y="200"/>
    - <position x="845" y="200"/>
    - <position x="845" y="185"/>
    - <position x="815" y="185"/>
    + <position x="870" y="285"/>
    + <position x="815" y="285"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -372,26 +361,24 @@
    </variable>
    </outputVariables>
    </block>
    - <block localId="38" width="80" height="65" typeName="AND">
    - <position x="1050" y="135"/>
    + <block localId="38" width="80" height="95" typeName="AND" executionOrderId="0">
    + <position x="1050" y="210"/>
    <inputVariables>
    <variable formalParameter="IN1">
    <connectionPointIn>
    - <relPosition x="0" y="30"/>
    + <relPosition x="0" y="40"/>
    <connection refLocalId="30" formalParameter="ENO">
    - <position x="1050" y="165"/>
    - <position x="815" y="165"/>
    + <position x="1050" y="250"/>
    + <position x="815" y="250"/>
    </connection>
    </connectionPointIn>
    </variable>
    <variable formalParameter="IN2">
    <connectionPointIn>
    - <relPosition x="0" y="55"/>
    + <relPosition x="0" y="75"/>
    <connection refLocalId="37" formalParameter="OUT">
    - <position x="1050" y="190"/>
    - <position x="1025" y="190"/>
    - <position x="1025" y="200"/>
    - <position x="995" y="200"/>
    + <position x="1050" y="285"/>
    + <position x="995" y="285"/>
    </connection>
    </connectionPointIn>
    </variable>
    @@ -400,18 +387,27 @@
    <outputVariables>
    <variable formalParameter="OUT">
    <connectionPointOut>
    - <relPosition x="80" y="30"/>
    + <relPosition x="80" y="40"/>
    </connectionPointOut>
    </variable>
    </outputVariables>
    </block>
    - <inVariable localId="39" height="30" width="60">
    - <position x="5" y="335"/>
    + <inVariable localId="39" height="30" width="60" executionOrderId="0" negated="false">
    + <position x="30" y="485"/>
    <connectionPointOut>
    <relPosition x="60" y="15"/>
    </connectionPointOut>
    <expression>INT#1</expression>
    </inVariable>
    + <comment localId="101" height="115" width="680">
    + <position x="10" y="30"/>
    + <content>
    + <xhtml:p><![CDATA[This example shows how IEC program in PLC can interact with UI created using wxGlade.
    +
    +"WxGlade GUI" is extension to build user interface for PLC using wxGlade.
    +To edit user interface click on "WxGlade" icon in extension settings.]]></xhtml:p>
    + </content>
    + </comment>
    </FBD>
    </body>
    </pou>