merge

py_ext: better handling of coma separated OnChange attribute for python safe global variables.

Project tree: Clicking on ConfigTreeNode should have same behaviour as for POUS and other IEC types : simple click to select and double click to open.

Allow customization of generated py_ext OnChange calls, by adding a static method to PythonFileCTNMixin that can the be later hot patched.

Arbitrary variables added to JsonTable subscription are now passed as 'extra' field in json query. As an example added JsonTable filtering in tests/svghmi

SVGHMI: Fix HMI_REAL support, and add a HMI_REAL use case in tests/svghmi.

merge

SVGHMI: JsonTable now outputs "visible" value as well.

SVGHMI: non significant cosmetic changes

- New widget customHtml which allows to insert block of html code
- widget animate transfered to animaterotation
- widget animate, left to be more customizable
- changes to svghmi_v2/svghmi.svg

PY_EXT: OnChange is now a coma separated list of callables. Updated tests/python accordingly.

Button fix if no active or inactive state,
Widget animate changed to use anitmateTransform and added option to change rotation
Widget circular slider fixed so it is working on got and reprogramed so it similar to normal slider
Widget slider added support for changing size still need some changes to work properly
Added slider to svghmi test project
Changed svg in svhgmi_v2 project

Merge two different heads

SVGHMI: Documentation fix

Button and toggle reworked to use animate and dispatch
Slider added buttons to incremente/decrement by 1
Init for animate widget
Changed test svg and plc

Merge + fix side effects of making warning instead of errors in case of missing HMI variable

Updated svg and xml for testing program

Button, ToggleButton and slider updated. Error to warning when building

Button fixed so it doesn't release until it gets feedback from plc

Toggle button changed so it makes changes instantly. There was too big delay if we waited for feedback.

Slider added new features need some changes for final version.

Modbus: fixed typo in ctype typing.

MODBUS: Fix saving of websettings.

Runtime/PLCObject : move call to PreStartPLC right after call to the "start" method of all python extensions, and then just before the start of the python loop executing python_* blocks.

SVGHMI: Better error message when inkscape is not installed.

SVGHMI: nicer error message

Merge

Attempt to workaround problem reported about empty plc.xml after unrelated crash. Now, if etree model is corrupted in a way tostring() would generate an empty string, exception prevents saving.

SVGHMI: JsonTable can now have clickable elements, that trigger a request with extra argument whose content is taken from Json data.

Merged

SVGHMI: cosmetic fix in test

All widgets reworked to use widget class and animate function if needed

SVGHMI: Moved JsonTable/Alarm related test in a separate page.

SVGHMI: JsonTable now ignores elements and groups starting with #

SVGHMI: Fix keypad : non-number input was always considered invalid because of missing type checking.

SVGHMI: JsonTable now updates range and position variables so that slider widget can update.

SVGHMI: Fix multiple variable support in widget

SVGHMI: Add TODOs in Button widgets.

SVGHMI: Alarm test not using Button widget anymore, too many problems. Use Input widget instead to increment value on each click and execute python code on change.

SVGHMI: little fix in HMI:Button

SVGHMI: JsonTable now use intermediate variables again to address JSON data without duplicating code or referencing. Using intermediate variables also alows to check for availability of data and stop evaluating early if data is missing. Finally added complete roundtrip example to illustrate use of JSonTable to display "alarms" collected in python from changes on PLC boolean variables.

SVGHMI: removed debug code forgotten here and there.

SVGHMI: JsonTable now makes meaningfull JSON request : all arguments and variables are passed in.

SVGHMI: Keypad is now keeping Javascript type constency. In other words, if a number was given as initial value, input value will have to convert to number in order to be valid. In case invalid value is entered, initial value is restored.

SVGHMI: Behave when project path include spaces, and make more understandable error in case of problem extracting geometry with inkscape.

SVGHMI: Refactor the way JsonTable generate javascript code to access json data. Now support multiple assignments, used in the case of text to change both content and style on the same element.

