--- a/tests/svghmi/plc.xml Mon Aug 03 16:34:44 2020 +0200
+++ b/tests/svghmi/plc.xml Mon Aug 03 18:22:19 2020 +0200
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2019-08-06T14:23:42"/>
- <contentHeader name="Unnamed" modificationDateTime="2020-08-03T16:16:26">
+ <contentHeader name="Unnamed" modificationDateTime="2020-08-03T17:17:02"> @@ -50,6 +50,26 @@
<derived name="PumpControl"/>
+ <variable name="Pump4"> + <derived name="PumpControl"/> + <variable name="Pump5"> + <derived name="PumpControl"/> + <variable name="Pump6"> + <derived name="PumpControl"/> + <variable name="Pump7"> + <derived name="PumpControl"/> @@ -131,6 +151,78 @@
+ <block localId="6" typeName="PumpControl" instanceName="Pump4" executionOrderId="0" height="40" width="127"> + <position x="595" y="315"/> + <variable formalParameter="TargetPressure"> + <relPosition x="0" y="30"/> + <connection refLocalId="5"> + <position x="595" y="345"/> + <position x="582" y="345"/> + <position x="582" y="80"/> + <position x="570" y="80"/> + <block localId="7" typeName="PumpControl" instanceName="Pump5" executionOrderId="0" height="40" width="127"> + <position x="595" y="395"/> + <variable formalParameter="TargetPressure"> + <relPosition x="0" y="30"/> + <connection refLocalId="5"> + <position x="595" y="425"/> + <position x="582" y="425"/> + <position x="582" y="80"/> + <position x="570" y="80"/> + <block localId="8" typeName="PumpControl" instanceName="Pump6" executionOrderId="0" height="40" width="127"> + <position x="595" y="475"/> + <variable formalParameter="TargetPressure"> + <relPosition x="0" y="30"/> + <connection refLocalId="5"> + <position x="595" y="505"/> + <position x="582" y="505"/> + <position x="582" y="80"/> + <position x="570" y="80"/> + <block localId="9" typeName="PumpControl" instanceName="Pump7" executionOrderId="0" height="40" width="127"> + <position x="595" y="545"/> + <variable formalParameter="TargetPressure"> + <relPosition x="0" y="30"/> + <connection refLocalId="5"> + <position x="595" y="575"/> + <position x="582" y="575"/> + <position x="582" y="80"/> + <position x="570" y="80"/> --- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg Mon Aug 03 16:34:44 2020 +0200
+++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg Mon Aug 03 18:22:19 2020 +0200
@@ -167,16 +167,16 @@
inkscape:document-units="px"
- inkscape:current-layer="g1338"
+ inkscape:current-layer="g6077"
- inkscape:cx="1424.4975"
- inkscape:cy="65.457417"
+ inkscape:zoom="1.4142136" + inkscape:cx="1970.3359" + inkscape:cy="368.15797" inkscape:window-width="2419"
inkscape:window-height="1266"
- inkscape:window-x="1158"
- inkscape:window-y="651"
+ inkscape:window-x="1197" + inkscape:window-y="563" inkscape:window-maximized="0"
inkscape:guide-bbox="true" />
@@ -3239,7 +3239,7 @@
inkscape:connector-curvature="0"
d="M 130.96206,4.0725977 79.111776,-41.363223"
- style="fill:none;fill-rule:evenodd;stroke:#ff3000;stroke-width:2.96333337;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0, 32.59666666999999762;stroke-dashoffset:29.63333321;stroke-opacity:1;marker-end:url(#marker1656)" />
+ style="fill:none;fill-rule:evenodd;stroke:#ff3000;stroke-width:2.96333337;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0, 32.59666667;stroke-dashoffset:29.63333321;stroke-opacity:1;marker-end:url(#marker1656)" /> style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -3942,154 +3942,262 @@
- transform="matrix(0.57180538,0,0,0.57180538,1024.0513,-317.49049)"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP0"
+ inkscape:label="HMI:ForEach:PUMP@/"> - inkscape:label="button"
- inkscape:label="button"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ inkscape:label="PUMP:1"> + transform="matrix(0.57180538,0,0,0.57180538,1024.0513,-317.49049)" + inkscape:label="HMI:Jump:RelativePageTest@/PUMP0" + inkscape:label="button" + inkscape:label="button" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="setting_jmp"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3">Pump</tspan></text> + style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579209px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP0/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.24579209px">8888</tspan></text>
- style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="setting_jmp"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1460-3">Pump 0</tspan></text>
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP1"
- transform="matrix(0.57180538,0,0,0.57180538,1184.0513,-317.49049)">
- inkscape:label="button">
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- inkscape:label="button" />
+ inkscape:label="PUMP:2"> + inkscape:label="HMI:Jump:RelativePageTest@/PUMP1" + transform="matrix(0.57180538,0,0,0.57180538,1184.0513,-317.49049)"> + inkscape:label="button"> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + inkscape:label="button" /> + inkscape:label="setting_jmp" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1477-6">Pump</tspan></text> + style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP1/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
- inkscape:label="setting_jmp"
- style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- xml:space="preserve"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- sodipodi:role="line">Pump 1</tspan><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1477-6" /></text>
- transform="matrix(0.57180538,0,0,0.57180538,1344.0513,-317.49049)"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP2"
- inkscape:label="button"
- inkscape:label="button"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ inkscape:label="PUMP:3"> + transform="matrix(0.57180538,0,0,0.57180538,1344.0513,-317.49049)" + inkscape:label="HMI:Jump:RelativePageTest@/PUMP2" + inkscape:label="button" + inkscape:label="button" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="setting_jmp"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Pump</tspan></text> + style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP2/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
+ inkscape:label="PUMP:4"> + inkscape:label="HMI:Jump:RelativePageTest@/PUMP3" + transform="matrix(0.57180538,0,0,0.57180538,1504.0513,-317.49049)"> + inkscape:label="button"> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + inkscape:label="button" /> + inkscape:label="setting_jmp" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1511-4">Pump</tspan><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1503-1" /></text> + style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP3/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text> + inkscape:label="PUMP:+1" + transform="matrix(0.57180538,0,0,0.57180538,1461.2541,-321.48847)"> + style="fill:#000000;fill-opacity:1;stroke:#ff0000;stroke-width:1.74884677" - style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="setting_jmp"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1493-6">Pump 2</tspan><tspan
+ style="font-style:normal;font-weight:normal;font-size:42.81540298px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.0703851"
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" /></text>
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP3"
- transform="matrix(0.57180538,0,0,0.57180538,1504.0513,-317.49049)">
- inkscape:label="button">
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- inkscape:label="button" />
+ style="fill:#ffffff;stroke-width:1.0703851">+1</tspan></text>
+ transform="matrix(0.57180538,0,0,0.57180538,752.02604,-322.19558)" + inkscape:label="PUMP:-1"> + style="fill:#000000;fill-opacity:1;stroke:#ff0000;stroke-width:1.74884677" /> - inkscape:label="setting_jmp"
- style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ style="font-style:normal;font-weight:normal;font-size:42.81540298px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.0703851" xml:space="preserve"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1511-4">Pump 3</tspan><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1503-1" /></text>
+ style="fill:#ffffff;stroke-width:1.0703851" + sodipodi:role="line">-1</tspan></text>