Sergey Surkov <surkovsv93@gmail.com> [Fri, 09 Sep 2016 13:33:49 +0300] rev 1522
fix bug with non-editable names and types of FB local variables in POU's written in ST or IL
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 05 Sep 2016 16:47:34 +0300] rev 1521
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);
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 24 Aug 2016 13:08:13 +0300] rev 1520
add initialization tick time on Beremiz start
This fixes issue #6
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 24 Aug 2016 13:06:52 +0300] rev 1519
fix race condition in ProcessLogger
alexander@60.125.16.172.in-addr.arpa [Tue, 23 Aug 2016 10:24:47 +0500] rev 1518
- Fixed startup from ancestor code.
Paul Beltyukov [Thu, 18 Aug 2016 14:35:03 +0500] rev 1517
This fixes issue #5
andrey@new-nest [Fri, 06 May 2016 22:21:22 +0300] rev 1516
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]
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 19:14:10 +0300] rev 1515
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 18:04:40 +0300] rev 1514
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 16:16:30 +0300] rev 1513
add distribution license notice to about dialog as GPL requires
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 14:45:06 +0300] rev 1512
add GPLv2 license
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 14:05:44 +0300] rev 1511
add copyright notices to python files where there were missing, that
is required by GPLv2
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 10:35:46 +0300] rev 1510
fix issue that was impossible to remove local instance of functional
block if pou is written in ST or IL
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 16:54:01 +0300] rev 1509
fix highlighting of multiline comments in ST and IL
close #2
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 15:21:02 +0300] rev 1508
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)
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 13:05:57 +0300] rev 1507
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 12:58:58 +0300] rev 1506
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 27 Apr 2016 18:42:30 +0300] rev 1505
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 'Это...'
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 25 Apr 2016 17:23:04 +0300] rev 1504
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 21:26:31 +0300] rev 1503
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 19:49:10 +0300] rev 1502
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 17:02:18 +0300] rev 1501
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 16:59:47 +0300] rev 1500
update Russian about Beremiz dialog window
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 16:24:06 +0300] rev 1499
fix issue, that was impossible to change time interval for cyclic
tasks, when wx 3.0 is used
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 20:42:37 +0300] rev 1498
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
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 19:14:28 +0300] rev 1497
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)
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:51:29 +0300] rev 1496
update Russian translation
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:49:39 +0300] rev 1495
add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:47:35 +0300] rev 1494
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
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:44:17 +0300] rev 1493
increase height of some dialog windows so they have enough space for buttons
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:41:43 +0300] rev 1492
add translation into Russian for dialog window "About PLCOpen Editor"
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:40:52 +0300] rev 1491
add translation of "about" window into Russian
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 17:30:16 +0300] rev 1490
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 17:15:35 +0300] rev 1489
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 16:20:53 +0300] rev 1488
add i18n for couple of strings in TextViewer.py
add source file for Russian translation
update messages.pot and app.fil
update Russian translation
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 16:14:25 +0300] rev 1487
increase height for ConnectionDialog and ArrayTypeDialog to have
enough place for buttons
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 19 Apr 2016 13:18:21 +0300] rev 1486
add Russian translation
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 19 Apr 2016 12:16:29 +0300] rev 1485
bitmap in wx3.0 doesn't have useAlpha() method
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 19 Apr 2016 12:15:51 +0300] rev 1484
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
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:18:11 +0300] rev 1483
enable use of wxWidgets-3.0
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:17:22 +0300] rev 1482
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
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:15:55 +0300] rev 1481
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
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:08:29 +0300] rev 1480
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.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 18:59:11 +0300] rev 1479
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;
^
^
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 18:56:51 +0300] rev 1478
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
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 18:51:59 +0300] rev 1477
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'
Andrey Skvortsov <andrej.skvortzov@gmail.com [Mon, 18 Apr 2016 18:48:15 +0300] rev 1476
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'
mjsousa [Wed, 21 Oct 2015 15:00:32 +0100] rev 1475
merge
mjsousa [Sat, 06 Dec 2014 19:31:51 +0000] rev 1474
Use '-p' command line option when running matiec (iec2c)
mjsousa [Wed, 26 Nov 2014 16:05:14 +0000] rev 1473
Add command line option '-l' when calling matiec
mjsousa [Wed, 12 Nov 2014 17:36:27 +0000] rev 1472
merge
mjsousa [Tue, 08 Jul 2014 18:01:33 +0100] rev 1471
merge
mjsousa [Fri, 06 Jun 2014 18:30:49 +0100] rev 1470
merge
mjsousa [Mon, 26 May 2014 14:44:03 +0100] rev 1469
Update __SET_VAR() macros to reflect changes made to matiec
Edouard Tisserant [Fri, 19 Jun 2015 23:36:35 +0200] rev 1468
Merged
Edouard Tisserant [Fri, 19 Jun 2015 22:36:35 +0200] rev 1467
Merged
Edouard Tisserant [Fri, 19 Jun 2015 21:56:35 +0200] rev 1466
Fixed win32 build warning caused by leftover debug code
Edouard Tisserant [Fri, 19 Jun 2015 21:36:35 +0200] rev 1465
Fixed win32 runtime crashing when attempting to log before errors before PLC start. Added pictures to wxHMI and fixed it so that it loads on windows as well
Edouard Tisserant [Fri, 19 Jun 2015 11:36:35 +0200] rev 1464
Fixed canfestival extension own path resolution
Edouard Tisserant [Fri, 19 Jun 2015 09:34:18 +0200] rev 1463
Changed runtime's global PLCID to PLC_ID, working around redefinition in windoze' headers.
Edouard Tisserant [Thu, 18 Jun 2015 15:22:43 +0200] rev 1462
Extended wxHMI test
Edouard Tisserant [Thu, 18 Jun 2015 11:36:35 +0200] rev 1461
Added wxHMI test
Edouard Tisserant [Mon, 15 Jun 2015 10:19:52 +0200] rev 1460
merged forgotten changesets
Edouard Tisserant [Sat, 14 Mar 2015 14:51:39 +0100] rev 1459
Added log message when RETAIN memory not valid