Make Modbus extension license compatible with the rest of Beremiz IDE python code : GPLv2.

Commented out safety check to prevent deadlock in wxEvaluator, since wx Mainloop is not anymore in main thread. That safety check actually leads to having wx code running outside of MainLoop

Merge

Print version information about software used for tests

Fix codestyle

Fix typos introduced by 9fa2f8e "Fixed random segfault happening when loading new PLC in runtime, when using Xenonai."

merged changes in README.md

add python-cycler dependence in readme

Make Modbus mutexes non blocking for PLC. If data related to some modbus request is alredy locked when PLC wants to access it, then data isn't copied to/from PLC

Merged #2476, URI dialog fixes

close branch #2476 - URI dialog fixed

#2476 Changes to the comment.

#2476 Connectors dialog module added.

#2476 Separate connectors dialogs from connectors module.

#2476 Additional check added if we can import wx.

Allow deleting configuration tree node with no corresponding directory in project tree

Support unicode in LDFLAGS returned by extensions

Fixed typos

#2476 Added uri location editor, getting connectors from list in Beremiz.

Fixed random segfault happening when loading new PLC in runtime, when using Xenonai.

PEP-8 and PyLint

merged Denis change to apply input as we type in CTN configuration forms text fieds

PEP-8 and PyLint

Add safety check to prevent exception when disconnecting while debugging

Removed DebugThread. Take advantage of the fact that buffering is done in runtime. No need to poll for traces more than ten per second, then use simple wxTimer for that. Also removed Debug Lock since now everything happens in wx' mainloop.

Rework of runtime non-real-time threading, and shared object dynamic loading :
- All exposed operations on PLCObject are now serialized through main thread
(@RunInMain). Only one exception : python trace thread calling _GetDebugData
- Re-loading of same shared object is prevented. dlclose/delte/rewrite/dlopen
don't happen in that case. This is a workaround for some xenomai copperplate
bug triggering segfault, inbetween delete and rewrite.
- Trace thread now waits for data, dies if no data, and dies instead of
suspending as before when no data consumed after 3 seconds.
- Disabled threading in Pyro client
- Enforced auxiliary threads starting sequence : Pyro -> [UI] ->
PLCWorker.RunLoop

Stripped forgotten debug code

close branch

#2476 Fix for saving text in URI edit text box. No need to click out of URI edit text box to save edited text.

Fixed Xenomai 3 PLC stop freeze. Now use explicit finish command with pipes. Closing both ends of pipes doesn't abort blocking read anymore.

More canonical test.
There is an exception happening around here in some cases when connection is dropped while waiting for answer. Not sure that this fixes it but this is anyhow better.

PLCObject got more methods serialized through worker : Start, Stop, NewPLC.
This particularly helps with initialization/startup/re-load problems
when targeting Xenomai. It should help in general for runtime robustness,
since those operations aren't meant to be executed concurrently.

Fixed implementation of runtime worker that ensure that PLCObject Load and Unload methods always run main thread.

merged

merged

Intermediate state while implementing runtime worker to ensure that PLCObject Load and Unload methods always run main thread.

Stripped more dead code.

Cleanup of some dead code in PYRO connector.

Added logging in Xenomai init phase.

Apply new RT Pipes API from Xenomai 3

Removed useless try/except in Canfestival.py

#2579 On showing search result, text color of tree item is set to white. We need to change back color to show the result.

PEP-8...

Fixed bug that was creating many frames at starup on Windows

re-merge

Xenomai 3

merged Sergeys changes

fix bug with indelible values in some 'optional' fields in project properties panel

only 'required' fields should be indelible

make the URI model compatible with https

add address validation in Company URL field

remove duplicating code for variables name generate

add fields autocomplete when adding task or instance in resources

values will be copied from previous row, first row fills with the default values

fix search in TextViewer objects, search returns only first entry

side effect of a63bb40

fix import order according to PEP8

fix default time range choice for debug variable panel

only localized versions were affected

enlarge canvas border for debug variable graphic viewer

fix rounding milliseconds from nanoseconds

example:rounding 299999 ns to 300ms, if division result is an
integer, remainder will be lost, and result will be 299.

fix display TIME type variables in debug variable panel

fix for test app from skv. thanks

Prevent catching exception if exception handling was not enabled (or disabled by test test app).

pep8 and pylint hate me

Fixed typo introduced in 5736d25bb393

GetEditedElementInstancesInfos now optimized as well. Forgotten because not using [R.I.P]LibraryResolver, but still XSLT compiling was hapenning on each call.

Another attempt to make BitBuket's version of pylint happy.

Attempt to make BitBuket's version of pep8 and pylint happy.

Removed dead slow code

PEP8 and PyLint conformance: whitespaces and stuff

Copy pasted, no time wasted !

GetVariableDictionary and GetPouInterfaceReturnType optimized with new VariableInfoCollector based on XSLTModelQuery. Moved corresponding definitions out of PLCControler.py.

GetPouInstanceTagName optimized with XSLTModelQuery.

Better writing of some xpath added in previous commits about XSLT optimization.

Moved some definitions away from controller class, and adaped references them through all code.

Hook Beremiz Launcher AppStart to AdvancedSplash OnPaint event in order to ensure image is beeing displayed before loading.

Avoid endline escaping in multiline xpath epressions in xslt. '
' Is apparently ignored but never know...

Fixed earlier XSLT optimizations. Some/most results were missing.

Moved some code from PLCController.py to other modules. Added necessary imports.

GetPouVariables optimized with XSLTModelQuery

Added /plcopen/InstancesPathCollector.py, to move more model xslt querying code away from PLCController.py.

Fixed Exception dialog disapearing after a view second when exception occurs during app startup.
Problem was caused by splashscreen timeout, wx closing averything else if there is no more main frame.
Changes:
- no more timeout for splashscreen
- use wx.App OnInit method to give first operation to mainloop, object are then now created in mainloop
- main loop is then created _before_ showing splash screen
- no more wxyield or wx processevent tricks needed to display splash screen
- exception handler not blocking anymore on dialog (callafter)
- because of mainloop being there before everything, exit must be called explicitely if exception caught during startup -> exit parameter in handle_exception + try/except around startup calls

UNTESTED ON WINDOWS

Moved XSLTModelQuery class to own module in plcopen package.

Added a class to speedup all XSLT queries. WIP, now only for instances_path.xslt / GetInstanceList()

Stripped useless node creation in instances_path stylesheet.

This should really help GetInstanceList to perform better: resolver removed, no more deepcopy, no more useless xml serialization, no more node-set() calls.

YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files

Prevent compiling XSLT on each call of GetInstanceList. To be continued. More optimization needed here. 100x would be fine...

Changed meaning of -c commandline argument for Beremiz service : only gives DEFAULT wamp config.
If existing project already has a wamp config, it is taken instead.

Factorized duplicated code

Better variable naming, and small optimization.

Unclutter graphics package scope.
Moved some import statements from "graphics" package to "viewer" module.
It also avoid systematic import of everything in graphics when we only need one submodule.

Removed dead code

Fixed pyro timeout for runtime, was set too short and runtime was disconnecting when building PLC

Ask to stop PLC before transfer if it is running

Factorized some repeated refresh code into a method, to allow customisation.

Launcher : add a debug attribute, instead of BMZ_DBG, so that customization can use it.

Stripped old dead code.

More changes in Launcher. Modules to be loaded in the background are given in a list, and assigned as object attributes. Also splitted CreateUI into CloseSplashScreen and CreatueUI.

ClassImporter now accepts string, callable or class, for compatibility with some old extensions.

