# HG changeset patch # User Edouard Tisserant <edouard.tisserant@gmail.com> # Date 1631278087 -7200 # Node ID 21d37b199ede03637d0f9b00aa058668031a9d19 # Parent 2c0511479b187bb1c815af16e044b3bb81126c75 Tests/svghmi_scrollbar: Fix variables names and remove useless "OnStart OnStop OnWatchdog" to use defaults. diff -r 2c0511479b18 -r 21d37b199ede tests/svghmi_scrollbar/beremiz.xml --- a/tests/svghmi_scrollbar/beremiz.xml Fri Sep 10 14:44:20 2021 +0200 +++ b/tests/svghmi_scrollbar/beremiz.xml Fri Sep 10 14:48:07 2021 +0200 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="PYRO://127.0.0.1:61284"> +<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="LOCAL://"> <TargetType/> <Libraries Enable_SVGHMI_Library="true"/> </BeremizRoot> diff -r 2c0511479b18 -r 21d37b199ede tests/svghmi_scrollbar/plc.xml --- a/tests/svghmi_scrollbar/plc.xml Fri Sep 10 14:44:20 2021 +0200 +++ b/tests/svghmi_scrollbar/plc.xml Fri Sep 10 14:48:07 2021 +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="2021-02-12T19:29:13"> + <contentHeader name="Unnamed" modificationDateTime="2021-09-10T14:17:04"> <coordinateInfo> <fbd> <scaling x="5" y="5"/> diff -r 2c0511479b18 -r 21d37b199ede tests/svghmi_scrollbar/svghmi_0@svghmi/confnode.xml --- a/tests/svghmi_scrollbar/svghmi_0@svghmi/confnode.xml Fri Sep 10 14:44:20 2021 +0200 +++ b/tests/svghmi_scrollbar/svghmi_0@svghmi/confnode.xml Fri Sep 10 14:48:07 2021 +0200 @@ -1,2 +1,2 @@ <?xml version='1.0' encoding='utf-8'?> -<SVGHMI xmlns:xsd="http://www.w3.org/2001/XMLSchema" OnWatchdog="echo Watchdog for {name} !" OnStart="chromium http://127.0.0.1:{port}/{name}" OnStop="echo Closing {name}" WatchdogInitial="10" WatchdogInterval="5"/> +<SVGHMI xmlns:xsd="http://www.w3.org/2001/XMLSchema" WatchdogInitial="10" WatchdogInterval="5"/> diff -r 2c0511479b18 -r 21d37b199ede tests/svghmi_scrollbar/svghmi_0@svghmi/svghmi.svg --- a/tests/svghmi_scrollbar/svghmi_0@svghmi/svghmi.svg Fri Sep 10 14:44:20 2021 +0200 +++ b/tests/svghmi_scrollbar/svghmi_0@svghmi/svghmi.svg Fri Sep 10 14:48:07 2021 +0200 @@ -60,13 +60,13 @@ showgrid="false" units="px" inkscape:zoom="0.64" - inkscape:cx="318.22524" - inkscape:cy="196.09799" - inkscape:window-width="1939" - inkscape:window-height="1243" - inkscape:window-x="3325" - inkscape:window-y="162" - inkscape:window-maximized="0" + inkscape:cx="-438.80601" + inkscape:cy="183.59799" + inkscape:window-width="3200" + inkscape:window-height="1672" + inkscape:window-x="0" + inkscape:window-y="54" + inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-global="true" @@ -745,7 +745,7 @@ </g> <g id="g4507" - inkscape:label="HMI:ScrollBar@.position@.range@.size" + inkscape:label="HMI:ScrollBar@.range@.position@.size" transform="translate(-202)"> <rect y="84" @@ -818,7 +818,7 @@ x="277.58728" y="596.54126">Size</tspan></text> <g - inkscape:label="HMI:ScrollBar@.position@.range@.size" + inkscape:label="HMI:ScrollBar@.range@.position@.size" id="g146" transform="rotate(90,837.8103,-106.02497)"> <rect @@ -854,7 +854,7 @@ </g> <g transform="matrix(0.35355339,0.35355339,-0.35355339,0.35355339,831.43929,-136.17916)" - inkscape:label="HMI:ScrollBar@.position@.range@.size" + inkscape:label="HMI:ScrollBar@.range@.position@.size" id="g156" style="stroke-width:2"> <rect