SVGHMI: Fix again clone unlinking, and this time add an "original" attribute to track the id of the original object before unlinking.

SVGHMI: Fix svg test file while testing latest JsonTableChanges

SVGHMI: HMI:JsonTable also recognize TextStyleList, but parsing of textContent is still not implemented and style is still not updated.

SVGHMI: Deeper clone unlinking. Was actually not recursive, and clones in clones where not unlinked. Stack successive ids to avoid collisions.

SVGHMI: factorize dispatch calling logic.

SVGHMI: HMI:VarInit:"a string"@a_value : empty widget (i.e. empty svg:group) that initialize content of local variables to value given as first argument.

Merge

SVGHMI: Add more local HMI variable tests in tests/svghmi.

SVGHMI: finished initial implementation of PAGE_LOCAL and HMI_LOCAL variables.

SVGHMI: add a SetPoint to Slider Widget, visible only when operating the slider.

SVGHMI: Update Slider widget so that it doesn't display future value but actual value only.

SVGHMI: provide request_animate() to Widget authors so that they can register redraw code when events lead to redraw. Widget member animate() is called when it is time to update DOM.

Merge

SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change.

Beremiz test project with newly created widgets.

Rebuilded gen_index_html.xslt after all new widgets were commited

Create new multistate widget which extand class widget

Create new CircularSlider widget which extand class widget

Create new slider widget which extand class widget

Reworked togglebutton widget to extand class widget

Changed keyboard to show on defined position.

* svghmi.js
added size paramter to edit_value
changed show_modal function to offset keyboard if paramter passed

*widget_input.ysl2
in on_edit_click:
function get position if key_pos element is defined in input widget

*widget_keypad.ysl2
Reworked keypad widget to extand class widget,
added support for changing keyboard position to user defined location

Reworked button widget so it uses classes.

SVGHMI: allow multiple variables and formatting in Display widget. Formatting is printf style and given as first argument. If no formating is given as widget argument, space separated.

SVGHMI : have to move some JS declarations from "preamble" to "declarations" and others from "declarations" to "definitions" section to make room for JS libraries that would be used by widget classes.

SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit)

SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness".

Because of allowing multiple variables per widget, we must distinguish if individual variables is relative to page, not the whole widget.

SVGHMI: More JS code refactoring : change_hmi_value and apply_hmi_value now methods of widget class.

SVGHMI: Better JS code semantic in ForEach widget class. Update lagging generated xslt.

SVGHMI: Add ForEach Widget is svghmi test

SVGHMI: add get_idx(index) to widget objects to factorize a bit code repeated accross widgets. To be continued.

SVGHMI: prefer apply_hmi_value() to change_hmi_value() when possible

SVGHMI: Add RelativePages to tests

SVGHMI: Update Widget Display templates to generate Class based declaration.

SVGHMI: JsonTable now picks items from HMI:List, and update texts, all according to Json data. Still miss scrolling.