Launcher: ShowUI call moves from preStart to start. ShowUI() split into CreateUI() and ShowUI(). Start()'s arguments are passed to CreateUI()
This is meant to allow customizations to pass own pre-instanciated controller to UI at startup.

Launcher: allows customizations to specify what globals passed to extensions

Documentation

Another set of meaningless changes to satisfy PEP8 and PyLint.

PEP8 conformity for modbus. Most of it done by autopep8, plus some easy refactoring.

Add some class factory function to ease declaration of simple POU libraries in customizations (i.e. TC6 XML file only, no special C code generation)

Small pep8 conformity enforcement.

Better have globals passed to python extensions (-e) than locals.

launcher : move call to ShowSplashScreen and BackgroundInitialization to PreStart()
It doesn't change behaviour of launcher in beremiz, but may have some impact on some customizations.
Some customizations need to squeeze some bitmap folder init in between app creation and ShowSplashScreen

modbus extension code cleanup, from smarteh's patch

Merged Mario's modbus branch. Fixed line endings.

merge

Ignore bug report files.

Add support for Modbus (TCP and RTU) working as master & slave

merge

fixed erro introduced 2 commits ago (-e) : tuples have no reverse() method

Trying to get better logging/display of exceptions at runtime's startup

Changed way to deal with extensions arguments (-e) so that path and filename are stored independently and accessible for extensions themselves.

Textviewer : moved call to Colourise in a better place, so that ST highlighting gets also updated when typing in some case, not only IL

Main runtime template C code : Added HAVE_RETAIN preprocessor definition for customized build to signal it provides IEC-61131 Retain memory handling function. Removed targets/Xenomai/plc_Xenomai_noretain.c, now useless.

Clarify licensing, and packaging of runtime only files :
- moved and split targets/typemapping.py into runtime/typemapping.py and runtime/loglevels.py
- added runtime_files.list pointing to files necessary for runtime, and referring to runtime license

Enforced check_source.sh pep8 and pylint rules.

runtime/WAMP: Fixed secret loading into configuration. Fixed secret commandline switch handling.

runtime/WAMP : was 'Added time print on session left.' from dporopat. Purpose is to log (dis/re)connection, to help debugging connection problem

runtime/Wamp : adapt to unicode being enforced in latest crossbar API. Updated some documentation, to explain why there is unused definitions like SubscribedEvents or DoOnJoin.

Extend python<->PLC global variable description "GlobalDesc" to support Initial value setting.

Rebased from dporopat change "add initial value to runtime.py file", which means :
- GlobalDesc is used by some customized beremiz python runtime
- Those runtimes need to know what is initial value of these special variables

update tests/wamp README file, based on changes from dporopat.

Fixed WAMP test (crossbar confile upgrade and use same ID on both PLC and IDE side)

Fixed changes from dporopat and agregorcic about WAMP CRA and config.

WAMP runtime : changes from dporopat and agregorcic, adding CRA (-s) and changed way to load WAMP conf (-c)
- added Challenge Response Authentication,
- use -s commandline switch to give the shared secret.
- WAMP configuration now either given as -c commandline switch
or taken as default wampconf.json in project files.

Set WAMP registration option so that reconnecting while earlier session still didn't timeout is possible (in case of connection lost, for example).

More canonical overload of ReconnectingClientFactory (according twisted doc)

non significant print syntax change. ready for py3.

whitespace cosmetic for pep8

Added arbitrary timeout on Pyro, to force it to free memory after disconnect.

Moved code from to Beremiz_service.py Server class Start method to Loop method to allow customisation by hot patching. Also renamed Stop method as _stop and use Restart instead of Stop from everywhere else to make it clear that _stop actually does restart...

enforce PEP8 in previous commit

replaced normal panel with scrolled panel under project properties

fix missing root in empty search results panel

add possibility to specify subprocess stdout encoding

fix deadlock if method kill() is called after process is already finished

fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"

make CanFestival to be at the expected place in bitbucket pipelines container

fix pylint error '(unsubscriptable-object) Value 'X' is unsubscriptable'

fix pylint warning '(bad-continuation) Wrong hanging indentation before block'

force all python source code to have LF line ending

fix pylint warning '(expression-not-assigned) Expression "X" is assigned to nothing'

fix pylint warning '(redefine-in-handler) Redefining name 'X' from outer scope (line Y) in exception handler'

fix displaying result of update check during Beremiz startup

fix pylint warning '(no-init) Class has no __init__ method'

fix pylint error "(undefined-variable) Undefined variable 'X'"

fix problem happend when tests are running under python-coverage

$ python-coverage run ./tests/tools/test_application.py

