beremiz

Fix bug Variable and Continuation BoundingBox not refreshed when using Type modification shortcuts

2012-10-31, Laurent Bessard
8737f1554494
Fix bug Variable and Continuation BoundingBox not refreshed when using Type modification shortcuts
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.plcopen.org/xml/tc6.xsd"
xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xhtml="http://www.w3.org/1999/xhtml">
<fileHeader companyName="beremiz"
productName="Beremiz"
productVersion="0.0"
creationDateTime="2008-12-14T16:21:19"/>
<contentHeader name="Beremiz Python Support Tests"
modificationDateTime="2012-10-23T00:54:38">
<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>
<dataType name="CPLX_TYPE">
<baseType>
<struct>
<variable name="FIRSTBYTE">
<type>
<SINT/>
</type>
</variable>
<variable name="SECONDBYTE">
<type>
<SINT/>
</type>
</variable>
</struct>
</baseType>
</dataType>
</dataTypes>
<pous>
<pou name="main_pytest" pouType="program">
<interface>
<localVars>
<variable name="pytest_var1">
<type>
<string/>
</type>
</variable>
<variable name="pytest_var2">
<type>
<BOOL/>
</type>
</variable>
<variable name="py1">
<type>
<derived name="python_eval"/>
</type>
</variable>
<variable name="Block1">
<type>
<derived name="python_eval"/>
</type>
</variable>
<variable name="Block2">
<type>
<derived name="python_eval"/>
</type>
</variable>
<variable name="Block3">
<type>
<derived name="python_eval"/>
</type>
</variable>
<variable name="pytest_var3">
<type>
<BOOL/>
</type>
</variable>
<variable name="FromC">
<type>
<SINT/>
</type>
</variable>
<variable name="C_Pragma0">
<type>
<derived name="C_Pragma"/>
</type>
</variable>
</localVars>
<localVars>
<variable name="TestInput" address="%IB1.0">
<type>
<SINT/>
</type>
</variable>
<variable name="TestOutput" address="%QB1.0">
<type>
<SINT/>
</type>
</variable>
</localVars>
<localVars>
<variable name="FromInput">
<type>
<SINT/>
</type>
</variable>
</localVars>
</interface>
<body>
<FBD>
<inVariable localId="4" height="30" width="160">
<position x="295" y="230"/>
<connectionPointOut>
<relPosition x="160" y="15"/>
</connectionPointOut>
<expression>'time.sleep(1)'</expression>
</inVariable>
<block localId="5" width="125" height="80" typeName="python_eval" instanceName="py1">
<position x="650" y="180"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="7" formalParameter="OUT">
<position x="650" y="215"/>
<position x="285" y="215"/>
<position x="285" y="260"/>
<position x="250" y="260"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="CODE">
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="4">
<position x="650" y="245"/>
<position x="455" y="245"/>
</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="65"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<block localId="7" width="70" height="45" typeName="NOT">
<position x="180" y="230"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="3">
<position x="180" y="260"/>
<position x="155" y="260"/>
</connection>
</connectionPointIn>
</variable>
</inputVariables>
<inOutVariables/>
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
<relPosition x="70" y="30"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inOutVariable localId="3" height="30" width="120">
<position x="35" y="245"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="7" formalParameter="OUT">
<position x="35" y="260"/>
<position x="25" y="260"/>
<position x="25" y="220"/>
<position x="270" y="220"/>
<position x="270" y="260"/>
<position x="250" y="260"/>
</connection>
</connectionPointIn>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>pytest_var2</expression>
</inOutVariable>
<block localId="8" width="125" height="80" typeName="python_eval" instanceName="Block1">
<position x="650" y="295"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="7" formalParameter="OUT">
<position x="650" y="330"/>
<position x="285" y="330"/>
<position x="285" y="260"/>
<position x="250" y="260"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="CODE">
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="9">
<position x="650" y="360"/>
<position x="585" y="360"/>
</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="65"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="9" height="30" width="290">
<position x="295" y="345"/>
<connectionPointOut>
<relPosition x="290" y="15"/>
</connectionPointOut>
<expression>'sys.stdout.write("FBID :"+str(FBID)+"\n")'</expression>
</inVariable>
<inVariable localId="11" height="30" width="290">
<position x="295" y="465"/>
<connectionPointOut>
<relPosition x="290" y="15"/>
</connectionPointOut>
<expression>'PLCBinary.Simple_C_Call(5678)'</expression>
</inVariable>
<block localId="12" width="125" height="80" typeName="python_eval" instanceName="Block2">
<position x="650" y="417"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="33"/>
<connection refLocalId="7" formalParameter="OUT">
<position x="650" y="450"/>
<position x="285" y="450"/>
<position x="285" y="260"/>
<position x="250" y="260"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="CODE">
<connectionPointIn>
<relPosition x="0" y="63"/>
<connection refLocalId="11">
<position x="650" y="480"/>
<position x="585" y="480"/>
</connection>
</connectionPointIn>
</variable>
</inputVariables>
<inOutVariables/>
<outputVariables>
<variable formalParameter="ACK">
<connectionPointOut>
<relPosition x="125" y="33"/>
</connectionPointOut>
</variable>
<variable formalParameter="RESULT">
<connectionPointOut>
<relPosition x="125" y="63"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="14" height="30" width="290">
<position x="290" y="590"/>
<connectionPointOut>
<relPosition x="290" y="15"/>
</connectionPointOut>
<expression>'MyPythonFunc(42)'</expression>
</inVariable>
<block localId="15" width="125" height="80" typeName="python_eval" instanceName="Block3">
<position x="650" y="542"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="33"/>
<connection refLocalId="7" formalParameter="OUT">
<position x="650" y="575"/>
<position x="285" y="575"/>
<position x="285" y="260"/>
<position x="250" y="260"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="CODE">
<connectionPointIn>
<relPosition x="0" y="63"/>
<connection refLocalId="14">
<position x="650" y="605"/>
<position x="580" y="605"/>
</connection>
</connectionPointIn>
</variable>
</inputVariables>
<inOutVariables/>
<outputVariables>
<variable formalParameter="ACK">
<connectionPointOut>
<relPosition x="125" y="33"/>
</connectionPointOut>
</variable>
<variable formalParameter="RESULT">
<connectionPointOut>
<relPosition x="125" y="63"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<comment localId="16" height="90" width="680">
<position x="50" y="25"/>
<content>
<![CDATA[This example test that, despite of 2T period clock stimulating TRIG pin of pyth_eval blocks, blocks keep executing one after the other, in respect of execution order.]]>
</content>
</comment>
<block localId="17" width="80" height="120" typeName="MUX">
<position x="1065" y="495"/>
<inputVariables>
<variable formalParameter="K">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="18">
<position x="1065" y="525"/>
<position x="1030" y="525"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN0">
<connectionPointIn>
<relPosition x="0" y="50"/>
<connection refLocalId="5" formalParameter="RESULT">
<position x="1065" y="545"/>
<position x="905" y="545"/>
<position x="905" y="245"/>
<position x="775" y="245"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="8" formalParameter="RESULT">
<position x="1065" y="565"/>
<position x="890" y="565"/>
<position x="890" y="360"/>
<position x="775" y="360"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN2">
<connectionPointIn>
<relPosition x="0" y="90"/>
<connection refLocalId="12" formalParameter="RESULT">
<position x="1065" y="585"/>
<position x="875" y="585"/>
<position x="875" y="480"/>
<position x="775" y="480"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN3">
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="15" formalParameter="RESULT">
<position x="1065" y="605"/>
<position x="775" y="605"/>
</connection>
</connectionPointIn>
</variable>
</inputVariables>
<inOutVariables/>
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
<relPosition x="80" y="30"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="18" height="30" width="20">
<position x="1010" y="510"/>
<connectionPointOut>
<relPosition x="20" y="15"/>
</connectionPointOut>
<expression>3</expression>
</inVariable>
<outVariable localId="19" height="35" width="125">
<position x="1185" y="510"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="17" formalParameter="OUT">
<position x="1185" y="525"/>
<position x="1145" y="525"/>
</connection>
</connectionPointIn>
<expression>pytest_var1</expression>
</outVariable>
<block localId="21" width="80" height="120" typeName="MUX">
<position x="985" y="165"/>
<inputVariables>
<variable formalParameter="K">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="22">
<position x="985" y="195"/>
<position x="950" y="195"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN0">
<connectionPointIn>
<relPosition x="0" y="50"/>
<connection refLocalId="5" formalParameter="ACK">
<position x="985" y="215"/>
<position x="775" y="215"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="8" formalParameter="ACK">
<position x="985" y="235"/>
<position x="805" y="235"/>
<position x="805" y="330"/>
<position x="775" y="330"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN2">
<connectionPointIn>
<relPosition x="0" y="90"/>
<connection refLocalId="12" formalParameter="ACK">
<position x="985" y="255"/>
<position x="820" y="255"/>
<position x="820" y="450"/>
<position x="775" y="450"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN3">
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="15" formalParameter="ACK">
<position x="985" y="275"/>
<position x="835" y="275"/>
<position x="835" y="575"/>
<position x="775" y="575"/>
</connection>
</connectionPointIn>
</variable>
</inputVariables>
<inOutVariables/>
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
<relPosition x="80" y="30"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="22" height="30" width="20">
<position x="930" y="180"/>
<connectionPointOut>
<relPosition x="20" y="15"/>
</connectionPointOut>
<expression>3</expression>
</inVariable>
<outVariable localId="23" height="35" width="125">
<position x="1150" y="180"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="21" formalParameter="OUT">
<position x="1150" y="195"/>
<position x="1065" y="195"/>
</connection>
</connectionPointIn>
<expression>pytest_var3</expression>
</outVariable>
<outVariable localId="25" height="30" width="60">
<position x="520" y="655"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="26" formalParameter="OUT">
<position x="520" y="670"/>
<position x="465" y="670"/>
</connection>
</connectionPointIn>
<expression>FromC</expression>
</outVariable>
<inVariable localId="1" height="30" width="30">
<position x="305" y="655"/>
<connectionPointOut>
<relPosition x="30" y="15"/>
</connectionPointOut>
<expression>23</expression>
</inVariable>
<block localId="26" width="80" height="45" typeName="C_Pragma" instanceName="C_Pragma0">
<position x="385" y="640"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="1">
<position x="385" y="670"/>
<position x="335" y="670"/>
</connection>
</connectionPointIn>
</variable>
</inputVariables>
<inOutVariables/>
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
<relPosition x="80" y="30"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="27" height="30" width="75">
<position x="305" y="770"/>
<connectionPointOut>
<relPosition x="75" y="15"/>
</connectionPointOut>
<expression>TestInput</expression>
</inVariable>
<outVariable localId="28" height="30" width="90">
<position x="395" y="705"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="2">
<position x="395" y="720"/>
<position x="340" y="720"/>
</connection>
</connectionPointIn>
<expression>TestOutput</expression>
</outVariable>
<outVariable localId="29" height="30" width="85">
<position x="415" y="770"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="27">
<position x="415" y="785"/>
<position x="380" y="785"/>
</connection>
</connectionPointIn>
<expression>FromInput</expression>
</outVariable>
<inVariable localId="2" height="30" width="30">
<position x="310" y="705"/>
<connectionPointOut>
<relPosition x="30" y="15"/>
</connectionPointOut>
<expression>10</expression>
</inVariable>
<comment localId="30" height="90" width="405">
<position x="245" y="825"/>
<content>
<![CDATA[You will be ready to use beremiz with C and Python when you will understand why "FromInput" is equal to 75.
Enjoy. ]]>
</content>
</comment>
<comment localId="31" height="60" width="345">
<position x="295" y="265"/>
<content>
<![CDATA[Sleep here is bad. It blocks other py_eval instances. Whith a wxGlade GUI, GUI freeze for a second.]]>
</content>
</comment>
<comment localId="6" height="60" width="345">
<position x="295" y="380"/>
<content>
<![CDATA[Prints FBID to stdout of PLC runtime. FBID is a unique reference to py_eval instance.]]>
</content>
</comment>
<comment localId="10" height="60" width="345">
<position x="295" y="500"/>
<content>
<![CDATA[Simple_C_Call is declared in C_File "1.x:c_code". See python ctypes manual for details on typing.]]>
</content>
</comment>
<comment localId="32" height="105" width="235">
<position x="25" y="285"/>
<content>
<![CDATA[Fast clock, at least faster that sleep(1). See what happens when python takes time to answer : PLC continues.]]>
</content>
</comment>
</FBD>
</body>
</pou>
<pou name="C_Pragma" pouType="functionBlock">
<interface>
<outputVars>
<variable name="OUT">
<type>
<SINT/>
</type>
</variable>
</outputVars>
<inputVars>
<variable name="IN">
<type>
<SINT/>
</type>
</variable>
</inputVars>
<localVars>
<variable name="COORDS">
<type>
<array>
<dimension lower="0" upper="5"/>
<baseType>
<SINT/>
</baseType>
</array>
</type>
<initialValue>
<arrayValue>
<value>
<simpleValue value="54"/>
</value>
<value>
<simpleValue value="55"/>
</value>
<value>
<simpleValue value="56"/>
</value>
<value>
<simpleValue value="57"/>
</value>
<value>
<simpleValue value="58"/>
</value>
<value>
<simpleValue value="59"/>
</value>
</arrayValue>
</initialValue>
</variable>
<variable name="SMURF">
<type>
<derived name="CPLX_TYPE"/>
</type>
</variable>
</localVars>
</interface>
<body>
<ST>
<![CDATA[(* hereafter is a C pragma accessing FB interface in a clean way *)
{{
char toPLC;
char fromPLC = GetFbVar(IN);
if(PLC_C_Call(fromPLC, &toPLC)){
SetFbVar(OUT, toPLC);
}
if(0){
/* that code demonstrate C access to complex types */
char somebyte = GetFbVar(COORDS, .table[3]);
SetFbVar(SMURF, somebyte, .FIRSTBYTE);
SetFbVar(COORDS, somebyte, .table[4]);
}
}}
(* If you do not use __GET_VAR and _SET_VAR macro, expect unexpected *)
]]>
</ST>
</body>
</pou>
</pous>
</types>
<instances>
<configurations>
<configuration name="conf_pytest">
<resource name="res_pytest">
<task name="pytest_task" interval="t#100ms" priority="0"/>
<pouInstance name="pytest_instance" typeName="main_pytest"/>
</resource>
</configuration>
</configurations>
</instances>
</project>