beremiz

SVGHMI: Add use of Python PLC Globals it test
svghmi
2020-06-18, Edouard Tisserant
43198edb6ac0
Parents 1627d552f181
Children 8c42504b6384
SVGHMI: Add use of Python PLC Globals it test
3 files changed, 243 insertions(+), 17 deletions(-)
  • +2 -0
    tests/svghmi/py_ext_0@py_ext/baseconfnode.xml
  • +30 -0
    tests/svghmi/py_ext_0@py_ext/pyfile.xml
  • +211 -17
    tests/svghmi/svghmi_0@svghmi/svghmi.svg
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/svghmi/py_ext_0@py_ext/baseconfnode.xml Thu Jun 18 14:15:43 2020 +0200
    @@ -0,0 +1,2 @@
    +<?xml version='1.0' encoding='utf-8'?>
    +<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="1" Name="py_ext_0"/>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/svghmi/py_ext_0@py_ext/pyfile.xml Thu Jun 18 14:15:43 2020 +0200
    @@ -0,0 +1,30 @@
    +<?xml version='1.0' encoding='utf-8'?>
    +<PyFile xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
    + <variables>
    + <variable name="SomePLCglobal" type="HMI_STRING" onchange="MyOnChangeFunc"/>
    + </variables>
    + <globals>
    + <xhtml:p><![CDATA[
    +
    +def MyOnChangeFunc(changed_var_name):
    + print changed_var_name + ": " + getattr(PLCGlobals, changed_var_name)
    +
    +]]></xhtml:p>
    + </globals>
    + <init>
    + <xhtml:p><![CDATA[
    +]]></xhtml:p>
    + </init>
    + <cleanup>
    + <xhtml:p><![CDATA[
    +]]></xhtml:p>
    + </cleanup>
    + <start>
    + <xhtml:p><![CDATA[
    +]]></xhtml:p>
    + </start>
    + <stop>
    + <xhtml:p><![CDATA[
    +]]></xhtml:p>
    + </stop>
    +</PyFile>
    --- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg Thu Jun 18 11:00:26 2020 +0200
    +++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg Thu Jun 18 14:15:43 2020 +0200
    @@ -16,7 +16,7 @@
    version="1.1"
    id="hmi0"
    sodipodi:docname="svghmi.svg"
    - inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
    + inkscape:version="0.92.3 (2405546, 2018-03-11)">
    <metadata
    id="metadata4542">
    <rdf:RDF>
    @@ -141,13 +141,13 @@
    inkscape:current-layer="hmi0"
    showgrid="false"
    units="px"
    - inkscape:zoom="0.5"
    - inkscape:cx="523.16321"
    - inkscape:cy="-1.5475559"
    - inkscape:window-width="1920"
    - inkscape:window-height="1348"
    - inkscape:window-x="3815"
    - inkscape:window-y="700"
    + inkscape:zoom="0.35355339"
    + inkscape:cx="477.09179"
    + inkscape:cy="-82.185108"
    + inkscape:window-width="1800"
    + inkscape:window-height="836"
    + inkscape:window-x="0"
    + inkscape:window-y="27"
    inkscape:window-maximized="0"
    showguides="true"
    inkscape:guide-bbox="true" />
    @@ -2517,33 +2517,37 @@
    inkscape:transform-center-x="1.0089177e-06" />
    </g>
    <g
    - transform="translate(-867.71696,-14.163562)"
    + transform="matrix(0.5,0,0,0.5,356.41959,186.78858)"
    id="g443"
    - inkscape:label="HMI:Button@/SELECTION">
    + inkscape:label="HMI:Button@/SELECTION"
    + style="stroke-width:2">
    <g
    id="g435"
    - inkscape:label="bg">
    + inkscape:label="bg"
    + style="stroke-width:2">
    <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"
    + 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:10;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="rect433"
    width="245.44583"
    height="95.723877"
    x="971.96545"
    y="594.82263"
    - ry="35.579063"
    - inkscape:label="button" />
    + ry="71.158127"
    + inkscape:label="button"
    + rx="71.158127" />
    </g>
    <g
    id="g441"
    - inkscape:label="text">
    + inkscape:label="text"
    + style="stroke-width:2">
    <text
    inkscape:label="setting_jmp"
    id="text439"
    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"
    + 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:1.99999988px;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"
    + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:1.99999988px"
    y="656.98151"
    x="1090.7626"
    id="tspan437"
    @@ -2656,4 +2660,194 @@
    points="946.41039,971.35373 946.41039,1128.6905 855.90072,1047.042 855.90072,905.24473 " />
    </g>
    </g>
    + <g
    + transform="matrix(0.5,0,0,0.5,-34.345762,554.88681)"
    + id="g208-1-3"
    + inkscape:label="HMI:Input@/SOMEPLCGLOBAL"
    + style="stroke-width:2">
    + <text
    + inkscape:label="value"
    + id="text164-6"
    + y="218.24219"
    + x="136.32812"
    + 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:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    + xml:space="preserve"><tspan
    + style="stroke-width:2px"
    + y="218.24219"
    + x="136.32812"
    + id="tspan162-7"
    + sodipodi:role="line">8888</tspan></text>
    + <rect
    + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;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="rect166-5"
    + width="407.7037"
    + height="128"
    + x="139.85185"
    + y="95.40741"
    + onclick=""
    + inkscape:label="edit" />
    + <g
    + transform="translate(-416.52022,170.47452)"
    + inkscape:label="+&quot;dhu&quot;"
    + id="g174-3"
    + style="stroke-width:2">
    + <path
    + 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:none;stroke-width:10;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"
    + inkscape:transform-center-y="-14.956361"
    + d="m 797.19546,145.18619 -80.62929,0.60214 -0.60215,-80.629288 80.6293,-0.60214 z"
    + id="path168-5"
    + inkscape:connector-curvature="0" />
    + <text
    + xml:space="preserve"
    + style="font-style:normal;font-weight:normal;font-size:20px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    + x="733.58197"
    + y="111.05016"
    + id="text172-6"><tspan
    + sodipodi:role="line"
    + id="tspan170-2"
    + x="733.58197"
    + y="111.05016"
    + style="stroke-width:1px">dhu</tspan></text>
    + </g>
    + <g
    + transform="translate(-416.52022,170.47452)"
    + inkscape:label="=&quot;plop&quot;"
    + id="g182-9"
    + style="stroke-width:2">
    + <path
    + transform="matrix(0,-2.0000001,1.9999999,0,1034.195,1298.6541)"
    + sodipodi:type="star"
    + 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:none;stroke-width:10;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="path176-1"
    + sodipodi:sides="3"
    + sodipodi:cx="596.74072"
    + sodipodi:cy="-184.98808"
    + sodipodi:r1="29.912722"
    + sodipodi:r2="14.956361"
    + sodipodi:arg1="0.52359878"
    + sodipodi:arg2="1.5707963"
    + inkscape:flatsided="true"
    + inkscape:rounded="0"
    + inkscape:randomized="0"
    + d="m 622.6459,-170.03172 -51.81035,0 25.90517,-44.86908 z"
    + inkscape:transform-center-y="-3.6154501e-05"
    + inkscape:transform-center-x="14.956371" />
    + <text
    + id="text180-2"
    + y="111.05016"
    + x="633.09552"
    + style="font-style:normal;font-weight:normal;font-size:20px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    + xml:space="preserve"><tspan
    + style="stroke-width:1px"
    + y="111.05016"
    + x="633.09552"
    + id="tspan178-7"
    + sodipodi:role="line">plop</tspan></text>
    + </g>
    + <g
    + transform="translate(-416.52022,170.47452)"
    + inkscape:label="=&quot;mhoo&quot;"
    + id="g190-0"
    + style="stroke-width:2">
    + <path
    + inkscape:transform-center-y="-5.9989963e-06"
    + d="m 648.55108,-186.34718 -103.62071,0 51.81035,-89.73817 z"
    + inkscape:randomized="0"
    + inkscape:rounded="0"
    + inkscape:flatsided="true"
    + sodipodi:arg2="1.5707963"
    + sodipodi:arg1="0.52359878"
    + sodipodi:r2="29.912722"
    + sodipodi:r1="59.825443"
    + sodipodi:cy="-216.2599"
    + sodipodi:cx="596.74072"
    + sodipodi:sides="3"
    + id="path184-9"
    + 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:none;stroke-width:10;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"
    + sodipodi:type="star"
    + transform="rotate(-90,746.45698,-44.543641)"
    + inkscape:transform-center-x="14.956364" />
    + <text
    + xml:space="preserve"
    + style="font-style:normal;font-weight:normal;font-size:20px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    + x="537.25018"
    + y="111.05016"
    + id="text188-3"><tspan
    + sodipodi:role="line"
    + id="tspan186-6"
    + x="537.25018"
    + y="111.05016"
    + style="stroke-width:1px">mhoo</tspan></text>
    + </g>
    + <g
    + transform="translate(-416.52022,170.47452)"
    + inkscape:label="=&quot;yodl&quot;"
    + id="g198-0"
    + style="stroke-width:2">
    + <path
    + sodipodi:type="star"
    + 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:none;stroke-width:10;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="path192-6"
    + sodipodi:sides="3"
    + sodipodi:cx="596.74072"
    + sodipodi:cy="105.17262"
    + sodipodi:r1="59.825443"
    + sodipodi:r2="29.912722"
    + sodipodi:arg1="0.52359878"
    + sodipodi:arg2="1.5707963"
    + inkscape:flatsided="true"
    + inkscape:rounded="0"
    + inkscape:randomized="0"
    + d="m 648.55108,135.08534 -103.62071,0 51.81035,-89.738161 z"
    + inkscape:transform-center-y="-5.5023185e-06"
    + transform="matrix(0,-1,-1,0,1043.9134,701.91334)"
    + inkscape:transform-center-x="-14.956365" />
    + <text
    + xml:space="preserve"
    + style="font-style:normal;font-weight:normal;font-size:20px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    + x="925.82605"
    + y="111.05016"
    + id="text196-2"><tspan
    + sodipodi:role="line"
    + id="tspan194-6"
    + x="925.82605"
    + y="111.05016"
    + style="stroke-width:1px">yodl</tspan></text>
    + </g>
    + <g
    + transform="translate(-416.52022,170.47452)"
    + inkscape:label="=&quot;mhe&quot;"
    + id="g206-1-1"
    + style="stroke-width:2">
    + <path
    + inkscape:transform-center-y="-3.3040441e-05"
    + d="m 622.6459,151.4008 -51.81035,0 25.90517,-44.86908 z"
    + inkscape:randomized="0"
    + inkscape:rounded="0"
    + inkscape:flatsided="true"
    + sodipodi:arg2="1.5707963"
    + sodipodi:arg1="0.52359878"
    + sodipodi:r2="14.956361"
    + sodipodi:r1="29.912722"
    + sodipodi:cy="136.44444"
    + sodipodi:cx="596.74072"
    + sodipodi:sides="3"
    + id="path200-8"
    + 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:none;stroke-width:10;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"
    + sodipodi:type="star"
    + transform="matrix(0,-2.0000001,-1.9999999,0,1122.1514,1298.6541)"
    + inkscape:transform-center-x="-14.956349" />
    + <text
    + id="text204-7"
    + y="111.05016"
    + x="842.71497"
    + style="font-style:normal;font-weight:normal;font-size:20px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    + xml:space="preserve"><tspan
    + style="stroke-width:1px"
    + y="111.05016"
    + x="842.71497"
    + id="tspan202-9"
    + sodipodi:role="line">mhe</tspan></text>
    + </g>
    + </g>
    </svg>