beremiz: comparison svghmi/gen_index

equal deleted inserted replaced

-:8fab1886ebec
+:d022523cb621
 /* This retrieves geometry obtained through "inkscape -S"
 * already parsed by python and presented as a list of
 * <bbox x="0" y="0" w="42" h="42">
 */
-variable "geometry", "ns:GetSVGGeometry()";
+const "geometry", "ns:GetSVGGeometry()";
-variable "hmitree", "ns:GetHMITree()";
+const "hmitree", "ns:GetHMITree()";
-variable "_categories" {
+const "_categories" {
 noindex > HMI_ROOT
 noindex > HMI_LABEL
 noindex > HMI_CLASS
 noindex > HMI_PLC_STATUS
 noindex > HMI_CURRENT_PAGE
 }
-variable "categories", "exsl:node-set($_categories)";
+const "categories", "exsl:node-set($_categories)";
-//variable "indexed_hmitree", "$hmitree[not(local-name() = $categories/noindex/text())]";
+//const "indexed_hmitree", "$hmitree[not(local-name() = $categories/noindex/text())]";
-variable "indexed_hmitree" apply "$hmitree", mode="index";
+const "_indexed_hmitree" apply "$hmitree", mode="index";
+const "indexed_hmitree", "exsl:node-set($_indexed_hmitree)";
-template "node()", mode="index"{
+template "*", mode="index"{
 param "index", "0";
-variable "content" {
+param "parentpath", "''";
+const "content" {
+const "path"
+choose {
+when "local-name() = 'HMI_ROOT'" > «$parentpath»
+otherwise > «$parentpath»/«@name»
+}
 choose {
 when "not(local-name() = $categories/noindex)" {
 xsl:copy {
 attrib "index" > «$index»
+attrib "hmipath" > «$path»
 foreach "@*" xsl:copy;
 }
 /* no node expected below value nodes */
 }
 otherwise {
 apply "*[1]", mode="index"{
 with "index", "$index";
+with "parentpath" > «$path»
 }
 }
 }
 }
 copy "$content";
 apply "following-sibling::*[1]", mode="index" {
 with "index", "$index + count(exsl:node-set($content)/*)";
+with "parentpath" > «$parentpath»
 }
 }
 /* Identity template :
 *  - copy every attributes
 *  - copy every sub-elements
 */
-template "@* | node()" {
+template "@* | node()", mode="identity_svg" {
 /* use real xsl:copy instead copy-of alias from yslt.yml2 */
-xsl:copy apply "@* | node()";
+xsl:copy apply "@* | node()", mode="identity_svg";
 }
-variable "mark" > =HMI=\n
+const "mark" > =HMI=\n
 /* copy root node and add geometry as comment for a test */
 template "/"
 html xmlns="http://www.w3.org/1999/xhtml" {
 head;
 }
 comment {
 apply "$hmitree", mode="testtree";
 }
 comment {
-apply "exsl:node-set($indexed_hmitree)", mode="testtree";
+apply "$indexed_hmitree", mode="testtree";
 }
-apply "@* | node()";
+apply "@* | node()", mode="identity_svg";
 }
 script{
 /* TODO : paste hmitree hash stored in hmi tree root node */
 /* TODO re-enable
 var Page;
 var Input;
 var Display;
 var res = [];
 ||
-variable "midmark" > \n«$mark»
+const "midmark" > \n«$mark»
 apply """//*[contains(child::svg:desc, $midmark) or \
 starts-with(child::svg:desc, $mark)]""",2
 mode="code_from_descs";
 ||
 return res;
 - pages content
 + with ref to elt ?
 - widgets parameters
 */
-||
+| var subscriptions = {
-var subscriptions = {
-||
+const "svg","/"; /* foreach loses document root */
-//    apply "$hmitree", mode="subscription_";
+foreach "$indexed_hmitree/*" {
-||
+| «@index»: {
-return res;
+|     name: "«@name»",
+|     hmipath: "«@hmipath»"
+|     ids: [
+const "hmipath","@hmipath";
+foreach "$svg//*[substring-after(@inkscape:label,'@') = $hmipath]" {
+|         "«@id»"`if "position()!=last()" > ,`
+}
+|     ]
+| }`if "position()!=last()" > ,`
 }
-||
+| }
 include text svghmi.js
 }
 }
 }

branch	svghmi
changeset 2791	d022523cb621
parent 2790	8fab1886ebec
child 2792	0c0d3895b036