# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1597510225 -7200
# Node ID 72ee99635db7f2287272cfaa0e6776e3cf33a266
# Parent  d660b1b6bf4f3945ba2922a4dcb432ddce00d159
SVGHMI: HMI:JsonTable also recognize TextStyleList, but parsing of textContent is still not implemented and style is still not updated.

diff -r d660b1b6bf4f -r 72ee99635db7 svghmi/widget_jsontable.ysl2
--- a/svghmi/widget_jsontable.ysl2	Sat Aug 15 18:46:35 2020 +0200
+++ b/svghmi/widget_jsontable.ysl2	Sat Aug 15 18:50:25 2020 +0200
@@ -37,18 +37,31 @@
     error > JsonTable Widget can't contain element of type «local-name()».
 }
 
+
+const "hmi_textstylelists_descs", "$parsed_widgets/widget[@type = 'TextStyleList']";
+const "hmi_textstylelists", "$hmi_elements[@id = $hmi_textstylelists_descs/@id]";
+
 template "svg:use", mode="json_table_elt_render" {
     param "value_expr";
     // cloned element must be part of a HMI:List
     const "targetid", "substring-after(@xlink:href,'#')";
     const "from_list", "$hmi_lists[(@id | */@id) = $targetid]";
+    const "from_textstylelist", "$hmi_textstylelists[(@id | */@id) = $targetid]";
 
-    if "count($from_list) = 0"
-        error > Clones (svg:use) in JsonTable Widget must point to a valid HMI:List widget or HMI:List item. Reference "«@xlink:href»" is not valid.
-
-    |         id("«@id»").setAttribute("xlink:href", 
-    // obtain new target id from HMI:List widget
-    |             "#"+hmi_widgets["«$from_list/@id»"].items[«$value_expr»]);
+    choose {
+        when "count($from_list) > 0" {
+            |         id("«@id»").setAttribute("xlink:href", 
+            // obtain new target id from HMI:List widget
+            |             "#"+hmi_widgets["«$from_list/@id»"].items[«$value_expr»]);
+        }
+        when "count($from_textstylelist) > 0" {
+            |         console.log("from_textsylelist","«@id»", "«$value_expr»", «$value_expr»,
+            // obtain new style from HMI:TextStyleList widget
+            |             hmi_widgets["«$from_textstylelist/@id»"].items[«$value_expr»]);
+        }
+        otherwise
+            warning > Clones (svg:use) in JsonTable Widget must point to a valid HMI:List or HMI:TextStyleList widget or item. Reference "«@xlink:href»" is not valid and will not be updated.
+    }
 }
 
 template "svg:text", mode="json_table_elt_render" {
@@ -58,12 +71,12 @@
 
 template "svg:*", mode="json_table_render" {
     param "objname";
-    apply ".", mode="json_table_elt_render" with "value_expr" > «$objname»«@inkscape:label»
+    apply ".", mode="json_table_elt_render" with "value_expr" > «$objname»«substring-before(@inkscape:label, ' ')»
 }
 
 template "svg:g", mode="json_table_render" {
     param "objname";
-    |         let obj_«@id» = «$objname»«@inkscape:label»;
+    |         let obj_«@id» = «$objname»«substring-before(@inkscape:label, ' ')»;
     apply "*[@inkscape:label]", mode="json_table_render" 
         with "objname" > obj_«@id»
 }
diff -r d660b1b6bf4f -r 72ee99635db7 svghmi/widget_list.ysl2
--- a/svghmi/widget_list.ysl2	Sat Aug 15 18:46:35 2020 +0200
+++ b/svghmi/widget_list.ysl2	Sat Aug 15 18:50:25 2020 +0200
@@ -1,6 +1,6 @@
 // widget_list.ysl2
 
-template "widget[@type='List']", mode="widget_defs" {
+template "widget[@type='List' or @type='TextStyleList']", mode="widget_defs" {
     param "hmi_element";
     |     items: {
     foreach "$hmi_element/*[@inkscape:label]" {
diff -r d660b1b6bf4f -r 72ee99635db7 tests/svghmi/svghmi_0@svghmi/svghmi.svg
--- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg	Sat Aug 15 18:46:35 2020 +0200
+++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg	Sat Aug 15 18:50:25 2020 +0200
@@ -185,9 +185,9 @@
      inkscape:current-layer="hmi0"
      showgrid="false"
      units="px"
-     inkscape:zoom="0.25"
-     inkscape:cx="840.93557"
-     inkscape:cy="117.51363"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="1149.6204"
+     inkscape:cy="676.68024"
      inkscape:window-width="1800"
      inkscape:window-height="836"
      inkscape:window-x="0"
@@ -2850,17 +2850,15 @@
            height="100%"
            transform="matrix(0.7609336,0,0,0.7609336,199.15217,164.3798)"
            inkscape:label=".sides" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
-           x="971.58551"
-           y="56.106419"
-           id="text1382"
-           inkscape:label=".name"><tspan
-             sodipodi:role="line"
-             id="tspan1380"
-             x="971.58551"
-             y="56.106419">value</tspan></text>
+        <use
+           transform="matrix(2,0,0,2,-474.04606,349.02524)"
+           x="0"
+           y="0"
+           xlink:href="#use913"
+           id="use966"
+           width="100%"
+           height="100%"
+           inkscape:label=".textstyle content=.name" />
       </g>
       <use
          inkscape:label="[1]"
@@ -2893,7 +2891,8 @@
   </g>
   <g
      id="g1332"
-     inkscape:label="polygons">
+     inkscape:label="polygons"
+     transform="translate(-126,32)">
     <path
        inkscape:transform-center-y="2.9995242"
        inkscape:transform-center-x="0.14620371"
@@ -3005,7 +3004,8 @@
   </g>
   <g
      inkscape:label="HMI:List:polygons"
-     id="g1311">
+     id="g1311"
+     transform="translate(-126,32)">
     <use
        x="0"
        y="0"
@@ -5729,4 +5729,98 @@
   <g
      id="g825"
      inkscape:label="HMI:VarInit:&quot;a page string&quot;@.piff" />
+  <g
+     id="g893"
+     inkscape:label="textstyles"
+     transform="translate(-136,-6.0000001)">
+    <text
+       inkscape:label="alarm"
+       id="text1382-7"
+       y="-171.54395"
+       x="1298.9102"
+       style="font-style:normal;font-weight:normal;font-size:20px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.5"
+       xml:space="preserve"><tspan
+         y="-171.54395"
+         x="1298.9102"
+         id="tspan1380-5"
+         sodipodi:role="line"
+         style="stroke-width:0.5">value</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:20px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5"
+       x="1298.9102"
+       y="-191.54395"
+       id="text875"
+       inkscape:label="ack"><tspan
+         style="fill:#000000;stroke-width:0.5"
+         sodipodi:role="line"
+         id="tspan873"
+         x="1298.9102"
+         y="-191.54395">value</tspan></text>
+    <text
+       inkscape:label="active"
+       id="text879"
+       y="-211.54395"
+       x="1298.9102"
+       style="font-style:normal;font-weight:normal;font-size:20px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:0.5"
+       xml:space="preserve"><tspan
+         y="-211.54395"
+         x="1298.9102"
+         id="tspan877"
+         sodipodi:role="line"
+         style="fill:#00ff00;stroke-width:0.5">value</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:20px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.5"
+       x="1298.9102"
+       y="-231.54395"
+       id="text883"
+       inkscape:label="disabled"><tspan
+         style="fill:#999999;stroke-width:0.5"
+         sodipodi:role="line"
+         id="tspan881"
+         x="1298.9102"
+         y="-231.54395">value</tspan></text>
+  </g>
+  <g
+     id="g907"
+     inkscape:label="HMI:StyleList:textstyles"
+     transform="translate(440,40)">
+    <use
+       x="0"
+       y="0"
+       xlink:href="#text879"
+       id="use913"
+       width="100%"
+       height="100%"
+       transform="translate(-573,60.999998)"
+       inkscape:label="&quot;active&quot;" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#text875"
+       id="use911"
+       width="100%"
+       height="100%"
+       transform="translate(-573,40.999998)"
+       inkscape:label="&quot;ack&quot;" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#text1382-7"
+       id="use909"
+       width="100%"
+       height="100%"
+       transform="translate(-573,20.999998)"
+       inkscape:label="&quot;alarm&quot;" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#text883"
+       id="use915"
+       width="100%"
+       height="100%"
+       transform="translate(-573,80.999998)"
+       inkscape:label="&quot;disabled&quot;" />
+  </g>
 </svg>