SVGHMI: JsonTable now generate working data access code for data/* elements.

SVGHMI: Minimal support for HMI:List : clones pointing to elements of any HMI:List are never unlinked, widgets using HMI:List will rely on this.

SVGHMI: minimal JSON Table Widget communication infra + corresponding python code as py_ext code in svghmi test. To be continued.

Python Runtime: order of execution of extension's init() and cleanup() now reflects order of appearance of extensions in configuration tree.

Python Runtime : stil untested optimization of Python Safe Globals.

Now only one python_poll block per python extension is used to trigger
execution of OnChange calls.

Prevent global python_poll blocks to be created when accidentally adding content to C-File OnChange column.

Merge from default

Modbus: fix strange side effect of re-use of condition variables or mutex with Xenomai : without bzero of the associated types, mutex keeps locked.

Modbus: fix client timer invalid arguments.

Modbus add a timer thread, and switch timer to SIGEV_THREAD_ID to follow xenomai posix skin restrictions.

Runtime: Fix typo in PLCObject leading to exception when reporting failure.

merged

SVGHMI: Fix bug introduced when merging default

SVGHMI: Add use of Python PLC Globals it test

Merge default changes in SVGHMI

Merge default changes in SVGHMI

SVGHMI: add "unsubscribable" property to widgets in order to generalize what already happens for jump buttons.
In most cases jump buttons do not really subscribe to pointed HMI variable, path is given as a relative page jump path. When widget.unsubscribable is set to true, no subscription is made on page switch, but still offset is updated.
This fixes bug happening on relative jump buttons without "disabled" element where offset did not change on relative page switch.

merge

Merge

SVGHMI: Added widget toggleButton.

SVGHMI: Changed widget button handler to element attribute.

Runtime: create .md5 file at the end of all transfered files being written to disk, so that it presence indicates completeness of transfer.

IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.

Runtime: fsync() files when transfering them, to prebent data loss when poweroff soon after programming. Fixed variable naming as a side effect.

PLCObject : reorganize code in StartPLC(), add a PreStartPLC() empty method, to be overloaded by runtime extensions.

Solve import order problem when POULibrary imports ConfigTreeNode because of UserAddressedException. Now UserAddressedException is declared in POULibrary.py, as a quick and dirty fix, but some independant module should be created for beremiz exceptions in general.

SVGHMI: stop using eval in change_hmi_value, apparently slowly leaking memory.

SVGHMI: Switch widget was picking sub-elements from original SVG, not the result SVG ehwe clones are unlinked, thus making problems with svg:use based widgets.

SVGHMI: When unlinking a clone of a group, do not create additional group, but merge transformation and styles, and replace label. This allows svg:use based widgets to directly access elements of svg:use targeted element.

SVGHMI: Applies clone unlinking to widget themselves, not only to clones inside widgets.

merge

SVGHMI: Makes error when HMI tree is not well formed. Prevents multiple and non-first HMI_NODE, and ensure that all paths in HMI tree are unique.

Added FatalError call to Libraries code gen, so that they can emit messages addressed like config tree nodes do.

SVGHMI: more Widget properties declared ES6 style.

SVGHMI: Switch widget now use class declaration

SVGHMI: Update Button widget to class declaration, and add a button widget in tests/svghmi.

SVGHMI: explicit handling of undefined maximum widget update frequency

SVGHMI: removed dead code

SVGHMI: Back button updated to class style

merge

DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing

SVGHMI: Exclude non-widget HMI:* labeled elements from hmi_widget. Namely : HMI:Page HMI:Lang and HMI:List have been excluded.

SVGHMI: clean up dead code, update generated xslt.

SVGHMI: apply per class overloading of sub/unsub to Jump widget

SVGHMI: apply per class overloading of sub/unsub to ForEach widget

SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class.

SVGHMI: Parameters common to all widget constructors now passed as ordered parameters.

SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets.

SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes.

SVGHMI: Systematically output local name as /* comment */ when emiting content.

Merge

SVGHMI: Fix flawed logic to place nodes in the HMI tree, leading to wrecked tree in some cases.

Added button and circular bar widgets.

SVGHMI: added more meaningful namespaces to emit javascript code from.

SVGHMI: moved JS code of foreach and jump widget in corresponding widget_*.ysl2. To be continued.

SVGHMI: spread JS code from svghmi/scripts.ysl2 in other .ysl2 files, using dedicated preamble and epilogue namespaces

SVGHMI: Introduced "emit" to simplify producing per-topic code and content from anywhere in code. Applied to debug output, next to JS.

SVGHMI: Move reflective debug tags from "reflect" to "debug" namespace, preparing for per-purpose namespaces.

SVGHMI: Added scripts.ysl2

SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability.

SVGHMI: HMI:DropDown: more documentation.

SVGHMI: Comments in HMI:DropDown source code

