merge

SVGHMI: split svghmi.py into svghmi.py (Config Tree Node + code gen) and ui.py (UI for HMI tree and Widget picking)

SVGHMI: stop serving HMI open wide on all interfaces. That was a security hole. It is user/developer responsibity to forward connection with for exemple stunnel and make it securely accessible from LAN.

SVGHMI: Filter unseen geometry from inkscape CSV output.

When inkscape exports geometry form all objects, then it also includes objects from svg:defs. This makes problems when deciding if an object is part of a page, since coordinate of objects in svg:defs can eventualy be contained in a page. In the end, those objects where getting detached when leaving pages where they where found, leading for exemple to non working text on clipping when the clipped text was cloned in multiple page.

SVGHMI: Fix typo in error message formating in i18n.

SVGHMI: split svghmi.py into hmi_tree.py + svghmi.py

Merged

SVGHMI: JsonTable: Fixed options not being passed in JSON post when jumping to a page where additional variables are pre-defined by a HMI:VarInit.
Was JS Fetch Promise not executed late enough, and gathering JsonTable variables before the sequence of calls to dispatch() was finished.

SVGHMI: Added small widget library for library browser testing.

SVGHMI: Added SVG widget library browser. Supports browsing and previewing widgets. Widget validation and drag'n'drop are still to be implemented.

Allow using spin() from ProcessLogger even with no logger given.

merged

SVGHMI: cosmetic change, missing semicolon

SVGHMI: JsonTable should refresh when re-subscibing, because data might have changed while not on the page we are switching to.

SVGHMI: Fixed problems happening when value is higher than maximum or lower than minimum in Input widget. "max" and "min" string was getting into keypad text field, was not diplayed systematically, and was staying forever sometime.

SVGHMI: change default values for JsonTable, leading to scrollbar initialized at annoying non-zero position

SVGHMI: Ensure that when a HMI:List is refered, none of its refered elements are discarded.

Backed out changeset b2ba6eeb61ec. Users reported text styling being messed in some cases.

merge

merge

Runtime: Added PostStart methot to PLCObject, called after PLC is started, with all libraries and python object already created, and python extensions "Start" methods being called.
This is called before python thread processing py_eval blocks starts. Example purpose: attach additional ressource to web services

SVGHMI: Add generic action buttons to JSON table, with an example in tests/svghmi: wipe alar list.

SVGHMI: do not do XSLT transform if both SVGHMI and HMI Tree didn't change since last build

Merged

SVGHMI: Make ScrollBar's variables order match JsonTable's variables order to avoid confusion

