SVGHMI: update test/svghmi to reflect latest changes
authorEdouard Tisserant <edouard.tisserant@gmail.com>
Mon, 04 Oct 2021 07:55:57 +0200
changeset 3363 c28a064d7f1a
parent 3362 abcdbef160e9
child 3364 fa2365fa6154
SVGHMI: update test/svghmi to reflect latest changes
tests/svghmi/beremiz.xml
tests/svghmi/plc.xml
tests/svghmi/svghmi_0@svghmi/svghmi.svg
--- a/tests/svghmi/beremiz.xml	Mon Oct 04 07:52:54 2021 +0200
+++ b/tests/svghmi/beremiz.xml	Mon Oct 04 07:55:57 2021 +0200
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="PYRO://127.0.0.1:61284">
+<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="LOCAL://">
   <TargetType/>
   <Libraries Enable_SVGHMI_Library="true"/>
 </BeremizRoot>
--- a/tests/svghmi/plc.xml	Mon Oct 04 07:52:54 2021 +0200
+++ b/tests/svghmi/plc.xml	Mon Oct 04 07:55:57 2021 +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="2021-05-13T10:44:29">
+  <contentHeader name="Unnamed" modificationDateTime="2021-10-03T20:43:39">
     <coordinateInfo>
       <fbd>
         <scaling x="5" y="5"/>
--- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg	Mon Oct 04 07:52:54 2021 +0200
+++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg	Mon Oct 04 07:55:57 2021 +0200
@@ -128,14 +128,14 @@
      inkscape:current-layer="hmi0"
      showgrid="false"
      units="px"
-     inkscape:zoom="0.84355635"
-     inkscape:cx="956.92617"
-     inkscape:cy="-289.32713"
-     inkscape:window-width="3840"
+     inkscape:zoom="0.42177818"
+     inkscape:cx="543.13877"
+     inkscape:cy="-467.92793"
+     inkscape:window-width="2400"
      inkscape:window-height="2096"
      inkscape:window-x="3200"
      inkscape:window-y="27"
-     inkscape:window-maximized="1"
+     inkscape:window-maximized="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-global="true"
@@ -406,18 +406,6 @@
          y="-78.144218"
          style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.26458332px">10000</tspan></text>
     <text
-       inkscape:label="value"
-       id="text4517"
-       y="-6.1937833"
-       x="113.53007"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         id="tspan4515"
-         style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.26458332px"
-         y="-6.1937833"
-         x="113.53007"
-         sodipodi:role="line">000</tspan></text>
-    <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:7.5467205px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="124.77896"
@@ -467,201 +455,6 @@
        y="336.90073"
        style="fill:#ff6600;stroke-width:0.57180536px">Pressure</tspan></text>
   <g
-     id="layer4"
-     inkscape:label="HMI:Lang:cn"
-     style="display:none"
-     inkscape:groupmode="layer">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:80px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;display:inline;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="83.669571"
-       y="136.78285"
-       id="text948-6"
-       inkscape:label="setpoint_label"><tspan
-         sodipodi:role="line"
-         id="tspan946-2"
-         x="136.78285"
-         y="83.669571"
-         style="stroke-width:1px">设定值</tspan></text>
-    <text
-       id="text952-9"
-       y="137.16286"
-       x="703.711"
-       style="font-style:normal;font-weight:normal;font-size:80px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;display:inline;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"
-       inkscape:label="actual_label"><tspan
-         y="703.711"
-         x="137.16286"
-         id="tspan950-1"
-         sodipodi:role="line"
-         style="text-align:center;writing-mode:vertical-lr;text-anchor:middle;stroke-width:1px">当前值</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:80px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="480.61847"
-       y="278.37503"
-       id="text956-2"
-       inkscape:label="pressure_label"><tspan
-         sodipodi:role="line"
-         id="tspan954-7"
-         x="278.37503"
-         y="480.61847"
-         style="writing-mode:vertical-lr;fill:#ff6600;stroke-width:0.99999994px">压力</tspan></text>
-    <text
-       inkscape:label="setting_jmp"
-       id="text1097"
-       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"
-         id="tspan1095"
-         sodipodi:role="line">设置</tspan></text>
-    <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="1436.9814"
-       id="text1101"
-       inkscape:label="home_jmp"><tspan
-         sodipodi:role="line"
-         x="1090.7626"
-         y="1436.9814"
-         style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
-         id="tspan1107">家</tspan></text>
-  </g>
-  <g
-     id="layer2"
-     inkscape:label="HMI:Lang:fr"
-     style="display:none"
-     inkscape:groupmode="layer">
-    <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;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="340.9082"
-       y="77.142853"
-       id="text948"
-       inkscape:label="setpoint_label"><tspan
-         sodipodi:role="line"
-         id="tspan946"
-         x="340.9082"
-         y="77.142853">Valeur de consigne</tspan></text>
-    <text
-       id="text952"
-       y="77.142853"
-       x="960.9082"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"
-       inkscape:label="actual_label"><tspan
-         y="77.142853"
-         x="960.9082"
-         id="tspan950"
-         sodipodi:role="line"
-         style="text-align:center;text-anchor:middle">Valeur courante</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="420.37848"
-       y="399.41504"
-       id="text956"
-       inkscape:label="pressure_label"><tspan
-         sodipodi:role="line"
-         id="tspan954"
-         x="420.37848"
-         y="399.41504"
-         style="fill:#ff6600;stroke-width:0.99999994px">Pression</tspan></text>
-    <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="setting_jmp-0"
-       inkscape:label="setting_jmp"><tspan
-         sodipodi:role="line"
-         id="tspan1024-9"
-         x="1090.7626"
-         y="656.98151"
-         style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Settings</tspan></text>
-    <text
-       inkscape:label="home_jmp"
-       id="home_jmp-3"
-       y="1436.9814"
-       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="1436.9814"
-         x="1090.7626"
-         id="tspan1028-6"
-         sodipodi:role="line">Home</tspan></text>
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="HMI:Lang:si"
-     style="display:inline"
-     inkscape:groupmode="layer">
-    <text
-       id="text930"
-       y="77.142853"
-       x="338.67188"
-       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;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"
-       inkscape:label="setpoint_label"><tspan
-         y="77.142853"
-         x="338.67188"
-         id="tspan928"
-         sodipodi:role="line">nastavljena vrednost</tspan></text>
-    <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;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="959.38477"
-       y="77.142853"
-       id="text934"
-       inkscape:label="actual_label"><tspan
-         sodipodi:role="line"
-         id="tspan932"
-         x="959.38477"
-         y="77.142853">dejanska vrednost</tspan></text>
-    <text
-       id="text938"
-       y="399.41504"
-       x="420.37848"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"
-       inkscape:label="pressure_label"><tspan
-         style="fill:#ff6600;stroke-width:0.99999994px"
-         y="399.41504"
-         x="420.37848"
-         id="tspan936"
-         sodipodi:role="line">pritisk</tspan></text>
-    <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="setting_jmp-06"
-       inkscape:label="setting_jmp"><tspan
-         sodipodi:role="line"
-         id="tspan1024-2"
-         x="1090.7626"
-         y="656.98151"
-         style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Settings</tspan></text>
-    <text
-       inkscape:label="home_jmp"
-       id="home_jmp-6"
-       y="1436.9814"
-       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="1436.9814"
-         x="1090.7626"
-         id="tspan1028-1"
-         sodipodi:role="line">Home</tspan></text>
-  </g>
-  <g
      inkscape:label="HMI:Meter@/PUMP0/SLOTH"
      transform="matrix(7.5590552,0,0,7.5590552,-244.3956,1321.2434)"
      id="g110">