SVGHMI: HMI:DropDown menu aligns to selected when opening

SVGHMI: When clicking outside of opened HMI:DropDown box, close it.

SVGHMI: Fix HMI:DropDown flicker on close.

SVGHMI: HMI:DropDown now temporarily takes content from widget's arguments, until HMI:List is implemented.

SVGHMI: Connect HMI:DropDown to value in HMI Tree, in svghmi test as well.

SVGHMI: fix probable problem in HMI:Input, where value could be applied to wrong index if used in relative page.

SVGHMI: HMI:DropDown element is brought in front when opened, so that it isn't occulted by other widgets at the same level.

SVGHMI: HMI:DropDown now catches all clicks when open

SVGHMI: Add button element to HMI:DropDown, also fix problem with computed box margins.

SVGHMI: HMI:DropDown now scrolls forward and backward

SVGHMI: progress on HMI:DropDown - now selects some value on click, and close

SVGHMI: HMI:DropDown work in progress, intermediate commit. Now menu's rectangle grows up to viewport borders.

SVGHMI: intermediate commit while working on dropdown widget.

Here is the plan :
HMI:DropDown : svg:g of svg:rect + svg:text
rect is extended to match content size, and if content size exceed page size, user can scroll
HMI:List : either HMI:List:ListName as svg:text, one tspan per list entry
or HMI:List:ListName:Foreach:HMI_CLASS:SUB/PATH/TO/VALUE@/ROOT/PATH as empty svg:g

SVGHMI: HMI is not speculating on PLC variable update anymore when sending new variable value.

HMI variable cache in JS was changed in advance for more responsive behaviour when updating a HMI tree variable. This was leading to display value different from hmi tree variable in case the expected update did not happen because PLC program did revert it.

SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled...

SVGHMI: fixed keypad JS regarding shift/capslock and other details

Fix unmatched "Courier" font for monospace fonts on latest ubuntu 20.04. Selected "FreeMono" instead, present since at least 18.04

SVGHMI: Keypad working for HMI_STRING, still Shift/CapsLock not finished.

SVGHMI: fix keyboard not showing

SVGHMI: Added keypads to svghmi test's SVG file

merge

SVGHMI: Keypad: added code to re-attach keypad when starting edit.

SVGHMI: removed debug code

SVGHMI: More infrastructure for editing values with a keypad.

SVGHMI: Widget input buttons should be clickable through svg:use (onclick attribute instead of addEventListener)

SVGHMI: moved dead code to where it belongs

SVGHMI: empty widget_keypad.ysl2, WIP

SVGHMI: HMI:Switch now accepts boolean values 'true' and 'false'

SVGHMI: Jump widget, if it has a 'disabled' labeled element, reflects value of the pointed HMITree variable by showing this element when value is False, and behaving normaly otherwise.

SVGHMI: prevent man-made memory leak by limiting back button history items count to 42

SVGHMI: collect debug data through xslt reflectivity instead of yml2/python trick

SVGHMI: Jump widget can now display as active or inactive, if corresponfing "active" and "inactive labeled elements are provided.

SVGHMI: added Back widget.

SVGHMI: Jump widget now make errors if path given for relative jump doesn't match target page reference path class.

SVGHMI: Check that explicit relative page jump path is consistant with destination page reference path.

SVGHMI: ForEach Widget now has a better wrap-around when scrolling : hit the boundary systematically before wrapping

SVGHMI: Alow relative relative Jump. (i.e, relative jump from a foreach widget)

SVGHMI: Generalize applying cache to widgets, be it from page or ForEach widgets. Now ForEach widget buttons work as expected.

SVGHMI: Widget ForEach buttons now call corresponding methods.

SVGHMI: ForEach now has working (un)subscribe. Fixed PageSwitch that wasn't behaving when jumping to current page with another path.

SVGHMI: Easier way to match HMI tree elements to paths. ForEach widget now looks for paths and indexes of all items, and enforce path to be consistent with ForEach items sub widgets

