SVGHMI: More strict formating of active HMI labels : @ separator only used for paths svghmi
authorEdouard Tisserant
Fri, 27 Sep 2019 06:54:35 +0200
branchsvghmi
changeset 2787 86a572fb05f8
parent 2786 1b82f21b2b41
child 2788 2ed9ff826d03
SVGHMI: More strict formating of active HMI labels : @ separator only used for paths
tests/svghmi/svghmi_0@svghmi/svghmi.svg
--- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg	Thu Sep 26 09:33:49 2019 +0200
+++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg	Fri Sep 27 06:54:35 2019 +0200
@@ -76,12 +76,12 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:document-units="px"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="hmi0"
      showgrid="false"
      units="px"
      inkscape:zoom="0.421875"
-     inkscape:cx="507.44686"
-     inkscape:cy="350.5161"
+     inkscape:cx="528.78019"
+     inkscape:cy="-50.076488"
      inkscape:window-width="1600"
      inkscape:window-height="886"
      inkscape:window-x="0"
@@ -91,13 +91,47 @@
      inkscape:guide-bbox="true" />
   <rect
      sodipodi:insensitive="true"
-     inkscape:label="HMI:Page@Conf"
+     inkscape:label="HMI:Page:Conf"
      y="780"
      x="0"
      height="720"
      width="1280"
      id="rect1016"
      style="color:#000000;fill:#4d4d4d" />
+  <g
+     id="g1082"
+     inkscape:label="HMI:Jump:Home"
+     transform="translate(0,2)">
+    <g
+       id="g1152"
+       inkscape:label="button">
+      <rect
+         ry="35.579063"
+         y="1374.8225"
+         x="971.96545"
+         height="95.723877"
+         width="245.44583"
+         id="rect1022"
+         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"
+         rx="35.579063" />
+    </g>
+    <g
+       id="g1149"
+       inkscape:label="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="home_jmp"
+         inkscape:label="home_jmp"><tspan
+           sodipodi:role="line"
+           id="tspan1028"
+           x="1090.7626"
+           y="1436.9814"
+           style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Home</tspan></text>
+    </g>
+  </g>
   <rect
      style="color:#000000;fill:#4d4d4d"
      id="page0"
@@ -105,8 +139,41 @@
      height="720"
      x="0"
      y="0"
-     inkscape:label="HMI:Page@Home"
+     inkscape:label="HMI:Page:Home"
      sodipodi:insensitive="true" />
+  <g
+     id="g1077"
+     inkscape:label="HMI:Jump:Conf">
+    <g
+       id="g1159"
+       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="rect1020"
+         width="245.44583"
+         height="95.723877"
+         x="971.96545"
+         y="594.82263"
+         ry="35.579063"
+         inkscape:label="button" />
+    </g>
+    <g
+       id="g1156"
+       inkscape:label="text">
+      <text
+         inkscape:label="setting_jmp"
+         id="setting_jmp"
+         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="tspan1024"
+           sodipodi:role="line">Settings</tspan></text>
+    </g>
+  </g>
   <text
      xml:space="preserve"
      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"
@@ -239,74 +306,8 @@
        y="399.41504"
        style="fill:#ff6600;stroke-width:0.99999994px">Pressure</tspan></text>
   <g
-     id="g1077"
-     inkscape:label="HMI:Jump@Conf">
-    <g
-       id="g1159"
-       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="rect1020"
-         width="245.44583"
-         height="95.723877"
-         x="971.96545"
-         y="594.82263"
-         ry="35.579063"
-         inkscape:label="button" />
-    </g>
-    <g
-       id="g1156"
-       inkscape:label="text">
-      <text
-         inkscape:label="setting_jmp"
-         id="setting_jmp"
-         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="tspan1024"
-           sodipodi:role="line">Settings</tspan></text>
-    </g>
-  </g>
-  <g
-     id="g1082"
-     inkscape:label="HMI:Jump@Home">
-    <g
-       id="g1152"
-       inkscape:label="button">
-      <rect
-         ry="35.579063"
-         y="1374.8225"
-         x="971.96545"
-         height="95.723877"
-         width="245.44583"
-         id="rect1022"
-         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"
-         rx="35.579063" />
-    </g>
-    <g
-       id="g1149"
-       inkscape:label="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="home_jmp"
-         inkscape:label="home_jmp"><tspan
-           sodipodi:role="line"
-           id="tspan1028"
-           x="1090.7626"
-           y="1436.9814"
-           style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Home</tspan></text>
-    </g>
-  </g>
-  <g
      id="layer4"
-     inkscape:label="HMI:Lang@cn"
+     inkscape:label="HMI:Lang:cn"
      style="display:none"
      inkscape:groupmode="layer">
     <text
@@ -372,7 +373,7 @@
   </g>
   <g
      id="layer2"
-     inkscape:label="HMI:Lang@fr"
+     inkscape:label="HMI:Lang:fr"
      style="display:none"
      inkscape:groupmode="layer">
     <text
@@ -437,7 +438,7 @@
   </g>
   <g
      id="layer3"
-     inkscape:label="HMI:Lang@si"
+     inkscape:label="HMI:Lang:si"
      style="display:none"
      inkscape:groupmode="layer">
     <text