Exception while connecting LOCAL://!
Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 1753, in _Connect
self._SetConnector(connectors.ConnectorFactory(uri, self)
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 1702, in _SetConnector
if connector is not None:
PyAssertionError: C++ assertion "m_window" failed at ../src/gtk/dcclient.cpp(2043) in DoGetSize(): GetSize() doesn't work without window

fix pylint error '(too-many-function-args) Too many positional arguments for function call'

fix pylint error '(import-error) Unable to import X'

fix pylint error '(no-self-argument) Method should have "self" as first argument'

fix pylint error "(no-name-in-module) No name 'X' in module 'Y'"

fix pylint error '(bad-except-order) Bad except clauses order (X is an ancestor class of Y)'

fix pylint warning "(no-value-for-parameter) No value for argument 'X' in function call"

fix problems with unconnected input of InOut function variables and
enfoce InOut variables to be connected for functions and function blocks

fix error for functions with VAR_IN_OUT

The problem was found by pylint '(used-before-assignment) Using variable "X" before assignment'

fix pylint warning '(unidiomatic-typecheck) Using type() instead of isinstance() for a typecheck'

fix pylint warning '(misplaced-bare-raise) The raise statement is not inside an except clause'

fix format string argument error found by pylint '(too-many-format-args) Too many arguments for format string'

fix pylint warning '(wrong-import-position) Import "import X" should be placed at the top of the module'

fix pylint warning '(import-self) Module import itself'

remove old code useless code found by pylint "(unnecessary-pass) Unnecessary pass statement"

fix error found by pylint 'W0104(pointless-statement) Statement seems to have no effect'

fix pylint warning "(undefined-loop-variable) Using possibly undefined loop variable 'X'"

fix pylint warning 'C0112(empty-docstring) Empty function docstring'

fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'"

fix pylint warning '(dangerous-default-value) Dangerous default value {} as argument'

fix pylint warning '(old-style-class) Old-style class defined.'

This warning is ignored for classes from PyJSLib, because library
overrides base object class.

fix pylint warning '(unused-import), Unused import connectors'

fix typos

comment out unused code SFC_Step.RefreshBoundingBox()

explicitly mark unused variables found by pylint with _ or dummy

pylint don't ignores unused variables with '_' in the name, even when
they are started with '_'. This bug is already fixed upstream, to fix
this in all versions of pylint custom dummy-variables-rgx is used
'_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy'

remove unused variables found by pylint

update .PHONE target in Makefile for mki18n.py

make mki18n return 0 on success

update list with files for internatialization, app.fil

move README content to Makefile

It's not necessary to copy commands from README anymore. Just use
'make source_list', 'make template' or 'make locales'.

fix pylint warning '(global-variable-not-assigned) Using global for 'X' but no assignment is done'

fix pylint error '(function-redefined) method already defined'

fix pylint warning '(unreachable) Unreachable code'

fix pylint warning (bad-indentation) Bad indentation. Found X spaces, expected Y

fix pylint warning '(pointless-string-statement) String statement has no effect'

Python doesn't support docstring for variables directly. Where
appropriate Sphinx style for docstrings for variables is used
'#: some-docstring'

fix error __init__ method from base class is not called

fix more than one statement on a single line

fix ungrouped imports from package X

fix unnecessary lambda and enable corresponding pylint check

fix wrong-import-order. first standard modules are imported, then others

fix (old-style-class) Old-style class defined error for most parts of
the code

only PyJS code is left, because it does some fancy tricks and can't be
easily fixed. So far PyJS doesn't support Python3 anyway.

remove in-tree version of Zeroconf and use upstream from
python-zeroconf package

remove reimported modules

fix unnecessary parens after keyword

enable pylint checker

so far only print statement is checked

fix usage of python2-only print statement

run python tests with non-english locale to catch bugs related to localization

make it possible to update XSD schema in project controller after new
target PLC is added or removed.

For example:


...
import targets
targets.targets["PLC"] = {"xsd": os.path.join(self.customBeremizPath, "PLCtarget", xsd),
"class": lambda: PLC_target,
"code": {"plc_PLC_main.c": os.path.join(self.customBeremizPath, "PLCtarget", "plc_PLC_main.c")}
}

from ProjectController import ProjectController, GetProjectControllerXSD
ProjectController.XSD = GetProjectControllerXSD()

fix commit "lazy initialization of highlight pens and brushes
for DebugVariableViewer" (5562f34f)

clean build example project after running test

fix problem if DataTypeEditor was imported before localization is
loaded

That doesn't affect systems with english locales.

add shell script to run all python tests and automatically handle Xvfb

add PLCOpenEditor tests

run application tests in full screen mode

clean sys.argv, because if test is running from pytest
sys.argv contains string "pytest --timeout 0 ./tests/tools"
Beremiz application parses it and throws exception.

rework Beremiz application "testCheckProject" test to allow easier reuse later

add application name for PLCOpenEditor

This is needed to work user configuration load/store, if PLCOpenEditor
is launched from test environment.

rewrite PLCOpenEditor. Add PLCOpenEditorApp class for easier customizations.

lazy locale initialization

wx.Locale() can't be called without wx.App. So don't call it at
import. It makes PLCOpenEditor simpler.

use CustomIntCtrl instead of wx.SpinCtrl because it doesn't support
long integer needed for UDINT, (U)LINT types.

This commit complements commit 74a3f4d "fix LINT and ULINT ranges".

add custom TextCtrl allowed to enter long integer with bounds checking

It's needed because wx.SpinCtrl supports only 'int' type. For UDINT
and (U)LINT long type is necessary.

use pytest for testing

run separate test on every project instead of one big long test all projects

move configuration for test environment into separate file conftest.py

lazy initialization of highlight pens and brushes for DebugVariableViewer

Constructors wx.Pen() and wx.Brush() require wx.App to exist already.
That causes crash during import of the control,
because import is done before calling main application code.

add '_' function to builtin dictionary at import time

This allows to import many Beremiz python modules before calling
util.misc.InstallLocalRessources().

remove builtin BMZ_DBG. It's not used.

update translation strings

updated all existing translations
added new languages: Portuguese (Portugal), Italian, Hungarian,
Spanish and Bengali. See version.py for information about translators.

fix LINT and ULINT ranges

found installed Inkscape on Windows

tested with Inkscape version 0.9 on Windows 7.

make possible to turn off at compile time online debugging, logging
and external sync functionality

Defines TARGET_DEBUG_DISABLE, TARGET_LOGGING_DISABLE, TARGET_EXT_SYNC_DISABLE
allow to use generated PLC code in low-cost microcontrollers,
integrate into external programs and so on.

main.c:
extern void __run(void);
int main(void)
{
for(;;) {
__run();
// sleep common_ticktime__ ns
// add common_ticktime__ ns to __CURRENT_TIME
}
return 0;
}

Compile for example for arm bare-metal:
../build$ arm-none-eabi-gcc \
-DTARGET_DEBUG_DISABLE -DTARGET_LOGGER_DISABLE
-DTARGET_EXT_SYNC_DISABLE \
-flto -ffunction-sections -fdata-sections -I../../../../matiec/lib/C \
*.c \
-nodefaultlibs --specs=nano.specs -Wl,--static -Wl,--gc-section -Wl,--start-group -lc -lm -lnosys -lgcc -Wl,--end-group

make default caption for PouNameDialog translatable

fix max value for UDINT and ULINT types

update Build icon

add couple Beremiz application tests

These tests trigger around 45% of python code.
Used in tests docker files are avaiable here:
https://bitbucket.org/skvorl/beremiz-dockerfiles

fix problem if _should_write is called by expired timer after
termination of wx application.

Initial Bitbucket Pipelines configuration

fix bug with unfinished debug thread
this bug occurs when user doesn't stop debugging process in current project, and opens another project

unify exception handling of Beremiz and PLCOpenEditor

fix problem running PLCOpenEditor

$ ./PLCOpenEditor.py
../src/common/stdpbase.cpp(62): assert "traits" failed in Get(): create wxApp before calling this

Regression was introduced by '3311eea' (clean-up: fix PEP8 E402 module level import not at top of file)

don't check any particular wx version

Beremiz works with any version of wx.

fix problem when Beremiz is running without matiec installed

set matiec settings only once on first use of ProjectController class and give
user-friendly message on compilation about missing matiec
installation.


Traceback (most recent call last):
File "Beremiz.py", line 197, in <module>
beremiz.Start()
File "Beremiz.py", line 192, in Start
self.CreateApplication()
File "Beremiz.py", line 130, in CreateApplication
self.BackgroundInitialization()
File "Beremiz.py", line 137, in BackgroundInitialization
self.ImportModules()
File "Beremiz.py", line 176, in ImportModules
import BeremizIDE
File
"BeremizIDE.py", line 76, in <module>
from ProjectController import ProjectController, GetAddMenuItems,
MATIEC_ERROR_MODEL, ITEM_CONFNODE
File
"ProjectController.py", line 177, in <module>
iec2c_cfg = Iec2CSettings()
File
"ProjectController.py", line 101, in __init__
self.ieclib_c_path = self.findLibCPath()
File
"ProjectController.py", line 135, in findLibCPath
os.path.join(self.ieclib_path, "C"),
File "/usr/lib/python2.7/posixpath.py", line 70, in join
elif path == '' or path.endswith('/'):
AttributeError: 'NoneType' object has no attribute 'endswith'

Initial Bitbucket Pipelines configuration

add configuration for Bitbucket pipelines

add shell script to test Beremiz python code

currently only codestyle checking is done using pycodestyle (ex-pep8).
Later checks by flake8 and pylint maybe enabled.

clean-up: fix PEP8 W503 line break before binary operator

fix codestyle issues according to PEP8

clean-up: fix PEP8 E402 module level import not at top of file

clean-up: fix PEP8 E265 block comment should start with '# '

clean-up: fix PEP8 E266 too many leading '#' for block comment

clean-up: fix PEP8 E722 do not use bare except'

better it'd be to use particular exception instead of 'except Exception'.

clean-up: fix PEP8 E115 expected an indented block (comment)

clean-up: fix PEP8 E721 do not compare types, use 'isinstance()'

clean-up: fix PEP8 E131 continuation line unaligned for hanging indent

clean-up: fix PEP8 E122 continuation line missing indentation or outdented

clean-up: fix PEP8 E713 test for membership should be 'not in'

clean-up: fix PEP8 E272 multiple spaces before keyword

clean-up: fix PEP8 E124 closing bracket does not match visual indentation

clean-up: fix PEP8 W191 indentation contains tabs

clean-up: fix PEP8 E211 whitespace before '[' or '('

clean-up: fix PEP8 E114 indentation is not a multiple of four (comment)

clean-up: fix PEP8 E125 continuation line with same indent as next logical line

clean-up: fix PEP8 E128 continuation line under-indented for visual indent

clean-up: fix PEP8 E127 continuation line over-indented for visual indent

clean-up: fix PEP8 E129 visually indented line with same indent as next logical line

clean-up: fix PEP8 W602 deprecated form of raising exception

clean-up: fix PEP8 E502 the backslash is redundant between brackets

clean-up: fix PEP8 W601 .has_key() is deprecated, use 'in'

clean-up: fix PEP8 E731 do not assign a lambda expression, use a def

clean-up: fix PEP8 E203 whitespace before ','

clean-up: fix PEP8 E262 inline comment should start with '# '

clean-up: fix PEP8 E712 comparison to True should be 'if cond is True:' or 'if cond:'

clean-up: fix PEP8 E222 multiple spaces after operator

clean-up: fix PEP8 E111 indentation is not a multiple of four

clean-up: fix PEP8 E701 multiple statements on one line (colon)

clean-up: fix PEP8 E741 ambiguous variable name

clean-up: fix most PEP8 E221 multiple spaces before operator

clean-up: fix most PEP8 E266 too many leading '#' for block comment

clean-up: fix PEP8 E703 statement ends with a semicolon

clean-up: fix PEP8 E301 expected 1 blank line, found 0

clean-up: fix PEP8 E306 expected 1 blank line before a nested definition, found X

clean-up: fix PEP8 E305 expected 2 blank lines after class or function definition

clean-up: fix PEP8 W391 blank line at end of file

clean-up: fix PEP8 E201 whitespace after '{'

clean-up: fix PEP8 E202 whitespace before ')'

clean-up: fix PEP8 E227 missing whitespace around bitwise or shift operator

clean-up: fix PEP8 E251 unexpected spaces around keyword / parameter equals

clean-up: fix PEP8 E711 comparison to None should be 'if cond is not None:'

clean-up: fix PEP8 E225 missing whitespace around operator

clean-up: fix PEP8 E303 too many blank lines

clean-up: fix PEP8 E231 missing whitespace after ':' or ','

clean-up: fix PEP8 E203 whitespace before ':' and whitespace before ','

clean-up: fix PEP8 E271 multiple spaces after keyword

clean-up: fix PEP8 E261 at least two spaces before inline comment

clean-up: fix PEP8 E302 expected 2 blank lines, found 1

clean-up: fix PEP8 W293 blank line contains whitespace

clean-up: fix some PEP8 E228 missing whitespace around modulo operator

clean-up: fix some PEP8 E265 block comment should start with '# '

clean-up: fix PEP8 E401 multiple imports on one line

convert some files from CRLF to LF

It'll break for these files hg blame/annotate. Fortunately not many
files are affected.

clean-up for PEP8: fix W291 trailing whitespace

README.md edited online with Bitbucket

fix link to documentation in README.md

Add information about built official documentation to README.md

don't allow empty dimension for ARRAY types

ignore built documentation

manual: add untranslated po files for French and Korean

build missing pot files, when building HTML documentation

fix some typos

Changed title of new project dialog from:
Choose a project
to
Choose an empty directory for new project

Changed title of New Project dialog
from
Chose a project
to
Choose an empty directory for new project

skip hidden files and directories on permission check

To fix problems with git, because .git subdirectory contains
read-only repository objects.

change structure of filename for bug reports in Beremiz and
PLCOpenEditor so bug reports could be easily sorted by name

fix target Xenomai missing functions

update messages.pot and messages.po

mki18n.py: generate messages.po (contains English strings in msgstr)

This po file is necessary because Transifex translation platform
automatically can only import PO files. Usually messages.pot is
enough.

add to i18n/README forgotten commands to add some XML schemes as source
for strings and update app.fil

Backout commit 92537ed because of writing localized string in node *.xml file

Backout changeset 92537edeb2052d53ba5cad8b6da8463dbc660bb1

fixes double mouse capturing after forcing variable in debug mode
this problem appears on Linux

fix bug with TextViewer instance in debug mode, appears after transferring new program on PLC
TextViewer isn't able to display debug values, so calling for this class SubscribeAllDataConsumers method causes error

fix build problem when make command have trailing whitespace(s)

whitespaces at the end are replaced with "", that causes make problem

add dialog "add program", that appears after creating new project
also, sets one task and one instance of created program in main project resource

fix i18n string selection for combobox generated from XSD

update Russian and French (Fabien M) translations
added Slovenian (Janez Pregelj) and Portuguese (Thiago Alves) translations

l18n: update messages.pot and app.fil

add l18n support to variable table in CodeFileEditor (python/C extension)

set project name and character set in generated messages.pot

close DurationEditorDialog on ENTER key

add button to ForceVariableDialog to toggle forced boolean value

Button is added only for boolean variables.

fix problem with hidden FindInPou dialog with wxPython 3.0 on Windows

FindInPou.IsShown() returned True, but dialog was hidden.
At same time On GNU/Linux with wxPython 3.0 there wasn't such problem.
So it's Windows specific.

enable non-latin variable descriptions in CodeFileEditor

fix following backtrace:

UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-7: ordinal not in range(128)
Traceback (most recent call last):
File "beremiz/editors/CodeFileEditor.py", line 610, in GetValue
return str(self.data[row].get(self.GetColLabelValue(col, False), ""))
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-7: ordinal not in range(128)

disable empty coils and contacts in LD/SFC editors

Closes #30

remove debug code

make all dialog have non-fixed size

this fixes the problem, that some controls may be hidden in some cases, because
dialog size is too small. This can happen when system fonts are bigger
than expected, default system them controls are bigger or if localized
strings are bigger than in English.

avoid infinite loop in search

for example following regexp '()' creates infinite list of result

make adjustable size of ArrayTypeDialog

fix problem with initial values for array of structures

for structures wrong empty repetition attributes were generated

add information about community support channel to Beremiz and PLCOpenEditor

cleanup wxHMI example

cleanup wxGlade example

add comments to wiimote example

fix running wxGlade on current Debian systems

wxGlade was moved from python import path to /usr/share/wxglade

rename text field in SVG graphic to match IEC code in svgui example

This caused svgui example to crash.

disallow setting IEC location addresses for TIME, DATE, DT and TOD variables

Size of these types is not defined and depends on the implementation
(IEC 61131-3 2.3.1).

if there is no users matiec installation, then use system path to run iec2c

search for matiec libraries in system path as well

Closes #29

remove child node from add child node menu, if max count of the same type nodes reached

fix reducing groups with ordered elements

fix extra brace

add getCompiler and getLinker methods, to abstract from XSD.
add calc_source_md5 as it's more convenient especially for embedded
targets to add -DPLC_MD5="something" option at compile time than
to mess with editing binary.
add some more helper methods

make run Beremiz and PLCOpen Editor, if full path contain non-lating
characters

There was a problem in About dialog and in project properites tab and
probably in my other places, when str is automatically converted to
unicode string using ascii.
This patch converts str to unicode using proper encoding at the very beggining.

README.md edited online with Bitbucket

fix clearing project name on opening project properties page.

The problem exists only on Windows with wxPython-3.0.

This happens because callback for EVT_KILL_FOCUS for a first text
control (project name) is called just after creating page with project
properties. It happens before initializing text controls from PLCController.

fix problem with debugging external string variables

Debug update stopped if external string variable added to debug
variable panel.

fix problem with clearing non-empty location field after changing type of config variable

introduced by cd9db17 ("clear variable location cell in variable
panel, if variable class or type changed").

Closes #26

fix backtrace on opening program/resource on small screens

Fix regression introduced by f4696d8 ("add stretching to columns Name,
Type, Doc in variable panel").
This problem happens only on wxPython-3.0.

show whether instance of SFC action is currently active or not in its
debug instance view

clean PLC log only if there is something to clean

Otherwise exception happens in Beremiz service.

Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/connectors/PYRO/_init_.py", line 113, in catcher_func
return func(*args, **kwargs)
File "/home/developer/WorkData/PLC/beremiz/beremiz/connectors/PYRO/_init_.py", line 194, in my_local_func
return RemotePLCObjectProxy._getattr_(attrName)(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/Pyro/core.py", line 381, in _call_
return self._send(self._name, args, kwargs)
File "/usr/lib/python2.7/dist-packages/Pyro/core.py", line 456, in _invokePYRO
return self.adapter.remoteInvocation(name, Pyro.constants.RIF_VarargsAndKeywords, vargs, kargs)
File "/usr/lib/python2.7/dist-packages/Pyro/protocol.py", line 457, in remoteInvocation
return self._remoteInvocation(method, flags, *args)
File "/usr/lib/python2.7/dist-packages/Pyro/protocol.py", line 532, in _remoteInvocation
answer.raiseEx()
File "/usr/lib/python2.7/dist-packages/Pyro/errors.py", line 72, in raiseEx
raise self.excObj
AttributeError: 'PLCObject' object has no attribute '_ResetLogCount'
+--- This exception occured remotely (Pyro) - Remote traceback:
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/Pyro/protocol.py", line 719, in _handleInvocation2
res = obj.Pyro_dyncall(req[1],flags,req[3]) # (method,flags,args)
File "/usr/lib/python2.7/dist-packages/Pyro/core.py", line 108, in Pyro_dyncall
return getattr(self.delegate or self,method) (args,*keywords)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/PLCObject.py", line 101, in ResetLogCount
if self._ResetLogCount is not None:
AttributeError: 'PLCObject' object has no attribute '_ResetLogCount'
+--- End of remote traceback

reset loaded messages counts on new PLC program trasnfer

This fixes the problem that first message from newer PLC program maybe
lost, if it's issued before first PLC log fetching.

Closes #23

add function block to variable panel if fb is added using toolbar

Closes #25

enable to write SFC transition in IL

This commit reverts previous commit 3f3d97be9a9f.
Because the fix for the matiec problem is already upstream
(https://bitbucket.org/mjsousa/matiec/commits/ce026aee03e00c0790948a18bd7b35805457da81)

fix debug button and variable tree generate for actions and transitions in POU instance variable panel
for 'None' type instances(Python POU's, Native, SVGUI, user-defined pou's, etc.) debug button will be disabled. If action or transition instances have opened in instance variable panel,variables from main POU will be loaded. When user press debug button on variable instance in action or transition, instance path to main POU will be used, because all variables of action or transition in instance variable tree belong to main POU.

clear variable location cell in variable panel, if variable class or type changed
if variable class is not local or global, or variable type is not locatable, variable location cell would be empty and read-only

runtime is licensed under LGPLv2.1

make command line help message for Beremiz more verbose

fix typos and small errors in Russian translation

merge Beremiz launcher support

Closes #13

rename BeremizIDELauncher.py to Beremiz.py

rename Beremiz.py to BeremizIDE.py

wrap Beremiz startup code into separate launcher class

this should make it easier to make customized version of Beremiz IDE.
It's easy to add own splash, change version, add/disable extensions
and many other things.

For example:

[----- MyBeremiz.py ------]
#!/usr/bin/env python
from BeremizIDELauncher import BeremizIDELauncher

class MyBeremizIDELauncher(BeremizIDELauncher):
def __init__(self):
BeremizIDELauncher.__init__(self)
self.splashPath = self.Bpath("", "splash.png")

def ShowSplashScreen(self):
# comment next line to disable splash entirely
BeremizIDELauncher.ShowSplashScreen(self)

# change version
import version
version.app_version = "3.141-rc52"

def LoadExtensions(self):
# add/modifine list of extensions
# in self.extensions
BeremizIDELauncher.LoadExtensions(self)

if __name__ == '__main__':
beremiz = MyBeremizIDELauncher()
beremiz.Start()

[-------------------------]

dynamically increase size of dialog window for editing comment block

add hotkeys to open recent projects

For simplicity only last 9 projects are saved.

Alt-F, R, 1 - to open last opened project
Alt-F, R, 2 ...
...
Alt-F, R, 9 ...

fix twice shown error message box, when wrong non-valid IEC identifier entered

It happens when non-valid name for variable name or name of field in
structure entered. This issue is described in details here:
http://trac.wxwidgets.org/ticket/16333

apply constraints to names for tasks and task instances in resource configuration

The same rules as for IEC identifiers are applied.
- no non-lating characters, ...
- no IEC keywords
- check for duplicate names in resource configuration

closes #19

Fix russian translation

Merged skvorl/beremiz into default

add stretching to columns Name, Type, Doc in variable panel

fix SFC Step flush method

fix redraw debug instance tab after transferring new build to PLC. closes #15

1. Deleted .directory file, and added it to .hgignore.
2. Added russian locale .mo file.

Fix russian translation

Merge

Safe

broken code is temporarily blocked
This code used to highlight with green color text in upper-left corner (path to current instance) in debug mode, if current instance active. Only SFC actions are affected. #16

fix exception handling
now only one exception dialog is displayed, if many same type exceptions handled (like in #16), and bug reports files always save after exception, not only after pressing "OK" button in exception dialog, closes #17

change directory for saving Beremiz bug reports from current working directory to TEMP directory.

Correct element size, if block type or variable name is wider than block width.
Previously, if size corrected, element changed position to the right (or down, if height is corrected). Now upper-left corner is fixed.

remove non-existed and not necessary self.logger from detecting options in iec2c

remove Linux target from first_steps example

Then default target on the system will be used.

1.2rc1

closing 1.1 branch

for tests svgui and logging move code from old py_ext.xml to the new pyfile.xml

merge

fix IL jumps highlighting in Text Viewer

change white background for icons in PouInstanceVariablePanel to transparent

in wxPython 2.8 panel has white background and therefore white
background is appropriate, but in wxPython 3.0 panel has grey
background (on GNU/Linux and on Windows).
Transparent background looks good on both wxPython versions and on all platforms.

change white background for project tree element to transparent

because on GNU/Linux project tree has grey background, therefore
white background looks not good.

fix second error message in case of error appearing too early to have a wx frame

fix a side effect of 95ecb26fdc4e

remove old unused .cvsignore

fix issue with printing scheme (FBD, LD or SFC) with comment element on GNU/Linux

If you draw FBD scheme and place comment on it and then try to print
it, then no wires will be printed and comment box is empty (text is
missing). This happens only for wx.PrinterDC and not on wx.MemoryDC
that is used to draw print preview window in Beremiz IDE.
Looks like a bug in wxPython or wxWidgets.

There were found several workaround for this issue.
1) If some dc.DrawLines call is placed before dc.DrawPolygon, then the
problem is gone.

...
dc.DrawLines(polygon)
dc.DrawPolygon(polygon)
...

2) Reseting DC brush solves the problem as well (see this changeset).

detect iec2c options and ieclib path only once during the first build

attach checkedBlockDict variable to the body object

fix file header in AboutDialog.py

update Russian translation

check before program generation whether SFC step, that is referenced
by SFC jump, does exists

use translatable descriptions for stadard and additional IEC function
blocks from xml files instead of hardcoded in python

move code in mki18n.py generated translation strings from custom files into separate function

clean search result panel after open another project

fix highlight of search result in Search Result Panel
Remove previous highlight, after next search result clicked.

fix doubling search results in Search Result Panel

After fix local search in SFC POU in 163d3a8, search results tree assemble with "children" branches: results of search in actions anf transitions. Deleted code doubling this search results into one more separate branch, so it's useless.

make FindInPouDialog work on Windows with wxPython 2.8

additional fix for changeset 474de7f

fix local search in actions and transitions

convert FindInPouDialog from wx.Frame to wx.Dialog

In this case FindInPouDialog Windows isn't listed in windows manager
on Alt-Tab. And it's not shown on top of other applications. For
example, previously the dialog was shown even on top of web browser or
word processor.

temporary disable SFC transitions in IL, because matiec can't compile it

matiec freezes in this case.
See https://bitbucket.org/mjsousa/matiec/issues/58/iec2c-freezes-if-sfc-transition-is-in-il

fix issue with creating SFC transitions using ST and IL

Beremiz generates text representation for transitions without names.
Therefore transition name in its IL code is not needed.

replace '-' with '.' in resource tab and transition/action SFC code


This makes tab names consistent with the way the same information is shown in variable panel.

check during program generation whether source signal is defined for single task

fix strange behavior on Backspace press in ST

Before:
if text was selected and cursor was at indention, one indention (two
spaces) was removed.

if cursor was at start position of the line, then nothing happened.

if cursor was in the middle of indention then on backspace more
indention were added


Now:
if text is selected, it will be removed.
if cursor is at start position, then new line will be removed.
if cursor was in the middle of indention one indention is removed.

fix close button in system menu for AboutDialog on Windows


If SetEscapeId receives wx.ID_CLOSE as parameter, then on Windows with
wxPython 2.8 system close button in title bar stops working.
If wx.ID_CANCEL or wx.ID_OK is used in SetEscapeId call, then close
button works correctly.

make renames caseinsensitive

fix problem with SFC action/transition rename

Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line
1636, in OnProjectTreeItemEndEdit
elif new_name.upper() in [name.upper() for name in
self.Controler.GetProjectPouVariableNames(pou_name) if name !=
old_name]:
NameError: global name 'pou_name' is not defined

fix problem that it was impossible to edit SFC jump, if it references non-existent SFC step

remove all corresponding SFC jumps when SFC step is removed (but only in DRIVENDRAWING_MODE)

rename all corresponding SFC jumps when SFC step is renamed (but only in DRIVENDRAWING_MODE)

add check of new project path in Save As
add dialog window if selected directory is the current directory project, or already contains another project

fix issue that in Debug mode LD instance doesn't show correctly its state after
continuation of FBD_Connector.

Previously state signals doesn't propogate through FBD_Connector.

fix issue with task rename if "Name" column label is translated into
other language

fix issue with compiling SFC POU with non-connected transition (type "connection")

fix bug with recent projects menu, remove path to the project from menu, if project directory doesn't exist

fix bug with empty directories in recent projects menu
remove path to a project from recent projects menu, if project directory is empty

fix list of recent projects in File menu, add path to current project after Save As

by default init input and output in step sfc block, and output for initial step sfc block

update PLC status after initialization

This is necessary especially if existed PLC program is loaded, but PLC
is not started automatically. In this case taskbar icon shows that PLC
isn't empty.

always load existing PLC program from the working directory

stop PLC before unloading


This fixes segmentation fault if service was quit without stopping it.
It has happened if Beremiz service was quit using taskbar icon or by
closing Beremiz IDE (in case of autostarted local service).

In second case to trigger the bug following step has to be done:
1. Open Beremiz IDE
2. Open project, compile and connect to LOCAL:// runtime
3. Transfer and start the PLC program
4. Open other project without disconneting the PLC runtime
5. Close Beremiz IDE

add internatialization support for Beremiz_service.py

fix issue with changing annonced Pyro service name via taskbar icon

don't crash on trying to change IP interface for Beremiz_service using taskbar icon if IP wasn't previously


By default IP is not set (None) and service listen only on localhost interface.

start/stop from taskbar icon only if PLC is stopped/started

close Pyro socket after daemon stop


without that socket port is open after daemon shutdown.
As a result if you restart daemon with new settings (service name, for example),
it can't listen on already used port and opens the next free TCP port
regardless of requested settings.

add python-wxgtk3.0 support to Beremiz_service.py

make about dialog on Windows not so big


It was automatically expanded to place description in one line.

update Russian translation

add i18n to PLC status

Extra strings are added to the code to make mki18n.py to find these
strings in source files and put them into i18n/messages.pot.

remove clear and reset execution order buttons in popup menu in SFC and LD viewers.

fix initial(equal to the min) number of sequences in SFC Divergence dialog.

make only correct blocks(by IEC 61131-3 standard) available in wire popup menu in SFC Viewer

move EnhancedStatusBar.py to the right location

add internatialization support to startup messages during checking software updates

fix translation strings with multiple parameters


this fixes a lot of warnings given by msgmerge:

../PLCOpenEditor.py:196: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
The translator cannot reorder the arguments.
Please consider using a format string with named arguments,

change bug report address for PLCOpenEditor to beremiz-devel@lists.sourceforge.net

make error message to be the same as in Beremiz IDE

fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file

closes #11

add localization to time strings in DebugVariablePanel and to dialog shown after variable drag'n'drop

fix issue that if located variable was dropped in location column, then address was changed in wrong row (row - 1).

It's not neccessary to carry about label size. YToRow() does the work.

increase size for time buttons in LogViewer

The buttons are slightly bigger now. This gives more space for label
translations in other languages.
closes #12

don't rebuild the makefile based project if only companyName, projectName or productName are changed

And this fix current encoding issues, because all these information fields can
contain non-latin characters.

add progress bar to status bar

It can be used to display progress during program upload.
To use it call ShowPLCProgress (like ShowPLCProgress("transfered",
10)) in your PLCObject implementation.

fix warning: 'return' with no value in function startPLC

fix inconsistent whitespace

fix license notices in source files and license files under GPLv2+

Previously a lot of files were referenced to GNU Public License 2.1,
which never existed.
All copyright attributions are kept the same.

fix PLC autostart option for Beremiz_service.py

remove old debug code

fix wrong font family in CustromGrid control

closes #10

now only correct chart can be created in SFC Viewer

if user trying to connect incompatible blocks (by IEC 61131-3 standard), wire highlight will become red

add Russian translations for About dialogs

make about dialog boxes use standard wx about dialogs

Any information in dialog can be easily changed without much effort
and the dialog can be easy translated.

Unfortunately on Windows there is no good standard about dialog,
therefore own implementation is used there.

fix highlighting error and warning messages with non-lating characters

fix breaking non-latin description and comments in FBD, LD, SFC and
project settings after Undo operation

fix borders of pull-down choice list box in Config tab, in Project Properties

add version.py needed for previous commit '4ce8492'

add version with commit hash to 'About' dialogs for Beremiz IDE and PLCOpenEditor

ignore generated bugreports and output of i18n script

now dialogs Find and Search in Project can be closed with ESC button

fix russian translation of "direction" in Find dialog

fix major bugs in Find and Search in Project functionality.

fix case sensitive and regexp search, remove duplicating code

Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>

fix issue with non-updated button 'generated IECCode' after Build and Clean

increase dialog size for edit SFC transition, so buttons are visible

fix issue that sometimes period for cyclic task wasn't saved.

This is complete fix for the problem described in 8626bba.

add first steps example, that shows how use all IEC 61131 languages

fix issue with empty frame with generated ST code

fix not saving location address from variable panel

this regression was introduced by commit 3518d10

add $(Beremiz installation)/mingw/bin in PATH on Windows platform

This fixes issue if multiple gcc installation are found in user's
PATH. Now gcc from Beremiz is used by default.

fix issue with non-working global hotkeys in IEC code panel

add more comments to svgui example

cleanup traffic lights example

cleanup svgui example

Fix bug with two or more wires connected to one input. Now only one wire can be connected to one input, except BOOLean signals in LD and SFC. If user trying to connect wire with already connected input, wire highlight will become red.
Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>

fix issue with sequence of multiple whitespaces in makefile command
line from project configuration

for every additional whitespace '""' was inserted in result command line.

fix minor issue and do some cleanup work in genericmake example

cleanup python example

complete fix in commit 3518d10 for wxgtk2.8

fix syncronization issue during killing ProcessLoggers on IDE close

Add russian translation on label "Tick" in debug variable panel.

Add russian language in Project properties -> Other menu.

fix issue, that was impossible to change variable location IEC-address, when wx 3.0 is used

Merge

fix infinite recursion in 'Reset Execution Order' functionality if FBD body contains feedback connections

fix issues in PLCOpenEditor with moving from wxWidgets 2.8 to 3.0

1)
./PLCOpenEditor.py:63: wxPyDeprecationWarning: Using deprecated class PySimpleApp.
app = wx.PySimpleApp()

2)
./PLCOpenEditor.py:475: wxPyDeprecationWarning: Call to deprecated item.
wx.InitAllImageHandlers()

3)
Traceback (most recent call last):
File "./PLCOpenEditor.py", line 480, in <module>
frame = PLCOpenEditor(None, fileOpen=fileOpen)
File "./PLCOpenEditor.py", line 163, in __init__
IDEFrame.__init__(self, parent)
File "/tmp/f/beremiz/IDEFrame.py", line 657, in __init__
self._init_ctrls(parent)
File "/tmp/f/beremiz/IDEFrame.py", line 485, in _init_ctrls
self._init_icon(prnt)
File "/tmp/f/beremiz/IDEFrame.py", line 476, in _init_icon
if self.icon:
AttributeError: 'PLCOpenEditor' object has no attribute 'icon'

update messages and add Russian translation for new menu entry 'switch perspective'

Merged in Surkovsv/beremiz (pull request #4)

Add hotkey (F12) for switching perspective.

Add hotkey (F12) for switching perspective.

Switching perspective feature hides/restores all panels except of the main editor window for current FB.
So all available screen space is used for editor.

Merged skvorl/beremiz into default

Fixed crash when starts on OS X with wxPython 3.0.x

Merged skvorl/beremiz into default

Added .idea dir to ignore.

cleanup logging example

add comments, rename variables, some rework for algorithm

fix non-working logging at first connection to PLC after Beremiz launch

At the same time this helps to avoid exception described in 1484:d5efbb20927e.

Merged in Surkovsv/beremiz (pull request #2)

fix bug with non-editable names and types of FB local variables in POU's written in ST or IL

fix bug with non-editable names and types of FB local variables in POU's written in ST or IL

fix highlighting input/outputs in function call in ST, if comment section is placed
inside call.

For example:

PackOutputs(
W4 := OUT1,
W5 := OUT2,
W6 := OUT3,
W7 := OUT4,
W8 := OUT5 (* comment inside call *),
W9 := OUT6,
W10 := OUT7,
W11 := OUT8);

add initialization tick time on Beremiz start

This fixes issue #6

fix race condition in ProcessLogger

- Fixed startup from ancestor code.

This fixes issue #5

fix bug: Beremiz IDE hangs during launching Beremiz_service

this is regression introduced as side effect by d7f474d [fix issue
with sometimes wrong return code of ProcessLogger]

automatically detect flags supported by matiec and find correct path
for matiec C library files

This makes possible to use an old matiec and the new one.

fix bug that appears if datatype in the project tree is renamed to wrong name (keyword, existend type,...)

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16765, in <lambda>
lambda event: event.callable(*event.args, **event.kw) )
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/expando.py", line 126, in _adjustCtrl
numLines = self.GetNumberOfLines()
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16710, in __getattr__
raise PyDeadObjectError(self.attrStr % self._name)
PyDeadObjectError: The C++ part of the TreeTextCtrl object has been deleted, attribute access no longer allowed.

add distribution license notice to about dialog as GPL requires

add GPLv2 license

add copyright notices to python files where there were missing, that
is required by GPLv2

fix issue that was impossible to remove local instance of functional
block if pou is written in ST or IL

fix highlighting of multiline comments in ST and IL

close #2

fix error if non-latin character was entered in initial value in
data type element

Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 575, in OnStructureElementsGridCellChange
value = self.StructureElementsTable.GetValue(row, col)
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)

fix issue with sometimes wrong return code of ProcessLogger


As a result of wrong return code Beremiz gives folowing traceback:
Traceback (most recent call last):
File "./Beremiz.py", line 850, in OnMenu
getattr(self.CTR, method)()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 925, in _Build
IECGenRes = self._Generate_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 568, in _Generate_SoftPLC
return self._Compile_ST_to_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 661, in _Compile_ST_to_SoftPLC
C_files.remove("POUS.c")
ValueError: list.remove(x): x not in list

The problem is that both threads (for reading stdout and stderr) call self.Proc.poll(),
that updates internal returncode field. This call is done without any locking and the first thread gets correct result,
but other gets 0 as retval. If 0 gets thread, that afterwards calls callback finish, then wrong return code is returned
to the parent. Now only the thread with a callback polls for the return code, other thread just checked local value.

Additionally function spin() waits now until all threads finish reading their pipes, so the results are always correct.

Fix error about missing attribute 'timeout' that happens sometimes during compilation

The fix [1476:49f1763a5613] of the problem with following trace was wrong.
Traceback (most recent call last):
File "./Beremiz.py", line 1229, in run_with_except_hook
run_old(*args, **kw)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 68, in run
self.endcallback(self.Proc.pid, err)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 169, in finish
if self.timeout: self.timeout.cancel()
AttributeError: ProcessLogger instance has no attribute 'timeout'
The problem was that compilation process was finished before the timeout attribute is set.
Now timeout is set before launcing of compilation process.

fix copying elements with non-latin content like comment element, or
variables with description in non-latin character set

before any non-latin text was converted after copying to strings like '&#1069;&#1090;&#1086;...'

fix issue that if functional block is dragged from project panel into
ST text editor and in dialog 'Please enter a block name' button
'cancel' is pressed, despite of cancel text about drag'n'dropped type
is pasted in ST program.

fix regression introduced by changeset: 1431:28e9d479aa65 [Use '-p' command line option when running matiec (iec2c)]

Variable matiec_flags in c_ext.py and PythonFileCTNMixin.py is not
used for flags for matiec (IEC to C compiler) actually, but it's used
to compile C-code generated for extensions using normal C-compiler,
like gcc.

fix display of ARRAY fields inside of structure data types.

Previously ARRAY fields in structures were displayed, for example,
like 'ARRAY [1..2] OF ARRAY' instead of 'ARRAY [1..2] OF INT'. Because
of this error the array type can be really edited.

fix Traceback if search icon on library panel is clicked, when no
category/item is selected in the library.

The problem is here, that if nothing is selected method GetSelection()
returns root item, that doesn't have any python data associated with it.
This issue seems to be wx3.0 specified, because it doesn't exist
with wx2.8 on Windows.

update Russian about Beremiz dialog window

fix issue, that was impossible to change time interval for cyclic
tasks, when wx 3.0 is used

fix deprecation warnings about accessing properties m_x, m_y of wxKeyEvent

/home/beremiz/beremiz/controls/PouInstanceVariablesPanel.py:354: wxPyDeprecationWarning: Accessing deprecated property.
event.m_x = size.width / 2

fix set_color_cycle from matplotlib deprecation warning

/usr/lib/python2.7/dist-packages/matplotlib/cbook.py:137: MatplotlibDeprecationWarning: The set_color_cycle attribute was deprecated in version 1.5. Use set_prop_cycle instead.
warnings.warn(message, mplDeprecation, stacklevel=1)

update Russian translation

add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor

fix wrong Row number in DiscoveryDialog.py that caused following traceback:

Traceback (most recent call last):
File "/home/beremiz/beremiz/ProjectController.py", line 1536, in _Connect
dialog = DiscoveryDialog(self.AppFrame)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 124, in __init__
self._init_ctrls(parent)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 121, in _init_ctrls
self._init_sizers()
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 73, in _init_sizers
self._init_coll_ButtonGridSizer_Growables(self.ButtonGridSizer)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 64, in _init_coll_ButtonGridSizer_Growables
parent.AddGrowableRow(1)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 15343, in AddGrowableRow
return _core_.FlexGridSizer_AddGrowableRow(*args, **kwargs)
PyAssertionError: C++ assertion "!m_rows || idx < (size_t)m_rows" failed at ../src/common/sizer.cpp(1967) in AddGrowableRow(): invalid row index

increase height of some dialog windows so they have enough space for buttons

add translation into Russian for dialog window "About PLCOpen Editor"

add translation of "about" window into Russian

make About and Find dialogs have the same icon as main Beremiz window

all child windows will take the parent's icon, if no other is specified.

fix splash loading with wx3.0

Previously only gray square was shown. Apparently to show splash screen several calls of wx.Yield() are necessary.
Unfortunately splash.IsShowOnScreen() returns always 1 regardless of whether splash is on the screen or not.
this fix is a dirty hack. It just process all events after splash is created during 0.3 seconds.

add i18n for couple of strings in TextViewer.py
add source file for Russian translation
update messages.pot and app.fil
update Russian translation

increase height for ConnectionDialog and ArrayTypeDialog to have
enough place for buttons

add Russian translation

bitmap in wx3.0 doesn't have useAlpha() method

Suppress WXDEBUG assertions, as happens by default with wx2.8. This is
necessary for wx3.0

Exception while connecting LOCAL://!
Traceback (most recent call last):
File "/home/beremiz/beremiz/ProjectController.py", line 1560, in _Connect
self._SetConnector(connectors.ConnectorFactory(uri, self))
File "/home/beremiz/beremiz/ProjectController.py", line 1508, in _SetConnector
self.StatusTimer.Start(milliseconds=500, oneShot=False)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_misc.py", line 1324, in Start
return _misc_.Timer_Start(*args, **kwargs)
PyAssertionError: C++ assertion "m_window" failed at ../src/gtk/dcclient.cpp(2043) in DoGetSize(): GetSize() doesn't work without window

enable use of wxWidgets-3.0

make mki18n.py wx-3.0 compatible and fix segmentation fault

$ python mki18n.py -m -v --moTarget=../locale --domain=Beremiz
No project directory given. Using current one: /home/beremiz/beremiz/i18n
Application domain used is: 'Beremiz'
Target directory for .mo files is: ../locale
../src/common/stdpbase.cpp(62): assert "traits" failed in Get(): create wxApp before calling this
Segmentation fault

fix issue, then it wasn't possible to view FBD programs

the reason for that is possible wx-3.0-gtk2 bug that happens if
ALWAYS_SHOW_SB is set.

Traceback (most recent call last):
File "Beremiz.py", line 1045, in OnProjectTreeItemActivated
IDEFrame.OnProjectTreeItemActivated(self, event)
File "IDEFrame.py", line 1667, in OnProjectTreeItemActivated
self.EditProjectElement(item_infos["type"], item_infos["tagname"])
File "IDEFrame.py", line 1752, in EditProjectElement
new_window = Viewer(self.TabsOpened, tagname, self, self.Controler)
File "editors/Viewer.py", line 611, in __init__
EditorPanel.__init__(self, parent, tagname, window, controler, debug)
File "editors/EditorPanel.py", line 68, in __init__
self._init_ctrls(parent)
File "editors/EditorPanel.py", line 52, in _init_ctrls
self._init_Editor(self)
File "editors/Viewer.py", line 603, in _init_Editor
style=wx.HSCROLL | wx.VSCROLL | wx.ALWAYS_SHOW_SB)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_windows.py", line 296, in __init__
_windows_.ScrolledWindow_swiginit(self,_windows_.new_ScrolledWindow(*args, **kwargs))
PyAssertionError: C++ assertion "scrolled" failed at ../src/gtk/scrolwin.cpp(205) in DoShowScrollbars(): window must be created

