# HG changeset patch
# User etisserant
# Date 1232350776 -3600
# Node ID 6d2cc92eee0b9414d4b5f8fa29625dd9b8e62a42
# Parent 9a731a4354035c3024a3e5f8511e6e2c5c4778b3
Added wxGlade test
diff -r 9a731a435403 -r 6d2cc92eee0b tests/wxGlade/beremiz.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/wxGlade/beremiz.xml Mon Jan 19 08:39:36 2009 +0100
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BeremizRoot URI_location="LOCAL://">
+ <TargetType>
+ <Linux CFLAGS="-g" LDFLAGS="-g"/>
+ </TargetType>
+</BeremizRoot>
diff -r 9a731a435403 -r 6d2cc92eee0b tests/wxGlade/hmi.wxg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/wxGlade/hmi.wxg Mon Jan 19 08:39:36 2009 +0100
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.6.3 on Sun Jan 18 22:23:21 2009 -->
+
+<application path="" name="" class="" option="0" language="python" top_window="frame_1" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.8" is_template="0">
+ <object class="HMIFrame" name="frame_1" base="EditFrame">
+ <style>wxDEFAULT_FRAME_STYLE</style>
+ <title>frame_1</title>
+ <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>0</option>
+ <object class="wxSpinCtrl" name="spin_ctrl_1" base="EditSpinCtrl">
+ <range>0, 10000</range>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>0</option>
+ <object class="wxCheckBox" name="checkbox_1" base="EditCheckBox">
+ <label>checkbox_1</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>0</option>
+ <object class="wxStaticText" name="label_1" base="EditStaticText">
+ <attribute>1</attribute>
+ <label>GUI modifiée !</label>
+ </object>
+ </object>
+ </object>
+ </object>
+</application>
diff -r 9a731a435403 -r 6d2cc92eee0b tests/wxGlade/plc.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/wxGlade/plc.xml Mon Jan 19 08:39:36 2009 +0100
@@ -0,0 +1,430 @@
+<?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="LOLITECH"
+ productName="Beremiz"
+ productVersion="0.0"
+ creationDateTime="2008-12-14 16:21:19"/>
+ <contentHeader name="Beremiz Python Support Tests"
+ modificationDateTime="2009-01-18 18:40:44">
+ <coordinateInfo>
+ <pageSize x="1024" y="1024"/>
+ <fbd>
+ <scaling x="5" y="5"/>
+ </fbd>
+ <ld>
+ <scaling x="5" y="5"/>
+ </ld>
+ <sfc>
+ <scaling x="5" y="5"/>
+ </sfc>
+ </coordinateInfo>
+ </contentHeader>
+ <types>
+ <dataTypes/>
+ <pous>
+ <pou name="main_pytest" pouType="program">
+ <interface>
+ <localVars>
+ <variable name="python1">
+ <type>
+ <derived name="python_poll"/>
+ </type>
+ </variable>
+ <variable name="counter">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ <variable name="Block1">
+ <type>
+ <derived name="python_poll"/>
+ </type>
+ </variable>
+ </localVars>
+ </interface>
+ <body>
+ <FBD>
+ <block localId="24" width="125" height="90" typeName="python_poll" instanceName="python1">
+ <position x="480" y="115"/>
+ <inputVariables>
+ <variable formalParameter="TRIG">
+ <connectionPointIn>
+ <relPosition x="0" y="35"/>
+ <connection refLocalId="25">
+ <position x="480" y="150"/>
+ <position x="420" y="150"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="CODE">
+ <connectionPointIn>
+ <relPosition x="0" y="70"/>
+ <connection refLocalId="26">
+ <position x="480" y="185"/>
+ <position x="420" y="185"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="ACK">
+ <connectionPointOut>
+ <relPosition x="125" y="35"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="RESULT">
+ <connectionPointOut>
+ <relPosition x="125" y="70"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="25" height="30" width="100">
+ <position x="320" y="135"/>
+ <connectionPointOut>
+ <relPosition x="100" y="15"/>
+ </connectionPointOut>
+ <expression>BOOL#TRUE</expression>
+ </inVariable>
+ <inVariable localId="26" height="30" width="400">
+ <position x="20" y="170"/>
+ <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"/>
+ <connectionPointOut>
+ <relPosition x="40" y="15"/>
+ </connectionPointOut>
+ <expression>')'</expression>
+ </inVariable>
+ <inVariable localId="28" height="30" width="350">
+ <position x="125" y="265"/>
+ <connectionPointOut>
+ <relPosition x="350" 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"/>
+ <inputVariables>
+ <variable formalParameter="EN">
+ <connectionPointIn>
+ <relPosition x="0" y="30"/>
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN">
+ <connectionPointIn>
+ <relPosition x="0" y="50"/>
+ <connection refLocalId="24" formalParameter="RESULT">
+ <position x="670" y="185"/>
+ <position x="605" y="185"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="ENO">
+ <connectionPointOut>
+ <relPosition x="145" y="30"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="145" y="50"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="32" width="80" height="80" typeName="ADD">
+ <position x="110" y="300"/>
+ <inputVariables>
+ <variable formalParameter="EN">
+ <connectionPointIn>
+ <relPosition x="0" y="30"/>
+ <connection refLocalId="38" formalParameter="OUT">
+ <position x="110" y="330"/>
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="50"/>
+ <connection refLocalId="39">
+ <position x="110" y="350"/>
+ <position x="65" y="350"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN2">
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="ENO">
+ <connectionPointOut>
+ <relPosition x="80" y="30"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="80" y="50"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="34" width="80" height="100" typeName="CONCAT">
+ <position x="580" y="280"/>
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="50"/>
+ <connection refLocalId="28">
+ <position x="580" y="330"/>
+ <position x="560" y="330"/>
+ <position x="560" y="280"/>
+ <position x="475" y="280"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN2">
+ <connectionPointIn>
+ <relPosition x="0" y="70"/>
+ <connection refLocalId="35" formalParameter="OUT">
+ <position x="580" y="350"/>
+ <position x="475" y="350"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN3">
+ <connectionPointIn>
+ <relPosition x="0" y="90"/>
+ <connection refLocalId="27">
+ <position x="580" y="370"/>
+ <position x="550" y="370"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="ENO">
+ <connectionPointOut>
+ <relPosition x="80" y="30"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="80" y="50"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inOutVariable localId="33" height="35" width="85">
+ <position x="210" y="335"/>
+ <connectionPointIn>
+ <relPosition x="0" y="15"/>
+ <connection refLocalId="32" formalParameter="OUT">
+ <position x="210" y="350"/>
+ <position x="190" y="350"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="85" y="15"/>
+ </connectionPointOut>
+ <expression>counter</expression>
+ </inOutVariable>
+ <block localId="35" width="145" height="60" typeName="INT_TO_STRING">
+ <position x="330" y="300"/>
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN">
+ <connectionPointIn>
+ <relPosition x="0" y="50"/>
+ <connection refLocalId="33">
+ <position x="330" y="350"/>
+ <position x="295" y="350"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="ENO">
+ <connectionPointOut>
+ <relPosition x="145" y="30"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="145" y="50"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="36" width="125" height="90" typeName="python_poll" instanceName="Block1">
+ <position x="710" y="275"/>
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="CODE">
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="ACK">
+ <connectionPointOut>
+ <relPosition x="125" y="35"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="RESULT">
+ <connectionPointOut>
+ <relPosition x="125" y="70"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="37" width="125" height="45" typeName="INT_TO_BOOL">
+ <position x="870" y="170"/>
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="125" y="30"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="38" width="80" height="65" typeName="AND">
+ <position x="1050" y="135"/>
+ <inputVariables>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="30"/>
+ <connection refLocalId="30" formalParameter="ENO">
+ <position x="1050" y="165"/>
+ <position x="815" y="165"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN2">
+ <connectionPointIn>
+ <relPosition x="0" y="55"/>
+ <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"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="80" y="30"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="39" height="30" width="60">
+ <position x="5" y="335"/>
+ <connectionPointOut>
+ <relPosition x="60" y="15"/>
+ </connectionPointOut>
+ <expression>INT#1</expression>
+ </inVariable>
+ </FBD>
+ </body>
+ </pou>
+ </pous>
+ </types>
+ <instances>
+ <configurations>
+ <configuration name="conf_pytest">
+ <resource name="res_pytest">
+ <task name="pytest_task" interval="00:00:00.100000" priority="0"/>
+ <pouInstance name="pytest_instance" type="main_pytest"/>
+ </resource>
+ </configuration>
+ </configurations>
+ </instances>
+</project>
diff -r 9a731a435403 -r 6d2cc92eee0b tests/wxGlade/runtime.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/wxGlade/runtime.py Mon Jan 19 08:39:36 2009 +0100
@@ -0,0 +1,5 @@
+import time,sys
+def myprintfunc(arg):
+ print arg
+ sys.stdout.flush()
+ return arg