@@ -704,19 +497,6 @@
          id="tspan98"
          sodipodi:role="line">10000</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="-20.624428"
-       y="-109.67243"
-       id="text104"
-       inkscape:label="value"
-       transform="rotate(90)"><tspan
-         sodipodi:role="line"
-         x="-20.624428"
-         y="-109.67243"
-         style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.26458332px"
-         id="tspan102">000</tspan></text>
-    <text
        inkscape:label="unit"
        id="text108"
        y="-9.4425077"
@@ -2841,18 +2621,6 @@
          id="tspan1326"
          sodipodi:role="line">10000</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="113.53007"
-       y="-6.1937833"
-       id="text1332"
-       inkscape:label="value"><tspan
-         sodipodi:role="line"
-         x="113.53007"
-         y="-6.1937833"
-         style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.26458332px"
-         id="tspan1330">000</tspan></text>
-    <text
        inkscape:label="unit"
        id="text1336"
        y="1.1408259"
@@ -4326,18 +4094,6 @@
          id="tspan697"
          sodipodi:role="line">10000</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="113.53007"
-       y="-6.1937833"
-       id="text703"
-       inkscape:label="value"><tspan
-         sodipodi:role="line"
-         x="113.53007"
-         y="-6.1937833"
-         style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.26458332px"
-         id="tspan701">000</tspan></text>
-    <text
        inkscape:label="unit"
        id="text707"
        y="1.1408259"
@@ -7733,4 +7489,53 @@
        inkscape:transform-center-y="-10.828983"
        inkscape:label="=0" />
   </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:80px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:1.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="1165.3422"
+     y="-584.62439"
+     id="text1129"
+     inkscape:label="HMI:Display@/PUMP0/SLOTH"
+     transform="rotate(90)"><tspan
+       sodipodi:role="line"
+       x="1165.3422"
+       y="-584.62439"
+       style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:1.99999988px"
+       id="tspan1127">000</tspan></text>
+  <text
+     inkscape:label="HMI:Display@/PUMP0/SLOTH"
+     id="text4517"
+     y="455.53851"
+     x="388.12311"
+     style="font-style:normal;font-weight:normal;font-size:22.87221527px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.57180536px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       id="tspan4515"
+       style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.57180536px"
+       y="455.53851"
+       x="388.12311"
+       sodipodi:role="line">000</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:22.87221527px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.57180536px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="848.12311"
+     y="415.53851"
+     id="text703"
+     inkscape:label="HMI:Display@level"><tspan
+       sodipodi:role="line"
+       x="848.12311"
+       y="415.53851"
+       style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.57180536px"
+       id="tspan701">000</tspan></text>
+  <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;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="2057.6001"
+     y="606.89435"
+     id="text1332"
+     inkscape:label="HMI:Display@/PUMP0/SLOTH"><tspan
+       sodipodi:role="line"
+       x="2057.6001"
+       y="606.89435"
+       style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
+       id="tspan1330">000</tspan></text>
 </svg>