fix issue, then it wasn't possible to remove functional blocks from
project using right click and popup menu.

The problem is that, PopupMenu was called using IDEFrame object and as
a result item in ProjectTree loosed focus and focus went to IDEFrame.
Therefore later functions couldn't detect which item in ProjectTree
was selected.

fix many compilation warnings about static variables used by non-static functions

[CC] plc_main.c -> plc_main.o
/tmp/be/build/plc_main.c:396:40: warning: ?LogBuff? is static but used in inline function ?copy_from_log? which is not static
memcpy((char*)buf + remaining, LogBuff[level], size - remaining);
^
/tmp/be/build/plc_main.c:395:22: warning: ?LogBuff? is static but used in inline function ?copy_from_log? which is not static
memcpy(buf, &LogBuff[level][buffpos], remaining);
^
...

^
/tmp/be/build/plc_debugger.c:825:20: warning: ?retain_offset? is static but used in inline function ?BufferIterator? which is not static
Retain(retain_offset, size, real_value_p);
^
/tmp/be/build/plc_debugger.c:823:47: warning: ?retain_offset? is static but used in inline function ?BufferIterator? which is not static
unsigned int next_retain_offset = retain_offset + size;
^
^

make attribute CFLAGS and LDFLAGS optional and add default empty value

Actually CFLAGS and LDFLAGS are not required and can be empty.
Without default empty value if target platform in project settings was
set to "Linux" CFLAGS and LDFLAGS was initialized with NoneType.
The result was broken build and it wasn't to save/load project with
such settings.

Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 956, in _Build
if not builder.build() :
File "/home/developer/WorkData/PLC/beremiz/beremiz/targets/toolchain_gcc.py", line 96, in build
Builder_CFLAGS = ' '.join(self.getBuilderCFLAGS())
TypeError: sequence item 0: expected string, NoneType found

fix issue, when structure data type with array field is created

Traceback (most recent call last):
File "editors/DataTypeEditor.py", line 669, in ElementArrayTypeFunction
self.RefreshTypeInfos()
File "editors/DataTypeEditor.py", line 761, in RefreshTypeInfos
self.Controler.SetDataTypeInfos(self.TagName, infos)
File "PLCControler.py", line 2075, in SetDataTypeInfos
array.baseType.setcontent(PLCOpenParser.CreateElement(
AttributeError: 'lxml.etree._Element' object has no attribute 'setcontent'

fixes sometimes happened error during project compilation

Traceback (most recent call last):
File "./Beremiz.py", line 1229, in run_with_except_hook
run_old(*args, **kw)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 68, in run
self.endcallback(self.Proc.pid, err)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 169, in finish
if self.timeout: self.timeout.cancel()
AttributeError: ProcessLogger instance has no attribute 'timeout'

merge

Use '-p' command line option when running matiec (iec2c)

Add command line option '-l' when calling matiec

merge