SVGHMI: added func:get_hmi_tree_elt to match HMI tree node from path. Continue implementing ForEach widget : force order and completeness of items list. Now also collecting ForEach buttons.

SVGHMI: ForEach knows its own widgets

SVGHMI: add widget_foreach.ysl2

SVGHMI: make root HMI tree node a HMI_NODE, droped HMI_ROOT node type

SVGHMI: reworked widget (un)subscription now a method of widgect object, allowing special subscription methods

SVGHMI: Exclude (again) sub-widgets of forEach widget from page-switch managed widget.

SVGHMI: cosmetic changes

SVGHMI: Simplification and optimization. func:parselabel becomes a template.

All labels are parsed into a global variable containing resulting widget
description as a node-set. func:widget(id) was added for random access to
widget description.

SVGHMI: intermediate untested state. Excluded ForEach widget from pages handled widgets.

SVGHMI: update Makefile to pick all changes to any dependency

SVGHMI: created widget_*.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing.

SVGHMI: moving comments

SVGHMI: added widget_common.ysl2

SVGHMI: More readable debug output gen code

SVGHMI: Cosmetic changes

SVGHMI: added inline_svg.ysl2

SVGHMI: detachable_elements.ysl2 becomes detachable_pages.ysl2, and includes logic to process pages elements. Other minor code moves.

SVGHMI: moved debug code

SVGHMI: created detachable_elements.ysl2

SVGHMI: more debug code moved to hmi_tree.ysl2

SVGHMI : create hmi_tree.ysl2, rename bbox_intersect.ysl2 into geometry.ysl2 and move more code into. Add per included ysl2 file debug output.

SVGHMI: created bbox_intersect.ysl2

SVGHMI: Re-enable dispatch to arrays of functions in case of multiple suscription per widget. Still unused, but disabled for reasons not any more true.

SVGHMI: relative pages and page jumps

SVGHMI: take care of path given in HMI:Page and HMI:Jump, but do not apply subscription offset for now. Intermediate commit in a "working" state.

SVGHMI: significant whitespace changes

SVGHMI: unsignificant changes or changes in generated code

SVGHMI: Stop ignoring HMI_NODE in HMI tree, and count it as a BOOL. Soon we use those nodes as reference for relative page jump, and as an "enable" bit for features associated to an HMI tree fragment.

SVGHMI: cosmetic code moving

SVGHMI: split page switch into switching subscription and switching elements in the DOM, to ensure that subscriptions have been send before changing DOM, and avoid some flicker.

SVGHMI: fix wrong updates of HMI variables on each change, especially when not subscribed.

SVGHMI: whitespaces

SVGHMI: fixed repeated error when Input widget is missing 'value' element

SVGHMI: more decoupling in between UI related and the rest of JS code, still in the aim of enhancing robustness under heavy load.

SVGHMI: use requestAnimationFrame to delegate rendering of updates from network. Should help prevent browser collapse leading to watchdog in case of overload.

SVGHMI: Fix disapearing elements in case of nested detachable elements.

SVGHMI: Meter widget accepts 2 arguments : min and max, taken in account when min or max text element is missing

SVGHMI: More precise error message on missing HMI path. Meter widget now defaults 0-100 range when min and max elements arent's present, without error.

SVGHMI: more whitespace fixes

SVGHMI: unlink clones (i.e. deep copy elements refered by svg:use) inside widget.

Designer can use Inkscape clones to duplicate similar assets accross widget. Those clones are unliked so that elements can be independently transformed by individual widgets.

SVGHMI: whitespaces and comments

SVGHMI: completely fixed indentation of generated widget description. Lets try to keep it as-is until we can use yslt indentation.

SVGHMI: re-indent generated JS

SVGHMI: detach/re-attach elements required by pages on page switch

This is meant to optimize performances with large drawings leading to long restyle or reflow.