SVGHMI: Lighter display of HMI Tree, no more icons and use buttons. Auto expand root. Fix loading of HMI tree XML backup (hmiclass attribute wasn't kept).

SVGHMI: Systematically save HMI Tree in build directory as hmitree.xml when building, so that HMI Tree can be displayed when re-opening project, without having to build

SVGHMI: attempt to prevent crazy styling with HMI:TextStyleList when inkscape store style in tspan instead of text element.

IDE: Fix logging of external process execution time so that it is visible on windows as well.

IDE: Process Logging : Add annotation in log so that user can see build is still alive and how long external process takes.

IDE: Iec2CSettings: Log wasn't available in case of exception when launching iec2c.

IDE: Log: Cosmetic changes, refactoring

SVGHMI: Make build log less redundant, and refactor progress information code a bit, to make it also a bit less redundant.

IDE: Make ST code generation more verbose, since it can be really long in case of big programs, and it is better to let the user know build is still in progress.

merged

SVGHMI: Fixed progress time computation

IDE: Fixed log console that was not updating line by line smoothly when building.

SVGHMI: Optimized overlapping geometry (widget ot page belonging) computation. Added human readable messages for progress. Includes updated XSLT.

merged

Merge changes from default into svghmi branch

SVGHMI: More build time optimization : def_by_label now takes far less time.

SVGHMI: Optimize sumarized_elements xslt function, taking most of SVGHMI build time.

Merge

SVGHMI: Add icons

SVGHMI: Fixed/extended error message when failing to launch POEdit.

SVGHMI: Fix launch of POEdit on widows. Parsing oommand in registry based on heuristic was bad, now using regex should be safer. TODO : replicate for Inkscape launch.

SVGHMI: display progress in IDE console while building

SVGHMI: finally found why HMI:Input wasnt't initializing properly: vsprintf takes a list. Also, removed intermediate variable last_val, since edit_value() works on strings anyhow, and in case of formated floats, it is better to workl on already formated value.

SVGHMI: update generated XSLT

Allow printf-like formating in HMI:Input, usefull for example when dealing with floating point numbers.

SVGHMI: Switch from {object} to Map for "updates" global, for performance but also preventing wierd behaviour when iterating

SVGHMI: Fixed HMI:ScrollBar to exclude cursor size from accessible range ( position is now 0->range-size instead of 0->range ). Fixed and extended tests/svghmi to have working ScrollBar on two alarm pages. Includes generated XSLT update.

SVGHMI: JsonTable removed useless promise since fetch() already does one. Updated generated XSLT.

SVGHMI: Optimization for JsonTable : reload JSON only when necessary, and avoid concurrent http requests.

merge

SVGHMI: update generated XSLT

SVGHMI: little fix ihn i18n example.

SVGHMI: Fixed sending HMI_REAL to PLC. Added a svghmi_real test that illustrates using printf style formating in HMI:Display to control precision of Float number display.

SVGHMI: i18n: ensure langs always appea in same order, and add two variables that are updated automatically when selecting a new language : lang_name and lang_code. Also fixed i18n startup, prevent wrong lang numer to crash loading.

SVGHMI: more straightforward implementation of dragging position computation in Scrollbar + some little fix about boundaries.

SVGHMI: allow i18n of formated strings of HMI:Messages. This was by construction impossible since formating was given as an argument. Now added optional "format" labelled element in HMI:Display, so that it can be translated, when labelled "_format".

SVGHMI: update generated XSLT

SVGHMI: i18n: prevent creating messages.pot if no translation

SVGHMI: Add inhibition to widget's apply_hmi_value() so that it does not change variable more frquently than given widget's frequency. This prevents flooding network with many update if browser is producing events at high rate, as for exemple when dragging ScrollBar's cursor.

SVGHMI: fix scrollbar not behaving when rotated.

SVGHMI: remove forgotten debug code

SVGHMI: Add a robust ScrollBar widget. HMI:ScrollBar@positionrange@size

SVGHMI: propagate default local variables (HMI_LOCAL, PAGE_LOCAL) to widgets at startup

SVGHMI: Update generated XSLT

SVGHMI: HMI:DropDown:#langs@lang now automatically shows human readable list of languages. tests/svghmi_i18n updated accordingly.

SVGHMI: Add a simple i18n test

SVGHMI: Prevent Dropdown widget to mak exception whe value out of range

SVGHMI: removed dead code

SVGHMI: Add "lang" permament persistent HMI_LOCAL variable to reflect selected language, apply stored language choice at startup and make it always subscribed to a pseudo widget (as for hearbeat) that apply language choice when it changes.

SVGHMI: Added HMI:VarInitPersistent to initialize persistent HMI_LOCAL and PAGE_LOCAL variables, stored as cookies in browser.

SVGHMI: Enforce formating HMI_LOCAL and PAGE_LOCAL variables until the end of variable name

SVGHMI: generate JS translation literals so that it is possible to also translate uses of texts, and added JS code that apply translations to tspans

SVGHMI: widget activable elements : moved code to wher it belongs, rewrote cleaner

SVGHMI: update generated XSLT

Merged

SVGHMI: make a copy of tests/svghmi as test/svghmi_widget because too crowded since having pages for widget documentation. Strip those pages from tests/svghmi, so that it
is more light for regular testing.

SVGHMI: Prevent excluded widget to appear in generated pages' widget list.

SVGHMI: Remove recursive walk in parsed widget to find unique type and use xsl:key instead.

SVGHMI: Fix browser side exception when some widget are not used, and are then discarded and not present in final SVG. In that case JS code was still making reference to discarded widget elements and was raising exception at init.

SVGHMI : removed support for changing keyboard position and showing at user defined location. Feature was problematic in many respect.

SVGHMI: Make an error when pages are nested

SVGHMI: i18n: finished passing back translated messaged to xslt proc, finished template to generate corresponding javascript literals.

SVGHMI: i18n: various fixes about unicode encoding and converting translation result back to XML to feed xslt processor

SVGHMI: i18n: better warning messages, more explicit.

SVGHMI: i18n: now loads PO filesand match translation against catalog. Refactored a bit to move i18n related code in i18n.py

SVGHMI: still WIP, now POT file is properly generated with utf-8 encoding and POEdit is launched when pressing button.

Docutil : reworked Inkscape launching and path resolution in docsvg.py

merge

Removed harmful assert in ProcessLogger.

ProcessLogger was having an assert in constructor when missing logger, leading to systematic exception when testing options accepted by compiler. This exception was silenced in ProjectController, and then MatIEC was always called without options.

SVGHMI: Intermediate commit while implementing i18n. WIP.

SVGHMI: Jump widget: switch to class based declaraion, and add some TODO comments to prepare for jump to relative page being selected through a DropDown widget.

SVGHMI: intermediate state of test/svghmi's SVG for backup... WIP

SVGHMI: CircularBar: use animate() + cormetic changes

SVGHMI: Meter widget: use animate() + cosmetic changes

SVGHMI: Update generated xslt

SVGHMI: Fix bug in keypad leading to error messages in browser console when keypas has no Shift or CapsLock keys

SVGHMI: cosmetic changes

SVGHMI: Input widget overrides undershot() and overshot() methods to display "min: xxx" or "max: xxx" when user input goes out of given range.

SVGHMI: Added clipping to min and max value for all widget using @path,min,max syntax. Added overshot() and undershot() methods to widget base class, called when value is limited to max or min respectively.

SVGHMI: decoupled operation string evaluation from HMI variable uptdate in change_hmi_variable(), paving the way for min/max boundaries enforcement

SVGHMI: Added parsing of min and max value that can be given as @path,min,max in widget description

Merged default in svghmi branch

WebInterface: better wording for wiping PLC content: "Repair"

SVGHMI: almost rewrote Input widget to make it new class based style.

runtime: added restart/reset button in web settings. Accidentaly fixed web settings logging feature.

SVGHMI: added dropdown selection highlighting and fixed scrolling so that it doesn't miss any entry while jumping from one page to the other.

SVGHMI: change scroll buttons into single unicode triangle and center them. Use highlight rectangle duplicated and hidden to catch selection clicks so that the whole row is clickable.

SVGHMI: DropDown widget now using new class based style

Add a little test to see OnChange's .count .first .last in action

Fixed "Onchange" object added in previous commit

Python Safe Globals now have more reliable triggering of OnChange call. Added "Onchange" object to accessible runtime variables that let user python code see count of changes and first and last values.

SVGHMI: cosmetic fixes in button widget

SVGHMI: Rewrote button widget.

SVGHMI: update generated XSLT

SVGHMI: stuff test so that it moves all the time, to have better chance to spot memory leaks...

SVGHMI: prevent unwnted context menu and pinch zoom

SVGHMI: more attempts to prevent losing memory in JS closure

SVGHMI: WIP trying to reduce memory usage : use .onclick onstead of SetAttribute, avoid useless closure and object creation when possible, etc.

SVGHMI: update generated xslt file

SVGHMI: use const when applicable

SVGHMI: prevents text and svg elements selection on the whole page when dragging.

SVGHMI: Update default test to check that Input widget is indeed updated when variable changes.

SVGHMI: Fix: on screen keyboard wasn't showing up when editing local variables through Input widget.

Project tree: avoid flickering and glitches in notebook when selecting some still not opened ConfigTreeNode

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.