# HG changeset patch
# User usveticic
# Date 1600242146 -7200
# Node ID 696301e869d56c1acb009346c93a6b88deb28f4f
# Parent  827bf284feec26247d76a422849eb3442c2f7515
Updated svg and xml for testing program

diff -r 827bf284feec -r 696301e869d5 tests/svghmi_v2/plc.xml
--- a/tests/svghmi_v2/plc.xml	Wed Sep 16 09:41:52 2020 +0200
+++ b/tests/svghmi_v2/plc.xml	Wed Sep 16 09:42:26 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-07-30T12:04:22">
+  <contentHeader name="Unnamed" modificationDateTime="2020-09-15T14:59:06">
     <coordinateInfo>
       <fbd>
         <scaling x="5" y="5"/>
@@ -55,6 +55,21 @@
                 <derived name="HMI_INT"/>
               </type>
             </variable>
+            <variable name="Toggle">
+              <type>
+                <derived name="HMI_BOOL"/>
+              </type>
+            </variable>
+            <variable name="Toggle1">
+              <type>
+                <derived name="HMI_BOOL"/>
+              </type>
+            </variable>
+            <variable name="Toggle2">
+              <type>
+                <derived name="HMI_BOOL"/>
+              </type>
+            </variable>
             <variable name="MultistateExt">
               <type>
                 <INT/>
@@ -88,7 +103,7 @@
               <expression>TargetPressure</expression>
             </inVariable>
             <inVariable localId="6" executionOrderId="0" height="25" width="90" negated="false">
-              <position x="155" y="220"/>
+              <position x="130" y="60"/>
               <connectionPointOut>
                 <relPosition x="90" y="10"/>
               </connectionPointOut>
@@ -100,7 +115,9 @@
                 <relPosition x="0" y="10"/>
                 <connection refLocalId="6">
                   <position x="495" y="230"/>
-                  <position x="245" y="230"/>
+                  <position x="367" y="230"/>
+                  <position x="367" y="70"/>
+                  <position x="220" y="70"/>
                 </connection>
               </connectionPointIn>
               <expression>TestLocal</expression>
@@ -190,34 +207,12 @@
               </connectionPointOut>
               <expression>TargetPressure</expression>
             </inVariable>
-            <inOutVariable localId="4" executionOrderId="0" height="30" width="60" negatedOut="false" negatedIn="false">
-              <position x="510" y="80"/>
-              <connectionPointIn>
-                <relPosition x="0" y="15"/>
-                <connection refLocalId="6" formalParameter="OUT">
-                  <position x="510" y="95"/>
-                  <position x="470" y="95"/>
-                </connection>
-              </connectionPointIn>
-              <connectionPointOut>
-                <relPosition x="60" y="15"/>
-              </connectionPointOut>
-              <expression>Sloth</expression>
-            </inOutVariable>
             <block localId="6" typeName="ADD" executionOrderId="0" height="60" width="65">
               <position x="405" y="65"/>
               <inputVariables>
                 <variable formalParameter="IN1">
                   <connectionPointIn>
                     <relPosition x="0" y="30"/>
-                    <connection refLocalId="4">
-                      <position x="405" y="95"/>
-                      <position x="385" y="95"/>
-                      <position x="385" y="50"/>
-                      <position x="580" y="50"/>
-                      <position x="580" y="95"/>
-                      <position x="570" y="95"/>
-                    </connection>
                   </connectionPointIn>
                 </variable>
                 <variable formalParameter="IN2">
@@ -559,6 +554,13 @@
               </connectionPointOut>
               <expression>0</expression>
             </inVariable>
+            <inVariable localId="4" executionOrderId="0" height="30" width="60" negated="false">
+              <position x="510" y="80"/>
+              <connectionPointOut>
+                <relPosition x="60" y="15"/>
+              </connectionPointOut>
+              <expression>Sloth</expression>
+            </inVariable>
           </FBD>
         </body>
       </pou>
