--- a/tests/svghmi/plc.xml Wed Dec 02 14:31:57 2020 +0100
+++ b/tests/svghmi/plc.xml Wed Dec 02 14:32:56 2020 +0100
@@ -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-10-30T20:07:00">
+ <contentHeader name="Unnamed" modificationDateTime="2020-12-01T09:52:25"> @@ -748,6 +748,161 @@
+ <block localId="28" typeName="EQ" executionOrderId="0" height="60" width="65"> + <position x="410" y="430"/> + <variable formalParameter="IN1"> + <relPosition x="0" y="30"/> + <connection refLocalId="36"> + <position x="418" y="460"/> + <position x="401" y="460"/> + <position x="401" y="435"/> + <position x="380" y="435"/> + <variable formalParameter="IN2"> + <relPosition x="0" y="50"/> + <connection refLocalId="29"> + <position x="410" y="480"/> + <position x="367" y="480"/> + <position x="367" y="475"/> + <position x="325" y="475"/> + <variable formalParameter="OUT"> + <relPosition x="65" y="30"/> + <inVariable localId="29" executionOrderId="0" height="30" width="20" negated="false"> + <position x="305" y="460"/> + <relPosition x="20" y="15"/> + <expression>0</expression> + <inVariable localId="32" executionOrderId="0" height="30" width="20" negated="false"> + <position x="765" y="505"/> + <relPosition x="20" y="15"/> + <expression>0</expression> + <outVariable localId="31" executionOrderId="0" height="30" width="75" negated="false"> + <position x="925" y="460"/> + <relPosition x="0" y="15"/> + <connection refLocalId="33" formalParameter="OUT"> + <position x="925" y="475"/> + <position x="890" y="475"/> + <expression>Sloth</expression> + <block localId="33" typeName="MUX" executionOrderId="0" height="80" width="65"> + <position x="825" y="445"/> + <variable formalParameter="K"> + <relPosition x="0" y="30"/> + <connection refLocalId="34" formalParameter="OUT"> + <position x="825" y="475"/> + <position x="685" y="475"/> + <position x="685" y="465"/> + <position x="675" y="465"/> + <variable formalParameter="IN0"> + <relPosition x="0" y="50"/> + <connection refLocalId="30"> + <position x="825" y="495"/> + <position x="800" y="495"/> + <position x="800" y="485"/> + <position x="790" y="485"/> + <variable formalParameter="IN1"> + <relPosition x="0" y="70"/> + <connection refLocalId="32"> + <position x="825" y="515"/> + <position x="795" y="515"/> + <position x="795" y="520"/> + <position x="785" y="520"/> + <variable formalParameter="OUT"> + <relPosition x="65" y="30"/> + <inVariable localId="30" executionOrderId="0" height="30" width="75" negated="false"> + <position x="715" y="470"/> + <relPosition x="75" y="15"/> + <expression>Sloth</expression> + <block localId="34" typeName="BOOL_TO_SINT" executionOrderId="0" height="40" width="110"> + <position x="565" y="435"/> + <variable formalParameter="IN"> + <relPosition x="0" y="30"/> + <connection refLocalId="28" formalParameter="OUT"> + <position x="565" y="465"/> + <position x="520" y="465"/> + <position x="520" y="460"/> + <position x="475" y="460"/> + <variable formalParameter="OUT"> + <relPosition x="110" y="30"/> + <connector name="Connection0" localId="35" height="25" width="125"> + <position x="400" y="140"/> + <relPosition x="0" y="10"/> + <connection refLocalId="7" formalParameter="OUT"> + <position x="400" y="150"/> + <position x="375" y="150"/> + <position x="375" y="115"/> + <position x="360" y="115"/> + <continuation name="Connection0" localId="36" height="25" width="125"> + <position x="255" y="425"/> + <relPosition x="125" y="10"/> --- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg Wed Dec 02 14:31:57 2020 +0100
+++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg Wed Dec 02 14:32:56 2020 +0100
@@ -200,9 +200,9 @@
inkscape:current-layer="hmi0"
- inkscape:zoom="1.0913159"
- inkscape:cx="363.63068"
+ inkscape:zoom="0.27282898" + inkscape:cx="646.17826" + inkscape:cy="652.93449" inkscape:window-width="1848"
inkscape:window-height="1016"
@@ -210,6 +210,15 @@
inkscape:window-maximized="1"
inkscape:guide-bbox="true" />
+ transform="translate(1480,800)" + inkscape:label="HMI:Page:RelativePageTest@/PUMP0" /> sodipodi:insensitive="true"
inkscape:label="HMI:Page:Conf"
@@ -257,8 +266,7 @@
- inkscape:label="HMI:Page:Home"
- sodipodi:insensitive="true" />
+ inkscape:label="HMI:Page:Home" /> inkscape:label="HMI:Jump:Conf"
@@ -420,7 +428,7 @@
sodipodi:role="line">8888</tspan></text>
- transform="matrix(2.1611542,0,0,2.1611542,182.76714,468.92423)"
+ transform="matrix(2.1611542,0,0,2.1611542,142.76714,468.92423)" inkscape:label="HMI:Meter@/PUMP0/SLOTH">
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;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#3ee800;stroke-width:26.45833397;stroke-miterlimit:4;stroke-dasharray:2.64583333, 2.64583333;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
@@ -518,13 +526,13 @@
style="font-style:normal;font-weight:normal;font-size:22.87221527px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.57180536px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:label="pressure_label"><tspan
style="fill:#ff6600;stroke-width:0.57180536px">Pressure</tspan></text>
@@ -2386,32 +2394,33 @@
inkscape:label="HMI:DropDown:1:2:3:4:5:6:7:8:9:10@/SELECTION"
- transform="matrix(0.28590269,0,0,0.28590269,248.76957,33.129558)">
+ transform="matrix(0.81491208,0,0,0.81491208,243.6641,-510.30491)" + style="stroke-width:0.35083869"> - 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:#53676c;fill-opacity:1;fill-rule:nonzero;stroke:none;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="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:#53676c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.75419343;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-variant:normal;font-weight:normal;font-stretch:normal;font-size:80px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d42aff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:80px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d42aff;fill-opacity:1;stroke:none;stroke-width:0.35083869px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:label="text"><tspan
- style="text-align:start;text-anchor:start;fill:#d42aff;stroke-width:1px"
+ style="text-align:start;text-anchor:start;fill:#d42aff;stroke-width:0.35083869px" id="tspan421">sel_0</tspan></text>
- style="opacity:1;vector-effect:none;fill:#a7a5a6;fill-opacity:1;stroke:none;stroke-width:0.35277769;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ style="opacity:1;vector-effect:none;fill:#a7a5a6;fill-opacity:1;stroke:none;stroke-width:0.12376806;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" @@ -2433,7 +2442,7 @@
inkscape:label="HMI:Input@/SELECTION"
- transform="matrix(0.28590269,0,0,0.28590269,527.38811,348.87609)">
+ transform="matrix(0.28590269,0,0,0.28590269,487.38811,348.87609)"> style="font-style:normal;font-weight:normal;font-size:160px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -2510,7 +2519,7 @@
inkscape:transform-center-x="1.0089177e-06" />
- transform="matrix(0.28590269,0,0,0.28590269,210.16209,215.31977)"
+ transform="matrix(0.28590269,0,0,0.28590269,170.16209,215.31977)" inkscape:label="HMI:Button@/SELECTION"
@@ -2722,14 +2731,6 @@
sodipodi:role="line">information</tspan></text>
- inkscape:label="HMI:Page:RelativePageTest@/PUMP0"
- style="color:#000000;fill:#4d4d4d" />
inkscape:label="HMI:Meter@/PUMP0/SLOTH"
transform="matrix(3.7795276,0,0,3.7795276,1628.51,630.30393)"
@@ -3425,37 +3426,6 @@
sodipodi:role="line">8888</tspan></text>
- inkscape:label="HMI:Jump:Home"
- transform="translate(1469.3474,-1334.1633)">
- 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"
- d="m 1217.4113,1410.4016 -22,24.5657 c -10.7925,12.0511 6.1317,35.5791 -13.5791,35.5791 h -174.2877 c -19.71078,0 -2.7866,-23.528 -13.57905,-35.5791 l -22,-24.5657 127.74845,-48.4334 z"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssccc" />
- 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="home_jmp"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Home</tspan></text>
inkscape:label="HMI:ForEach:PUMP@/">
@@ -3717,24 +3687,24 @@
style="font-style:normal;font-weight:normal;font-size:59.01374435px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#82ff77;fill-opacity:1;stroke:none;stroke-width:0.3688359px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:label="HMI:Display:Ploc %d (%d) grmbl !@/PUMP0/PRESSURE@/PUMP0/SLOTH"><tspan
style="text-align:center;text-anchor:middle;fill:#82ff77;fill-opacity:1;stroke-width:0.3688359px">8888</tspan></text>
style="font-style:normal;font-weight:normal;font-size:25.4761734px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.63690436px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:label="actual_label"><tspan
style="stroke-width:0.63690436px">Multiple variables</tspan></text>
@@ -4168,7 +4138,7 @@
id="tspan1611">PAGE_LOCAL variables</tspan></text>
inkscape:label="HMI:Meter@level"
- transform="matrix(2.1611542,0,0,2.1611542,902.76714,468.92423)"
+ transform="matrix(2.1611542,0,0,2.1611542,602.76714,428.92423)" @@ -4242,7 +4212,7 @@
inkscape:label="HMI:Input@level"
- transform="matrix(0.35865594,0,0,0.35865594,758.57767,293.49106)">
+ transform="matrix(0.35865594,0,0,0.35865594,458.57767,253.49106)"> @@ -5226,15 +5196,15 @@
inkscape:label="HMI:VarInit:7@.visibleAlarms"
- style="color:#000000;fill:#4d4d4d"
- inkscape:label="HMI:Page:AlarmPage"
- sodipodi:insensitive="true" />
+ transform="translate(-1380,800)" + inkscape:label="HMI:Page:AlarmPage" /> style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:80px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -6091,13 +6061,13 @@
style="font-style:normal;font-weight:normal;font-size:45.74443054px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28590268px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:label="HMI:Display@/PUMP0/FLOATING"><tspan
style="fill:#ffffff;fill-opacity:1;stroke-width:0.28590268px">8888</tspan></text>
@@ -6521,4 +6491,45 @@
style="stroke-width:2px">mhe</tspan></text>
+ style="color:#000000;fill:#4d4d4d" /> + inkscape:label="HMI:Jump:Home" + transform="translate(-10.6526,-2134.1633)"> + 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" + d="m 1217.4113,1410.4016 -22,24.5657 c -10.7925,12.0511 6.1317,35.5791 -13.5791,35.5791 h -174.2877 c -19.71078,0 -2.7866,-23.528 -13.57905,-35.5791 l -22,-24.5657 127.74845,-48.4334 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssccc" /> + 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="home_jmp"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Home</tspan></text>