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.