diff -r 827bf284feec -r 696301e869d5 tests/svghmi_v2/svghmi_0@svghmi/svghmi.svg
--- a/tests/svghmi_v2/svghmi_0@svghmi/svghmi.svg	Wed Sep 16 09:41:52 2020 +0200
+++ b/tests/svghmi_v2/svghmi_0@svghmi/svghmi.svg	Wed Sep 16 09:42:26 2020 +0200
@@ -16,7 +16,7 @@
    version="1.1"
    id="hmi0"
    sodipodi:docname="svghmi.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:version="0.92.5 (0.92.5+68)"
    inkscape:label="Layer">
   <metadata
      id="metadata4542">
@@ -137,16 +137,16 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:document-units="px"
-     inkscape:current-layer="g110-0-9"
+     inkscape:current-layer="hmi0"
      showgrid="false"
      units="px"
      inkscape:zoom="1.4142136"
-     inkscape:cx="437.24009"
-     inkscape:cy="177.36896"
-     inkscape:window-width="1800"
-     inkscape:window-height="836"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:cx="462.89448"
+     inkscape:cy="318.79031"
+     inkscape:window-width="2503"
+     inkscape:window-height="1416"
+     inkscape:window-x="57"
+     inkscape:window-y="24"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -200,7 +200,7 @@
          y="-64.195457"
          x="113.27539"
          sodipodi:role="line"
-         id="tspan1409">100</tspan></text>
+         id="tspan1409">10</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"
@@ -1221,7 +1221,7 @@
          y="5.501111"
          x="159.67337"
          sodipodi:role="line"
-         id="tspan1409-1">100</tspan></text>
+         id="tspan1409-1">1000</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:7.78479624px;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.19461991px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -1522,4 +1522,66 @@
          y="258.16129"
          style="fill:#ff00ca;fill-opacity:1;stroke:none;stroke-width:2.25346255px;stroke-opacity:1">000</tspan></text>
   </g>
+  <g
+     id="g4791"
+     inkscape:label="HMI:ToggleButton@/TOGGLE2">
+    <rect
+       inkscape:label="inactive"
+       y="46.127251"
+       x="906.51086"
+       height="44.547726"
+       width="45.254833"
+       id="rect4772"
+       style="opacity:1;fill:#ff0015;fill-opacity:1;stroke:none" />
+    <rect
+       inkscape:label="active"
+       y="46.127251"
+       x="906.51086"
+       height="44.547726"
+       width="45.254833"
+       id="rect4772-3"
+       style="opacity:1;fill:#00ff03;fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     transform="translate(-67.175138,-1.0606552)"
+     id="g4791-6"
+     inkscape:label="HMI:ToggleButton@/TOGGLE1">
+    <rect
+       inkscape:label="inactive"
+       y="47.187904"
+       x="906.51086"
+       height="44.547726"
+       width="45.254833"
+       id="rect4772-5"
+       style="opacity:1;fill:#ff0015;fill-opacity:1;stroke:none" />
+    <rect
+       inkscape:label="active"
+       y="47.187904"
+       x="906.51086"
+       height="44.547726"
+       width="45.254833"
+       id="rect4772-3-7"
+       style="opacity:1;fill:#00ff03;fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     transform="translate(63.639613)"
+     id="g4791-3"
+     inkscape:label="HMI:ToggleButton@/TOGGLE">
+    <rect
+       inkscape:label="active"
+       y="46.127251"
+       x="906.51086"
+       height="44.547726"
+       width="45.254833"
+       id="rect4772-3-5"
+       style="opacity:1;fill:#00ff03;fill-opacity:1;stroke:none" />
+    <rect
+       inkscape:label="inactive"
+       y="46.127251"
+       x="906.51086"
+       height="44.547726"
+       width="45.254833"
+       id="rect4772-6"
+       style="opacity:1;fill:#ff0015;fill-opacity:1;stroke:none" />
+  </g>
 </svg>