--- 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:pageopacity="0"
inkscape:pageshadow="2"
inkscape:document-units="px"
- inkscape:current-layer="g1338"
+ inkscape:current-layer="g6077"
showgrid="false"
units="px"
- inkscape:zoom="0.5"
- 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"
showguides="true"
inkscape:guide-bbox="true" />
@@ -3239,7 +3239,7 @@
inkscape:connector-curvature="0"
id="path1320"
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)" />
<text
xml:space="preserve"
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 @@
</g>
</g>
<g
- transform="matrix(0.57180538,0,0,0.57180538,1024.0513,-317.49049)"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP0"
- id="g1458-8">
- <g
- inkscape:label="button"
- id="g1450-4">
+ id="g6077"
+ inkscape:label="HMI:ForEach:PUMP@/">
+ <g
+ id="g6130"
+ inkscape:label="PUMP:1">
+ <g
+ transform="matrix(0.57180538,0,0,0.57180538,1024.0513,-317.49049)"
+ inkscape:label="HMI:Jump:RelativePageTest@/PUMP0"
+ id="g1458-8">
+ <g
+ inkscape:label="button"
+ id="g1450-4">
+ <rect
+ inkscape:label="button"
+ ry="35.579063"
+ y="594.82263"
+ x="971.96545"
+ height="95.723877"
+ width="245.44583"
+ id="rect1448-8"
+ 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" />
+ </g>
+ <g
+ inkscape:label="text"
+ id="g1456-1">
+ <text
+ xml:space="preserve"
+ 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"
+ x="1038.2972"
+ y="635.99542"
+ id="text1454-0"
+ inkscape:label="setting_jmp"><tspan
+ sodipodi:role="line"
+ x="1038.2972"
+ y="635.99542"
+ style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
+ id="tspan1460-3">Pump</tspan></text>
+ <text
+ xml:space="preserve"
+ 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"
+ x="992.45087"
+ y="674.76117"
+ id="text1517-8"
+ inkscape:label="HMI:Display@/PUMP0/STROUT"><tspan
+ sodipodi:role="line"
+ id="tspan1515-5"
+ x="992.45087"
+ y="674.76117"
+ style="fill:#000000;fill-opacity:1;stroke-width:0.24579209px">8888</tspan></text>
+ </g>
+ </g>
+ </g>
+ <g
+ id="g6122"
+ inkscape:label="PUMP:2">
+ <g
+ id="g1475-0"
+ inkscape:label="HMI:Jump:RelativePageTest@/PUMP1"
+ transform="matrix(0.57180538,0,0,0.57180538,1184.0513,-317.49049)">
+ <g
+ id="g1467-4"
+ inkscape:label="button">
+ <rect
+ 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"
+ id="rect1464-4"
+ width="245.44583"
+ height="95.723877"
+ x="971.96545"
+ y="594.82263"
+ ry="35.579063"
+ inkscape:label="button" />
+ </g>
+ <g
+ id="g1473-4"
+ inkscape:label="text">
+ <text
+ inkscape:label="setting_jmp"
+ id="text1471-4"
+ y="635.99542"
+ x="1038.2972"
+ 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"
+ y="635.99542"
+ x="1038.2972"
+ sodipodi:role="line"
+ id="tspan1477-6">Pump</tspan></text>
+ <text
+ xml:space="preserve"
+ 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"
+ x="992.8111"
+ y="674.76117"
+ id="text1517-8-5"
+ inkscape:label="HMI:Display@/PUMP1/STROUT"><tspan
+ sodipodi:role="line"
+ id="tspan1515-5-3"
+ x="992.8111"
+ y="674.76117"
+ style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
+ </g>
+ </g>
+ </g>
+ <g
+ id="g6113"
+ inkscape:label="PUMP:3">
+ <g
+ transform="matrix(0.57180538,0,0,0.57180538,1344.0513,-317.49049)"
+ inkscape:label="HMI:Jump:RelativePageTest@/PUMP2"
+ id="g1491-3">
+ <g
+ inkscape:label="button"
+ id="g1481-1">
+ <rect
+ inkscape:label="button"
+ ry="35.579063"
+ y="594.82263"
+ x="971.96545"
+ height="95.723877"
+ width="245.44583"
+ id="rect1479-7"
+ 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" />
+ </g>
+ <g
+ inkscape:label="text"
+ id="g1489-5">
+ <text
+ xml:space="preserve"
+ 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"
+ x="1038.2972"
+ y="635.99542"
+ id="text1487-9"
+ inkscape:label="setting_jmp"><tspan
+ id="tspan1485-2"
+ sodipodi:role="line"
+ x="1038.2972"
+ y="635.99542"
+ style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Pump</tspan></text>
+ <text
+ xml:space="preserve"
+ 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"
+ x="993.17108"
+ y="674.76117"
+ id="text1517-8-8"
+ inkscape:label="HMI:Display@/PUMP2/STROUT"><tspan
+ sodipodi:role="line"
+ id="tspan1515-5-8"
+ x="993.17108"
+ y="674.76117"
+ style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
+ </g>
+ </g>
+ </g>
+ <g
+ id="g6104"
+ inkscape:label="PUMP:4">
+ <g
+ id="g1509-1"
+ inkscape:label="HMI:Jump:RelativePageTest@/PUMP3"
+ transform="matrix(0.57180538,0,0,0.57180538,1504.0513,-317.49049)">
+ <g
+ id="g1499-7"
+ inkscape:label="button">
+ <rect
+ 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"
+ id="rect1497-8"
+ width="245.44583"
+ height="95.723877"
+ x="971.96545"
+ y="594.82263"
+ ry="35.579063"
+ inkscape:label="button" />
+ </g>
+ <g
+ id="g1507-5"
+ inkscape:label="text">
+ <text
+ inkscape:label="setting_jmp"
+ id="text1505-7"
+ y="635.99542"
+ x="1038.2972"
+ 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"
+ y="635.99542"
+ x="1038.2972"
+ sodipodi:role="line"
+ id="tspan1511-4">Pump</tspan><tspan
+ style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
+ y="685.99542"
+ x="1038.2972"
+ sodipodi:role="line"
+ id="tspan1503-1" /></text>
+ <text
+ xml:space="preserve"
+ 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"
+ x="993.53101"
+ y="674.76117"
+ id="text1517-8-3"
+ inkscape:label="HMI:Display@/PUMP3/STROUT"><tspan
+ sodipodi:role="line"
+ id="tspan1515-5-1"
+ x="993.53101"
+ y="674.76117"
+ style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
+ </g>
+ </g>
+ </g>
+ <g
+ inkscape:label="PUMP:+1"
+ id="g6241"
+ transform="matrix(0.57180538,0,0,0.57180538,1461.2541,-321.48847)">
<rect
- inkscape:label="button"
- ry="35.579063"
- y="594.82263"
- x="971.96545"
- height="95.723877"
- width="245.44583"
- id="rect1448-8"
- 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" />
- </g>
- <g
- inkscape:label="text"
- id="g1456-1">
+ style="fill:#000000;fill-opacity:1;stroke:#ff0000;stroke-width:1.74884677"
+ id="rect6235"
+ width="89.036743"
+ height="79.143768"
+ x="1326.8333"
+ y="612.41589"
+ rx="22.385239"
+ ry="20.986162" />
<text
xml:space="preserve"
- 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"
- x="1090.7626"
- y="656.98151"
- id="text1454-0"
- inkscape:label="setting_jmp"><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"
+ x="1340.5292"
+ y="663.73657"
+ id="text6239"><tspan
sodipodi:role="line"
- x="1090.7626"
- y="656.98151"
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1460-3">Pump 0</tspan></text>
- </g>
- </g>
- <g
- id="g1475-0"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP1"
- transform="matrix(0.57180538,0,0,0.57180538,1184.0513,-317.49049)">
- <g
- id="g1467-4"
- inkscape:label="button">
+ id="tspan6237"
+ x="1340.5292"
+ y="663.73657"
+ style="fill:#ffffff;stroke-width:1.0703851">+1</tspan></text>
+ </g>
+ <g
+ transform="matrix(0.57180538,0,0,0.57180538,752.02604,-322.19558)"
+ id="g6209"
+ inkscape:label="PUMP:-1">
<rect
- 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"
- id="rect1464-4"
- width="245.44583"
- height="95.723877"
- x="971.96545"
- y="594.82263"
- ry="35.579063"
- inkscape:label="button" />
- </g>
- <g
- id="g1473-4"
- inkscape:label="text">
+ ry="20.986162"
+ rx="22.385239"
+ y="612.41589"
+ x="1326.8333"
+ height="79.143768"
+ width="89.036743"
+ id="rect6200"
+ style="fill:#000000;fill-opacity:1;stroke:#ff0000;stroke-width:1.74884677" />
<text
- inkscape:label="setting_jmp"
- id="text1471-4"
- y="656.98151"
- x="1090.7626"
- 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"
+ id="text6204"
+ y="663.73657"
+ x="1340.5292"
+ 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
- id="tspan1469-7"
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- y="656.98151"
- x="1090.7626"
- sodipodi:role="line">Pump 1</tspan><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- y="706.98151"
- x="1090.7626"
- sodipodi:role="line"
- id="tspan1477-6" /></text>
- </g>
- </g>
- <g
- transform="matrix(0.57180538,0,0,0.57180538,1344.0513,-317.49049)"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP2"
- id="g1491-3">
- <g
- inkscape:label="button"
- id="g1481-1">
- <rect
- inkscape:label="button"
- ry="35.579063"
- y="594.82263"
- x="971.96545"
- height="95.723877"
- width="245.44583"
- id="rect1479-7"
- 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" />
- </g>
- <g
- inkscape:label="text"
- id="g1489-5">
- <text
- xml:space="preserve"
- 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"
- x="1090.7626"
- y="656.98151"
- id="text1487-9"
- inkscape:label="setting_jmp"><tspan
- sodipodi:role="line"
- x="1090.7626"
- y="656.98151"
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1493-6">Pump 2</tspan><tspan
- id="tspan1485-2"
- sodipodi:role="line"
- x="1090.7626"
- y="706.98151"
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" /></text>
- </g>
- </g>
- <g
- id="g1509-1"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP3"
- transform="matrix(0.57180538,0,0,0.57180538,1504.0513,-317.49049)">
- <g
- id="g1499-7"
- inkscape:label="button">
- <rect
- 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"
- id="rect1497-8"
- width="245.44583"
- height="95.723877"
- x="971.96545"
- y="594.82263"
- ry="35.579063"
- inkscape:label="button" />
- </g>
- <g
- id="g1507-5"
- inkscape:label="text">
- <text
- inkscape:label="setting_jmp"
- id="text1505-7"
- y="656.98151"
- x="1090.7626"
- 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"
- y="656.98151"
- x="1090.7626"
- sodipodi:role="line"
- id="tspan1511-4">Pump 3</tspan><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- y="706.98151"
- x="1090.7626"
- sodipodi:role="line"
- id="tspan1503-1" /></text>
+ style="fill:#ffffff;stroke-width:1.0703851"
+ y="663.73657"
+ x="1340.5292"
+ id="tspan6202"
+ sodipodi:role="line">-1</tspan></text>
</g>
</g>
</svg>
