# HG changeset patch
# User PaulBeltyukov
# Date 1487237712 -18000
# Node ID 3291024e00da8d5f317118dc88ab5a4f6c0065ae
# Parent 6431f26aa50160943420a75a50f7560af6278e60# Parent 13d15a1ae899fbb74d56c2300835cff31edf3ff3
Merge
diff -r 6431f26aa501 -r 3291024e00da .hgignore
--- a/.hgignore Thu Feb 16 14:34:40 2017 +0500
+++ b/.hgignore Thu Feb 16 14:35:12 2017 +0500
@@ -2,9 +2,14 @@
syntax: regexp
^tests/.*/build$
+^.idea/.*
syntax: regexp
^.*\.pyc$
syntax: regexp
^.*~$
syntax: regexp
^.*\.swp$
+
+bug_report.*\.txt
+i18n/.*.new$
+revision
diff -r 6431f26aa501 -r 3291024e00da Beremiz.py
--- a/Beremiz.py Thu Feb 16 14:34:40 2017 +0500
+++ b/Beremiz.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,27 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
updateinfo_url = None
@@ -31,6 +30,7 @@
import shutil
import random
import time
+import version
from types import ListType
beremiz_dir = os.path.dirname(os.path.realpath(__file__))
@@ -105,13 +105,17 @@
app.SetAppName('beremiz')
if wx.VERSION < (3, 0, 0):
- wx.InitAllImageHandlers()
+ wx.InitAllImageHandlers()
# popup splash
splash = ShowSplashScreen()
+
+ # load internatialization files
+ from util.misc import InstallLocalRessources
+ InstallLocalRessources(beremiz_dir)
if updateinfo_url is not None:
- updateinfo = "Fetching %s" % updateinfo_url
+ updateinfo = _("Fetching %s") % updateinfo_url
# warn for possible updates
def updateinfoproc():
global updateinfo
@@ -119,7 +123,7 @@
import urllib2
updateinfo = urllib2.urlopen(updateinfo_url,None).read()
except :
- updateinfo = "update info unavailable."
+ updateinfo = _("update info unavailable.")
from threading import Thread
splash.SetText(text=updateinfo)
@@ -130,9 +134,6 @@
splash.SetText(text=updateinfo)
wx.Yield()
- from util.misc import InstallLocalRessources
- InstallLocalRessources(beremiz_dir)
-
# Load extensions
for extfilename in extensions:
from util.TranslationCatalogs import AddCatalog
@@ -158,6 +159,8 @@
from util.ProcessLogger import ProcessLogger
from controls.LogViewer import LogViewer
from controls.CustomStyledTextCtrl import CustomStyledTextCtrl
+from controls import EnhancedStatusBar as esb
+from dialogs.AboutDialog import ShowAboutDialog
from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY, ITEM_PROJECT, ITEM_RESOURCE
from ProjectController import ProjectController, GetAddMenuItems, MATIEC_ERROR_MODEL, ITEM_CONFNODE
@@ -247,12 +250,14 @@
# adding text. It seems that text modifications, even
# programmatically, are disabled in StyledTextCtrl when read
# only is active
+ start_pos = self.output.GetLength()
self.output.SetReadOnly(False)
self.output.AppendText(s)
self.output.SetReadOnly(True)
+ text_len = self.output.GetLength() - start_pos
if style != self.black_white:
- self.output.SetStyling(len(s), style)
+ self.output.SetStyling(text_len, style)
self.stack = []
self.lock.release()
self.output.Thaw()
@@ -393,6 +398,11 @@
inspectorID = wx.NewId()
self.Bind(wx.EVT_MENU, self.OnOpenWidgetInspector, id=inspectorID)
accels = [wx.AcceleratorEntry(wx.ACCEL_CTRL|wx.ACCEL_ALT, ord('I'), inspectorID)]
+
+ keyID = wx.NewId()
+ self.Bind(wx.EVT_MENU, self.SwitchFullScrMode, id=keyID)
+ accels += [wx.AcceleratorEntry(wx.ACCEL_NORMAL, wx.WXK_F12, keyID)]
+
for method,shortcut in [("Stop", wx.WXK_F4),
("Run", wx.WXK_F5),
("Transfer", wx.WXK_F6),
@@ -456,13 +466,27 @@
self.AUIManager.Update()
- self.ConnectionStatusBar = wx.StatusBar(self, style=wx.ST_SIZEGRIP)
+ self.ConnectionStatusBar = esb.EnhancedStatusBar(self, style=wx.ST_SIZEGRIP)
self._init_coll_ConnectionStatusBar_Fields(self.ConnectionStatusBar)
+ self.ProgressStatusBar = wx.Gauge(self.ConnectionStatusBar, -1, range = 100)
+ self.ConnectionStatusBar.AddWidget(self.ProgressStatusBar, esb.ESB_EXACT_FIT, esb.ESB_EXACT_FIT, 2)
+ self.ProgressStatusBar.Hide()
self.SetStatusBar(self.ConnectionStatusBar)
+ def __init_execute_path(self):
+ if os.name == 'nt':
+ # on windows, desktop shortcut launches Beremiz.py
+ # with working dir set to mingw/bin.
+ # then we prefix CWD to PATH in order to ensure that
+ # commands invoked by build process by default are
+ # found here.
+ os.environ["PATH"] = os.getcwd()+';'+os.environ["PATH"]
+
+
def __init__(self, parent, projectOpen=None, buildpath=None, ctr=None, debug=True):
# Add beremiz's icon in top left corner of the frame
self.icon = wx.Icon(Bpath("images", "brz.ico"), wx.BITMAP_TYPE_ICO)
+ self.__init_execute_path()
IDEFrame.__init__(self, parent, debug)
self.Log = LogPseudoFile(self.LogConsole,self.SelectTab)
@@ -498,7 +522,7 @@
if projectOpen is not None and os.path.isdir(projectOpen):
self.CTR = ProjectController(self, self.Log)
self.Controler = self.CTR
- result = self.CTR.LoadProject(projectOpen, buildpath)
+ result, err = self.CTR.LoadProject(projectOpen, buildpath)
if not result:
self.LibraryPanel.SetController(self.Controler)
self.ProjectTree.Enable(True)
@@ -550,7 +574,7 @@
{False : "-x 0", True :"-x 1"}[taskbaricon],
self.local_runtime_tmpdir),
no_gui=False,
- timeout=500, keyword = "working",
+ timeout=500, keyword = self.local_runtime_tmpdir,
cwd = self.local_runtime_tmpdir)
self.local_runtime.spin()
return self.runtime_port
@@ -733,6 +757,11 @@
self.GetConfigEntry("RecentProjects", []))
except:
recent_projects = []
+
+ while self.RecentProjectsMenu.GetMenuItemCount() > len(recent_projects):
+ item = self.RecentProjectsMenu.FindItemByPosition(0)
+ self.RecentProjectsMenu.RemoveItem(item)
+
self.FileMenu.Enable(ID_FILEMENURECENTPROJECTS, len(recent_projects) > 0)
for idx, projectpath in enumerate(recent_projects):
text = u'%d: %s' % (idx + 1, projectpath)
@@ -872,7 +901,7 @@
self.DebugVariablePanel.SetDataProducer(None)
self.ResetConnectionStatusBar()
- def RefreshConfigRecentProjects(self, projectpath):
+ def RefreshConfigRecentProjects(self, projectpath, err=False):
try:
recent_projects = map(DecodeFileSystemPath,
self.GetConfigEntry("RecentProjects", []))
@@ -880,7 +909,8 @@
recent_projects = []
if projectpath in recent_projects:
recent_projects.remove(projectpath)
- recent_projects.insert(0, projectpath)
+ if not err:
+ recent_projects.insert(0, projectpath)
self.Config.Write("RecentProjects", cPickle.dumps(
map(EncodeFileSystemPath, recent_projects[:MAX_RECENT_PROJECTS])))
self.Config.Flush()
@@ -947,12 +977,11 @@
self.ResetView()
self.CTR = ProjectController(self, self.Log)
self.Controler = self.CTR
- result = self.CTR.LoadProject(projectpath)
+ result, err = self.CTR.LoadProject(projectpath)
if not result:
self.LibraryPanel.SetController(self.Controler)
self.ProjectTree.Enable(True)
self.PouInstanceVariablesPanel.SetController(self.Controler)
- self.RefreshConfigRecentProjects(projectpath)
if self.EnableDebug:
self.DebugVariablePanel.SetDataProducer(self.CTR)
self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
@@ -960,8 +989,11 @@
self.ResetView()
self.ShowErrorMessage(result)
self.RefreshAll()
+ self.SearchResultPanel.ResetSearchResults()
else:
self.ShowErrorMessage(_("\"%s\" folder is not a valid Beremiz project\n") % projectpath)
+ err = True
+ self.RefreshConfigRecentProjects(projectpath, err)
self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU)
def OnCloseProjectMenu(self, event):
@@ -990,13 +1022,15 @@
if self.CTR is not None:
self.CTR.SaveProjectAs()
self.RefreshAll()
+ self.RefreshConfigRecentProjects(self.CTR.ProjectPath)
self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES)
def OnQuitMenu(self, event):
self.Close()
def OnAboutMenu(self, event):
- OpenHtmlFrame(self,_("About Beremiz"), Bpath("doc", _("about.html")), wx.Size(550, 550))
+ info = version.GetAboutDialogInfo()
+ ShowAboutDialog(self, info)
def OnProjectTreeItemBeginEdit(self, event):
selected = event.GetItem()
@@ -1161,7 +1195,7 @@
Please be kind enough to send this file to:
beremiz-devel@lists.sourceforge.net
-You should now restart Beremiz.
+You should now restart program.
Traceback:
""") % bug_report_path +
@@ -1189,45 +1223,48 @@
def AddExceptHook(path, app_version='[No version]'):#, ignored_exceptions=[]):
+ def save_bug_report(e_type, e_value, e_traceback, bug_report_path,date):
+ info = {
+ 'app-title': wx.GetApp().GetAppName(), # app_title
+ 'app-version': app_version,
+ 'wx-version': wx.VERSION_STRING,
+ 'wx-platform': wx.Platform,
+ 'python-version': platform.python_version(), # sys.version.split()[0],
+ 'platform': platform.platform(),
+ 'e-type': e_type,
+ 'e-value': e_value,
+ 'date': date,
+ 'cwd': os.getcwd(),
+ }
+ if e_traceback:
+ info['traceback'] = ''.join(traceback.format_tb(e_traceback)) + '%s: %s' % (e_type, e_value)
+ last_tb = get_last_traceback(e_traceback)
+ exception_locals = last_tb.tb_frame.f_locals # the locals at the level of the stack trace where the exception actually occurred
+ info['locals'] = format_namespace(exception_locals)
+ if 'self' in exception_locals:
+ try:
+ info['self'] = format_namespace(exception_locals['self'].__dict__)
+ except:
+ pass
+ if not os.path.exists(path):
+ os.mkdir(path)
+ output = open(bug_report_path, 'w')
+ lst = info.keys()
+ lst.sort()
+ for a in lst:
+ output.write(a + ":\n" + str(info[a]) + "\n\n")
+ output.close()
+
def handle_exception(e_type, e_value, e_traceback):
traceback.print_exception(e_type, e_value, e_traceback) # this is very helpful when there's an exception in the rest of this func
last_tb = get_last_traceback(e_traceback)
ex = (last_tb.tb_frame.f_code.co_filename, last_tb.tb_frame.f_lineno)
if ex not in ignored_exceptions:
+ ignored_exceptions.append(ex)
date = time.ctime()
- bug_report_path = path+os.sep+"bug_report_"+date.replace(':','-').replace(' ','_')+".txt"
- result = Display_Exception_Dialog(e_type,e_value,e_traceback,bug_report_path)
- if result:
- ignored_exceptions.append(ex)
- info = {
- 'app-title' : wx.GetApp().GetAppName(), # app_title
- 'app-version' : app_version,
- 'wx-version' : wx.VERSION_STRING,
- 'wx-platform' : wx.Platform,
- 'python-version' : platform.python_version(), #sys.version.split()[0],
- 'platform' : platform.platform(),
- 'e-type' : e_type,
- 'e-value' : e_value,
- 'date' : date,
- 'cwd' : os.getcwd(),
- }
- if e_traceback:
- info['traceback'] = ''.join(traceback.format_tb(e_traceback)) + '%s: %s' % (e_type, e_value)
- last_tb = get_last_traceback(e_traceback)
- exception_locals = last_tb.tb_frame.f_locals # the locals at the level of the stack trace where the exception actually occurred
- info['locals'] = format_namespace(exception_locals)
- if 'self' in exception_locals:
- try :
- info['self'] = format_namespace(exception_locals['self'].__dict__)
- except :
- pass
-
- output = open(bug_report_path,'w')
- lst = info.keys()
- lst.sort()
- for a in lst:
- output.write(a+":\n"+str(info[a])+"\n\n")
-
+ bug_report_path = path + os.sep + "bug_report_" + date.replace(':', '-').replace(' ', '_') + ".txt"
+ save_bug_report(e_type, e_value, e_traceback, bug_report_path, date)
+ Display_Exception_Dialog(e_type, e_value, e_traceback, bug_report_path)
#sys.excepthook = lambda *args: wx.CallAfter(handle_exception, *args)
sys.excepthook = handle_exception
@@ -1247,7 +1284,8 @@
if __name__ == '__main__':
# Install a exception handle for bug reports
- AddExceptHook(os.getcwd(),updateinfo_url)
+ logpath = tempfile.gettempdir()+os.sep+'Beremiz'
+ AddExceptHook(logpath ,version.app_version)
frame = Beremiz(None, projectOpen, buildpath)
if splash:
diff -r 6431f26aa501 -r 3291024e00da Beremiz_service.py
--- a/Beremiz_service.py Thu Feb 16 14:34:40 2017 +0500
+++ b/Beremiz_service.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os, sys, getopt
from threading import Thread
@@ -112,10 +112,52 @@
if __name__ == '__main__':
__builtin__.__dict__['_'] = lambda x: x
+def Bpath(*args):
+ return os.path.join(beremiz_dir,*args)
+
+def SetupI18n():
+ # Import module for internationalization
+ import gettext
+
+ # Get folder containing translation files
+ localedir = os.path.join(beremiz_dir,"locale")
+ # Get the default language
+ langid = wx.LANGUAGE_DEFAULT
+ # Define translation domain (name of translation files)
+ domain = "Beremiz"
+
+ # Define locale for wx
+ loc = __builtin__.__dict__.get('loc', None)
+ if loc is None:
+ loc = wx.Locale(langid)
+ __builtin__.__dict__['loc'] = loc
+ # Define location for searching translation files
+ loc.AddCatalogLookupPathPrefix(localedir)
+ # Define locale domain
+ loc.AddCatalog(domain)
+
+
+ import locale
+ global default_locale
+ default_locale = locale.getdefaultlocale()[1]
+
+
+ # sys.stdout.encoding = default_locale
+ # if Beremiz_service is started from Beremiz IDE
+ # sys.stdout.encoding is None (that means 'ascii' encoding').
+ # And unicode string returned by wx.GetTranslation() are
+ # automatically converted to 'ascii' string.
+ def unicode_translation(message):
+ return wx.GetTranslation(message).encode(default_locale)
+
+ if __name__ == '__main__':
+ __builtin__.__dict__['_'] = unicode_translation
+ # __builtin__.__dict__['_'] = wx.GetTranslation
+
if enablewx:
try:
import wxversion
- wxversion.select('2.8')
+ wxversion.select(['2.8', '3.0'])
import wx
havewx = True
except:
@@ -126,36 +168,15 @@
import re
from threading import Thread, currentThread
from types import *
- app=wx.App(redirect=False)
-
- # Import module for internationalization
- import gettext
-
- def Bpath(*args):
- return os.path.join(beremiz_dir,*args)
-
- # Get folder containing translation files
- localedir = os.path.join(beremiz_dir,"locale")
- # Get the default language
- langid = wx.LANGUAGE_DEFAULT
- # Define translation domain (name of translation files)
- domain = "Beremiz"
-
- # Define locale for wx
- loc = __builtin__.__dict__.get('loc', None)
- if loc is None:
- loc = wx.Locale(langid)
- __builtin__.__dict__['loc'] = loc
- # Define location for searching translation files
- loc.AddCatalogLookupPathPrefix(localedir)
- # Define locale domain
- loc.AddCatalog(domain)
-
- def unicode_translation(message):
- return wx.GetTranslation(message).encode("utf-8")
-
- if __name__ == '__main__':
- __builtin__.__dict__['_'] = wx.GetTranslation#unicode_translation
+
+ if wx.VERSION >= (3, 0, 0):
+ app = wx.App(redirect=False)
+ else:
+ app = wx.PySimpleApp(redirect=False)
+ app.SetTopWindow(wx.Frame(None, -1))
+
+ default_locale = None
+ SetupI18n()
defaulticon = wx.Image(Bpath("images", "brz.png"))
starticon = wx.Image(Bpath("images", "icoplay24.png"))
@@ -170,7 +191,7 @@
event(self, function)
- def __init__(self, parent, message, caption = "Please enter text", defaultValue = "",
+ def __init__(self, parent, message, caption = _("Please enter text"), defaultValue = "",
style = wx.OK|wx.CANCEL|wx.CENTRE, pos = wx.DefaultPosition):
wx.TextEntryDialog.__init__(self, parent, message, caption, defaultValue, style, pos)
@@ -267,14 +288,23 @@
def OnTaskBarStartPLC(self, evt):
if self.pyroserver.plcobj is not None:
- self.pyroserver.plcobj.StartPLC()
+ plcstatus = self.pyroserver.plcobj.GetPLCstatus()[0]
+ if plcstatus is "Stopped":
+ self.pyroserver.plcobj.StartPLC()
+ else:
+ print _("PLC is empty or already started.")
def OnTaskBarStopPLC(self, evt):
if self.pyroserver.plcobj is not None:
- Thread(target=self.pyroserver.plcobj.StopPLC).start()
+ if self.pyroserver.plcobj.GetPLCstatus()[0] == "Started":
+ Thread(target=self.pyroserver.plcobj.StopPLC).start()
+ else:
+ print _("PLC is not started.")
def OnTaskBarChangeInterface(self, evt):
- dlg = ParamsEntryDialog(None, _("Enter the IP of the interface to bind"), defaultValue=self.pyroserver.ip_addr)
+ ip_addr = self.pyroserver.ip_addr
+ ip_addr = '' if ip_addr is None else ip_addr
+ dlg = ParamsEntryDialog(None, _("Enter the IP of the interface to bind"), defaultValue=ip_addr)
dlg.SetTests([(re.compile('\d{1,3}(?:\.\d{1,3}){3}$').match, _("IP is not valid!")),
( lambda x :len([x for x in x.split(".") if 0 <= int(x) <= 255]) == 4, _("IP is not valid!"))
])
@@ -296,10 +326,12 @@
self.pyroserver.Stop()
def OnTaskBarChangeName(self, evt):
- dlg = ParamsEntryDialog(None, _("Enter a name "), defaultValue=self.pyroserver.name)
+ servicename = self.pyroserver.servicename
+ servicename = '' if servicename is None else servicename
+ dlg = ParamsEntryDialog(None, _("Enter a name "), defaultValue=servicename)
dlg.SetTests([(lambda name : len(name) is not 0 , _("Name must not be null!"))])
if dlg.ShowModal() == wx.ID_OK:
- self.pyroserver.name = dlg.GetValue()
+ self.pyroserver.servicename = dlg.GetValue()
self.pyroserver.Restart()
def _LiveShellLocals(self):
@@ -379,6 +411,7 @@
def Quit(self):
self.continueloop = False
if self.plcobj is not None:
+ self.plcobj.StopPLC()
self.plcobj.UnLoadPLC()
self.Stop()
@@ -390,9 +423,13 @@
self.pyruntimevars)
uri = self.daemon.connect(self.plcobj,"PLCObject")
- print "Pyro port :",self.port
- print "Pyro object's uri :",uri
- print "Current working directory :",self.workdir
+ print _("Pyro port :"), self.port
+ print _("Pyro object's uri :"), uri
+
+ # Beremiz IDE detects daemon start by looking
+ # for self.workdir in the daemon's stdout.
+ # Therefore don't delete the following line
+ print _("Current working directory :"), self.workdir
# Configure and publish service
# Not publish service if localhost in address params
@@ -400,18 +437,20 @@
self.ip_addr is not None and
self.ip_addr != "localhost" and
self.ip_addr != "127.0.0.1"):
- print "Publishing service on local network"
+ print _("Publishing service on local network")
self.servicepublisher = ServicePublisher.ServicePublisher()
self.servicepublisher.RegisterService(self.servicename, self.ip_addr, self.port)
- if self.autostart :
- self.plcobj.AutoLoad()
- if self.plcobj.GetPLCstatus()[0] != "Empty":
+ self.plcobj.AutoLoad()
+ if self.plcobj.GetPLCstatus()[0] != "Empty":
+ if self.autostart :
self.plcobj.StartPLC()
+ self.plcobj.StatusChange()
sys.stdout.flush()
self.daemon.requestLoop()
+ self.daemon.sock.close()
def Stop(self):
if self.plcobj is not None:
@@ -434,7 +473,7 @@
havetwisted = True
except:
- print "Twisted unavailable."
+ print _("Twisted unavailable.")
havetwisted = False
pyruntimevars = {}
@@ -512,7 +551,7 @@
try:
import runtime.NevowServer as NS
except Exception, e:
- print "Nevow/Athena import failed :", e
+ print _("Nevow/Athena import failed :"), e
webport = None
NS.WorkingDir = WorkingDir
@@ -520,7 +559,7 @@
try:
import runtime.WampClient as WC
except Exception, e:
- print "WAMP import failed :", e
+ print _("WAMP import failed :"), e
wampconf = None
# Load extensions
@@ -536,7 +575,7 @@
pyruntimevars["website"] = website
statuschange.append(NS.website_statuslistener_factory(website))
except Exception, e:
- print "Nevow Web service failed.", e
+ print _("Nevow Web service failed. "), e
if wampconf is not None :
try:
@@ -544,7 +583,7 @@
pyruntimevars["wampsession"] = WC.GetSession
WC.SetServer(pyroserver)
except Exception, e:
- print "WAMP client startup failed.", e
+ print _("WAMP client startup failed. "), e
if havetwisted or havewx:
diff -r 6431f26aa501 -r 3291024e00da CodeFileTreeNode.py
--- a/CodeFileTreeNode.py Thu Feb 16 14:34:40 2017 +0500
+++ b/CodeFileTreeNode.py Thu Feb 16 14:35:12 2017 +0500
@@ -117,11 +117,12 @@
try:
self.CodeFile, error = self.CodeFileParser.LoadXMLString(codefile_xml)
if error is not None:
- self.GetCTRoot().logger.write_warning(
- XSDSchemaErrorMessage % ((self.CODEFILE_NAME,) + error))
+ (fname, lnum, src) = ((self.CODEFILE_NAME,) + error)
+ self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1 = fname, a2 = lnum, a3 = src))
self.CreateCodeFileBuffer(True)
except Exception, exc:
- self.GetCTRoot().logger.write_error(_("Couldn't load confnode parameters %s :\n %s") % (CTNName, unicode(exc)))
+ msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1 = CTNName, a2 = unicode(exc))
+ self.GetCTRoot().logger.write_error(msg)
self.GetCTRoot().logger.write_error(traceback.format_exc())
else:
self.CodeFile = self.CodeFileParser.CreateRoot()
diff -r 6431f26aa501 -r 3291024e00da ConfigTreeNode.py
--- a/ConfigTreeNode.py Thu Feb 16 14:34:40 2017 +0500
+++ b/ConfigTreeNode.py Thu Feb 16 14:35:12 2017 +0500
@@ -53,7 +53,7 @@
</xsd:schema>""")
NameTypeSeparator = '@'
-XSDSchemaErrorMessage = _("%s XML file doesn't follow XSD schema at line %d:\n%s")
+XSDSchemaErrorMessage = _("{a1} XML file doesn't follow XSD schema at line %{a2}:\n{a3}")
class ConfigTreeNode:
"""
@@ -421,7 +421,8 @@
shutil.move(oldname, self.CTNPath())
# warn user he has two left hands
if DesiredName != res:
- self.GetCTRoot().logger.write_warning(_("A child named \"%s\" already exist -> \"%s\"\n")%(DesiredName,res))
+ msg = _("A child named \"{a1}\" already exists -> \"{a2}\"\n").format(a1 = DesiredName, a2 = res)
+ self.GetCTRoot().logger.write_warning(msg)
return res
def GetAllChannels(self):
@@ -525,7 +526,7 @@
try:
CTNClass, CTNHelp = CTNChildrenTypes[CTNType]
except KeyError:
- raise Exception, _("Cannot create child %s of type %s ")%(CTNName, CTNType)
+ raise Exception, _("Cannot create child {a1} of type {a2} ").format(a1 = CTNName, a2 = CTNType)
# if CTNClass is a class factory, call it. (prevent unneeded imports)
if type(CTNClass) == types.FunctionType:
@@ -535,7 +536,8 @@
ChildrenWithSameClass = self.Children.setdefault(CTNType, list())
# Check count
if getattr(CTNClass, "CTNMaxCount", None) and len(ChildrenWithSameClass) >= CTNClass.CTNMaxCount:
- raise Exception, _("Max count (%d) reached for this confnode of type %s ")%(CTNClass.CTNMaxCount, CTNType)
+ msg = _("Max count ({a1}) reached for this confnode of type {a2} ").format(a1 = CTNClass.CTNMaxCount, a2 = CTNType)
+ raise Exception, msg
# create the final class, derived of provided confnode and template
class FinalCTNClass(CTNClass, ConfigTreeNode):
@@ -561,7 +563,9 @@
_self.LoadXMLParams(NewCTNName)
# Basic check. Better to fail immediately.
if (_self.BaseParams.getName() != NewCTNName):
- raise Exception, _("Project tree layout do not match confnode.xml %s!=%s ")%(NewCTNName, _self.BaseParams.getName())
+ msg = _("Project tree layout do not match confnode.xml {a1}!={a2} ").\
+ format(a1 = NewCTNName, a2 = _self.BaseParams.getName())
+ raise Exception, msg
# Now, self.CTNPath() should be OK
@@ -614,12 +618,13 @@
basexmlfile = open(self.ConfNodeBaseXmlFilePath(CTNName), 'r')
self.BaseParams, error = _BaseParamsParser.LoadXMLString(basexmlfile.read())
if error is not None:
- self.GetCTRoot().logger.write_warning(
- XSDSchemaErrorMessage % ((ConfNodeName + " BaseParams",) + error))
+ (fname, lnum, src) = ((ConfNodeName + " BaseParams",) + error)
+ self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1 = fname, a2 = lnum, a3 = src))
self.MandatoryParams = ("BaseParams", self.BaseParams)
basexmlfile.close()
except Exception, exc:
- self.GetCTRoot().logger.write_error(_("Couldn't load confnode base parameters %s :\n %s") % (ConfNodeName, unicode(exc)))
+ msg = _("Couldn't load confnode base parameters {a1} :\n {a2}").format(a1 = ConfNodeName, a2 = unicode(exc))
+ self.GetCTRoot().logger.write_error(msg)
self.GetCTRoot().logger.write_error(traceback.format_exc())
# Get the xml tree
@@ -628,14 +633,15 @@
xmlfile = open(self.ConfNodeXmlFilePath(CTNName), 'r')
obj, error = self.Parser.LoadXMLString(xmlfile.read())
if error is not None:
- self.GetCTRoot().logger.write_warning(
- XSDSchemaErrorMessage % ((ConfNodeName,) + error))
+ (fname, lnum, src) = ((ConfNodeName,) + error)
+ self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1 = fname, a2 = lnum, a3 = src))
name = obj.getLocalTag()
setattr(self, name, obj)
self.CTNParams = (name, obj)
xmlfile.close()
except Exception, exc:
- self.GetCTRoot().logger.write_error(_("Couldn't load confnode parameters %s :\n %s") % (ConfNodeName, unicode(exc)))
+ msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1 = ConfNodeName, a2 = unicode(exc))
+ self.GetCTRoot().logger.write_error(msg)
self.GetCTRoot().logger.write_error(traceback.format_exc())
def LoadChildren(self):
@@ -647,6 +653,7 @@
try:
self.CTNAddChild(pname, ptype)
except Exception, exc:
- self.GetCTRoot().logger.write_error(_("Could not add child \"%s\", type %s :\n%s\n")%(pname, ptype, unicode(exc)))
+ msg = _("Could not add child \"{a1}\", type {a2} :\n{a3}\n").format(a1 = pname, a2 = ptype, a3 = unicode(exc))
+ self.GetCTRoot().logger.write_error(msg)
self.GetCTRoot().logger.write_error(traceback.format_exc())
diff -r 6431f26aa501 -r 3291024e00da IDEFrame.py
--- a/IDEFrame.py Thu Feb 16 14:34:40 2017 +0500
+++ b/IDEFrame.py Thu Feb 16 14:35:12 2017 +0500
@@ -64,7 +64,8 @@
# Define PLCOpenEditor DisplayMenu extra items id
[ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE,
-] = [wx.NewId() for _init_coll_DisplayMenu_Items in range(1)]
+ ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE,
+] = [wx.NewId() for _init_coll_DisplayMenu_Items in range(2)]
#-------------------------------------------------------------------------------
# EditorToolBar definitions
@@ -442,6 +443,10 @@
self.Bind(wx.EVT_MENU, self.GenerateZoomFunction(idx), id=new_id)
parent.AppendSeparator()
+ AppendMenu(parent, help='', id=ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE,
+ kind=wx.ITEM_NORMAL, text=_(u'Switch perspective') + '\tF12')
+ self.Bind(wx.EVT_MENU, self.SwitchFullScrMode, id=ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE)
+
AppendMenu(parent, help='', id=ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE,
kind=wx.ITEM_NORMAL, text=_(u'Reset Perspective'))
self.Bind(wx.EVT_MENU, self.OnResetPerspective, id=ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE)
@@ -1255,6 +1260,7 @@
def OnFindMenu(self, event):
if not self.FindDialog.IsShown():
self.FindDialog.Show()
+ self.FindDialog.FindPattern.SetFocus()
def CloseFindInPouDialog(self):
selected = self.TabsOpened.GetSelection()
@@ -1279,10 +1285,11 @@
dialog = SearchInProjectDialog(self)
if dialog.ShowModal() == wx.ID_OK:
criteria = dialog.GetCriteria()
- result = self.Controler.SearchInProject(criteria)
- self.ClearSearchResults()
- self.SearchResultPanel.SetSearchResults(criteria, result)
- self.SelectTab(self.SearchResultPanel)
+ if len(criteria) > 0:
+ result = self.Controler.SearchInProject(criteria)
+ self.ClearSearchResults()
+ self.SearchResultPanel.SetSearchResults(criteria, result)
+ self.SelectTab(self.SearchResultPanel)
#-------------------------------------------------------------------------------
# Display Menu Functions
@@ -1438,15 +1445,18 @@
def OnTabsOpenedDClick(event):
pos = event.GetPosition()
if tabctrl.TabHitTest(pos.x, pos.y, None):
- pane = self.AUIManager.GetPane(self.TabsOpened)
- if pane.IsMaximized():
- self.AUIManager.RestorePane(pane)
- else:
- self.AUIManager.MaximizePane(pane)
- self.AUIManager.Update()
+ self.SwitchFullScrMode(event)
event.Skip()
return OnTabsOpenedDClick
+ def SwitchFullScrMode(self,evt):
+ pane = self.AUIManager.GetPane(self.TabsOpened)
+ if pane.IsMaximized():
+ self.AUIManager.RestorePane(pane)
+ else:
+ self.AUIManager.MaximizePane(pane)
+ self.AUIManager.Update()
+
#-------------------------------------------------------------------------------
# Types Tree Management Functions
#-------------------------------------------------------------------------------
@@ -1481,8 +1491,7 @@
item_name = _(item_name)
self.ProjectTree.SetItemText(root, item_name)
self.ProjectTree.SetPyData(root, infos)
- highlight_colours = self.Highlights.get(infos.get("tagname", None), (wx.WHITE, wx.BLACK))
- self.ProjectTree.SetItemBackgroundColour(root, highlight_colours[0])
+ highlight_colours = self.Highlights.get(infos.get("tagname", None), (wx.Colour(255, 255, 255, 0), wx.BLACK))
self.ProjectTree.SetItemTextColour(root, highlight_colours[1])
self.ProjectTree.SetItemExtraImage(root, None)
if infos["type"] == ITEM_POU:
@@ -1612,6 +1621,8 @@
self.RefreshLibraryPanel()
self.RefreshPageTitles()
elif item_infos["type"] == ITEM_TRANSITION:
+ pou_item = self.ProjectTree.GetItemParent(event.GetItem())
+ pou_name = self.ProjectTree.GetItemText(pou_item)
if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
message = _("A POU named \"%s\" already exists!")%new_name
elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariableNames(pou_name) if name != old_name]:
@@ -1623,6 +1634,8 @@
self.Controler.ComputePouTransitionName(words[1], new_name))
self.RefreshPageTitles()
elif item_infos["type"] == ITEM_ACTION:
+ pou_item = self.ProjectTree.GetItemParent(event.GetItem())
+ pou_name = self.ProjectTree.GetItemText(pou_item)
if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
message = _("A POU named \"%s\" already exists!")%new_name
elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariableNames(pou_name) if name != old_name]:
diff -r 6431f26aa501 -r 3291024e00da PLCControler.py
--- a/PLCControler.py Thu Feb 16 14:34:40 2017 +0500
+++ b/PLCControler.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from xml.dom import minidom
from types import StringType, UnicodeType, TupleType
@@ -967,7 +967,8 @@
# programs cannot be pasted as functions or function blocks
if orig_type == 'functionBlock' and pou_type == 'function' or \
orig_type == 'program' and pou_type in ['function', 'functionBlock']:
- return _('''%s "%s" can't be pasted as a %s.''') % (orig_type, name, pou_type)
+ msg = _('''{a1} "{a2}" can't be pasted as a {a3}.''').format(a1 = orig_type, a2 = name, a3 = pou_type)
+ return msg
new_pou.setpouType(pou_type)
@@ -2183,7 +2184,7 @@
if pou is not None:
return self.GetPouInterfaceReturnType(pou, tree, debug)
elif words[0] == 'T':
- return "BOOL"
+ return ["BOOL", ([], [])]
return None
# Change the edited element text
@@ -3192,7 +3193,14 @@
def SearchInPou(self, tagname, criteria, debug=False):
pou = self.GetEditedElement(tagname, debug)
if pou is not None:
- return pou.Search(criteria)
+ search_results = pou.Search(criteria, [tagname])
+ if tagname.split("::")[0] in ['A', 'T']:
+ parent_pou_tagname = "P::%s" % (tagname.split("::")[-2])
+ parent_pou = self.GetEditedElement(parent_pou_tagname, debug)
+ for infos, start, end, text in parent_pou.Search(criteria):
+ if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]:
+ search_results.append((infos, start, end, text))
+ return search_results
return []
#-------------------------------------------------------------------------------
diff -r 6431f26aa501 -r 3291024e00da PLCGenerator.py
--- a/PLCGenerator.py Thu Feb 16 14:34:40 2017 +0500
+++ b/PLCGenerator.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from plcopen import PLCOpenParser
from plcopen.structures import *
@@ -393,6 +393,11 @@
single = task.getsingle()
# Single argument if exists
if single is not None:
+ if len(single) == 0:
+ msg = _("Source signal has to be defined for single task '{a1}' in resource '{a2}.{a3}'.").\
+ format(a1 = task.getname(), a2 = config_name, a3 = resource.getname())
+ raise PLCGenException, msg
+
if single[0]=='[' and single[-1]==']' :
SNGLKW = "MULTI"
else:
@@ -763,7 +768,10 @@
content = instance.getconditionContent()
if content["type"] == "connection":
self.ConnectionTypes[content["value"]] = "BOOL"
- for link in content["value"].getconnections():
+ connections = content["value"].getconnections()
+ if not connections:
+ raise PLCGenException, _("SFC transition in POU \"%s\" must be connected.") % self.Name
+ for link in connections:
connected = self.GetLinkedConnector(link, body)
if connected is not None and not self.ConnectionTypes.has_key(connected):
for related in self.ExtractRelatedConnections(connected):
@@ -775,7 +783,8 @@
for element in body.getcontentInstances():
if isinstance(element, ConnectorClass) and element.getname() == name:
if connector is not None:
- raise PLCGenException, _("More than one connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name)
+ msg = _("More than one connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU").format(a1 = name, a2 = self.Name)
+ raise PLCGenException, msg
connector = element
if connector is not None:
undefined = [instance.connectionPointOut, connector.connectionPointIn]
@@ -794,7 +803,8 @@
for connection in related:
self.ConnectionTypes[connection] = var_type
else:
- raise PLCGenException, _("No connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name)
+ msg = _("No connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU").format(a1 = name, a2 = self.Name)
+ raise PLCGenException, msg
elif isinstance(instance, BlockClass):
block_infos = self.GetBlockType(instance.gettypeName(), "undefined")
if block_infos is not None:
@@ -948,7 +958,7 @@
if block_infos is None:
block_infos = self.GetBlockType(block_type)
if block_infos is None:
- raise PLCGenException, _("Undefined block type \"%s\" in \"%s\" POU")%(block_type, self.Name)
+ raise PLCGenException, _("Undefined block type \"{a1}\" in \"{a2}\" POU").format(a1 = block_type, a2 = self.Name)
try:
self.GenerateBlock(instance, block_infos, body, None)
except ValueError, e:
@@ -1088,7 +1098,8 @@
self.Program += JoinList([(", ", ())], vars)
self.Program += [(");\n", ())]
else:
- self.Warnings.append(_("\"%s\" function cancelled in \"%s\" POU: No input connected")%(type, self.TagName.split("::")[-1]))
+ msg = _("\"{a1}\" function cancelled in \"{a2}\" POU: No input connected").format(a1 = type, a2 = self.TagName.split("::")[-1])
+ self.Warnings.append(msg)
elif block_infos["type"] == "functionBlock":
if not self.ComputedBlocks.get(block, False) and not order:
self.ComputedBlocks[block] = True
@@ -1177,11 +1188,12 @@
if output_parameter is None:
output_parameter = ""
if name:
- blockname = "%s(%s)" % (name, type)
+ blockname = "{a1}({a2})".format(a1 = name, a2 = type)
else:
blockname = type
- raise ValueError, _("No output %s variable found in block %s in POU %s. Connection must be broken") % \
- (output_parameter, blockname, self.Name)
+ msg = _("No output {a1} variable found in block {a2} in POU {a3}. Connection must be broken").\
+ format(a1 = output_parameter, a2 = blockname, a3 = self.Name)
+ raise ValueError, msg
def GeneratePaths(self, connections, body, order = False, to_inout = False):
paths = []
@@ -1199,7 +1211,8 @@
if block_infos is None:
block_infos = self.GetBlockType(block_type)
if block_infos is None:
- raise PLCGenException, _("Undefined block type \"%s\" in \"%s\" POU")%(block_type, self.Name)
+ msg = _("Undefined block type \"{a1}\" in \"{a2}\" POU").format(a1 = block_type, a2 = self.Name)
+ raise PLCGenException, msg
try:
paths.append(str(self.GenerateBlock(next, block_infos, body, connection, order, to_inout)))
except ValueError, e:
@@ -1214,7 +1227,8 @@
for instance in body.getcontentInstances():
if isinstance(instance, ConnectorClass) and instance.getname() == name:
if connector is not None:
- raise PLCGenException, _("More than one connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name)
+ msg = _("More than one connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU").format(a1 = name, a2 = self.Name)
+ raise PLCGenException, msg
connector = instance
if connector is not None:
connections = connector.connectionPointIn.getconnections()
@@ -1224,7 +1238,8 @@
self.ComputedConnectors[name] = expression
paths.append(str(expression))
else:
- raise PLCGenException, _("No connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name)
+ msg = _("No connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU").format(a1 = name, a2 = self.Name)
+ raise PLCGenException, msg
elif isinstance(next, ContactClass):
contact_info = (self.TagName, "contact", next.getlocalId())
variable = str(self.ExtractModifier(next, [(next.getvariable(), contact_info + ("reference",))], contact_info))
@@ -1372,6 +1387,10 @@
def GenerateSFCJump(self, jump, pou):
jump_target = jump.gettargetName()
+ if not pou.hasstep(jump_target):
+ pname = pou.getname()
+ msg = _("SFC jump in pou \"{a1}\" refers to non-existent SFC step \"{a2}\"").format( a1 = pname, a2 = jump_target)
+ raise PLCGenException, msg
if jump.connectionPointIn is not None:
instances = []
connections = jump.connectionPointIn.getconnections()
@@ -1576,7 +1595,9 @@
elif len(transition_infos["from"]) == 1:
self.Program += transition_infos["from"][0]
else:
- raise PLCGenException, _("Transition with content \"%s\" not connected to a previous step in \"%s\" POU")%(transition_infos["content"], self.Name)
+ msg = _("Transition with content \"{a1}\" not connected to a previous step in \"{a2}\" POU").\
+ format(a1 = transition_infos["content"], a2 = self.Name)
+ raise PLCGenException, msg
self.Program += [(" TO ", ())]
if len(transition_infos["to"]) > 1:
self.Program += [("(", ())]
@@ -1585,7 +1606,9 @@
elif len(transition_infos["to"]) == 1:
self.Program += transition_infos["to"][0]
else:
- raise PLCGenException, _("Transition with content \"%s\" not connected to a next step in \"%s\" POU")%(transition_infos["content"], self.Name)
+ msg = _("Transition with content \"{a1}\" not connected to a next step in \"{a2}\" POU").\
+ format(a1 = transition_infos["content"], a2 = self.Name)
+ raise PLCGenException, msg
self.Program += transition_infos["content"]
self.Program += [("%sEND_TRANSITION\n\n"%self.CurrentIndent, ())]
for [(step_name, step_infos)] in transition_infos["to"]:
diff -r 6431f26aa501 -r 3291024e00da PLCOpenEditor.py
--- a/PLCOpenEditor.py Thu Feb 16 14:34:40 2017 +0500
+++ b/PLCOpenEditor.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,29 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import os, sys, platform, time, traceback, getopt
+import version
beremiz_dir = os.path.dirname(os.path.realpath(__file__))
@@ -60,7 +61,11 @@
# Create wxApp (Need to create App before internationalization because of
# Windows)
- app = wx.PySimpleApp()
+ if wx.VERSION >= (3, 0, 0):
+ app = wx.App()
+ else:
+ app = wx.PySimpleApp()
+
from util.misc import InstallLocalRessources
InstallLocalRessources(beremiz_dir)
@@ -72,6 +77,7 @@
from editors.Viewer import Viewer
from PLCControler import PLCControler
from dialogs import ProjectDialog
+from dialogs.AboutDialog import ShowAboutDialog
#-------------------------------------------------------------------------------
# PLCOpenEditor Main Class
@@ -160,6 +166,7 @@
# @param fileOpen The filepath to open if no controler defined (default: None).
# @param debug The filepath to open if no controler defined (default: False).
def __init__(self, parent, fileOpen = None):
+ self.icon = wx.Icon(os.path.join(beremiz_dir, "images", "poe.ico"), wx.BITMAP_TYPE_ICO)
IDEFrame.__init__(self, parent)
result = None
@@ -178,15 +185,15 @@
self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
# Define PLCOpenEditor icon
- self.SetIcon(wx.Icon(os.path.join(beremiz_dir, "images", "poe.ico"),wx.BITMAP_TYPE_ICO))
+ self.SetIcon(self.icon)
self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
if result is not None:
- self.ShowErrorMessage(
- _("PLC syntax error at line %d:\n%s") % result)
+ (num, line) = result
+ self.ShowErrorMessage(_("PLC syntax error at line {a1}:\n{a2}").format(a1 = num, a2 = line))
def OnCloseFrame(self, event):
if self.Controler is None or self.CheckSaveBeforeClosing(_("Close Application")):
@@ -298,8 +305,8 @@
dialog.Destroy()
if result is not None:
- self.ShowErrorMessage(
- _("PLC syntax error at line %d:\n%s") % result)
+ (num, line) = result
+ self.ShowErrorMessage(_("PLC syntax error at line {a1}:\n{a2}").format(a1 = num, a2 = line))
def OnCloseProjectMenu(self, event):
if not self.CheckSaveBeforeClosing():
@@ -343,7 +350,12 @@
open_pdf(os.path.join(beremiz_dir, "plcopen", "TC6_XML_V101.pdf"))
def OnAboutMenu(self, event):
- OpenHtmlFrame(self,_("About PLCOpenEditor"), os.path.join(beremiz_dir, "doc", _("plcopen_about.html")), wx.Size(350, 350))
+ info = version.GetAboutDialogInfo()
+ info.Name = "PLCOpenEditor"
+ info.Description = _("PLCOpenEditor is part of Beremiz project.\n\n"
+ "Beremiz is an ") + info.Description
+ info.Icon = wx.Icon(os.path.join(beremiz_dir, "images", "aboutlogo.png"), wx.BITMAP_TYPE_PNG)
+ ShowAboutDialog(self, info)
def SaveProject(self):
result = self.Controler.SaveXMLFile()
@@ -394,16 +406,17 @@
dlg = wx.SingleChoiceDialog(None,
_("""
-An error has occurred.
-
-Click OK to save an error report.
+An unhandled exception (bug) occured. Bug report saved at :
+(%s)
Please be kind enough to send this file to:
-edouard.tisserant@gmail.com
-
-Error:
-""") +
- str(e_type) + _(" : ") + str(e_value),
+beremiz-devel@lists.sourceforge.net
+
+You should now restart program.
+
+Traceback:
+""") % bug_report_path +
+ repr(e_type) + " : " + repr(e_value),
_("Error"),
trcbck_lst)
try:
@@ -472,10 +485,11 @@
sys.excepthook = handle_exception
if __name__ == '__main__':
- wx.InitAllImageHandlers()
+ if wx.VERSION < (3, 0, 0):
+ wx.InitAllImageHandlers()
# Install a exception handle for bug reports
- AddExceptHook(os.getcwd(),__version__)
+ AddExceptHook(os.getcwd(), version.app_version)
frame = PLCOpenEditor(None, fileOpen=fileOpen)
diff -r 6431f26aa501 -r 3291024e00da ProjectController.py
--- a/ProjectController.py Thu Feb 16 14:34:40 2017 +0500
+++ b/ProjectController.py Thu Feb 16 14:35:12 2017 +0500
@@ -84,6 +84,60 @@
def GetAddMenuItems():
return ExtractMenuItemsFromCatalog(features.catalog)
+class Iec2CSettings():
+ def __init__(self):
+ self.iec2c = os.path.join(base_folder, "matiec", "iec2c"+(".exe" if wx.Platform == '__WXMSW__' else ""))
+ self.iec2c_buildopts = None
+ self.ieclib_path = os.path.join(base_folder, "matiec", "lib")
+ self.ieclib_c_path = None
+
+ def findLibCPath(self):
+ path=""
+ paths=[
+ os.path.join(base_folder, "matiec", "lib", "C"),
+ os.path.join(base_folder, "matiec", "lib") ]
+ for p in paths:
+ filename=os.path.join(p, "iec_types.h")
+ if (os.path.isfile(filename)):
+ path = p
+ break
+ return path
+
+ def findSupportedOptions(self):
+ buildcmd = "\"%s\" -h"%(self.iec2c)
+ options =["-f", "-l", "-p"]
+
+ buildopt = ""
+ try:
+ # Invoke compiler. Output files are listed to stdout, errors to stderr
+ status, result, err_result = ProcessLogger(None, buildcmd,
+ no_stdout=True, no_stderr=True).spin()
+ except Exception,e:
+ return buildopt
+
+ for opt in options:
+ if opt in result:
+ buildopt = buildopt + " " + opt
+ return buildopt
+
+ def getCmd(self):
+ return self.iec2c
+
+ def getOptions(self):
+ if self.iec2c_buildopts is None:
+ self.iec2c_buildopts = self.findSupportedOptions()
+ return self.iec2c_buildopts
+
+ def getLibPath(self):
+ return self.ieclib_path
+
+ def getLibCPath(self):
+ if self.ieclib_c_path is None:
+ self.ieclib_c_path = self.findLibCPath()
+ return self.ieclib_c_path
+
+iec2c_cfg = Iec2CSettings()
+
class ProjectController(ConfigTreeNode, PLCControler):
"""
This class define Root object of the confnode tree.
@@ -139,10 +193,6 @@
self.DebugTicks = []
self.SetAppFrame(frame, logger)
- self.iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+(".exe" if wx.Platform == '__WXMSW__' else ""))
- self.ieclib_path = os.path.join(base_folder, "matiec", "lib")
- self.ieclib_c_path = self._getMatIecCPath()
-
# Setup debug information
self.IECdebug_datas = {}
self.IECdebug_lock = Lock()
@@ -228,10 +278,10 @@
return self
def GetIECLibPath(self):
- return self.ieclib_c_path
+ return iec2c_cfg.getLibCPath()
def GetIEC2cPath(self):
- return self.iec2c_path
+ return iec2c_cfg.getCmd()
def GetCurrentLocation(self):
return ()
@@ -355,15 +405,15 @@
# Verify that project contains a PLCOpen program
plc_file = os.path.join(ProjectPath, "plc.xml")
if not os.path.isfile(plc_file):
- return _("Chosen folder doesn't contain a program. It's not a valid project!")
+ return _("Chosen folder doesn't contain a program. It's not a valid project!"), True
# Load PLCOpen file
error = self.OpenXMLFile(plc_file)
if error is not None:
if self.Project is not None:
- self.logger.write_warning(
- XSDSchemaErrorMessage % (("PLC",) + error))
+ (fname_err, lnum, src) = (("PLC",) + error)
+ self.logger.write_warning(XSDSchemaErrorMessage.format(a1 = fname_err, a2 = lnum, a3 = src))
else:
- return error
+ return error, False
if len(self.GetProjectConfigNames()) == 0:
self.AddProjectDefaultConfiguration()
# Change XSD into class members
@@ -377,20 +427,12 @@
#Load the confnode.xml file into parameters members
result = self.LoadXMLParams()
if result:
- return result
+ return result, False
#Load and init all the children
self.LoadChildren()
self.RefreshConfNodesBlockLists()
-
- if os.path.exists(self._getBuildPath()):
- self.EnableMethod("_Clean", True)
-
- if os.path.isfile(self._getIECcodepath()):
- self.ShowMethod("_showIECcode", True)
-
- self.UpdateMethodsFromPLCStatus()
-
- return None
+ self.UpdateButtons()
+ return None, False
def RecursiveConfNodeInfos(self, confnode):
values = []
@@ -423,6 +465,21 @@
self.ClearChildren()
self.ResetAppFrame(None)
+ def CheckNewProjectPath(self, old_project_path, new_project_path):
+ if old_project_path == new_project_path:
+ message = (_("Save path is the same as path of a project! \n"))
+ dialog = wx.MessageDialog(self.AppFrame, message, _("Error"), wx.OK | wx.ICON_ERROR)
+ dialog.ShowModal()
+ return False
+ else:
+ plc_file = os.path.join(new_project_path, "plc.xml")
+ if os.path.isfile(plc_file):
+ message = (_("Selected directory already contains another project. Overwrite? \n"))
+ dialog = wx.MessageDialog(self.AppFrame, message, _("Error"), wx.YES_NO | wx.ICON_ERROR)
+ answer = dialog.ShowModal()
+ return answer == wx.ID_YES
+ return True
+
def SaveProject(self, from_project_path=None):
if self.CheckProjectPathPerm(False):
if from_project_path is not None:
@@ -447,9 +504,10 @@
if answer == wx.ID_OK:
newprojectpath = dirdialog.GetPath()
if os.path.isdir(newprojectpath):
- self.ProjectPath, old_project_path = newprojectpath, self.ProjectPath
- self.SaveProject(old_project_path)
- self._setBuildPath(self.BuildPath)
+ if self.CheckNewProjectPath(self.ProjectPath, newprojectpath):
+ self.ProjectPath, old_project_path = newprojectpath, self.ProjectPath
+ self.SaveProject(old_project_path)
+ self._setBuildPath(self.BuildPath)
return True
return False
@@ -630,43 +688,14 @@
return True
- def _getMatIecCPath(self):
- path=''
- paths=[
- os.path.join(base_folder, "matiec", "lib", "C"),
- os.path.join(base_folder, "matiec", "lib") ]
- for p in paths:
- filename=os.path.join(p, "iec_types.h")
- if (os.path.isfile(filename)):
- path = p
- break
- return path
-
- def _getMatIecOptions(self):
- buildpath = self._getBuildPath()
- buildcmd = "\"%s\" -h"%(self.iec2c_path)
- options =["-f", "-l", "-p"]
-
- buildopt = ""
- try:
- # Invoke compiler. Output files are listed to stdout, errors to stderr
- status, result, err_result = ProcessLogger(self.logger, buildcmd,
- no_stdout=True, no_stderr=True).spin()
- except Exception,e:
- return buildopt
-
- for opt in options:
- if opt in result:
- buildopt = buildopt + " " + opt
- return buildopt
def _Compile_ST_to_SoftPLC(self):
self.logger.write(_("Compiling IEC Program into C code...\n"))
buildpath = self._getBuildPath()
buildcmd = "\"%s\" %s -I \"%s\" -T \"%s\" \"%s\""%(
- self.iec2c_path,
- self._getMatIecOptions(),
- self.ieclib_path,
+ iec2c_cfg.getCmd(),
+ iec2c_cfg.getOptions(),
+ iec2c_cfg.getLibPath(),
buildpath,
self._getIECcodepath())
@@ -735,7 +764,7 @@
# Keep track of generated C files for later use by self.CTNGenerate_C
self.PLCGeneratedCFiles = C_files
# compute CFLAGS for plc
- self.plcCFLAGS = '"-I%s" -Wno-unused-function'%self.ieclib_c_path
+ self.plcCFLAGS = '"-I%s" -Wno-unused-function'%iec2c_cfg.getLibCPath()
return True
def GetBuilder(self):
@@ -971,15 +1000,13 @@
# Eventually create build dir
if not os.path.exists(buildpath):
os.mkdir(buildpath)
- # There is something to clean
- self.EnableMethod("_Clean", True)
self.logger.flush()
self.logger.write(_("Start build in %s\n") % buildpath)
# Generate SoftPLC IEC code
IECGenRes = self._Generate_SoftPLC()
- self.ShowMethod("_showIECcode", True)
+ self.UpdateButtons()
# If IEC code gen fail, bail out.
if not IECGenRes:
@@ -1090,8 +1117,14 @@
def ShowError(self, logger, from_location, to_location):
chunk_infos = self.GetChunkInfos(from_location, to_location)
for infos, (start_row, start_col) in chunk_infos:
- start = (from_location[0] - start_row, from_location[1] - start_col)
- end = (to_location[0] - start_row, to_location[1] - start_col)
+ row = 1 if from_location[0] < start_row else (from_location[0] - start_row)
+ col = 1 if (start_row != from_location[0]) else (from_location[1] - start_col)
+ start = (row, col)
+
+ row = 1 if to_location[0] < start_row else (to_location[0] - start_row)
+ col = 1 if (start_row != to_location[0]) else (to_location[1] - start_col)
+ end = (row, col)
+
if self.AppFrame is not None:
self.AppFrame.ShowError(infos, start, end)
@@ -1124,6 +1157,7 @@
except:
text = '(* No IEC code have been generated at that time ! *)'
self._IECCodeView.SetText(text = text)
+ self._IECCodeView.Editor.SetReadOnly(True)
self._IECCodeView.SetIcon(GetBitmap("ST"))
setattr(self._IECCodeView, "_OnClose", self.OnCloseEditor)
@@ -1220,18 +1254,28 @@
shutil.rmtree(os.path.join(self._getBuildPath()))
else:
self.logger.write_error(_("Build directory already clean\n"))
- self.ShowMethod("_showIECcode", False)
- self.EnableMethod("_Clean", False)
# kill the builder
self._builder = None
self.CompareLocalAndRemotePLC()
-
+ self.UpdateButtons()
+
+ def _UpdateButtons(self):
+ self.EnableMethod("_Clean", os.path.exists(self._getBuildPath()))
+ self.ShowMethod("_showIECcode", os.path.isfile(self._getIECcodepath()))
+ if self.AppFrame is not None and not self.UpdateMethodsFromPLCStatus():
+ self.AppFrame.RefreshStatusToolBar()
+
+ def UpdateButtons(self):
+ wx.CallAfter(self._UpdateButtons)
+
+
def UpdatePLCLog(self, log_count):
if log_count:
if self.AppFrame is not None:
self.AppFrame.LogViewer.SetLogCounters(log_count)
def UpdateMethodsFromPLCStatus(self):
+ updated = False
status = None
if self._connector is not None:
PLCstatus = self._connector.GetPLCstatus()
@@ -1259,15 +1303,39 @@
self.ShowMethod(*args)
self.previous_plcstate = status
if self.AppFrame is not None:
+ updated = True
self.AppFrame.RefreshStatusToolBar()
if status == "Disconnected":
- self.AppFrame.ConnectionStatusBar.SetStatusText(_(status), 1)
+ self.AppFrame.ConnectionStatusBar.SetStatusText(self.GetTextStatus(status), 1)
self.AppFrame.ConnectionStatusBar.SetStatusText('', 2)
else:
self.AppFrame.ConnectionStatusBar.SetStatusText(
_("Connected to URI: %s") % self.BeremizRoot.getURI_location().strip(), 1)
- self.AppFrame.ConnectionStatusBar.SetStatusText(_(status), 2)
-
+ self.AppFrame.ConnectionStatusBar.SetStatusText(self.GetTextStatus(status), 2)
+ return updated
+
+ def GetTextStatus(self, status):
+ msgs = {
+ "Started": _("Started"),
+ "Stopped": _("Stopped"),
+ "Empty": _("Empty"),
+ "Broken": _("Broken"),
+ "Disconnected": _("Disconnected")
+ }
+ return msgs.get(status, status)
+
+ def ShowPLCProgress(self, status = "", progress = 0):
+ self.AppFrame.ProgressStatusBar.Show()
+ self.AppFrame.ConnectionStatusBar.SetStatusText(self.GetTextStatus(status), 1)
+ self.AppFrame.ProgressStatusBar.SetValue(progress)
+
+ def HidePLCProgress(self):
+ # clear previous_plcstate to restore status
+ # in UpdateMethodsFromPLCStatus()
+ self.previous_plcstate = ""
+ self.AppFrame.ProgressStatusBar.Hide()
+ self.UpdateMethodsFromPLCStatus()
+
def PullPLCStatusProc(self, event):
self.UpdateMethodsFromPLCStatus()
@@ -1561,11 +1629,8 @@
if connector is not None:
if self.StatusTimer is not None:
# Start the status Timer
- # Suppress WXDEBUG assertions, as happens by default with wx2.8
- try:
- self.StatusTimer.Start(milliseconds=500, oneShot=False)
- except:
- pass
+ wx.Yield()
+ self.StatusTimer.Start(milliseconds=500, oneShot=False)
else:
if self.StatusTimer is not None:
# Stop the status Timer
@@ -1714,6 +1779,7 @@
self.logger.write(_("Transfer completed successfully.\n"))
else:
self.logger.write_error(_("Transfer failed\n"))
+ self.HidePLCProgress()
else:
self.logger.write_error(_("No PLC to transfer (did build succeed ?)\n"))
diff -r 6431f26aa501 -r 3291024e00da canfestival/config_utils.py
--- a/canfestival/config_utils.py Thu Feb 16 14:34:40 2017 +0500
+++ b/canfestival/config_utils.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from types import *
@@ -352,14 +352,16 @@
# Check Id is in slave node list
if nodeid not in self.NodeList.SlaveNodes.keys():
- raise PDOmappingException, _("Non existing node ID : %d (variable %s)") % (nodeid,name)
+ raise PDOmappingException, _("Non existing node ID : {a1} (variable {a2})").format(a1 = nodeid, a2 = name)
# Get the model for this node (made from EDS)
node = self.NodeList.SlaveNodes[nodeid]["Node"]
# Extract and check index and subindex
if not node.IsEntry(index, subindex):
- raise PDOmappingException, _("No such index/subindex (%x,%x) in ID : %d (variable %s)") % (index,subindex,nodeid,name)
+ msg = _("No such index/subindex ({a1},{a2}) in ID : {a3} (variable {a4})").\
+ format(a1 = "%x" % index, a2 ="%x" % subindex, a3 = nodeid, a4 = name)
+ raise PDOmappingException, msg
# Get the entry info
subentry_infos = node.GetSubentryInfos(index, subindex)
@@ -369,19 +371,23 @@
if sizelocation == "X" and len(loc) > 3:
numbit = loc[3]
elif sizelocation != "X" and len(loc) > 3:
- raise PDOmappingException, _("Cannot set bit offset for non bool '%s' variable (ID:%d,Idx:%x,sIdx:%x))") % (name,nodeid,index,subindex)
+ msg = _("Cannot set bit offset for non bool '{a1}' variable (ID:{a2},Idx:{a3},sIdx:{a4}))").\
+ format(a1 = name, a2 = nodeid, a3 = "%x" % index, a4 = "%x" % subindex)
+ raise PDOmappingException, msg
else:
numbit = None
if location["IEC_TYPE"] != "BOOL" and subentry_infos["type"] != COlocationtype:
- raise PDOmappingException, _("Invalid type \"%s\"-> %d != %d for location\"%s\"") % (location["IEC_TYPE"], COlocationtype, subentry_infos["type"] , name)
+ raise PDOmappingException, _("Invalid type \"{a1}\"-> {a2} != {a3} for location\"{a4}\"").\
+ format(a1 = location["IEC_TYPE"], a2 = COlocationtype, a3 = subentry_infos["type"] , a4 = name)
typeinfos = node.GetEntryInfos(COlocationtype)
self.IECLocations[name] = {"type":COlocationtype, "pdotype":SlavePDOType[direction],
"nodeid": nodeid, "index": index,"subindex": subindex,
"bit": numbit, "size": typeinfos["size"], "sizelocation": sizelocation}
else:
- raise PDOmappingException, _("Not PDO mappable variable : '%s' (ID:%d,Idx:%x,sIdx:%x))") % (name,nodeid,index,subindex)
+ raise PDOmappingException, _("Not PDO mappable variable : '{a1}' (ID:{a2},Idx:{a3},sIdx:{a4}))").\
+ format(a1 = name, a2 = nodeid, a3 = "%x" % index, a4 = "%x" % subindex)
#-------------------------------------------------------------------------------
# Search for locations already mapped
@@ -630,12 +636,14 @@
# Extract and check index and subindex
if not slave.IsEntry(index, subindex):
- raise PDOmappingException, _("No such index/subindex (%x,%x) (variable %s)") % (index, subindex, name)
+ raise PDOmappingException, _("No such index/subindex ({a1},{a2}) (variable {a3})").\
+ format(a1 = "%x" % index, a2 = "%x" % subindex, a3 = name)
# Get the entry info
subentry_infos = slave.GetSubentryInfos(index, subindex)
if subentry_infos["type"] != COlocationtype:
- raise PDOmappingException, _("Invalid type \"%s\"-> %d != %d for location\"%s\"") % (location["IEC_TYPE"], COlocationtype, subentry_infos["type"] , name)
+ raise PDOmappingException, _("Invalid type \"{a1}\"-> {a2} != {a3} for location \"{a4}\"").\
+ format( a1 = location["IEC_TYPE"], a2 = COlocationtype, a3 = subentry_infos["type"] , a4 = name)
IECLocations[name] = COlocationtype
pointers[(index, subindex)] = name
diff -r 6431f26aa501 -r 3291024e00da connectors/PYRO/__init__.py
--- a/connectors/PYRO/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/connectors/PYRO/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,23 +1,27 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
# See COPYING file for copyrights details.
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-# This library is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
import Pyro
import Pyro.core
import Pyro.util
@@ -83,7 +87,7 @@
ip = str(socket.inet_ntoa(i.getAddress()))
port = str(i.getPort())
newlocation = ip + ':' + port
- confnodesroot.logger.write(_("'%s' is located at %s\n") % (location, newlocation))
+ confnodesroot.logger.write(_("'{a1}' is located at {a2}\n").format(a1 = location, a2 = newlocation))
location = newlocation
r.close()
except Exception, msg:
@@ -108,10 +112,10 @@
try:
return func(*args, **kwargs)
except Pyro.errors.ConnectionClosedError, e:
- confnodesroot.logger.write_error("Connection lost!\n")
+ confnodesroot.logger.write_error(_("Connection lost!\n"))
confnodesroot._SetConnector(None)
except Pyro.errors.ProtocolError, e:
- confnodesroot.logger.write_error("Pyro exception: " + str(e) + "\n")
+ confnodesroot.logger.write_error(_("Pyro exception: %s\n") % e)
except Exception, e:
# confnodesroot.logger.write_error(traceback.format_exc())
errmess = ''.join(Pyro.util.getPyroTraceback(e))
diff -r 6431f26aa501 -r 3291024e00da connectors/WAMP/__init__.py
--- a/connectors/WAMP/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/connectors/WAMP/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,23 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2015: Edouard TISSERANT
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import sys, traceback, atexit
#from twisted.python import log
@@ -105,7 +108,7 @@
reactor, _WampSession.call, wampfuncname,
*args,**kwargs)
except TransportLost, e:
- confnodesroot.logger.write_error("Connection lost!\n")
+ confnodesroot.logger.write_error(_("Connection lost!\n"))
confnodesroot._SetConnector(None)
except Exception,e:
errmess = traceback.format_exc()
diff -r 6431f26aa501 -r 3291024e00da connectors/__init__.py
--- a/connectors/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/connectors/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,23 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
# See COPYING file for copyrights details.
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-# This library is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Package initialisation
diff -r 6431f26aa501 -r 3291024e00da controls/CustomEditableListBox.py
--- a/controls/CustomEditableListBox.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/CustomEditableListBox.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import wx.gizmos
diff -r 6431f26aa501 -r 3291024e00da controls/CustomGrid.py
--- a/controls/CustomGrid.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/CustomGrid.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import wx.grid
@@ -37,8 +37,8 @@
self.UpButton = None
self.DownButton = None
- self.SetFont(wx.Font(12, 77, wx.NORMAL, wx.NORMAL, False, 'Sans'))
- self.SetLabelFont(wx.Font(10, 77, wx.NORMAL, wx.NORMAL, False, 'Sans'))
+ self.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False, 'Sans'))
+ self.SetLabelFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, False, 'Sans'))
self.SetSelectionBackground(wx.WHITE)
self.SetSelectionForeground(wx.BLACK)
self.DisableDragRowSize()
diff -r 6431f26aa501 -r 3291024e00da controls/CustomTable.py
--- a/controls/CustomTable.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/CustomTable.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,19 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import wx.grid
diff -r 6431f26aa501 -r 3291024e00da controls/CustomToolTip.py
--- a/controls/CustomToolTip.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/CustomToolTip.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da controls/CustomTree.py
--- a/controls/CustomTree.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/CustomTree.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,19 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import wx.lib.agw.customtreectrl as CT
diff -r 6431f26aa501 -r 3291024e00da controls/DebugVariablePanel/DebugVariableGraphicViewer.py
--- a/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from types import TupleType
from time import time as gettime
diff -r 6431f26aa501 -r 3291024e00da controls/DebugVariablePanel/DebugVariableItem.py
--- a/controls/DebugVariablePanel/DebugVariableItem.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DebugVariablePanel/DebugVariableItem.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import numpy
import binascii
diff -r 6431f26aa501 -r 3291024e00da controls/DebugVariablePanel/DebugVariablePanel.py
--- a/controls/DebugVariablePanel/DebugVariablePanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DebugVariablePanel/DebugVariablePanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from types import TupleType
import math
@@ -50,10 +50,10 @@
# List of values possible for graph range
# Format is [(time_in_plain_text, value_in_nanosecond),...]
RANGE_VALUES = \
- [("%dms" % i, i * MILLISECOND) for i in (10, 20, 50, 100, 200, 500)] + \
- [("%ds" % i, i * SECOND) for i in (1, 2, 5, 10, 20, 30)] + \
- [("%dm" % i, i * MINUTE) for i in (1, 2, 5, 10, 20, 30)] + \
- [("%dh" % i, i * HOUR) for i in (1, 2, 3, 6, 12, 24)]
+ [(_("%dms") % i, i * MILLISECOND) for i in (10, 20, 50, 100, 200, 500)] + \
+ [(_("%ds") % i, i * SECOND) for i in (1, 2, 5, 10, 20, 30)] + \
+ [(_("%dm") % i, i * MINUTE) for i in (1, 2, 5, 10, 20, 30)] + \
+ [(_("%dh") % i, i * HOUR) for i in (1, 2, 3, 6, 12, 24)]
# Scrollbar increment in pixel
SCROLLBAR_UNIT = 10
@@ -291,6 +291,7 @@
DebugViewer.__init__(self, producer, True)
self.SetSizer(main_sizer)
+ self.SetTickTime()
def SetTickTime(self, ticktime=0):
"""
@@ -561,20 +562,20 @@
else:
tick = None
if tick is not None:
- self.TickLabel.SetLabel("Tick: %d" % tick)
+ self.TickLabel.SetLabel(label=_("Tick: %d") % tick)
tick_duration = int(tick * self.Ticktime)
not_null = False
duration = ""
- for value, format in [(tick_duration / DAY, "%dd"),
- ((tick_duration % DAY) / HOUR, "%dh"),
- ((tick_duration % HOUR) / MINUTE, "%dm"),
- ((tick_duration % MINUTE) / SECOND, "%ds")]:
+ for value, format in [(tick_duration / DAY, _("%dd")),
+ ((tick_duration % DAY) / HOUR, _("%dh")),
+ ((tick_duration % HOUR) / MINUTE, _("%dm")),
+ ((tick_duration % MINUTE) / SECOND, _("%ds"))]:
if value > 0 or not_null:
duration += format % value
not_null = True
- duration += "%gms" % (float(tick_duration % SECOND) / MILLISECOND)
+ duration += _("%03gms") % (float(tick_duration % SECOND) / MILLISECOND)
self.TickTimeLabel.SetLabel("t: %s" % duration)
else:
self.TickLabel.SetLabel("")
diff -r 6431f26aa501 -r 3291024e00da controls/DebugVariablePanel/DebugVariableTextViewer.py
--- a/controls/DebugVariablePanel/DebugVariableTextViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DebugVariablePanel/DebugVariableTextViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from types import TupleType
diff -r 6431f26aa501 -r 3291024e00da controls/DebugVariablePanel/DebugVariableViewer.py
--- a/controls/DebugVariablePanel/DebugVariableViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DebugVariablePanel/DebugVariableViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from collections import OrderedDict
diff -r 6431f26aa501 -r 3291024e00da controls/DebugVariablePanel/GraphButton.py
--- a/controls/DebugVariablePanel/GraphButton.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DebugVariablePanel/GraphButton.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da controls/DebugVariablePanel/__init__.py
--- a/controls/DebugVariablePanel/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DebugVariablePanel/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -4,7 +4,7 @@
# This file is part of Beremiz, a Integrated Development Environment for
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
# See COPYING file for copyrights details.
#
diff -r 6431f26aa501 -r 3291024e00da controls/DurationCellEditor.py
--- a/controls/DurationCellEditor.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/DurationCellEditor.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -128,11 +128,11 @@
if wx.VERSION >= (3, 0, 0):
def EndEdit(self, row, col, grid, oldval):
- self.EndEditInternal(row, col, grid, oldval)
+ return self.EndEditInternal(row, col, grid, oldval)
else:
def EndEdit(self, row, col, grid):
oldval = self.Table.GetValueByName(row, self.Colname)
- self.EndEditInternal(row, col, grid, oldval)
+ return self.EndEditInternal(row, col, grid, oldval)
def SetSize(self, rect):
self.CellControl.SetDimensions(rect.x + 1, rect.y,
diff -r 6431f26aa501 -r 3291024e00da controls/EnhancedStatusBar.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controls/EnhancedStatusBar.py Thu Feb 16 14:35:12 2017 +0500
@@ -0,0 +1,248 @@
+# --------------------------------------------------------------------------- #
+# ENHANCEDSTATUSBAR wxPython IMPLEMENTATION
+# Python Code By:
+#
+# Andrea Gavana, @ 31 May 2005
+# Nitro, @ 21 September 2005
+# Latest Revision: 21 September 2005, 19.57.20 GMT+2
+# Latest Revision before Latest Revision: 21 September 2005, 18.29.35 GMT+2
+# Latest Revision before Latest Revision before Latest Revision: 31 May 2005, 23.17 CET
+#
+#
+# TODO List/Caveats
+#
+# 1. Some Requests/Features To Add?
+#
+#
+# For All Kind Of Problems, Requests Of Enhancements And Bug Reports, Please
+# Write To Me At:
+#
+#
+# andrea.gavana@agip.it
+# andrea_gavan@tin.it
+#
+# Or, Obviously, To The wxPython Mailing List!!!
+#
+#
+# licensed under wxWidgets License (GPL compatible)
+# End Of Comments
+# --------------------------------------------------------------------------- #
+
+""" Description:
+
+EnhancedStatusBar Is A Slight Modification (Actually A Subclassing) Of wx.StatusBar.
+It Allows You To Add Almost Any Widget You Like To The wx.StatusBar Of Your Main
+Frame Application And Also To Layout Them Properly.
+
+
+What It Can Do:
+
+1) Almost All The Functionalities Of wx.StatusBar Are Still Present;
+2) You Can Add Different Kind Of Widgets Into Every Field Of The EnhancedStatusBar;
+3) The AddWidget() Methods Accepts 2 Layout Inputs:
+ - horizontalalignment: This Specify The Horizontal Alignment For Your Widget,
+ And Can Be ESB_EXACT_FIT, ESB_ALIGN_CENTER_HORIZONTAL, ESB_ALIGN_LEFT And
+ ESB_ALIGN_RIGHT;
+ - varticalalignment: This Specify The Vertical Alignment For Your Widget,
+ And Can Be ESB_EXACT_FIT, ESB_ALIGN_CENTER_VERTICAL, ESB_ALIGN_BOTTOM And
+ ESB_ALIGN_LEFT;
+
+EnhancedStatusBar Is Freeware And Distributed Under The wxPython License.
+
+Latest Revision: 21 September 2005, 19.57.20 GMT+2
+Latest Revision before Latest Revision: 21 September 2005, 18.29.35 GMT+2
+Latest Revision before Latest Revision before Latest Revision: 31 May 2005, 23.17 CET
+
+"""
+
+import wx
+
+# Horizontal Alignment Constants
+ESB_ALIGN_CENTER_VERTICAL = 1
+ESB_ALIGN_TOP = 2
+ESB_ALIGN_BOTTOM = 3
+
+# Vertical Alignment Constants
+ESB_ALIGN_CENTER_HORIZONTAL = 11
+ESB_ALIGN_LEFT = 12
+ESB_ALIGN_RIGHT = 13
+
+# Exact Fit (Either Horizontal Or Vertical Or Both) Constant
+ESB_EXACT_FIT = 20
+
+
+# ---------------------------------------------------------------
+# Class EnhancedStatusBar
+# ---------------------------------------------------------------
+# This Is The Main Class Implementation. See The Demo For Details
+# ---------------------------------------------------------------
+class EnhancedStatusBarItem(object):
+ def __init__(self, widget, pos, horizontalalignment=ESB_ALIGN_CENTER_HORIZONTAL, verticalalignment=ESB_ALIGN_CENTER_VERTICAL):
+ self.__dict__.update( locals() )
+
+class EnhancedStatusBar(wx.StatusBar):
+
+ def __init__(self, parent, id=wx.ID_ANY, style=wx.ST_SIZEGRIP,
+ name="EnhancedStatusBar"):
+ """Default Class Constructor.
+
+ EnhancedStatusBar.__init__(self, parent, id=wx.ID_ANY,
+ style=wx.ST_SIZEGRIP,
+ name="EnhancedStatusBar")
+ """
+
+ wx.StatusBar.__init__(self, parent, id, style, name)
+
+ self._items = {}
+ self._curPos = 0
+ self._parent = parent
+
+ wx.EVT_SIZE(self, self.OnSize)
+ wx.CallAfter(self.OnSize, None)
+
+
+ def OnSize(self, event):
+ """Handles The wx.EVT_SIZE Events For The StatusBar.
+
+ Actually, All The Calculations Linked To HorizontalAlignment And
+ VerticalAlignment Are Done In This Function."""
+
+ for pos, item in self._items.items():
+ widget, horizontalalignment, verticalalignment = item.widget, item.horizontalalignment, item.verticalalignment
+
+ rect = self.GetFieldRect(pos)
+ widgetpos = widget.GetPosition()
+ widgetsize = widget.GetSize()
+
+ rect = self.GetFieldRect(pos)
+
+ if horizontalalignment == ESB_EXACT_FIT:
+
+ if verticalalignment == ESB_EXACT_FIT:
+ """ 1 September 2015 Fix fit align """
+ widget.SetSize((rect.width-4, rect.height-4))
+ widget.SetPosition((rect.x+2, rect.y+2))
+ elif verticalalignment == ESB_ALIGN_CENTER_VERTICAL:
+ if widgetsize[1] < rect.width - 1:
+ diffs = (rect.height - widgetsize[1])/2
+ widget.SetSize((rect.width-2, widgetsize[1]))
+ widget.SetPosition((rect.x-1, rect.y+diffs))
+ else:
+ widget.SetSize((rect.width-2, widgetsize[1]))
+ widget.SetPosition((rect.x-1, rect.y-1))
+ elif verticalalignment == ESB_ALIGN_TOP:
+ widget.SetSize((rect.width-2, widgetsize[1]))
+ widget.SetPosition((rect.x-1, rect.y))
+ elif verticalalignment == ESB_ALIGN_BOTTOM:
+ widget.SetSize((rect.width-2, widgetsize[1]))
+ widget.SetPosition((rect.x-1, rect.height-widgetsize[1]))
+
+ elif horizontalalignment == ESB_ALIGN_LEFT:
+
+ xpos = rect.x - 1
+ if verticalalignment == ESB_EXACT_FIT:
+ widget.SetSize((widgetsize[0], rect.height-2))
+ widget.SetPosition((xpos, rect.y-1))
+ elif verticalalignment == ESB_ALIGN_CENTER_VERTICAL:
+ if widgetsize[1] < rect.height - 1:
+ diffs = (rect.height - widgetsize[1])/2
+ widget.SetPosition((xpos, rect.y+diffs))
+ else:
+ widget.SetSize((widgetsize[0], rect.height-2))
+ widget.SetPosition((xpos, rect.y-1))
+ elif verticalalignment == ESB_ALIGN_TOP:
+ widget.SetPosition((xpos, rect.y))
+ elif verticalalignment == ESB_ALIGN_BOTTOM:
+ widget.SetPosition((xpos, rect.height-widgetsize[1]))
+
+ elif horizontalalignment == ESB_ALIGN_RIGHT:
+
+ xpos = rect.x + rect.width - widgetsize[0] - 1
+ if verticalalignment == ESB_EXACT_FIT:
+ widget.SetSize((widgetsize[0], rect.height-2))
+ widget.SetPosition((xpos, rect.y-1))
+ elif verticalalignment == ESB_ALIGN_CENTER_VERTICAL:
+ if widgetsize[1] < rect.height - 1:
+ diffs = (rect.height - widgetsize[1])/2
+ widget.SetPosition((xpos, rect.y+diffs))
+ else:
+ widget.SetSize((widgetsize[0], rect.height-2))
+ widget.SetPosition((xpos, rect.y-1))
+ elif verticalalignment == ESB_ALIGN_TOP:
+ widget.SetPosition((xpos, rect.y))
+ elif verticalalignment == ESB_ALIGN_BOTTOM:
+ widget.SetPosition((xpos, rect.height-widgetsize[1]))
+
+ elif horizontalalignment == ESB_ALIGN_CENTER_HORIZONTAL:
+
+ xpos = rect.x + (rect.width - widgetsize[0])/2 - 1
+ if verticalalignment == ESB_EXACT_FIT:
+ widget.SetSize((widgetsize[0], rect.height))
+ widget.SetPosition((xpos, rect.y))
+ elif verticalalignment == ESB_ALIGN_CENTER_VERTICAL:
+ if widgetsize[1] < rect.height - 1:
+ diffs = (rect.height - widgetsize[1])/2
+ widget.SetPosition((xpos, rect.y+diffs))
+ else:
+ widget.SetSize((widgetsize[0], rect.height-1))
+ widget.SetPosition((xpos, rect.y+1))
+ elif verticalalignment == ESB_ALIGN_TOP:
+ widget.SetPosition((xpos, rect.y))
+ elif verticalalignment == ESB_ALIGN_BOTTOM:
+ widget.SetPosition((xpos, rect.height-widgetsize[1]))
+
+
+ if event is not None:
+ event.Skip()
+
+
+ def AddWidget(self, widget, horizontalalignment=ESB_ALIGN_CENTER_HORIZONTAL,
+ verticalalignment=ESB_ALIGN_CENTER_VERTICAL, pos = -1):
+ """Add A Widget To The EnhancedStatusBar.
+
+ Parameters:
+
+ - horizontalalignment: This Can Be One Of:
+ a) ESB_EXACT_FIT: The Widget Will Fit Horizontally The StatusBar Field Width;
+ b) ESB_ALIGN_CENTER_HORIZONTAL: The Widget Will Be Centered Horizontally In
+ The StatusBar Field;
+ c) ESB_ALIGN_LEFT: The Widget Will Be Left Aligned In The StatusBar Field;
+ d) ESB_ALIGN_RIGHT: The Widget Will Be Right Aligned In The StatusBar Field;
+
+ - verticalalignment:
+ a) ESB_EXACT_FIT: The Widget Will Fit Vertically The StatusBar Field Height;
+ b) ESB_ALIGN_CENTER_VERTICAL: The Widget Will Be Centered Vertically In
+ The StatusBar Field;
+ c) ESB_ALIGN_BOTTOM: The Widget Will Be Bottom Aligned In The StatusBar Field;
+ d) ESB_ALIGN_TOP: The Widget Will Be TOP Aligned In The StatusBar Field;
+
+ """
+
+ if pos == -1:
+ pos = self._curPos
+ self._curPos += 1
+
+ if self.GetFieldsCount() <= pos:
+ raise "\nERROR: EnhancedStatusBar has a max of %d items, you tried to set item #%d" % (self.GetFieldsCount(), pos)
+
+ if horizontalalignment not in [ESB_ALIGN_CENTER_HORIZONTAL, ESB_EXACT_FIT,
+ ESB_ALIGN_LEFT, ESB_ALIGN_RIGHT]:
+ raise '\nERROR: Parameter "horizontalalignment" Should Be One Of '\
+ '"ESB_ALIGN_CENTER_HORIZONTAL", "ESB_ALIGN_LEFT", "ESB_ALIGN_RIGHT"' \
+ '"ESB_EXACT_FIT"'
+
+ if verticalalignment not in [ESB_ALIGN_CENTER_VERTICAL, ESB_EXACT_FIT,
+ ESB_ALIGN_TOP, ESB_ALIGN_BOTTOM]:
+ raise '\nERROR: Parameter "verticalalignment" Should Be One Of '\
+ '"ESB_ALIGN_CENTER_VERTICAL", "ESB_ALIGN_TOP", "ESB_ALIGN_BOTTOM"' \
+ '"ESB_EXACT_FIT"'
+
+
+ try:
+ self.RemoveChild(self._items[pos].widget)
+ self._items[pos].widget.Destroy()
+ except KeyError: pass
+
+ self._items[pos] = EnhancedStatusBarItem(widget, pos, horizontalalignment, verticalalignment)
+
+ wx.CallAfter(self.OnSize, None)
diff -r 6431f26aa501 -r 3291024e00da controls/FolderTree.py
--- a/controls/FolderTree.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/FolderTree.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2013: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2013: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os
diff -r 6431f26aa501 -r 3291024e00da controls/LibraryPanel.py
--- a/controls/LibraryPanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/LibraryPanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -67,8 +67,12 @@
self.OnSearchButtonClick, self.SearchCtrl)
# Bind keyboard event on SearchCtrl text control to catch UP and DOWN
# for search previous and next occurrence
- search_textctrl = self.SearchCtrl.GetChildren()[0]
- search_textctrl.Bind(wx.EVT_CHAR, self.OnKeyDown)
+
+ # This protects from fail to start when no children[0] available (possible for wxPython 3.0)
+ if self.SearchCtrl.GetChildren():
+ search_textctrl = self.SearchCtrl.GetChildren()[0]
+ search_textctrl.Bind(wx.EVT_CHAR, self.OnKeyDown)
+
main_sizer.AddWindow(self.SearchCtrl, flag=wx.GROW)
# Add Splitter window for tree and block comment to main sizer
diff -r 6431f26aa501 -r 3291024e00da controls/LocationCellEditor.py
--- a/controls/LocationCellEditor.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/LocationCellEditor.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -95,7 +95,7 @@
if not infos["location"].startswith("%"):
dialog = wx.SingleChoiceDialog(self,
_("Select a variable class:"), _("Variable class"),
- ["Input", "Output", "Memory"],
+ [_("Input"), _("Output"), _("Memory")],
wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
if dialog.ShowModal() == wx.ID_OK:
selected = dialog.GetSelection()
@@ -161,15 +161,22 @@
self.CellControl.SetVarType(self.Table.GetValueByName(row, 'Type'))
self.CellControl.SetFocus()
- def EndEdit(self, row, col, grid):
+ def EndEditInternal(self, row, col, grid, old_loc):
loc = self.CellControl.GetValue()
- old_loc = self.Table.GetValueByName(row, 'Location')
changed = loc != old_loc
if changed:
self.Table.SetValueByName(row, 'Location', loc)
self.Table.SetValueByName(row, 'Type', self.CellControl.GetVarType())
self.CellControl.Disable()
return changed
+
+ if wx.VERSION >= (3, 0, 0):
+ def EndEdit(self, row, col, grid, oldval):
+ return self.EndEditInternal(row, col, grid, oldval)
+ else:
+ def EndEdit(self, row, col, grid):
+ old_loc = self.Table.GetValueByName(row, 'Location')
+ return self.EndEditInternal(row, col, grid, old_loc)
def SetSize(self, rect):
self.CellControl.SetDimensions(rect.x + 1, rect.y,
diff -r 6431f26aa501 -r 3291024e00da controls/LogViewer.py
--- a/controls/LogViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/LogViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,27 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2013: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2013: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
from datetime import datetime
from time import time as gettime
@@ -176,7 +177,7 @@
dc.EndDrawing()
event.Skip()
-BUTTON_SIZE = (30, 15)
+BUTTON_SIZE = (70, 15)
class LogButton():
diff -r 6431f26aa501 -r 3291024e00da controls/PouInstanceVariablesPanel.py
--- a/controls/PouInstanceVariablesPanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/PouInstanceVariablesPanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from collections import namedtuple
@@ -93,7 +93,7 @@
images_bbx = self.GetItemRightImagesBBox(item)
r_image_w, r_image_h = self._imageListRight.GetSize(rightimages[0])
- dc.SetBrush(wx.WHITE_BRUSH)
+ dc.SetBrush(wx.TRANSPARENT_BRUSH)
dc.SetPen(wx.TRANSPARENT_PEN)
bg_width = (r_image_w + 4) * len(rightimages) + 4
diff -r 6431f26aa501 -r 3291024e00da controls/ProjectPropertiesPanel.py
--- a/controls/ProjectPropertiesPanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/ProjectPropertiesPanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -212,7 +212,7 @@
for param in REQUIRED_PARAMS:
getattr(self, param).Enable(enable_required)
- languages = ["", "en-US", "fr-FR", "zh-CN"]
+ languages = ["", "en-US", "fr-FR", "zh-CN", "ru-RU"]
for language in languages:
self.Language.Append(language)
diff -r 6431f26aa501 -r 3291024e00da controls/SearchResultPanel.py
--- a/controls/SearchResultPanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/SearchResultPanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from types import TupleType
@@ -232,28 +232,15 @@
break
if element_type == ITEM_RESOURCE:
search_results_tree_children.append(element_infos)
- else:
- _tagname = self.ParentWindow.Controler.ComputePouName(words[1])
- _element_type = self.ParentWindow.Controler.GetPouType(words[1])
-
- _element_infos = {"name": words[1],
- "type": _element_type,
- "data": _tagname,
- "text": None,
- "matches": 1,
- "children": [element_infos]}
-
- search_results_tree_children.append(_element_infos)
-
else:
search_results_tree_children.append(element_infos)
if matches_number < 2:
- header_format = _("'%s' - %d match in project")
+ header_format = _("'{a1}' - {a2} match in project")
else:
- header_format = _("'%s' - %d matches in project")
-
- self.HeaderLabel.SetLabel(header_format % (self.Criteria["raw_pattern"], matches_number))
+ header_format = _("'{a1}' - {a2} matches in project")
+
+ self.HeaderLabel.SetLabel(header_format.format(a1 = self.Criteria["find_pattern"], a2 = matches_number))
self.ResetButton.Enable(True)
if matches_number > 0:
@@ -337,6 +324,7 @@
search_results = [data]
else:
search_results = self.SearchResults.get(data, [])
+ self.ParentWindow.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
for infos, start, end, text in search_results:
self.ParentWindow.ShowSearchResult(infos, start, end)
diff -r 6431f26aa501 -r 3291024e00da controls/TextCtrlAutoComplete.py
--- a/controls/TextCtrlAutoComplete.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/TextCtrlAutoComplete.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import cPickle
diff -r 6431f26aa501 -r 3291024e00da controls/VariablePanel.py
--- a/controls/VariablePanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/VariablePanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os
import re
@@ -144,6 +144,14 @@
def GetOldValue(self):
return self.old_value
+ def _GetRowEdit(self, row):
+ row_edit = self.GetValueByName(row, "Edit")
+ var_type = self.Parent.GetTagName()
+ bodytype = self.Parent.Controler.GetEditedElementBodyType(var_type)
+ if bodytype in ["ST", "IL"]:
+ row_edit = True;
+ return row_edit
+
def _updateColAttrs(self, grid):
"""
wx.grid.Grid -> update the column attributes to add the
@@ -171,7 +179,7 @@
editor.SetParameters(",".join(map(_, options)))
else:
grid.SetReadOnly(row, col, True)
- elif col != 0 and self.GetValueByName(row, "Edit"):
+ elif col != 0 and self._GetRowEdit(row):
grid.SetReadOnly(row, col, False)
if colname == "Name":
editor = wx.grid.GridCellTextEditor()
@@ -238,7 +246,7 @@
self.ParentWindow.ParentWindow.Select()
x, y = self.ParentWindow.VariablesGrid.CalcUnscrolledPosition(x, y)
col = self.ParentWindow.VariablesGrid.XToCol(x)
- row = self.ParentWindow.VariablesGrid.YToRow(y - self.ParentWindow.VariablesGrid.GetColLabelSize())
+ row = self.ParentWindow.VariablesGrid.YToRow(y)
message = None
element_type = self.ParentWindow.ElementType
try:
@@ -265,7 +273,8 @@
if values[2] is not None:
base_location_type = self.ParentWindow.Controler.GetBaseType(values[2])
if values[2] != variable_type and base_type != base_location_type:
- message = _("Incompatible data types between \"%s\" and \"%s\"")%(values[2], variable_type)
+ message = _("Incompatible data types between \"{a1}\" and \"{a2}\"").\
+ format(a1 = values[2], a2 = variable_type)
if message is None:
if not location.startswith("%"):
@@ -274,11 +283,12 @@
elif location[0] not in LOCATIONDATATYPES:
message = _("Unrecognized data size \"%s\"")%location[0]
elif base_type not in LOCATIONDATATYPES[location[0]]:
- message = _("Incompatible size of data between \"%s\" and \"%s\"")%(location, variable_type)
+ message = _("Incompatible size of data between \"{a1}\" and \"{a2}\"").\
+ format(a1 = location, a2 = variable_type)
else:
dialog = wx.SingleChoiceDialog(self.ParentWindow.ParentWindow.ParentWindow,
_("Select a variable class:"), _("Variable class"),
- ["Input", "Output", "Memory"],
+ [_("Input"), _("Output"), _("Memory")],
wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
if dialog.ShowModal() == wx.ID_OK:
selected = dialog.GetSelection()
@@ -316,7 +326,7 @@
dlg = wx.TextEntryDialog(
self.ParentWindow.ParentWindow.ParentWindow,
_("Confirm or change variable name"),
- 'Variable Drop', var_name)
+ _('Variable Drop'), var_name)
dlg.SetValue(var_name)
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
dlg.Destroy()
@@ -338,7 +348,7 @@
if not location.startswith("%"):
dialog = wx.SingleChoiceDialog(self.ParentWindow.ParentWindow.ParentWindow,
_("Select a variable class:"), _("Variable class"),
- ["Input", "Output", "Memory"],
+ [_("Input"), _("Output"), _("Memory")],
wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
if dialog.ShowModal() == wx.ID_OK:
selected = dialog.GetSelection()
diff -r 6431f26aa501 -r 3291024e00da controls/__init__.py
--- a/controls/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/controls/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Package initialization
diff -r 6431f26aa501 -r 3291024e00da dialogs/AboutDialog.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dialogs/AboutDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -0,0 +1,182 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+# This file is based on code written for Whyteboard project.
+#
+# Copyright (c) 2009, 2010 by Steven Sproat
+# Copyright (c) 2016 by Andrey Skvortsov <andrej.skvortzov@gmail.com>
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
+
+"""
+This module contains classes extended from wx.Dialog used by the GUI.
+"""
+
+import os
+import sys
+import time
+import wx
+from wx.lib.agw.hyperlink import HyperLinkCtrl
+
+
+#----------------------------------------------------------------------
+
+class AboutDialog(wx.Dialog):
+ """
+ A replacement About Dialog for Windows, as it uses a generic frame that
+ well...sucks.
+ """
+ def __init__(self, parent, info):
+ title = _("About") + " " + info.Name
+ wx.Dialog.__init__(self, parent, title=title)
+ self.info = info
+
+ if parent and parent.GetIcon():
+ self.SetIcon(parent.GetIcon())
+
+ image = None
+ if self.info.Icon:
+ bitmap = wx.BitmapFromIcon(self.info.Icon)
+ image = wx.StaticBitmap(self, bitmap=bitmap)
+
+ name = wx.StaticText(self, label="%s %s" % (info.Name, info.Version))
+ description = wx.StaticText(self, label=info.Description)
+ description.Wrap(400)
+ copyright = wx.StaticText(self, label=info.Copyright)
+ url = HyperLinkCtrl(self, label=info.WebSite[0], URL=info.WebSite[1])
+
+ font = name.GetClassDefaultAttributes().font
+ font.SetWeight(wx.FONTWEIGHT_BOLD)
+ font.SetPointSize(18)
+ name.SetFont(font)
+
+ credits = wx.Button(self, id=wx.ID_ABOUT, label=_("C&redits"))
+ license = wx.Button(self, label=_("&License"))
+ close = wx.Button(self, id=wx.ID_CANCEL, label=_("&Close"))
+
+ btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+ btnSizer.Add(credits, flag=wx.CENTER | wx.LEFT | wx.RIGHT, border=5)
+ btnSizer.Add(license, flag=wx.CENTER | wx.RIGHT, border=5)
+ btnSizer.Add(close, flag=wx.CENTER | wx.RIGHT, border=5)
+
+ sizer = wx.BoxSizer(wx.VERTICAL)
+ if image:
+ sizer.Add(image, flag=wx.CENTER | wx.TOP | wx.BOTTOM, border=5)
+ sizer.Add(name, flag=wx.CENTER | wx.BOTTOM, border=10)
+ sizer.Add(description, flag=wx.CENTER | wx.BOTTOM, border=10)
+ sizer.Add(copyright, flag=wx.CENTER | wx.BOTTOM, border=10)
+ sizer.Add(url, flag=wx.CENTER | wx.BOTTOM, border=15)
+ sizer.Add(btnSizer, flag=wx.CENTER | wx.BOTTOM, border=5)
+
+ container = wx.BoxSizer(wx.VERTICAL)
+ container.Add(sizer, flag=wx.ALL, border=10)
+ self.SetSizer(container)
+ self.Layout()
+ self.Fit()
+ self.Centre()
+ self.Show(True)
+ self.SetEscapeId(close.GetId())
+
+ credits.Bind(wx.EVT_BUTTON, self.on_credits)
+ license.Bind(wx.EVT_BUTTON, self.on_license)
+ close.Bind(wx.EVT_BUTTON, lambda evt: self.Destroy())
+
+ def on_license(self, event):
+ LicenseDialog(self, self.info)
+
+ def on_credits(self, event):
+ CreditsDialog(self, self.info)
+
+
+#----------------------------------------------------------------------
+
+class CreditsDialog(wx.Dialog):
+ def __init__(self, parent, info):
+ wx.Dialog.__init__(self, parent, title=_("Credits"), size=(475, 320),
+ style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+
+ if parent and parent.GetIcon():
+ self.SetIcon(parent.GetIcon())
+
+ self.SetMinSize((300, 200))
+ notebook = wx.Notebook(self)
+ close = wx.Button(self, id=wx.ID_CLOSE, label=_("&Close"))
+ close.SetDefault()
+
+ developer = wx.TextCtrl(notebook, style=wx.TE_READONLY | wx.TE_MULTILINE)
+ translators = wx.TextCtrl(notebook, style=wx.TE_READONLY | wx.TE_MULTILINE)
+
+ developer.SetValue(u'\n'.join(info.Developers))
+ translators.SetValue(u'\n'.join(info.Translators))
+
+ notebook.AddPage(developer, text=_("Written by"))
+ notebook.AddPage(translators, text=_("Translated by"))
+
+ btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+ btnSizer.Add(close)
+
+ sizer = wx.BoxSizer(wx.VERTICAL)
+ sizer.Add(notebook, 1, wx.EXPAND | wx.ALL, 10)
+ sizer.Add(btnSizer, flag=wx.ALIGN_RIGHT | wx.RIGHT | wx.BOTTOM, border=10)
+ self.SetSizer(sizer)
+ self.Layout()
+ self.Show()
+ self.SetEscapeId(close.GetId())
+
+ close.Bind(wx.EVT_BUTTON, lambda evt: self.Destroy())
+
+
+#----------------------------------------------------------------------
+
+class LicenseDialog(wx.Dialog):
+ def __init__(self, parent, info):
+ wx.Dialog.__init__(self, parent, title=_("License"), size=(500, 400),
+ style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+
+ if parent and parent.GetIcon():
+ self.SetIcon(parent.GetIcon())
+
+ self.SetMinSize((400, 300))
+ close = wx.Button(self, id=wx.ID_CLOSE, label=_("&Close"))
+
+ ctrl = wx.TextCtrl(self, style=wx.TE_READONLY | wx.TE_MULTILINE)
+ ctrl.SetValue(info.License)
+
+ btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+ btnSizer.Add(close)
+
+ sizer = wx.BoxSizer(wx.VERTICAL)
+ sizer.Add(ctrl, 1, wx.EXPAND | wx.ALL, 10)
+ sizer.Add(btnSizer, flag=wx.ALIGN_RIGHT | wx.RIGHT | wx.BOTTOM, border=10)
+ self.SetSizer(sizer)
+ self.Layout()
+ self.Show()
+ self.SetEscapeId(close.GetId())
+
+ close.Bind(wx.EVT_BUTTON, lambda evt: self.Destroy())
+
+#----------------------------------------------------------------------
+
+def ShowAboutDialog(parent, info):
+ if os.name == "nt":
+ AboutDialog(parent, info)
+ else:
+ wx.AboutBox(info)
diff -r 6431f26aa501 -r 3291024e00da dialogs/ActionBlockDialog.py
--- a/dialogs/ActionBlockDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/ActionBlockDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,25 @@
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import wx.grid
diff -r 6431f26aa501 -r 3291024e00da dialogs/ArrayTypeDialog.py
--- a/dialogs/ArrayTypeDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/ArrayTypeDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,25 @@
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
from types import TupleType
diff -r 6431f26aa501 -r 3291024e00da dialogs/BlockPreviewDialog.py
--- a/dialogs/BlockPreviewDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/BlockPreviewDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2013: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2013: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -300,4 +300,4 @@
"""
self.RefreshPreview()
event.Skip()
-
\ No newline at end of file
+
diff -r 6431f26aa501 -r 3291024e00da dialogs/BrowseLocationsDialog.py
--- a/dialogs/BrowseLocationsDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/BrowseLocationsDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,21 +1,26 @@
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.#
import os
diff -r 6431f26aa501 -r 3291024e00da dialogs/BrowseValuesLibraryDialog.py
--- a/dialogs/BrowseValuesLibraryDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/BrowseValuesLibraryDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/ConnectionDialog.py
--- a/dialogs/ConnectionDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/ConnectionDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/DiscoveryDialog.py
--- a/dialogs/DiscoveryDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/DiscoveryDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,26 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import socket
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/DurationEditorDialog.py
--- a/dialogs/DurationEditorDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/DurationEditorDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
diff -r 6431f26aa501 -r 3291024e00da dialogs/FBDBlockDialog.py
--- a/dialogs/FBDBlockDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/FBDBlockDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
diff -r 6431f26aa501 -r 3291024e00da dialogs/FBDVariableDialog.py
--- a/dialogs/FBDVariableDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/FBDVariableDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -287,4 +287,4 @@
# Call BlockPreviewDialog function
BlockPreviewDialog.RefreshPreview(self)
-
\ No newline at end of file
+
diff -r 6431f26aa501 -r 3291024e00da dialogs/FindInPouDialog.py
--- a/dialogs/FindInPouDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/FindInPouDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,30 +1,31 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
+from plcopen.plcopen import *
-class FindInPouDialog(wx.Frame):
+class FindInPouDialog(wx.Dialog):
def _init_icon(self, parent):
if parent and parent.icon:
@@ -32,12 +33,11 @@
def __init__(self, parent):
- wx.Frame.__init__(self, parent, title=_("Find"),
- size=wx.Size(400, 250), style=wx.CAPTION|
+ wx.Dialog.__init__(self, parent, title=_("Find"),
+ size=wx.Size(500, 280), style=wx.CAPTION|
wx.CLOSE_BOX|
wx.CLIP_CHILDREN|
- wx.RESIZE_BORDER|
- wx.STAY_ON_TOP)
+ wx.RESIZE_BORDER)
self._init_icon(parent)
panel = wx.Panel(self, style=wx.TAB_TRAVERSAL)
@@ -59,6 +59,7 @@
self.FindPattern = wx.TextCtrl(panel)
self.Bind(wx.EVT_TEXT, self.OnFindPatternChanged, self.FindPattern)
+ self.Bind(wx.EVT_CHAR_HOOK, self.OnEscapeKey)
patterns_sizer.AddWindow(self.FindPattern, flag=wx.GROW)
params_sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -110,13 +111,18 @@
self.CloseButton = wx.Button(panel, label=_("Close"))
self.Bind(wx.EVT_BUTTON, self.OnCloseButton, self.CloseButton)
buttons_sizer.AddWindow(self.CloseButton)
+
+ self.StatusLabel = wx.StaticText(panel, label= "")
+ controls_sizer.AddWindow(self.StatusLabel, flag=wx.ALIGN_CENTER_VERTICAL)
panel.SetSizer(main_sizer)
+ main_sizer.Fit(self)
self.ParentWindow = parent
self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
-
+ self.infosPrev = {}
+ self.criteria = {}
self.FindPattern.SetFocus()
self.RefreshButtonsState()
@@ -132,17 +138,41 @@
self.Hide()
event.Skip()
+ def OnEscapeKey(self, event):
+ keycode = event.GetKeyCode()
+ if keycode == wx.WXK_ESCAPE:
+ self.OnCloseButton(event)
+ else:
+ event.Skip()
+
def OnFindPatternChanged(self, event):
self.RefreshButtonsState()
event.Skip()
+ def SetStatusText(self, msg):
+ self.StatusLabel.SetLabel(msg)
+ self.Layout()
+
def OnFindButton(self, event):
infos = {
"find_pattern": self.FindPattern.GetValue(),
"wrap": self.WrapSearch.GetValue(),
"case_sensitive": self.CaseSensitive.GetValue(),
- "regular_expression": self.RegularExpressions.GetValue()}
- wx.CallAfter(self.ParentWindow.FindInPou,
- {True: 1, False:-1}[self.Forward.GetValue()],
- infos)
+ "regular_expression": self.RegularExpressions.GetValue(),
+ "filter": "all"}
+
+ if self.infosPrev != infos:
+ self.infosPrev = infos
+ message = ""
+ try:
+ self.criteria = infos
+ CompilePattern(self.criteria)
+ except:
+ self.criteria.clear()
+ message = _("Syntax error in regular expression of pattern to search!")
+ self.SetStatusText(message)
+ if len(self.criteria) > 0:
+ wx.CallAfter(self.ParentWindow.FindInPou,
+ {True: 1, False:-1}[self.Forward.GetValue()],
+ self.criteria)
event.Skip()
diff -r 6431f26aa501 -r 3291024e00da dialogs/ForceVariableDialog.py
--- a/dialogs/ForceVariableDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/ForceVariableDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,25 @@
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
import datetime
@@ -174,7 +174,7 @@
if value == "":
message = _("You must type a value!")
elif GetTypeValue[self.IEC_Type](value) is None:
- message = _("Invalid value \"%s\" for \"%s\" variable!") % (value, self.IEC_Type)
+ message = _("Invalid value \"{a1}\" for \"{a2}\" variable!").format(a1 = value, a2 = self.IEC_Type)
if message is not None:
dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
dialog.ShowModal()
diff -r 6431f26aa501 -r 3291024e00da dialogs/LDElementDialog.py
--- a/dialogs/LDElementDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/LDElementDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/LDPowerRailDialog.py
--- a/dialogs/LDPowerRailDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/LDPowerRailDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,26 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/PouActionDialog.py
--- a/dialogs/PouActionDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/PouActionDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/PouDialog.py
--- a/dialogs/PouDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/PouDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/PouNameDialog.py
--- a/dialogs/PouNameDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/PouNameDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,26 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/PouTransitionDialog.py
--- a/dialogs/PouTransitionDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/PouTransitionDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -32,7 +32,12 @@
def GetTransitionLanguages():
_ = lambda x : x
- return [_("IL"), _("ST"), _("LD"), _("FBD")]
+ #
+ # IL language is temporary disabled because
+ # matiec freezes if transition is written in IL
+ #
+ # return [_("IL"), _("ST"), _("LD"), _("FBD")]
+ return [ _("ST"), _("LD"), _("FBD")]
TRANSITION_LANGUAGES_DICT = dict([(_(language), language) for language in GetTransitionLanguages()])
class PouTransitionDialog(wx.Dialog):
diff -r 6431f26aa501 -r 3291024e00da dialogs/ProjectDialog.py
--- a/dialogs/ProjectDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/ProjectDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/SFCDivergenceDialog.py
--- a/dialogs/SFCDivergenceDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/SFCDivergenceDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,26 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -39,12 +40,13 @@
class SFCDivergenceDialog(BlockPreviewDialog):
- def __init__(self, parent, controller, tagname):
+ def __init__(self, parent, controller, tagname, poss_div_types = None):
"""
Constructor
@param parent: Parent wx.Window of dialog for modal
@param controller: Reference to project controller
@param tagname: Tagname of project POU edited
+ @param poss_div_types: Types of divergence that will be available in the dialog window
"""
BlockPreviewDialog.__init__(self, parent, controller, tagname,
size=wx.Size(500, 300),
@@ -58,19 +60,28 @@
self.LeftGridSizer.AddWindow(type_label, flag=wx.GROW)
# Create radio buttons for selecting divergence type
+ divergence_buttons = [
+ (SELECTION_DIVERGENCE, _('Selection Divergence')),
+ (SELECTION_CONVERGENCE, _('Selection Convergence')),
+ (SIMULTANEOUS_DIVERGENCE, _('Simultaneous Divergence')),
+ (SIMULTANEOUS_CONVERGENCE, _('Simultaneous Convergence'))]
+ poss_div_btns = []
+ if poss_div_types is not None:
+ for val in poss_div_types:
+ poss_div_btns.append(divergence_buttons[val])
+ else:
+ poss_div_btns = divergence_buttons
self.TypeRadioButtons = {}
first = True
- for type, label in [
- (SELECTION_DIVERGENCE, _('Selection Divergence')),
- (SELECTION_CONVERGENCE, _('Selection Convergence')),
- (SIMULTANEOUS_DIVERGENCE, _('Simultaneous Divergence')),
- (SIMULTANEOUS_CONVERGENCE, _('Simultaneous Convergence'))]:
+ focusbtn = None
+ for type, label in poss_div_btns:
radio_button = wx.RadioButton(self, label=label,
style=(wx.RB_GROUP if first else 0))
radio_button.SetValue(first)
self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, radio_button)
self.LeftGridSizer.AddWindow(radio_button, flag=wx.GROW)
self.TypeRadioButtons[type] = radio_button
+ if first: focusbtn = type
first = False
# Create label for number of divergence sequences
@@ -79,7 +90,7 @@
self.LeftGridSizer.AddWindow(sequences_label, flag=wx.GROW)
# Create spin control for defining number of divergence sequences
- self.Sequences = wx.SpinCtrl(self, min=2, max=20)
+ self.Sequences = wx.SpinCtrl(self, min=2, max=20, initial=2)
self.Bind(wx.EVT_SPINCTRL, self.OnSequencesChanged, self.Sequences)
self.LeftGridSizer.AddWindow(self.Sequences, flag=wx.GROW)
@@ -93,7 +104,7 @@
# Selection divergence radio button is default control having keyboard
# focus
- self.TypeRadioButtons[SELECTION_DIVERGENCE].SetFocus()
+ self.TypeRadioButtons[focusbtn].SetFocus()
def GetMinElementSize(self):
"""
@@ -151,4 +162,4 @@
# Call BlockPreviewDialog function
BlockPreviewDialog.RefreshPreview(self)
-
\ No newline at end of file
+
diff -r 6431f26aa501 -r 3291024e00da dialogs/SFCStepDialog.py
--- a/dialogs/SFCStepDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/SFCStepDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,26 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -70,6 +71,8 @@
("output", _("Output")),
("action", _("Action"))]:
check_box = wx.CheckBox(self, label=label)
+ if name == "output" or (name == "input" and not initial):
+ check_box.SetValue(True)
self.Bind(wx.EVT_CHECKBOX, self.OnConnectorsChanged, check_box)
self.LeftGridSizer.AddWindow(check_box, flag=wx.GROW)
self.ConnectorsCheckBox[name] = check_box
diff -r 6431f26aa501 -r 3291024e00da dialogs/SFCStepNameDialog.py
--- a/dialogs/SFCStepNameDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/SFCStepNameDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,26 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da dialogs/SFCTransitionDialog.py
--- a/dialogs/SFCTransitionDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/SFCTransitionDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,25 +1,26 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -47,7 +48,7 @@
connection (default: True)
"""
BlockPreviewDialog.__init__(self, parent, controller, tagname,
- size=wx.Size(350, 300), title=_('Edit transition'))
+ size=wx.Size(350, 350), title=_('Edit transition'))
# Init common sizers
self._init_sizers(2, 0, 8, None, 2, 1)
diff -r 6431f26aa501 -r 3291024e00da dialogs/SearchInProjectDialog.py
--- a/dialogs/SearchInProjectDialog.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/SearchInProjectDialog.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,39 +1,31 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
-
+from plcopen.plcopen import *
import wx
-RE_ESCAPED_CHARACTERS = ".*+()[]?:|{}^$<>=-,"
-
-def EscapeText(text):
- text = text.replace('\\', '\\\\')
- for c in RE_ESCAPED_CHARACTERS:
- text = text.replace(c, '\\' + c)
- return text
-
#-------------------------------------------------------------------------------
# Search In Project Dialog
#-------------------------------------------------------------------------------
@@ -68,8 +60,9 @@
pattern_sizer.AddWindow(self.CaseSensitive, flag=wx.GROW)
self.Pattern = wx.TextCtrl(self)
+ self.Bind(wx.EVT_TEXT, self.FindPatternChanged, self.Pattern)
pattern_sizer.AddWindow(self.Pattern, flag=wx.GROW)
-
+ self.Bind(wx.EVT_CHAR_HOOK, self.OnEscapeKey)
self.RegularExpression = wx.CheckBox(self, label=_('Regular expression'))
pattern_sizer.AddWindow(self.RegularExpression, flag=wx.GROW)
@@ -99,58 +92,76 @@
self.ElementsList.Enable(False)
scope_sizer.AddWindow(self.ElementsList, 1, border=5,
flag=wx.GROW|wx.TOP|wx.RIGHT|wx.BOTTOM)
-
- self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
- ok_button = self.ButtonSizer.GetAffirmativeButton()
- ok_button.SetLabel(_('Search'))
- self.Bind(wx.EVT_BUTTON, self.OnOK, ok_button)
- main_sizer.AddSizer(self.ButtonSizer, border=20,
- flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ buttons_sizer = wx.BoxSizer(wx.HORIZONTAL)
+ main_sizer.AddSizer(buttons_sizer, border=20,
+ flag=wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.ALIGN_RIGHT)
+
+ self.FindButton = wx.Button(self, label=_("Find"))
+ self.FindButton.SetDefault()
+ self.Bind(wx.EVT_BUTTON, self.OnFindButton, self.FindButton)
+ buttons_sizer.AddWindow(self.FindButton, border=5, flag=wx.RIGHT)
+
+ self.CloseButton = wx.Button(self, label=_("Close"))
+ self.Bind(wx.EVT_BUTTON, self.OnCloseButton, self.CloseButton)
+ buttons_sizer.AddWindow(self.CloseButton)
self.SetSizer(main_sizer)
for name, label in GetElementsChoices():
self.ElementsList.Append(_(label))
-
+ self.infosPrev = {}
+ self.criteria = {}
self.Pattern.SetFocus()
+ self.RefreshButtonsState()
+
+ def RefreshButtonsState(self):
+ find_pattern = self.Pattern.GetValue()
+ self.FindButton.Enable(find_pattern != "")
def GetCriteria(self):
- raw_pattern = pattern = self.Pattern.GetValue()
- if not self.CaseSensitive.GetValue():
- pattern = pattern.upper()
- if not self.RegularExpression.GetValue():
- pattern = EscapeText(pattern)
- criteria = {
- "raw_pattern": raw_pattern,
- "pattern": re.compile(pattern),
+ return self.criteria
+
+ def FindPatternChanged(self, event):
+ self.RefreshButtonsState()
+ event.Skip()
+
+ def OnScopeChanged(self, event):
+ self.ElementsList.Enable(self.OnlyElements.GetValue())
+ event.Skip()
+
+ def OnCloseButton(self, event):
+ self.EndModal(wx.ID_CANCEL)
+
+ def OnEscapeKey(self, event):
+ keycode = event.GetKeyCode()
+ if keycode == wx.WXK_ESCAPE:
+ self.OnCloseButton(event)
+ else:
+ event.Skip()
+
+ def OnFindButton(self, event):
+ message = None
+ infos = {
+ "find_pattern": self.Pattern.GetValue(),
"case_sensitive": self.CaseSensitive.GetValue(),
"regular_expression": self.RegularExpression.GetValue(),
}
if self.WholeProject.GetValue():
- criteria["filter"] = "all"
+ infos["filter"] = "all"
elif self.OnlyElements.GetValue():
- criteria["filter"] = []
+ infos["filter"] = []
for index, (name, label) in enumerate(GetElementsChoices()):
if self.ElementsList.IsChecked(index):
- criteria["filter"].append(name)
- return criteria
-
- def OnScopeChanged(self, event):
- self.ElementsList.Enable(self.OnlyElements.GetValue())
- event.Skip()
-
- def OnOK(self, event):
- message = None
- if self.Pattern.GetValue() == "":
- message = _("Form isn't complete. Pattern to search must be filled!")
- else:
- wrong_pattern = False
- if self.RegularExpression.GetValue():
- try:
- re.compile(self.Pattern.GetValue())
- except:
- wrong_pattern = True
- if wrong_pattern:
+ infos["filter"].append(name)
+
+ if self.infosPrev != infos:
+ try:
+ self.criteria = infos
+ CompilePattern(self.criteria)
+ self.infosPrev = infos
+ except:
+ self.criteria.clear()
message = _("Syntax error in regular expression of pattern to search!")
if message is not None:
diff -r 6431f26aa501 -r 3291024e00da dialogs/__init__.py
--- a/dialogs/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/dialogs/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,27 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
# Package initialization
diff -r 6431f26aa501 -r 3291024e00da doc/about.html
--- a/doc/about.html Thu Feb 16 14:34:40 2017 +0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<HTML>
-<BODY>
-<CENTER>
-<IMG SRC="../images/splash.png">
-<BR><BR>
-<font size="3">Beremiz is an Open Source framework for automation.</font>
-<BR><BR>
-<a href="http://www.beremiz.org/">http://www.beremiz.org/</a>
-<BR><BR>
-<TABLE border="0" width="480">
- <TR>
- <TD align="right" valign="top">
- Contributor :
- </TD>
- <TD align="left" valign="top">
- University of Porto<BR>
- <a href="http://www.fe.up.pt/si/web_page.inicial">http://www.fe.up.pt/si/web_page.inicial</a>
- </TD>
- </TR>
- <TR>
- <TD colspan="2" align="center">
- <BR><BR><BR>
- Beremiz is distrubuted under the term <BR>of the
- <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC1">GNU
- General Public License (GPL) version 2</a> or
- <BR>(at your option) any later version.
- </TD>
- </TR>
-</TABLE>
-</CENTER>
-</BODY>
-</HTML>
diff -r 6431f26aa501 -r 3291024e00da doc/about.ru.html
--- a/doc/about.ru.html Thu Feb 16 14:34:40 2017 +0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<HTML lang="ru">
- <HEAD><meta charset="utf-8" http-equiv="Content-Type" content="text/html; charset=utf-8">
- <TITLE>О Beremiz</TITLE>
- </HEAD>
- <BODY>
- <CENTER>
- <IMG SRC="../images/splash.png">
- <BR><BR>
- <font size="3">Beremiz - Ñто Ñвободное программное обеÑпечение Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ð·Ð°Ñ†Ð¸Ð¸.</font>
- <BR><BR>
- <a href="http://www.beremiz.org/">http://www.beremiz.org/</a>
- <BR><BR>
- <TABLE border="0" width="480">
- <TR>
- <TD align="right" valign="top">
- СпонÑор разработки:
- </TD>
- <TD align="left" valign="top">
- УниверÑитет Порту<BR>
- <a href="http://www.fe.up.pt/si/web_page.inicial">http://www.fe.up.pt/si/web_page.inicial</a>
- </TD>
- </TR>
- <TR>
- <TD colspan="2" align="center">
- <BR><BR><BR>
- Beremiz раÑпроÑтранÑетÑÑ Ð½Ð° уÑловиÑÑ… <BR>
- <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC1">Стандартной
- общеÑтвенной лицензии GNU (GPL) верÑии 2</a>
- <BR>или (на ваше уÑмотрение) более поздней верÑии.
- </TD>
- </TR>
- </TABLE>
- </CENTER>
- </BODY>
-</HTML>
diff -r 6431f26aa501 -r 3291024e00da doc/plcopen_about.html
--- a/doc/plcopen_about.html Thu Feb 16 14:34:40 2017 +0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<HTML>
-<BODY>
-<CENTER>
-<IMG SRC="../images/aboutlogo.png">
-<BR><BR>
-<font size="3">The PLCopen Editor saves and loads XML projects,<BR>accordingly to PLCopen TC6-XML Schemes.</font>
-<BR><BR>
-More informations on :
-<a href="http://www.beremiz.org/">http://www.beremiz.org/</a>
-<BR><BR>
-</CENTER>
-</BODY>
-</HTML>
\ No newline at end of file
diff -r 6431f26aa501 -r 3291024e00da doc/plcopen_about.ru.html
--- a/doc/plcopen_about.ru.html Thu Feb 16 14:34:40 2017 +0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<HTML>
- <HEAD><meta charset="utf-8" http-equiv="Content-Type" content="text/html; charset=utf-8">
- <TITLE>О PLCOpen Editor</TITLE>
- </HEAD>
- <BODY>
-<CENTER>
-<IMG SRC="../images/aboutlogo.png">
-<BR><BR>
-<font size="3">PLCopen Editor ÑохранÑет и загружает XML
- проекты,<BR>Ñозданные ÑоглаÑно PLCopen TC6-XML Ñхемам.</font>
-<BR><BR>
-За подробной информацией обращатьÑÑ:
-<a href="http://www.beremiz.org/">http://www.beremiz.org/</a>
-<BR><BR>
-</CENTER>
-</BODY>
-</HTML>
diff -r 6431f26aa501 -r 3291024e00da docutil/__init__.py
--- a/docutil/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/docutil/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,27 +1,27 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from dochtml import *
from docpdf import *
-from docsvg import *
\ No newline at end of file
+from docsvg import *
diff -r 6431f26aa501 -r 3291024e00da docutil/dochtml.py
--- a/docutil/dochtml.py Thu Feb 16 14:34:40 2017 +0500
+++ b/docutil/dochtml.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx, os, wx.html, subprocess
@@ -94,4 +94,4 @@
elif subprocess.call("firefox %s"%url, shell=True) != 0:
wx.MessageBox("""Firefox browser not found.\nPlease point your browser at :\n%s""" % url)
except ImportError:
- wx.MessageBox('Please point your browser at: %s' % url)
\ No newline at end of file
+ wx.MessageBox('Please point your browser at: %s' % url)
diff -r 6431f26aa501 -r 3291024e00da docutil/docpdf.py
--- a/docutil/docpdf.py Thu Feb 16 14:34:40 2017 +0500
+++ b/docutil/docpdf.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx, os
@@ -53,7 +53,7 @@
if pagenum == None :
os.system("%s -remote DS301 %s &"%(readerexepath, pdffile))
else:
- print "Open pdf %s at page %d"%(pdffile, pagenum)
+ print "Open pdf %s at page %d"%(pdffile, pagenum)
os.system("%s -remote DS301 %s %d &"%(readerexepath, pdffile, pagenum))
def open_pdf(pdffile, pagenum = None):
diff -r 6431f26aa501 -r 3291024e00da docutil/docsvg.py
--- a/docutil/docsvg.py Thu Feb 16 14:34:40 2017 +0500
+++ b/docutil/docsvg.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx, os, subprocess
diff -r 6431f26aa501 -r 3291024e00da editors/CodeFileEditor.py
--- a/editors/CodeFileEditor.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/CodeFileEditor.py Thu Feb 16 14:35:12 2017 +0500
@@ -506,17 +506,11 @@
self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
self.SearchParams = search_params
- criteria = {
- "raw_pattern": search_params["find_pattern"],
- "pattern": re.compile(search_params["find_pattern"]),
- "case_sensitive": search_params["case_sensitive"],
- "regular_expression": search_params["regular_expression"],
- "filter": "all"}
self.SearchResults = [
(start, end, SEARCH_RESULT_HIGHLIGHT)
for start, end, text in
- TestTextElement(self.GetText(), criteria)]
+ TestTextElement(self.GetText(), search_params)]
self.CurrentFindHighlight = None
if len(self.SearchResults) > 0:
diff -r 6431f26aa501 -r 3291024e00da editors/ConfTreeNodeEditor.py
--- a/editors/ConfTreeNodeEditor.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/ConfTreeNodeEditor.py Thu Feb 16 14:35:12 2017 +0500
@@ -342,25 +342,20 @@
staticbox = wx.StaticBox(self.ParamsEditor,
label=_(label), size=wx.Size(10, 0))
staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
+ flags = (wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
if first:
- sizer.AddSizer(staticboxsizer, border=5,
- flag=wx.GROW|wx.TOP|wx.BOTTOM)
- else:
- sizer.AddSizer(staticboxsizer, border=5,
- flag=wx.GROW|wx.BOTTOM)
+ flags |= wx.TOP
+ sizer.AddSizer(staticboxsizer, border=5, flag=flags)
self.GenerateSizerElements(staticboxsizer,
element_infos["children"],
element_path)
else:
boxsizer = wx.FlexGridSizer(cols=3, rows=1)
boxsizer.AddGrowableCol(1)
+ flags = (wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
if first:
- sizer.AddSizer(boxsizer, border=5,
- flag=wx.GROW|wx.ALL)
- else:
- sizer.AddSizer(boxsizer, border=5,
- flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
-
+ flags |= wx.TOP
+ sizer.AddSizer(boxsizer, border=5, flag=flags)
staticbitmap = GenStaticBitmap(ID=-1, bitmapname=element_infos["name"],
name="%s_bitmap"%element_infos["name"], parent=self.ParamsEditor,
pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
@@ -408,7 +403,7 @@
staticbox = wx.StaticBox(self.ParamsEditor,
label="%s - %s"%(_(name), _(value)), size=wx.Size(10, 0))
staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
- sizer.AddSizer(staticboxsizer, border=5, flag=wx.GROW|wx.BOTTOM)
+ sizer.AddSizer(staticboxsizer, border=5, flag=wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
self.GenerateSizerElements(staticboxsizer, element_infos["children"], element_path)
callback = self.GetChoiceContentCallBackFunction(combobox, staticboxsizer, element_path)
else:
@@ -479,6 +474,8 @@
textctrl.Bind(wx.EVT_TEXT_ENTER, callback)
textctrl.Bind(wx.EVT_KILL_FOCUS, callback)
first = False
+ sizer.Layout()
+ self.RefreshScrollbars()
def GetItemChannelChangedFunction(self, dir):
diff -r 6431f26aa501 -r 3291024e00da editors/DataTypeEditor.py
--- a/editors/DataTypeEditor.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/DataTypeEditor.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
from types import TupleType
diff -r 6431f26aa501 -r 3291024e00da editors/DebugViewer.py
--- a/editors/DebugViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/DebugViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from threading import Lock, Timer
from time import time as gettime
diff -r 6431f26aa501 -r 3291024e00da editors/EditorPanel.py
--- a/editors/EditorPanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/EditorPanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -79,7 +79,7 @@
self.ParentWindow.EditProjectElement(None, self.GetTagName(), True)
def GetTitle(self):
- return "-".join(self.TagName.split("::")[1:])
+ return ".".join(self.TagName.split("::")[1:])
def GetIcon(self):
return self.Icon
diff -r 6431f26aa501 -r 3291024e00da editors/FileManagementPanel.py
--- a/editors/FileManagementPanel.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/FileManagementPanel.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os
import shutil
@@ -211,4 +211,4 @@
dragSource = wx.DropSource(self)
dragSource.SetData(data)
dragSource.DoDragDrop()
-
\ No newline at end of file
+
diff -r 6431f26aa501 -r 3291024e00da editors/LDViewer.py
--- a/editors/LDViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/LDViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import time
diff -r 6431f26aa501 -r 3291024e00da editors/ResourceEditor.py
--- a/editors/ResourceEditor.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/ResourceEditor.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
import wx.lib.buttons
@@ -434,17 +434,18 @@
def OnTasksGridCellChange(self, event):
row, col = event.GetRow(), event.GetCol()
- if self.TasksTable.GetColLabelValue(col) == "Name":
+ if self.TasksTable.GetColLabelValue(col, False) == "Name":
tasklist = [name for name in self.TaskList.split(",") if name != ""]
for i in xrange(self.TasksTable.GetNumberRows()):
task = self.TasksTable.GetValueByName(i, "Name")
if task in tasklist:
tasklist.remove(task)
if len(tasklist) > 0:
- old_name = tasklist[0]
+ old_name = tasklist[0].upper()
new_name = self.TasksTable.GetValue(row, col)
for i in xrange(self.InstancesTable.GetNumberRows()):
- if self.InstancesTable.GetValueByName(i, "Task") == old_name:
+ name = self.InstancesTable.GetValueByName(i, "Task").upper()
+ if old_name == name:
self.InstancesTable.SetValueByName(i, "Task", new_name)
self.RefreshModel()
colname = self.TasksTable.GetColLabelValue(col, False)
diff -r 6431f26aa501 -r 3291024e00da editors/SFCViewer.py
--- a/editors/SFCViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/SFCViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,35 +1,87 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from types import *
import wx
from Viewer import *
+from graphics.SFC_Objects import *
+from graphics.GraphicCommons import SELECTION_DIVERGENCE, \
+ SELECTION_CONVERGENCE, SIMULTANEOUS_DIVERGENCE, SIMULTANEOUS_CONVERGENCE, EAST, NORTH, WEST, SOUTH
+
+SFC_Objects = (SFC_Step, SFC_ActionBlock, SFC_Transition, SFC_Divergence, SFC_Jump)
+
class SFC_Viewer(Viewer):
+ SFC_StandardRules = {
+ # The key of this dict is a block that user try to connect,
+ # and the value is a list of blocks, that can be connected with the current block
+ # and with directions of connection
+ "SFC_Step": [("SFC_ActionBlock", EAST),
+ ("SFC_Transition", SOUTH),
+ (SELECTION_DIVERGENCE, SOUTH),
+ (SIMULTANEOUS_CONVERGENCE, SOUTH)],
+
+ "SFC_ActionBlock": [("SFC_Step", EAST)],
+
+ "SFC_Transition": [("SFC_Step", SOUTH),
+ (SELECTION_CONVERGENCE, SOUTH),
+ (SIMULTANEOUS_DIVERGENCE, SOUTH),
+ ("SFC_Jump", SOUTH),
+ ("FBD_Block", EAST),
+ ("FBD_Variable", EAST),
+ ("FBD_Connector", EAST),
+ ("LD_Contact", EAST),
+ ("LD_PowerRail", EAST),
+ ("LD_Coil", EAST)],
+
+ SELECTION_DIVERGENCE: [("SFC_Transition", SOUTH)],
+
+ SELECTION_CONVERGENCE: [("SFC_Step", SOUTH),
+ ("SFC_Jump", SOUTH)],
+
+ SIMULTANEOUS_DIVERGENCE: [("SFC_Step", SOUTH)],
+
+ SIMULTANEOUS_CONVERGENCE: [("SFC_Transition", SOUTH)],
+
+ "SFC_Jump": [],
+
+ "FBD_Block": [("SFC_Transition", WEST)],
+
+ "FBD_Variable": [("SFC_Transition", WEST)],
+
+ "FBD_Connector": [("SFC_Transition", WEST)],
+
+ "LD_Contact": [("SFC_Transition", WEST)],
+
+ "LD_PowerRail": [("SFC_Transition", WEST)],
+
+ "LD_Coil": [("SFC_Transition", WEST)]
+ }
+
def __init__(self, parent, tagname, window, controler, debug = False, instancepath = ""):
Viewer.__init__(self, parent, tagname, window, controler, debug, instancepath)
self.CurrentLanguage = "SFC"
@@ -282,6 +334,28 @@
self.UpdateScrollPos(event)
event.Skip()
+ def GetBlockName(self, block):
+ blockName = block.__class__.__name__
+ if blockName == "SFC_Divergence":
+ blockName = block.Type
+ return blockName
+
+ # This method check the IEC 61131-3 compatibility between two SFC blocks
+ def BlockCompatibility(self,startblock = None, endblock = None, direction = None):
+ if startblock!= None and endblock != None and (isinstance(startblock,SFC_Objects)\
+ or isinstance(endblock,SFC_Objects)):
+ # Full "SFC_StandardRules" table would be symmetrical and
+ # to avoid duplicate records and minimize the table only upper part is defined.
+ if (direction == SOUTH or direction == EAST):
+ startblock, endblock = endblock, startblock
+ start = self.GetBlockName(startblock)
+ end = self.GetBlockName(endblock)
+ for val in self.SFC_StandardRules[start]:
+ if end in val:
+ return True
+ return False
+ return True
+
#-------------------------------------------------------------------------------
# Keyboard event functions
#-------------------------------------------------------------------------------
diff -r 6431f26aa501 -r 3291024e00da editors/TextViewer.py
--- a/editors/TextViewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/TextViewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
from types import *
@@ -289,7 +289,7 @@
dlg = wx.TextEntryDialog(
self.ParentWindow,
_("Confirm or change variable name"),
- 'Variable Drop', var_name)
+ _('Variable Drop'), var_name)
dlg.SetValue(var_name)
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
dlg.Destroy()
@@ -304,7 +304,7 @@
if not location.startswith("%"):
dialog = wx.SingleChoiceDialog(self.ParentWindow,
_("Select a variable class:"), _("Variable class"),
- ["Input", "Output", "Memory"],
+ [_("Input"), _("Output"), _("Memory")],
wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
if dialog.ShowModal() == wx.ID_OK:
selected = dialog.GetSelection()
@@ -340,7 +340,7 @@
dlg = wx.TextEntryDialog(
self.ParentWindow,
_("Confirm or change variable name"),
- 'Variable Drop', var_name)
+ _('Variable Drop'), var_name)
dlg.SetValue(var_name)
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
dlg.Destroy()
@@ -363,7 +363,7 @@
dlg = wx.TextEntryDialog(
self.ParentWindow,
_("Confirm or change variable name"),
- 'Variable Drop', var_name)
+ _('Variable Drop'), var_name)
dlg.SetValue(var_name)
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
dlg.Destroy()
@@ -414,7 +414,7 @@
self.Colourise(0, -1)
def RefreshJumpList(self):
- if self.TextSyntax != "IL":
+ if self.TextSyntax == "IL":
self.Jumps = [jump.upper() for jump in LABEL_MODEL.findall(self.GetText())]
self.Colourise(0, -1)
@@ -629,6 +629,10 @@
self.SetStyling(current_pos - last_styled_pos + 2, STC_PLC_COMMENT)
last_styled_pos = current_pos + 1
state = SPACE
+ if len(self.CallStack) > 0:
+ current_call = self.CallStack.pop()
+ else:
+ current_call = None
elif state == PRAGMA:
if line.endswith("}"):
self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
@@ -806,17 +810,10 @@
self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
self.SearchParams = search_params
- criteria = {
- "raw_pattern": search_params["find_pattern"],
- "pattern": re.compile(search_params["find_pattern"]),
- "case_sensitive": search_params["case_sensitive"],
- "regular_expression": search_params["regular_expression"],
- "filter": "all"}
-
self.SearchResults = [
(infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT)
for infos, start, end, text in
- self.Search(criteria)]
+ self.Search(search_params)]
self.CurrentFindHighlight = None
if len(self.SearchResults) > 0:
@@ -897,14 +894,15 @@
key_handled = True
elif key == wx.WXK_BACK:
if self.TextSyntax in ["ST", "ALL"]:
- indent = self.Editor.GetLineIndentation(line)
- if lineText.strip() == "" and indent > 0:
- self.Editor.DelLineLeft()
- self.Editor.AddText(" " * ((max(0, indent - 1) / 2) * 2))
- key_handled = True
+ if not self.Editor.GetSelectedText():
+ indent = self.Editor.GetColumn(self.Editor.GetCurrentPos())
+ if lineText.strip() == "" and len(lineText) > 0 and indent > 0:
+ self.Editor.DelLineLeft()
+ self.Editor.AddText(" " * ((max(0, indent - 1) / 2) * 2))
+ key_handled = True
if not key_handled:
event.Skip()
- elif key in NAVIGATION_KEYS:
+ else:
event.Skip()
def OnKillFocus(self, event):
diff -r 6431f26aa501 -r 3291024e00da editors/Viewer.py
--- a/editors/Viewer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/editors/Viewer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
import math
@@ -43,6 +43,7 @@
SCROLL_ZONE = 10
CURSORS = None
+SFC_Objects = (SFC_Step, SFC_ActionBlock, SFC_Transition, SFC_Divergence, SFC_Jump)
def ResetCursors():
global CURSORS
@@ -146,6 +147,9 @@
specific_values.priority, id)
return transition
+divergence_types = [SELECTION_DIVERGENCE,
+ SELECTION_CONVERGENCE, SIMULTANEOUS_DIVERGENCE, SIMULTANEOUS_CONVERGENCE]
+
def GetDivergenceCreationFunction(divergence_type):
def divergenceCreationFunction(viewer, id, specific_values):
return SFC_Divergence(viewer, divergence_type,
@@ -243,7 +247,7 @@
elif pou_type == "function" and values[1] != "function":
message = _("Function Blocks can't be used in Functions!")
elif self.ParentWindow.Controler.PouIsUsedBy(pou_name, values[0], self.ParentWindow.Debug):
- message = _("\"%s\" is already used by \"%s\"!")%(pou_name, values[0])
+ message = _("\"{a1}\" is already used by \"{a2}\"!").format(a1 = pou_name, a2 = values[0])
else:
blockname = values[2]
if len(values) > 3:
@@ -282,7 +286,7 @@
if not location.startswith("%"):
dialog = wx.SingleChoiceDialog(self.ParentWindow.ParentWindow,
_("Select a variable class:"), _("Variable class"),
- ["Input", "Output", "Memory"],
+ [_("Input"), _("Output"), _("Memory")],
wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
if dialog.ShowModal() == wx.ID_OK:
selected = dialog.GetSelection()
@@ -301,7 +305,7 @@
dlg = wx.TextEntryDialog(
self.ParentWindow.ParentWindow,
_("Confirm or change variable name"),
- 'Variable Drop', var_name)
+ _('Variable Drop'), var_name)
dlg.SetValue(var_name)
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
dlg.Destroy()
@@ -331,7 +335,7 @@
dlg = wx.TextEntryDialog(
self.ParentWindow.ParentWindow,
_("Confirm or change variable name"),
- 'Variable Drop', var_name)
+ _('Variable Drop'), var_name)
dlg.SetValue(var_name)
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
dlg.Destroy()
@@ -353,7 +357,7 @@
dlg = wx.TextEntryDialog(
self.ParentWindow.ParentWindow,
_("Confirm or change variable name"),
- 'Variable Drop', var_name)
+ _('Variable Drop'), var_name)
dlg.SetValue(var_name)
var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
dlg.Destroy()
@@ -573,11 +577,11 @@
[ID_CLEAR_EXEC_ORDER, ID_RESET_EXEC_ORDER] = [wx.NewId() for i in xrange(2)]
# Create menu items
- self.AddMenuItems(menu, [
- (ID_CLEAR_EXEC_ORDER, wx.ITEM_NORMAL, _(u'Clear Execution Order'), '', self.OnClearExecutionOrderMenu),
- (ID_RESET_EXEC_ORDER, wx.ITEM_NORMAL, _(u'Reset Execution Order'), '', self.OnResetExecutionOrderMenu)])
-
- menu.AppendSeparator()
+ if self.CurrentLanguage == 'FBD':
+ self.AddMenuItems(menu, [
+ (ID_CLEAR_EXEC_ORDER, wx.ITEM_NORMAL, _(u'Clear Execution Order'), '', self.OnClearExecutionOrderMenu),
+ (ID_RESET_EXEC_ORDER, wx.ITEM_NORMAL, _(u'Reset Execution Order'), '', self.OnResetExecutionOrderMenu)])
+ menu.AppendSeparator()
add_menu = wx.Menu(title='')
self.AddAddMenuItems(add_menu)
@@ -883,6 +887,15 @@
comments.sort(lambda x, y: cmp(x.GetId(), y.GetId()))
return blocks + wires + comments
+ def GetContinuationByName(self, name):
+ blocks = []
+ for block in self.Blocks.itervalues():
+ if isinstance(block, FBD_Connector) and\
+ block.GetType() == CONTINUATION and\
+ block.GetName() == name:
+ blocks.append(block)
+ return blocks
+
def GetConnectorByName(self, name):
for block in self.Blocks.itervalues():
if isinstance(block, FBD_Connector) and\
@@ -959,6 +972,16 @@
return connector.GetEdge()
return "none"
+ def CorrectElementSize(self, element, width, height):
+ min_width, min_height = element.GetMinSize()
+ if width < min_width:
+ width = min_width
+ if height < min_height:
+ height = min_height
+ if element.Size != (width, height):
+ element.SetSize(width, height)
+ element.RefreshModel()
+
#-------------------------------------------------------------------------------
# Reset functions
#-------------------------------------------------------------------------------
@@ -1371,6 +1394,7 @@
if not self.CreateWires(connector, instance.id, input_connector.links, remaining_instances, selection):
element.RefreshModel()
element.RefreshConnectors()
+ self.CorrectElementSize(element, instance.width, instance.height)
if selection is not None and selection[0].get(instance.id, False):
self.SelectInGroup(element)
@@ -1462,12 +1486,24 @@
return None
def FindBlockConnector(self, pos, direction = None, exclude = None):
+ result, error = self.FindBlockConnectorWithError(pos, direction, exclude)
+ return result
+
+ def FindBlockConnectorWithError(self, pos, direction = None, exclude = None):
+ error = False
+ startblock = None
for block in self.Blocks.itervalues():
- result = block.TestConnector(pos, direction, exclude)
- if result:
- return result
- return None
-
+ connector = block.TestConnector(pos, direction, exclude)
+ if connector:
+ if self.IsWire(self.SelectedElement):
+ startblock = self.SelectedElement.StartConnected.GetParentBlock()
+ avail, error = connector.ConnectionAvailable(direction, exclude)
+ if not avail or not self.BlockCompatibility(startblock, block, direction):
+ connector = None
+ error = True
+ return connector, error
+ return None, error
+
def FindElementById(self, id):
block = self.Blocks.get(id, None)
if block is not None:
@@ -2048,47 +2084,7 @@
self.SelectedElement.HighlightPoint(pos)
self.RefreshBuffer()
elif connector is None or self.SelectedElement.GetDragging():
- start_connector = self.SelectedElement.GetStartConnected()
- start_direction = start_connector.GetDirection()
-
- items = []
-
- if self.CurrentLanguage == "SFC" and start_direction == SOUTH:
- items.extend([
- (_(u'Initial Step'), self.GetAddToWireMenuCallBack(self.AddNewStep, True)),
- (_(u'Step'), self.GetAddToWireMenuCallBack(self.AddNewStep, False)),
- (_(u'Transition'), self.GetAddToWireMenuCallBack(self.AddNewTransition, False)),
- (_(u'Divergence'), self.GetAddToWireMenuCallBack(self.AddNewDivergence)),
- (_(u'Jump'), self.GetAddToWireMenuCallBack(self.AddNewJump)),
- ])
-
- elif start_direction == EAST:
-
- if isinstance(start_connector.GetParentBlock(), SFC_Step):
- items.append(
- (_(u'Action Block'), self.GetAddToWireMenuCallBack(self.AddNewActionBlock))
- )
- else:
- items.extend([
- (_(u'Block'), self.GetAddToWireMenuCallBack(self.AddNewBlock)),
- (_(u'Variable'), self.GetAddToWireMenuCallBack(self.AddNewVariable, True)),
- (_(u'Connection'), self.GetAddToWireMenuCallBack(self.AddNewConnection)),
- ])
-
- if self.CurrentLanguage != "FBD":
- items.append(
- (_(u'Contact'), self.GetAddToWireMenuCallBack(self.AddNewContact))
- )
- if self.CurrentLanguage == "LD":
- items.extend([
- (_(u'Coil'), self.GetAddToWireMenuCallBack(self.AddNewCoil)),
- (_(u'Power Rail'), self.GetAddToWireMenuCallBack(self.AddNewPowerRail)),
- ])
- if self.CurrentLanguage == "SFC":
- items.append(
- (_(u'Transition'), self.GetAddToWireMenuCallBack(self.AddNewTransition, True))
- )
-
+ items = self.GetPopupMenuItems()
if len(items) > 0:
if self.Editor.HasCapture():
self.Editor.ReleaseMouse()
@@ -2273,7 +2269,8 @@
self.rubberBand.OnMotion(event, dc, self.Scaling)
elif not self.Debug and self.Mode == MODE_SELECTION and self.SelectedElement is not None:
if self.DrawingWire:
- connector = self.FindBlockConnector(pos, self.SelectedElement.GetConnectionDirection(), self.SelectedElement.EndConnected)
+ connector, errorHighlight = self.FindBlockConnectorWithError(pos, self.SelectedElement.GetConnectionDirection(), self.SelectedElement.EndConnected)
+ self.SelectedElement.ErrHighlight = errorHighlight;
if not connector or self.SelectedElement.EndConnected == None:
self.SelectedElement.ResetPoints()
movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling)
@@ -2340,6 +2337,54 @@
self.Scroll(xstart + move_window.x, ystart + move_window.y)
self.RefreshScrollBars(move_window.x, move_window.y)
+ def BlockCompatibility(self, startblock=None, endblock=None, direction = None):
+ return True
+
+ def GetPopupMenuItems(self):
+ start_connector = self.SelectedElement.GetStartConnected()
+ start_direction = start_connector.GetDirection()
+ startblock = start_connector.GetParentBlock()
+ items = []
+ if isinstance(startblock, SFC_Objects):
+ startblockname = self.GetBlockName(startblock)
+ poss_div_types = []
+
+ SFC_WireMenu_Buttons = {
+ 'SFC_Step': (_(u'Step'), self.GetAddToWireMenuCallBack(self.AddNewStep, False)),
+ 'SFC_Jump': (_(u'Jump'), self.GetAddToWireMenuCallBack(self.AddNewJump)),
+ 'SFC_Transition': (_(u'Transition'), self.GetAddToWireMenuCallBack(self.AddNewTransition, False)),
+ 'SFC_ActionBlock': (_(u'Action Block'), self.GetAddToWireMenuCallBack(self.AddNewActionBlock))}
+
+ for endblock in self.SFC_StandardRules.get(startblockname):
+ if start_direction in endblock:
+ if endblock[0] in divergence_types:
+ poss_div_types.append(endblock[0])
+ else:
+ items.append(SFC_WireMenu_Buttons[endblock[0]])
+ if len(poss_div_types) > 0:
+ items.append((_(u'Divergence'), self.GetAddToWireMenuCallBack(self.AddNewDivergence,
+ poss_div_types)))
+ elif start_direction == EAST:
+ items.extend([
+ (_(u'Block'), self.GetAddToWireMenuCallBack(self.AddNewBlock)),
+ (_(u'Connection'), self.GetAddToWireMenuCallBack(self.AddNewConnection))])
+
+ if self.CurrentLanguage != "FBD":
+ items.append((_(u'Contact'), self.GetAddToWireMenuCallBack(self.AddNewContact)))
+
+ if self.CurrentLanguage == "LD":
+ items.extend([
+ (_(u'Coil'), self.GetAddToWireMenuCallBack(self.AddNewCoil)),
+ (_(u'Power Rail'), self.GetAddToWireMenuCallBack(self.AddNewPowerRail))])
+
+ if self.CurrentLanguage == "SFC":
+ items.append(
+ (_(u'Transition'), self.GetAddToWireMenuCallBack(self.AddNewTransition, True)))
+ else:
+ items.append(
+ (_(u'Variable'), self.GetAddToWireMenuCallBack(self.AddNewVariable, True)))
+ return items
+
#-------------------------------------------------------------------------------
# Keyboard event functions
#-------------------------------------------------------------------------------
@@ -2607,7 +2652,7 @@
"name": self.Controler.GenerateNewName(
self.TagName, None, "Step%d", 0),
"input": True,
- "output": False,
+ "output": True,
"action":False}
else:
dialog = SFCStepDialog(self.ParentWindow, self.Controler, self.TagName, initial)
@@ -2651,8 +2696,8 @@
connector = transition.GetConnectors()["inputs"][0]
self.AddNewElement(transition, bbox, wire, connector)
- def AddNewDivergence(self, bbox, wire=None):
- dialog = SFCDivergenceDialog(self.ParentWindow, self.Controler, self.TagName)
+ def AddNewDivergence(self, bbox, poss_div_types = None, wire=None):
+ dialog = SFCDivergenceDialog(self.ParentWindow, self.Controler, self.TagName, poss_div_types)
dialog.SetPreviewFont(self.GetFont())
dialog.SetMinElementSize((bbox.width, bbox.height))
if dialog.ShowModal() == wx.ID_OK:
@@ -2868,7 +2913,20 @@
if dialog.ShowModal() == wx.ID_OK:
values = dialog.GetValues()
rect = step.GetRedrawRect(1, 1)
- step.SetName(values["name"])
+
+ new_name = values["name"]
+ if self.GetDrawingMode() == DRIVENDRAWING_MODE:
+ old_name = step.GetName().upper()
+ if new_name.upper() != old_name:
+ for block in self.Blocks.itervalues():
+ if isinstance(block, SFC_Jump):
+ if old_name == block.GetTarget().upper():
+ block.SetTarget(new_name)
+ block.RefreshModel()
+ rect = rect.Union(block.GetRedrawRect())
+ block.Refresh(rect)
+ step.SetName(new_name)
+
if values["input"]:
step.AddInput()
else:
@@ -2915,7 +2973,12 @@
dialog = wx.SingleChoiceDialog(self.ParentWindow,
_("Edit jump target"), _("Please choose a target"),
choices, wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
- dialog.SetSelection(choices.index(jump.GetTarget()))
+ try:
+ indx = choices.index(jump.GetTarget())
+ dialog.SetSelection(indx)
+ except ValueError:
+ pass
+
if dialog.ShowModal() == wx.ID_OK:
value = dialog.GetStringSelection()
rect = jump.GetRedrawRect(1, 1)
@@ -3216,6 +3279,17 @@
if element not in elements:
elements.append(element)
step.Clean()
+
+ if self.GetDrawingMode() == DRIVENDRAWING_MODE:
+ name = step.GetName().upper()
+ remove_jumps = []
+ for block in self.Blocks.itervalues():
+ if isinstance(block, SFC_Jump):
+ if name == block.GetTarget().upper():
+ remove_jumps.append(block)
+ for jump in remove_jumps:
+ self.DeleteJump(jump)
+
self.RemoveBlock(step)
self.Controler.RemoveEditedElementInstance(self.TagName, step.GetId())
for element in elements:
@@ -3399,22 +3473,16 @@
self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
self.SearchParams = search_params
- criteria = {
- "raw_pattern": search_params["find_pattern"],
- "pattern": re.compile(search_params["find_pattern"]),
- "case_sensitive": search_params["case_sensitive"],
- "regular_expression": search_params["regular_expression"],
- "filter": "all"}
-
self.SearchResults = []
blocks = []
- for infos, start, end, text in self.Controler.SearchInPou(self.TagName, criteria, self.Debug):
- if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]:
- self.SearchResults.append((infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT))
- else:
- block = self.Blocks.get(infos[2])
- if block is not None:
- blocks.append((block, (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT)))
+ for infos, start, end, text in self.Controler.SearchInPou(self.TagName, search_params, self.Debug):
+ if (infos[0] == self.TagName or self.TagName.split("::")[0] in ['A', 'T']) and infos[1] is not 'name':
+ if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]:
+ self.SearchResults.append((infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT))
+ else:
+ block = self.Blocks.get(infos[2])
+ if block is not None:
+ blocks.append((block, (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT)))
blocks.sort(sort_blocks)
self.SearchResults.extend([infos for block, infos in blocks])
self.CurrentFindHighlight = None
@@ -3592,13 +3660,16 @@
scalex, scaley = dc.GetUserScale()
dc.SetUserScale(1, 1)
- is_action = self.TagName.split("::")[0] == "A"
+ # is_action = self.TagName.split("::")[0] == "A"
text = _("Debug: %s") % self.InstancePath
- if is_action and self.Value is not None:
- text += " ("
+ '''if is_action and self.Value is not None:
+ text += " ("'''
text_offset_x, text_offset_y = self.CalcUnscrolledPosition(2, 2)
dc.DrawText(text, text_offset_x, text_offset_y)
- if is_action and self.Value is not None:
+ # TODO Fix self.Value in LD_Viewer instance.
+ # 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.
+ '''if is_action and self.Value is not None:
value_text = self.VALUE_TRANSLATION[self.Value]
tw, th = dc.GetTextExtent(text)
if self.Value:
@@ -3607,7 +3678,7 @@
if self.Value:
dc.SetTextForeground(wx.BLACK)
vw, vh = dc.GetTextExtent(value_text)
- dc.DrawText(")", text_offset_x + tw + vw + 2, text_offset_y)
+ dc.DrawText(")", text_offset_x + tw + vw + 2, text_offset_y)'''
dc.SetUserScale(scalex, scaley)
diff -r 6431f26aa501 -r 3291024e00da graphics/.cvsignore
--- a/graphics/.cvsignore Thu Feb 16 14:34:40 2017 +0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-*.pyc
diff -r 6431f26aa501 -r 3291024e00da graphics/DebugDataConsumer.py
--- a/graphics/DebugDataConsumer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/DebugDataConsumer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import datetime
diff -r 6431f26aa501 -r 3291024e00da graphics/FBD_Objects.py
--- a/graphics/FBD_Objects.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/FBD_Objects.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
@@ -902,7 +902,15 @@
else:
connectors["outputs"].append(self.Connector)
return connectors
-
+
+ def SpreadCurrent(self):
+ if self.Type == CONNECTOR:
+ continuations = self.Parent.GetContinuationByName(self.Name)
+ if continuations is not None:
+ value = self.Connector.ReceivingCurrent()
+ for cont in continuations:
+ cont.Connector.SpreadCurrent(value)
+
# Changes the variable type
def SetType(self, type):
if type != self.Type:
diff -r 6431f26aa501 -r 3291024e00da graphics/GraphicCommons.py
--- a/graphics/GraphicCommons.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/GraphicCommons.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
from math import *
@@ -1351,19 +1351,35 @@
self.Edge = edge
self.Negated = False
+ # assume that pointer is already inside of this connector
+ def ConnectionAvailable(self, direction=None, exclude=True):
+ wire_nums = len(self.Wires)
+
+ connector_free = (wire_nums<= 0)
+ connector_max_used = ((wire_nums > 0) and self.OneConnected)
+ if (self.Parent.CurrentLanguage in ["SFC", "LD"]) and (self.Type == "BOOL"):
+ connector_max_used = False;
+
+ # connector is available for new connection
+ connect = connector_free or not connector_max_used
+ return connect, connector_max_used
+
# Tests if the point given is near from the end point of this connector
- def TestPoint(self, pt, direction = None, exclude = True):
- parent_pos = self.ParentBlock.GetPosition()
- if (not (len(self.Wires) > 0 and self.OneConnected and exclude) or self.Type == "BOOL")\
- and direction is None or self.Direction == direction:
+ def TestPoint(self, pt, direction=None, exclude=True):
+ inside = False;
+ check_point = (not exclude) and (direction is None or self.Direction == direction);
+
+ if check_point:
# Calculate a square around the end point of this connector
+ parent_pos = self.ParentBlock.GetPosition()
x = parent_pos[0] + self.Pos.x + self.Direction[0] * CONNECTOR_SIZE - ANCHOR_DISTANCE
y = parent_pos[1] + self.Pos.y + self.Direction[1] * CONNECTOR_SIZE - ANCHOR_DISTANCE
width = ANCHOR_DISTANCE * 2 + abs(self.Direction[0]) * CONNECTOR_SIZE
height = ANCHOR_DISTANCE * 2 + abs(self.Direction[1]) * CONNECTOR_SIZE
rect = wx.Rect(x, y, width, height)
- return rect.InsideXY(pt.x, pt.y)
- return False
+ inside = rect.InsideXY(pt.x, pt.y);
+
+ return inside
# Draws the highlightment of this element if it is highlighted
def DrawHighlightment(self, dc):
@@ -1551,6 +1567,7 @@
self.OverEnd = False
self.ComputingType = False
self.Font = parent.GetMiniFont()
+ self.ErrHighlight = False
def GetDefinition(self):
if self.StartConnected is not None and self.EndConnected is not None:
@@ -2590,8 +2607,13 @@
def DrawHighlightment(self, dc):
scalex, scaley = dc.GetUserScale()
dc.SetUserScale(1, 1)
- dc.SetPen(MiterPen(HIGHLIGHTCOLOR, (2 * scalex + 5)))
- dc.SetBrush(wx.Brush(HIGHLIGHTCOLOR))
+ # If user trying to connect wire with wrong input, highlight will become red.
+ if self.ErrHighlight == True and not (self.EndConnected):
+ highlightcolor = wx.RED
+ else:
+ highlightcolor = HIGHLIGHTCOLOR
+ dc.SetPen(MiterPen(highlightcolor, (2 * scalex + 5)))
+ dc.SetBrush(wx.Brush(highlightcolor))
dc.SetLogicalFunction(wx.AND)
# Draw the start and end points if they are not connected or the mouse is over them
if len(self.Points) > 0 and (not self.StartConnected or self.OverStart):
@@ -2873,10 +2895,15 @@
wx.Point(self.Pos.x + self.Size[0], self.Pos.y + self.Size[1]),
wx.Point(self.Pos.x, self.Pos.y + self.Size[1])]
dc.DrawPolygon(polygon)
+
+ # dc.SetBrush call is workaround for the issue with wx.PrinterDC
+ # with wxPython 3.0 on GNU/Linux (don't remove it)
+ dc.SetBrush(wx.WHITE_BRUSH)
lines = [wx.Point(self.Pos.x + self.Size[0] - 10, self.Pos.y),
wx.Point(self.Pos.x + self.Size[0] - 10, self.Pos.y + 10),
wx.Point(self.Pos.x + self.Size[0], self.Pos.y + 10)]
dc.DrawLines(lines)
+
# Draws the comment content
y = self.Pos.y + 10
for idx, line in enumerate(self.Content.splitlines()):
diff -r 6431f26aa501 -r 3291024e00da graphics/LD_Objects.py
--- a/graphics/LD_Objects.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/LD_Objects.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da graphics/RubberBand.py
--- a/graphics/RubberBand.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/RubberBand.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da graphics/SFC_Objects.py
--- a/graphics/SFC_Objects.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/SFC_Objects.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da graphics/ToolTipProducer.py
--- a/graphics/ToolTipProducer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/ToolTipProducer.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import wx
diff -r 6431f26aa501 -r 3291024e00da graphics/__init__.py
--- a/graphics/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/graphics/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Package initialisation
@@ -29,4 +29,4 @@
from LD_Objects import *
from SFC_Objects import *
from RubberBand import RubberBand
-from DebugDataConsumer import DebugDataConsumer
\ No newline at end of file
+from DebugDataConsumer import DebugDataConsumer
diff -r 6431f26aa501 -r 3291024e00da i18n/Beremiz_ru_RU.po
--- a/i18n/Beremiz_ru_RU.po Thu Feb 16 14:34:40 2017 +0500
+++ b/i18n/Beremiz_ru_RU.po Thu Feb 16 14:35:12 2017 +0500
@@ -7,39 +7,17 @@
msgstr ""
"Project-Id-Version: Beremiz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-21 17:11+0300\n"
-"PO-Revision-Date: 2016-04-21 17:22+0300\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2017-01-12 14:39+0300\n"
+"PO-Revision-Date: 2017-01-12 14:41+0300\n"
+"Last-Translator: Andrey Skvortsov <andrej.skvortzov@gmail.com>\n"
"Language-Team: Andrey Skvortsov <andrej.skvortzov@gmail.com>\n"
"Language: ru_RU\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
-
-#: ../PLCOpenEditor.py:396
-msgid ""
-"\n"
-"An error has occurred.\n"
-"\n"
-"Click OK to save an error report.\n"
-"\n"
-"Please be kind enough to send this file to:\n"
-"edouard.tisserant@gmail.com\n"
-"\n"
-"Error:\n"
-msgstr ""
-"\n"
-"Произошла ошибка.\n"
-"\n"
-"Ðажмите OK, чтобы Ñохранить репорт об ошибке.\n"
-"\n"
-"Будьте так добры, пошлите Ñтот файл:\n"
-"edouard.tisserant@gmail.com\n"
-"\n"
-"Ошибка:\n"
-
-#: ../Beremiz.py:1155
+"X-Generator: Poedit 1.8.11\n"
+
+#: ../PLCOpenEditor.py:408 ../Beremiz.py:1191
#, python-format
msgid ""
"\n"
@@ -49,399 +27,427 @@
"Please be kind enough to send this file to:\n"
"beremiz-devel@lists.sourceforge.net\n"
"\n"
-"You should now restart Beremiz.\n"
+"You should now restart program.\n"
"\n"
"Traceback:\n"
msgstr ""
"\n"
-"Произошла невоÑÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° (bug). Отчет об ошибке Ñохранен:\n"
+"Произошла невоÑÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° (bug). Отчет об ошибке Ñохранен в:\n"
"(%s)\n"
"\n"
"Будьте добры, отправьте Ñтот файл по адреÑу\n"
"beremiz-devel@lists.sourceforge.net\n"
"\n"
-"Ð”Ð»Ñ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐµÐ¹ работы перезапуÑтите Beremiz.\n"
+"Ð”Ð»Ñ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐµÐ¹ работы перезапуÑтите программу.\n"
"\n"
"Traceback:\n"
#: ../controls/VariablePanel.py:72
msgid " External"
-msgstr "Внешний"
+msgstr " Внешний"
#: ../controls/VariablePanel.py:71
msgid " InOut"
-msgstr "Вход/Выход"
+msgstr " Вход/Выход"
#: ../controls/VariablePanel.py:71
msgid " Input"
-msgstr "Вход"
+msgstr " Вход"
#: ../controls/VariablePanel.py:72
msgid " Local"
-msgstr "Локальный"
+msgstr " Локальный"
#: ../controls/VariablePanel.py:71
msgid " Output"
-msgstr "Выход"
+msgstr " Выход"
#: ../controls/VariablePanel.py:73
msgid " Temp"
-msgstr "Временный"
-
-#: ../PLCOpenEditor.py:406
-msgid " : "
-msgstr ""
-
-#: ../dialogs/PouTransitionDialog.py:94 ../dialogs/ProjectDialog.py:66
+msgstr " Временный"
+
+#: ../dialogs/PouTransitionDialog.py:99 ../dialogs/ProjectDialog.py:66
#: ../dialogs/PouActionDialog.py:91 ../dialogs/PouDialog.py:113
#, python-format
msgid " and %s"
msgstr "и %s"
-#: ../ProjectController.py:1027
+#: ../ProjectController.py:1089
msgid " generation failed !\n"
msgstr "Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÐºÐ¾Ð´Ð°!\n"
-#: ../plcopen/plcopen.py:883
+#: ../plcopen/plcopen.py:881
#, python-format
msgid "\"%s\" Data Type doesn't exist !!!"
msgstr "Тип данных \"%s\" не ÑущеÑтвует!!!"
-#: ../plcopen/plcopen.py:901
+#: ../plcopen/plcopen.py:899
#, python-format
msgid "\"%s\" POU already exists !!!"
msgstr "POU \"%s\" уже ÑущеÑтвует!!!"
-#: ../plcopen/plcopen.py:922
+#: ../plcopen/plcopen.py:920
#, python-format
msgid "\"%s\" POU doesn't exist !!!"
msgstr "POU \"%s\" не найден!!!"
-#: ../editors/Viewer.py:242
+#: ../editors/Viewer.py:246
#, python-format
msgid "\"%s\" can't use itself!"
msgstr "\"%s\" не может иÑпользовать Ñам ÑебÑ!!!"
-#: ../IDEFrame.py:1615 ../IDEFrame.py:1634
+#: ../IDEFrame.py:1652 ../IDEFrame.py:1671
#, python-format
msgid "\"%s\" config already exists!"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ \"%s\" уже ÑущеÑтвует!!!"
-#: ../plcopen/plcopen.py:471
+#: ../plcopen/plcopen.py:467
#, python-format
msgid "\"%s\" configuration already exists !!!"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ \"%s\" уже ÑущеÑтвует!!!"
-#: ../IDEFrame.py:1569
+#: ../IDEFrame.py:1602
#, python-format
msgid "\"%s\" data type already exists!"
msgstr "Тип данных \"%s\" уже ÑущеÑтвует!!!"
-#: ../dialogs/PouTransitionDialog.py:105 ../dialogs/BlockPreviewDialog.py:219
-#: ../dialogs/PouActionDialog.py:102 ../editors/Viewer.py:258
-#: ../editors/Viewer.py:326 ../editors/Viewer.py:350 ../editors/Viewer.py:370
-#: ../editors/TextViewer.py:270 ../editors/TextViewer.py:299
-#: ../controls/VariablePanel.py:386
+#: ../dialogs/PouTransitionDialog.py:110 ../dialogs/BlockPreviewDialog.py:219
+#: ../dialogs/PouActionDialog.py:102 ../editors/Viewer.py:262
+#: ../editors/Viewer.py:330 ../editors/Viewer.py:354 ../editors/Viewer.py:374
+#: ../editors/TextViewer.py:272 ../editors/TextViewer.py:301
+#: ../controls/VariablePanel.py:396
#, python-format
msgid "\"%s\" element for this pou already exists!"
msgstr "Ðлемент Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\" уже ÑущеÑтвует в Ñтом POU!!!"
-#: ../Beremiz.py:962
+#: ../Beremiz.py:994
#, python-format
msgid "\"%s\" folder is not a valid Beremiz project\n"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ \"%s\" не ÑвлÑетÑÑ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð¾Ð¼ Beremiz\n"
-#: ../PLCGenerator.py:1091
-#, python-format
-msgid "\"%s\" function cancelled in \"%s\" POU: No input connected"
-msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ \"%s\" не иÑпользуетÑÑ Ð² POU \"%s\": входы не подключены"
-
-#: ../dialogs/SFCStepNameDialog.py:51 ../dialogs/PouTransitionDialog.py:101
-#: ../dialogs/BlockPreviewDialog.py:207 ../dialogs/PouNameDialog.py:49
+#: ../dialogs/SFCStepNameDialog.py:52 ../dialogs/PouTransitionDialog.py:106
+#: ../dialogs/BlockPreviewDialog.py:207 ../dialogs/PouNameDialog.py:50
#: ../dialogs/PouActionDialog.py:98 ../dialogs/PouDialog.py:120
-#: ../editors/DataTypeEditor.py:554 ../editors/DataTypeEditor.py:583
-#: ../editors/CodeFileEditor.py:750 ../controls/VariablePanel.py:733
-#: ../IDEFrame.py:1560
+#: ../editors/DataTypeEditor.py:555 ../editors/DataTypeEditor.py:584
+#: ../editors/CodeFileEditor.py:770 ../controls/VariablePanel.py:751
+#: ../IDEFrame.py:1593
#, python-format
msgid "\"%s\" is a keyword. It can't be used!"
msgstr "\"%s\" ÑвлÑетÑÑ ÐºÐ»ÑŽÑ‡ÐµÐ²Ñ‹Ð¼ Ñловом и не может быть иÑпользован!"
-#: ../editors/Viewer.py:246
-#, python-format
-msgid "\"%s\" is already used by \"%s\"!"
-msgstr "\"%s\" уже иÑпользуетÑÑ \"%s\"!"
-
-#: ../plcopen/plcopen.py:2405
+#: ../plcopen/plcopen.py:2412
#, python-format
msgid "\"%s\" is an invalid value!"
msgstr "\"%s\" недопуÑтимое значение!"
-#: ../PLCOpenEditor.py:332 ../PLCOpenEditor.py:369
+#: ../PLCOpenEditor.py:339 ../PLCOpenEditor.py:381
#, python-format
msgid "\"%s\" is not a valid folder!"
msgstr "\"%s\" не ÑвлÑетÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹!"
-#: ../dialogs/SFCStepNameDialog.py:49 ../dialogs/PouTransitionDialog.py:99
-#: ../dialogs/BlockPreviewDialog.py:203 ../dialogs/PouNameDialog.py:47
+#: ../dialogs/SFCStepNameDialog.py:50 ../dialogs/PouTransitionDialog.py:104
+#: ../dialogs/BlockPreviewDialog.py:203 ../dialogs/PouNameDialog.py:48
#: ../dialogs/PouActionDialog.py:96 ../dialogs/PouDialog.py:118
-#: ../editors/DataTypeEditor.py:578 ../editors/CodeFileEditor.py:748
-#: ../controls/VariablePanel.py:731 ../IDEFrame.py:1558
+#: ../editors/DataTypeEditor.py:579 ../editors/CodeFileEditor.py:768
+#: ../controls/VariablePanel.py:749 ../IDEFrame.py:1591
#, python-format
msgid "\"%s\" is not a valid identifier!"
msgstr "\"%s\" неверный идентификатор!"
-#: ../IDEFrame.py:2362
+#: ../IDEFrame.py:2396
#, python-format
msgid "\"%s\" is used by one or more POUs. Do you wish to continue?"
msgstr "\"%s\" иÑпользуетÑÑ Ð±Ð¾Ð»ÐµÐµ чем одним POU. Продолжить?"
#: ../dialogs/BlockPreviewDialog.py:211 ../dialogs/PouDialog.py:122
-#: ../editors/Viewer.py:256 ../editors/Viewer.py:311 ../editors/Viewer.py:341
-#: ../editors/Viewer.py:363 ../editors/TextViewer.py:268
-#: ../editors/TextViewer.py:297 ../editors/TextViewer.py:348
-#: ../editors/TextViewer.py:371 ../controls/VariablePanel.py:328
-#: ../IDEFrame.py:1578
+#: ../editors/Viewer.py:260 ../editors/Viewer.py:315 ../editors/Viewer.py:345
+#: ../editors/Viewer.py:367 ../editors/TextViewer.py:270
+#: ../editors/TextViewer.py:299 ../editors/TextViewer.py:350
+#: ../editors/TextViewer.py:373 ../controls/VariablePanel.py:338
+#: ../IDEFrame.py:1611
#, python-format
msgid "\"%s\" pou already exists!"
msgstr "POU \"%s\" уже ÑущеÑтвует!"
-#: ../plcopen/plcopen.py:495
-#, python-format
-msgid "\"%s\" resource already exists in \"%s\" configuration !!!"
-msgstr "РеÑÑƒÑ€Ñ \"%s\" уже ÑущеÑтвует в конфигурации \"%s\"!!!"
-
-#: ../plcopen/plcopen.py:512
-#, python-format
-msgid "\"%s\" resource doesn't exist in \"%s\" configuration !!!"
-msgstr "РеÑÑƒÑ€Ñ \"%s\" отÑутÑтвует в конфигурации \"%s\"!!!"
-
-#: ../dialogs/SFCStepNameDialog.py:57
+#: ../dialogs/SFCStepNameDialog.py:58
#, python-format
msgid "\"%s\" step already exists!"
msgstr "Шаг \"%s\" уже ÑущеÑтвует!"
-#: ../editors/DataTypeEditor.py:549
+#: ../editors/DataTypeEditor.py:550
#, python-format
msgid "\"%s\" value already defined!"
msgstr "\"%s\" значение уже задано!"
-#: ../dialogs/ArrayTypeDialog.py:97 ../editors/DataTypeEditor.py:744
+#: ../dialogs/ArrayTypeDialog.py:97 ../editors/DataTypeEditor.py:745
#, python-format
msgid "\"%s\" value isn't a valid array dimension!"
msgstr "\"%s\" не ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ размерноÑтью Ð´Ð»Ñ Ð¼Ð°ÑÑива! "
-#: ../dialogs/ArrayTypeDialog.py:103 ../editors/DataTypeEditor.py:751
+#: ../dialogs/ArrayTypeDialog.py:103 ../editors/DataTypeEditor.py:752
#, python-format
msgid ""
"\"%s\" value isn't a valid array dimension!\n"
"Right value must be greater than left value."
msgstr "\"%s\" не ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ размерноÑтью маÑÑива! Правое значение должно быть больше левого."
-#: ../editors/CodeFileEditor.py:663
-msgid "#"
-msgstr ""
+#: ../PLCGenerator.py:1101
+#, python-brace-format
+msgid "\"{a1}\" function cancelled in \"{a2}\" POU: No input connected"
+msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ \"{a1}\" не иÑпользуетÑÑ Ð² POU \"{a2}\": входы не подключены"
+
+#: ../editors/Viewer.py:250
+#, python-brace-format
+msgid "\"{a1}\" is already used by \"{a2}\"!"
+msgstr "\"{a1}\" уже иÑпользуетÑÑ \"{a2}\"!"
+
+#: ../plcopen/plcopen.py:491
+#, python-brace-format
+msgid "\"{a1}\" resource already exists in \"{a2}\" configuration !!!"
+msgstr "РеÑÑƒÑ€Ñ \"{a1}\" уже ÑущеÑтвует в конфигурации \"{a2}\"!!!"
+
+#: ../plcopen/plcopen.py:509
+#, python-brace-format
+msgid "\"{a1}\" resource doesn't exist in \"{a2}\" configuration !!!"
+msgstr "РеÑÑƒÑ€Ñ \"{a1}\" отÑутÑтвует в конфигурации \"{a2}\"!!!"
msgid "%(codefile_name)s"
msgstr "%(codefile_name)"
-#: ../PLCControler.py:970
-#, python-format
-msgid "%s \"%s\" can't be pasted as a %s."
-msgstr "%s \"%s\" не может быть вÑтавлен как %s."
-
-#: ../PLCControler.py:1530
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:578
+#, python-format
+msgid "%03gms"
+msgstr "%03gмÑ"
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:569
+#, python-format
+msgid "%dd"
+msgstr "%dд"
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:56
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:570
+#, python-format
+msgid "%dh"
+msgstr "%dч"
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:55
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:571
+#, python-format
+msgid "%dm"
+msgstr "%dм"
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:53
+#, python-format
+msgid "%dms"
+msgstr "%dмÑ"
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:54
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:572
+#, python-format
+msgid "%ds"
+msgstr "%dc"
+
+#: ../PLCControler.py:1531
#, python-format
msgid "%s Data Types"
msgstr "%s типы данных"
-#: ../PLCControler.py:1513
+#: ../PLCControler.py:1514
#, python-format
msgid "%s POUs"
msgstr "%s POU"
-#: ../canfestival/SlaveEditor.py:46 ../canfestival/NetworkEditor.py:67
+#: ../canfestival/SlaveEditor.py:69 ../canfestival/NetworkEditor.py:90
#, python-format
msgid "%s Profile"
msgstr "%s профиль"
-#: ../ConfigTreeNode.py:32
-#, python-format
-msgid ""
-"%s XML file doesn't follow XSD schema at line %d:\n"
-"%s"
-msgstr ""
-"%s XML файл не Ñледует XSD-Ñхеме в Ñтроке %d:\n"
-"%s"
-
-#: ../plcopen/plcopen.py:1638 ../plcopen/plcopen.py:1645
-#: ../plcopen/plcopen.py:1657 ../plcopen/plcopen.py:1665
-#: ../plcopen/plcopen.py:1675
+#: ../plcopen/plcopen.py:1645 ../plcopen/plcopen.py:1652
+#: ../plcopen/plcopen.py:1664 ../plcopen/plcopen.py:1672
+#: ../plcopen/plcopen.py:1682
#, python-format
msgid "%s body don't have instances!"
msgstr "Тело %s не Ñодержит ÑкземплÑров!"
-#: ../plcopen/plcopen.py:1693 ../plcopen/plcopen.py:1700
-#: ../plcopen/plcopen.py:1707
+#: ../plcopen/plcopen.py:1700 ../plcopen/plcopen.py:1707
+#: ../plcopen/plcopen.py:1714
#, python-format
msgid "%s body don't have text!"
msgstr "Тело %s не Ñодержит никакой текÑÑ‚!"
-#: ../IDEFrame.py:362
+#: ../IDEFrame.py:386
msgid "&Add Element"
msgstr "&Добавить Ñлемент"
-#: ../IDEFrame.py:332
+#: ../dialogs/AboutDialog.py:65 ../dialogs/AboutDialog.py:113
+#: ../dialogs/AboutDialog.py:150
+msgid "&Close"
+msgstr "&Закрыть"
+
+#: ../IDEFrame.py:356
msgid "&Configuration"
msgstr "&КонфигурациÑ"
-#: ../IDEFrame.py:321
+#: ../IDEFrame.py:345
msgid "&Data Type"
msgstr "&Типы данных"
-#: ../IDEFrame.py:366
+#: ../IDEFrame.py:390
msgid "&Delete"
msgstr "&Удалить"
-#: ../IDEFrame.py:313
+#: ../IDEFrame.py:337
msgid "&Display"
msgstr "&Вид"
-#: ../IDEFrame.py:312
+#: ../IDEFrame.py:336
msgid "&Edit"
msgstr "&Редактировать"
-#: ../IDEFrame.py:311
+#: ../IDEFrame.py:335
msgid "&File"
msgstr "&Файл"
-#: ../IDEFrame.py:323
+#: ../IDEFrame.py:347
msgid "&Function"
msgstr "&Функции"
-#: ../IDEFrame.py:314
+#: ../IDEFrame.py:338
msgid "&Help"
msgstr "&Помощь"
-#: ../IDEFrame.py:327
+#: ../dialogs/AboutDialog.py:64
+msgid "&License"
+msgstr "&ЛицензиÑ"
+
+#: ../IDEFrame.py:351
msgid "&Program"
msgstr "&Программы"
-#: ../PLCOpenEditor.py:119
+#: ../PLCOpenEditor.py:125
msgid "&Properties"
msgstr "&СвойÑтва"
-#: ../Beremiz.py:317
+#: ../Beremiz.py:324
msgid "&Recent Projects"
msgstr "&Ðедавние проекты"
-#: ../IDEFrame.py:329
+#: ../IDEFrame.py:353
msgid "&Resource"
msgstr "&РеÑурÑÑ‹"
-#: ../controls/SearchResultPanel.py:252
-#, python-format
-msgid "'%s' - %d match in project"
-msgstr "'%s'- %d Ñовпадений в проекте"
-
-#: ../controls/SearchResultPanel.py:254
-#, python-format
-msgid "'%s' - %d matches in project"
-msgstr "'%s' - %d Ñовпадений в проекте"
-
-#: ../connectors/PYRO/__init__.py:86
-#, python-format
-msgid "'%s' is located at %s\n"
-msgstr "'%s' находитÑÑ %s\n"
-
-#: ../controls/SearchResultPanel.py:304
+#: ../controls/SearchResultPanel.py:239
+#, python-brace-format
+msgid "'{a1}' - {a2} match in project"
+msgstr "'{a1}'- {a2} Ñовпадений в проекте"
+
+#: ../controls/SearchResultPanel.py:241
+#, python-brace-format
+msgid "'{a1}' - {a2} matches in project"
+msgstr "'{a1}' - {a2} Ñовпадений в проекте"
+
+#: ../connectors/PYRO/__init__.py:90
+#, python-brace-format
+msgid "'{a1}' is located at {a2}\n"
+msgstr "'{a1}' находитÑÑ {a2}\n"
+
+#: ../controls/SearchResultPanel.py:291
#, python-format
msgid "(%d matches)"
msgstr "(%d Ñовпадений)"
-#: ../PLCOpenEditor.py:384 ../PLCOpenEditor.py:386 ../PLCOpenEditor.py:387
+#: ../PLCOpenEditor.py:396 ../PLCOpenEditor.py:398 ../PLCOpenEditor.py:399
msgid ", "
-msgstr ""
-
-#: ../dialogs/PouTransitionDialog.py:96 ../dialogs/PouActionDialog.py:93
+msgstr ", "
+
+#: ../dialogs/PouTransitionDialog.py:101 ../dialogs/PouActionDialog.py:93
#: ../dialogs/PouDialog.py:115
#, python-format
msgid ", %s"
-msgstr ""
-
-#: ../PLCOpenEditor.py:382
+msgstr ", %s"
+
+#: ../PLCOpenEditor.py:394
msgid ". "
-msgstr ""
-
-#: ../controls/LogViewer.py:278
+msgstr ". "
+
+#: Extra TC6 documentation strings
+msgid "0 - current time, 1 - load time from PDT"
+msgstr "0 - текущее времÑ, 1 - отклонение от PDT"
+
+msgid "0 - manual , 1 - automatic"
+msgstr "0 - ручной, 1 - автоматичеÑкий"
+
+msgid "0 - track X0, 1 - ramp to/track X1"
+msgstr "0 - вход X0, 1 - нараÑтание до Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ X1"
+
+msgid "0 = reset"
+msgstr "0 = ÑброÑ"
+
+msgid "1 = integrate, 0 = hold"
+msgstr "1 = интегрировать, 0 = оÑтановка"
+
+#: ../controls/LogViewer.py:279
msgid "1d"
msgstr "1 день"
-#: ../controls/LogViewer.py:279
+#: ../controls/LogViewer.py:280
msgid "1h"
msgstr "1 чаÑ"
-#: ../controls/LogViewer.py:280
+#: ../controls/LogViewer.py:281
msgid "1m"
msgstr "1 мин"
-#: ../controls/LogViewer.py:281
+#: ../controls/LogViewer.py:282
msgid "1s"
msgstr "1 Ñек"
-#: ../dialogs/PouDialog.py:124 ../IDEFrame.py:1581 ../IDEFrame.py:1623
-#: ../IDEFrame.py:1642
+#: ../dialogs/PouDialog.py:124 ../IDEFrame.py:1614 ../IDEFrame.py:1660
+#: ../IDEFrame.py:1679
#, python-format
msgid "A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr "Ð’ POU приÑутÑтвует Ñлемент Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\". Ðто может вызвать конфликт. Хотите продолжить?"
-#: ../dialogs/SFCStepNameDialog.py:53 ../dialogs/PouTransitionDialog.py:103
-#: ../dialogs/PouNameDialog.py:51 ../dialogs/PouActionDialog.py:100
-#: ../controls/VariablePanel.py:735 ../IDEFrame.py:1593 ../IDEFrame.py:1604
+#: ../dialogs/SFCStepNameDialog.py:54 ../dialogs/PouTransitionDialog.py:108
+#: ../dialogs/PouNameDialog.py:52 ../dialogs/PouActionDialog.py:100
+#: ../controls/VariablePanel.py:753 ../IDEFrame.py:1628 ../IDEFrame.py:1641
#, python-format
msgid "A POU named \"%s\" already exists!"
msgstr "POU Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\" уже ÑущеÑтвует!"
-#: ../ConfigTreeNode.py:400
-#, python-format
-msgid "A child named \"%s\" already exist -> \"%s\"\n"
-msgstr "Дочерний Ñлемент Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\" уже ÑущеÑтвует -> \"%s\"\n"
-
-#: ../dialogs/BrowseLocationsDialog.py:211
+#: ../ConfigTreeNode.py:424
+#, python-brace-format
+msgid "A child named \"{a1}\" already exists -> \"{a2}\"\n"
+msgstr "Дочерний Ñлемент Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"{a1}\" уже ÑущеÑтвует -> \"{a2}\"\n"
+
+#: ../dialogs/BrowseLocationsDialog.py:216
msgid "A location must be selected!"
msgstr "Ðеобходимо выбрать размещение!"
-#: ../dialogs/SFCStepNameDialog.py:55 ../controls/VariablePanel.py:737
-#: ../IDEFrame.py:1595 ../IDEFrame.py:1606
+#: ../dialogs/SFCStepNameDialog.py:56 ../controls/VariablePanel.py:755
+#: ../IDEFrame.py:1630 ../IDEFrame.py:1643
#, python-format
msgid "A variable with \"%s\" as name already exists in this pou!"
msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\" уже ÑущеÑтвует в Ñтом POU!"
-#: ../editors/CodeFileEditor.py:754
+#: ../editors/CodeFileEditor.py:774
#, python-format
msgid "A variable with \"%s\" as name already exists!"
msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\" уже ÑущеÑтвует!"
-#: ../PLCOpenEditor.py:152 ../Beremiz.py:374
+#: ../dialogs/AboutDialog.py:40 ../PLCOpenEditor.py:158 ../Beremiz.py:381
msgid "About"
msgstr "О программе"
-#: ../Beremiz.py:997
-msgid "About Beremiz"
-msgstr "О Beremiz"
-
-#: ../PLCOpenEditor.py:346
-msgid "About PLCOpenEditor"
-msgstr "О PLCOpenEditor"
-
#: ../plcopen/iec_std.csv:22
msgid "Absolute number"
msgstr "ÐбÑолютный номер"
-#: ../dialogs/SFCStepDialog.py:71 ../dialogs/ActionBlockDialog.py:42
+#: ../dialogs/SFCStepDialog.py:72 ../dialogs/ActionBlockDialog.py:42
msgid "Action"
msgstr "ДейÑтвие"
-#: ../editors/Viewer.py:551 ../editors/Viewer.py:2069
+#: ../editors/Viewer.py:555 ../editors/Viewer.py:2345
msgid "Action Block"
msgstr "Блок дейÑтвиÑ"
@@ -453,7 +459,7 @@
msgid "Action Name:"
msgstr "Ð˜Ð¼Ñ Ð´ÐµÐ¹ÑтвиÑ:"
-#: ../plcopen/plcopen.py:1356
+#: ../plcopen/plcopen.py:1359
#, python-format
msgid "Action with name %s doesn't exist!"
msgstr "ДейÑтвие Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s не ÑущеÑтвует!"
@@ -466,72 +472,72 @@
msgid "Actions:"
msgstr "ДейÑтвиÑ:"
-#: ../editors/Viewer.py:1087
+#: ../editors/Viewer.py:1100
msgid "Active"
msgstr "Ðктивный"
-#: ../canfestival/SlaveEditor.py:57 ../canfestival/NetworkEditor.py:78
-#: ../editors/Viewer.py:584 ../Beremiz.py:1024
+#: ../canfestival/SlaveEditor.py:80 ../canfestival/NetworkEditor.py:101
+#: ../editors/Viewer.py:588 ../Beremiz.py:1060
msgid "Add"
msgstr "Добавить"
-#: ../IDEFrame.py:1856 ../IDEFrame.py:1891
+#: ../IDEFrame.py:1890 ../IDEFrame.py:1925
msgid "Add Action"
msgstr "Добавить дейÑтвие"
-#: ../features.py:8
+#: ../features.py:32
msgid "Add C code accessing located variables synchronously"
msgstr "Добавить C-код Ñ Ñинхронным доÑтупом к локальным переменным"
-#: ../IDEFrame.py:1839
+#: ../IDEFrame.py:1873
msgid "Add Configuration"
msgstr "Добавить конфигурацию"
-#: ../IDEFrame.py:1819
+#: ../IDEFrame.py:1853
msgid "Add DataType"
msgstr "Добавить тип данных"
-#: ../editors/Viewer.py:509
+#: ../editors/Viewer.py:513
msgid "Add Divergence Branch"
msgstr "Добавить ветвление"
-#: ../dialogs/DiscoveryDialog.py:115
+#: ../dialogs/DiscoveryDialog.py:116
msgid "Add IP"
msgstr "Добавить IP адреÑ"
-#: ../IDEFrame.py:1827
+#: ../IDEFrame.py:1861
msgid "Add POU"
msgstr "Добавить POU"
-#: ../features.py:9
+#: ../features.py:33
msgid "Add Python code executed asynchronously"
msgstr "Добавить аÑинхронно вызываемый код на Python"
-#: ../IDEFrame.py:1867 ../IDEFrame.py:1917
+#: ../IDEFrame.py:1901 ../IDEFrame.py:1951
msgid "Add Resource"
msgstr "Добавить реÑурÑ"
-#: ../IDEFrame.py:1845 ../IDEFrame.py:1888
+#: ../IDEFrame.py:1879 ../IDEFrame.py:1922
msgid "Add Transition"
msgstr "Добавить переход"
-#: ../editors/Viewer.py:496
+#: ../editors/Viewer.py:500
msgid "Add Wire Segment"
msgstr "Добавить провод"
-#: ../editors/SFCViewer.py:359
+#: ../editors/SFCViewer.py:433
msgid "Add a new initial step"
msgstr "Добавить новый иÑходный шаг"
-#: ../editors/Viewer.py:2672 ../editors/SFCViewer.py:696
+#: ../editors/Viewer.py:2706 ../editors/SFCViewer.py:770
msgid "Add a new jump"
msgstr "Добавить новый безуÑловный переход"
-#: ../editors/SFCViewer.py:381
+#: ../editors/SFCViewer.py:455
msgid "Add a new step"
msgstr "Добавить новый шаг"
-#: ../features.py:10
+#: ../features.py:34
msgid "Add a simple WxGlade based GUI."
msgstr "Добавить проÑтой GUI на WxGlade "
@@ -539,7 +545,7 @@
msgid "Add action"
msgstr "Добавить дейÑтвие"
-#: ../editors/DataTypeEditor.py:351
+#: ../editors/DataTypeEditor.py:352
msgid "Add element"
msgstr "Добавить Ñлемент"
@@ -547,7 +553,7 @@
msgid "Add instance"
msgstr "Добавить ÑкземплÑÑ€"
-#: ../canfestival/NetworkEditor.py:80
+#: ../canfestival/NetworkEditor.py:103
msgid "Add slave"
msgstr "Добавить ÑлÑйв"
@@ -555,7 +561,7 @@
msgid "Add task"
msgstr "Добавить задачу"
-#: ../editors/CodeFileEditor.py:640 ../controls/VariablePanel.py:440
+#: ../editors/CodeFileEditor.py:658 ../controls/VariablePanel.py:450
msgid "Add variable"
msgstr "Добавить переменную"
@@ -563,22 +569,22 @@
msgid "Addition"
msgstr "Сложение"
-#: ../plcopen/definitions.py:22
+#: ../plcopen/definitions.py:47
msgid "Additional function blocks"
msgstr "Дополнительные функциональные блоки"
-#: ../editors/Viewer.py:567
+#: ../editors/Viewer.py:571
msgid "Adjust Block Size"
msgstr "Скорректировать размер Ñлемента"
-#: ../editors/Viewer.py:1612
+#: ../editors/Viewer.py:1637
msgid "Alignment"
msgstr "Выравнивание"
-#: ../dialogs/BrowseLocationsDialog.py:34
-#: ../dialogs/BrowseLocationsDialog.py:42
-#: ../dialogs/BrowseLocationsDialog.py:135
-#: ../dialogs/BrowseLocationsDialog.py:138 ../controls/LogViewer.py:297
+#: ../dialogs/BrowseLocationsDialog.py:39
+#: ../dialogs/BrowseLocationsDialog.py:47
+#: ../dialogs/BrowseLocationsDialog.py:140
+#: ../dialogs/BrowseLocationsDialog.py:143 ../controls/LogViewer.py:298
#: ../controls/VariablePanel.py:70
msgid "All"
msgstr "Ð’Ñе"
@@ -587,11 +593,11 @@
msgid "All files (*.*)|*.*|CSV files (*.csv)|*.csv"
msgstr "Ð’Ñе файлы (*.*)|*.*|CSV files (*.csv)|*.csv"
-#: ../ProjectController.py:1523
+#: ../ProjectController.py:1623
msgid "Already connected. Please disconnect\n"
msgstr "Уже подключен. ПожалуйÑта, отключитеÑÑŒ Ñначала.\n"
-#: ../editors/DataTypeEditor.py:593
+#: ../editors/DataTypeEditor.py:594
#, python-format
msgid "An element named \"%s\" already exists in this structure!"
msgstr "Поле Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\" уже ÑущеÑтвует в данной Ñтруктуре!"
@@ -616,8 +622,8 @@
msgid "Arithmetic"
msgstr "Математика"
-#: ../editors/DataTypeEditor.py:54 ../editors/DataTypeEditor.py:634
-#: ../controls/VariablePanel.py:811
+#: ../editors/DataTypeEditor.py:54 ../editors/DataTypeEditor.py:635
+#: ../controls/VariablePanel.py:829
msgid "Array"
msgstr "МаÑÑив"
@@ -637,7 +643,10 @@
msgid "Author Name (optional):"
msgstr "Ð˜Ð¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð° (опционально):"
-#: ../dialogs/FindInPouDialog.py:78
+msgid "BUSY = 1 during ramping period"
+msgstr "BOSY = 1 во Ð²Ñ€ÐµÐ¼Ñ "
+
+#: ../dialogs/FindInPouDialog.py:79
msgid "Backward"
msgstr "Ðазад"
@@ -649,26 +658,26 @@
msgid "Bad domain name at "
msgstr "Ðеправильное доменное Ð¸Ð¼Ñ Ð²"
-#: ../canfestival/config_utils.py:342 ../canfestival/config_utils.py:624
+#: ../canfestival/config_utils.py:342 ../canfestival/config_utils.py:630
#, python-format
msgid "Bad location size : %s"
msgstr "Ðеправильный размер: %s"
-#: ../dialogs/ArrayTypeDialog.py:55 ../editors/DataTypeEditor.py:174
-#: ../editors/DataTypeEditor.py:204 ../editors/DataTypeEditor.py:296
+#: ../dialogs/ArrayTypeDialog.py:55 ../editors/DataTypeEditor.py:175
+#: ../editors/DataTypeEditor.py:205 ../editors/DataTypeEditor.py:297
msgid "Base Type:"
msgstr "Базовый тип:"
-#: ../editors/DataTypeEditor.py:624 ../controls/VariablePanel.py:769
+#: ../editors/DataTypeEditor.py:625 ../controls/VariablePanel.py:787
msgid "Base Types"
msgstr "Базовые типы"
msgid "BaseParams"
msgstr "Базовые параметры"
-#: ../Beremiz.py:527
+#: ../Beremiz.py:553
msgid "Beremiz"
-msgstr ""
+msgstr "Beremiz"
msgid "BeremizRoot"
msgstr "ÐаÑтройки Beremiz "
@@ -701,7 +710,7 @@
msgid "Bitwise inverting"
msgstr "Битовое ÐЕ"
-#: ../editors/Viewer.py:521 ../editors/Viewer.py:2073
+#: ../editors/Viewer.py:525 ../editors/Viewer.py:2358
msgid "Block"
msgstr "Блок"
@@ -709,69 +718,77 @@
msgid "Block Properties"
msgstr "СвойÑтва блока"
-#: ../editors/TextViewer.py:261
+#: ../editors/TextViewer.py:262
msgid "Block name"
msgstr "Ð˜Ð¼Ñ Ð±Ð»Ð¾ÐºÐ°"
-#: ../editors/Viewer.py:487
+#: ../editors/Viewer.py:491
msgid "Bottom"
msgstr "Ðиз"
+#: ../ProjectController.py:1301
+msgid "Broken"
+msgstr "Ошибка"
+
#: ../dialogs/BrowseValuesLibraryDialog.py:37
#, python-format
msgid "Browse %s values library"
-msgstr ""
-
-#: ../dialogs/BrowseLocationsDialog.py:60
+msgstr "Browse %s values library"
+
+#: ../dialogs/BrowseLocationsDialog.py:65
msgid "Browse Locations"
msgstr "ПроÑмотр директорий"
-#: ../ProjectController.py:1668
+#: ../ProjectController.py:1769
msgid "Build"
msgstr "Сборка"
-#: ../ProjectController.py:1166
+#: ../ProjectController.py:1235
msgid "Build directory already clean\n"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñборки уже пуÑта\n"
-#: ../ProjectController.py:1669
+#: ../ProjectController.py:1770
msgid "Build project into build folder"
msgstr "Сборка проекта в директории Ñборки"
-#: ../ProjectController.py:956
+#: ../ProjectController.py:1018
msgid "C Build crashed !\n"
msgstr "КрÑш во Ð²Ñ€ÐµÐ¼Ñ Ñборки C-кода!\n"
-#: ../ProjectController.py:953
+#: ../ProjectController.py:1015
msgid "C Build failed.\n"
msgstr "Ошибка Ñборки C-кода.\n"
-#: ../c_ext/CFileEditor.py:40
+#: ../c_ext/CFileEditor.py:63
msgid "C code"
msgstr "C код "
-#: ../ProjectController.py:1031
+#: ../ProjectController.py:1093
msgid "C code generated successfully.\n"
msgstr "C-код уÑпешно Ñгенерирован.\n"
-#: ../targets/toolchain_makefile.py:108
+#: ../targets/toolchain_makefile.py:122
msgid "C compilation failed.\n"
msgstr "Ошибка компилÑции.\n"
-#: ../targets/toolchain_gcc.py:132
+#: ../targets/toolchain_gcc.py:156
#, python-format
msgid "C compilation of %s failed.\n"
msgstr "Ошибка компилÑции %s.\n"
-#: ../features.py:8
+#: ../features.py:32
msgid "C extension"
msgstr "С-раÑширение"
-#: ../canfestival/NetworkEditor.py:29
+#: ../dialogs/AboutDialog.py:63
+msgid "C&redits"
+msgstr "&БлагодарноÑти"
+
+#: ../canfestival/NetworkEditor.py:52
msgid "CANOpen network"
msgstr "Сеть CANOpen"
-#: ../canfestival/SlaveEditor.py:21
+#: ../canfestival/SlaveEditor.py:44
msgid "CANOpen slave"
msgstr "CANOpen ведущий"
@@ -784,37 +801,37 @@
msgid "CAN_Driver"
msgstr "CAN драйвер"
-#: ../features.py:7
+#: ../features.py:31
msgid "CANopen support"
msgstr "Поддержка CANOpen"
msgid "CFLAGS"
-msgstr ""
-
-#: ../plcopen/plcopen.py:1580 ../plcopen/plcopen.py:1594
-#: ../plcopen/plcopen.py:1615 ../plcopen/plcopen.py:1631
+msgstr "CFLAGS"
+
+#: ../plcopen/plcopen.py:1584 ../plcopen/plcopen.py:1598
+#: ../plcopen/plcopen.py:1622 ../plcopen/plcopen.py:1638
msgid "Can only generate execution order on FBD networks!"
msgstr "Можно Ñгенерировать порÑдок иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ FBD!"
-#: ../controls/VariablePanel.py:259
+#: ../controls/VariablePanel.py:267
msgid "Can only give a location to local or global variables"
msgstr "Можно задать размещение только локальным или глобальным переменны"
-#: ../PLCOpenEditor.py:327
+#: ../PLCOpenEditor.py:334
#, python-format
msgid "Can't generate program to file %s!"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñгенерировать программу в файл %s!"
-#: ../controls/VariablePanel.py:257
+#: ../controls/VariablePanel.py:265
msgid "Can't give a location to a function block instance"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð´Ð°Ñ‚ÑŒ размещение Ð´Ð»Ñ ÑкземплÑра функционального блока"
-#: ../PLCOpenEditor.py:367
+#: ../PLCOpenEditor.py:379
#, python-format
msgid "Can't save project to file %s!"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñохранить проект в файл %s!"
-#: ../controls/VariablePanel.py:303
+#: ../controls/VariablePanel.py:313
msgid "Can't set an initial value to a function block instance"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð´Ð°Ñ‚ÑŒ иÑходное значение ÑкземплÑру функционального блока"
@@ -828,54 +845,54 @@
msgid "CanFestivalSlaveNode"
msgstr ""
-#: ../ConfigTreeNode.py:504
-#, python-format
-msgid "Cannot create child %s of type %s "
-msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñоздать дочерний Ñлемент %s типа %s"
-
-#: ../ConfigTreeNode.py:429
+#: ../ConfigTreeNode.py:529
+#, python-brace-format
+msgid "Cannot create child {a1} of type {a2} "
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñоздать дочерний Ñлемент {a1} типа {a2}"
+
+#: ../ConfigTreeNode.py:454
#, python-format
msgid "Cannot find lower free IEC channel than %d\n"
msgstr "Ðе удалоÑÑŒ найти Ñвободный ÐœÐК-канал Ñ Ð½Ð¾Ð¼ÐµÑ€Ð¾Ð¼ меньше чем %d\n"
-#: ../connectors/PYRO/__init__.py:127
+#: ../connectors/PYRO/__init__.py:131
msgid "Cannot get PLC status - connection failed.\n"
msgstr "Ðевозможно получить ÑоÑтоÑние ПЛК - ошибка подключениÑ.\n"
-#: ../ProjectController.py:817
+#: ../ProjectController.py:881
msgid "Cannot open/parse VARIABLES.csv!\n"
msgstr "Ðе удалоÑÑŒ открыть/прочитать VARIABLES.csv\n"
-#: ../canfestival/config_utils.py:372
-#, python-format
-msgid "Cannot set bit offset for non bool '%s' variable (ID:%d,Idx:%x,sIdx:%x))"
-msgstr "Ðевозможно уÑтановить битовое Ñмещение Ð´Ð»Ñ Ð½ÐµÐ±ÑƒÐ»ÐµÐ²Ð¾Ð¹ переменной '%s' (ID:%d,Idx:%x,sIdx:%x))"
-
-#: ../dialogs/SearchInProjectDialog.py:67 ../dialogs/FindInPouDialog.py:87
+#: ../canfestival/config_utils.py:374
+#, python-brace-format
+msgid "Cannot set bit offset for non bool '{a1}' variable (ID:{a2},Idx:{a3},sIdx:{a4}))"
+msgstr "Ðевозможно уÑтановить битовое Ñмещение Ð´Ð»Ñ Ð½ÐµÐ±ÑƒÐ»ÐµÐ²Ð¾Ð¹ переменной '{a1}' (ID:{a2},Idx:{a3},sIdx:{a4}))"
+
+#: ../dialogs/SearchInProjectDialog.py:59 ../dialogs/FindInPouDialog.py:88
msgid "Case sensitive"
msgstr "РегиÑтрозавиÑимый"
-#: ../editors/Viewer.py:482
+#: ../editors/Viewer.py:486
msgid "Center"
msgstr "Центр"
-#: ../Beremiz_service.py:245
+#: ../Beremiz_service.py:266
msgid "Change IP of interface to bind"
msgstr "Сменить IP-Ð°Ð´Ñ€ÐµÑ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñа Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ñзки Ñокета"
-#: ../Beremiz_service.py:244
+#: ../Beremiz_service.py:265
msgid "Change Name"
msgstr "Сменить имÑ"
-#: ../IDEFrame.py:1909
+#: ../IDEFrame.py:1943
msgid "Change POU Type To"
msgstr "Сменить тип POU на"
-#: ../Beremiz_service.py:246
+#: ../Beremiz_service.py:267
msgid "Change Port Number"
msgstr "Сменить номер порта"
-#: ../Beremiz_service.py:247
+#: ../Beremiz_service.py:268
msgid "Change working directory"
msgstr "Сменить рабочую директорию"
@@ -883,37 +900,37 @@
msgid "Character string"
msgstr "Строковые операции"
-#: ../svgui/svgui.py:101
+#: ../svgui/svgui.py:125
msgid "Choose a SVG file"
-msgstr "Выберете SVG-файл"
-
-#: ../ProjectController.py:420
+msgstr "Выберите SVG-файл"
+
+#: ../ProjectController.py:451
msgid "Choose a directory to save project"
-msgstr "Выберете директорию, чтобы Ñохранить проект"
-
-#: ../canfestival/canfestival.py:136 ../PLCOpenEditor.py:285
-#: ../PLCOpenEditor.py:317 ../PLCOpenEditor.py:361
+msgstr "Выберите директорию, чтобы Ñохранить проект"
+
+#: ../canfestival/canfestival.py:160 ../PLCOpenEditor.py:292
+#: ../PLCOpenEditor.py:324 ../PLCOpenEditor.py:373
msgid "Choose a file"
-msgstr "Выберете файл"
-
-#: ../Beremiz.py:899 ../Beremiz.py:934
+msgstr "Выберите файл"
+
+#: ../Beremiz.py:931 ../Beremiz.py:966
msgid "Choose a project"
-msgstr "Выберете проект"
+msgstr "Выберите проект"
#: ../dialogs/BrowseValuesLibraryDialog.py:42
#, python-format
msgid "Choose a value for %s:"
-msgstr "Выберете значение Ð´Ð»Ñ %s:"
-
-#: ../Beremiz_service.py:293
+msgstr "Выберите значение Ð´Ð»Ñ %s:"
+
+#: ../Beremiz_service.py:323
msgid "Choose a working directory "
-msgstr "Выберете рабочую директорию"
-
-#: ../ProjectController.py:334
+msgstr "Выберите рабочую директорию"
+
+#: ../ProjectController.py:358
msgid "Chosen folder doesn't contain a program. It's not a valid project!"
msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ Ñодержит программы. Ðто некорректный проект!"
-#: ../ProjectController.py:301
+#: ../ProjectController.py:325
msgid "Chosen folder isn't empty. You can't use it for a new project!"
msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ пуÑта и не может иÑпользоватьÑÑ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ проекта!"
@@ -921,7 +938,7 @@
msgid "Class"
msgstr "КлаÑÑ"
-#: ../controls/VariablePanel.py:431
+#: ../controls/VariablePanel.py:441
msgid "Class Filter:"
msgstr "Фильтр клаÑÑа:"
@@ -929,55 +946,55 @@
msgid "Class:"
msgstr "КлаÑÑ:"
-#: ../ProjectController.py:1672
+#: ../ProjectController.py:1773
msgid "Clean"
msgstr "ОчиÑтить"
-#: ../controls/LogViewer.py:317
+#: ../controls/LogViewer.py:318
msgid "Clean log messages"
msgstr "ОчиÑтить лог"
-#: ../ProjectController.py:1674
+#: ../ProjectController.py:1775
msgid "Clean project build folder"
msgstr "ОчиÑтить директорию Ñборки проекта"
-#: ../ProjectController.py:1163
+#: ../ProjectController.py:1232
msgid "Cleaning the build directory\n"
msgstr "ОчиÑтка директории Ñборки\n"
-#: ../IDEFrame.py:411
+#: ../IDEFrame.py:435
msgid "Clear Errors"
msgstr "ОчиÑтить ошибки"
-#: ../editors/Viewer.py:577
+#: ../editors/Viewer.py:582
msgid "Clear Execution Order"
msgstr "ОчиÑтить порÑдок иÑполнениÑ"
-#: ../dialogs/FindInPouDialog.py:110
+#: ../dialogs/SearchInProjectDialog.py:105 ../dialogs/FindInPouDialog.py:111
msgid "Close"
msgstr "Закрыть"
-#: ../PLCOpenEditor.py:192 ../Beremiz.py:667
+#: ../PLCOpenEditor.py:199 ../Beremiz.py:693
msgid "Close Application"
msgstr "Закрыть приложение"
-#: ../PLCOpenEditor.py:102 ../Beremiz.py:326 ../Beremiz.py:611
-#: ../IDEFrame.py:981
+#: ../PLCOpenEditor.py:108 ../Beremiz.py:333 ../Beremiz.py:637
+#: ../IDEFrame.py:1009
msgid "Close Project"
msgstr "Закрыть проект"
-#: ../PLCOpenEditor.py:100 ../Beremiz.py:324
+#: ../PLCOpenEditor.py:106 ../Beremiz.py:331
msgid "Close Tab"
msgstr "Закрыть вкладку"
-#: ../editors/Viewer.py:537 ../editors/Viewer.py:2084
+#: ../editors/Viewer.py:541 ../editors/Viewer.py:2366
msgid "Coil"
msgstr "Катушка"
msgid "Command"
msgstr "Комманда"
-#: ../editors/Viewer.py:557 ../editors/LDViewer.py:506
+#: ../editors/Viewer.py:561 ../editors/LDViewer.py:506
msgid "Comment"
msgstr "Комментарий"
@@ -1000,7 +1017,7 @@
msgid "Compiler"
msgstr "КомпилÑтор"
-#: ../ProjectController.py:609
+#: ../ProjectController.py:672
msgid "Compiling IEC Program into C code...\n"
msgstr "КомпилÑÑ†Ð¸Ñ ÐœÐК-программы в C-код...\n"
@@ -1008,15 +1025,15 @@
msgid "Concatenation"
msgstr "Объединение"
-#: ../editors/ConfTreeNodeEditor.py:206
+#: ../editors/ConfTreeNodeEditor.py:229
msgid "Config"
msgstr "КонфигурациÑ"
-#: ../editors/ProjectNodeEditor.py:13
+#: ../editors/ProjectNodeEditor.py:36
msgid "Config variables"
msgstr "Конфигурационные переменные"
-#: ../dialogs/SearchInProjectDialog.py:47
+#: ../dialogs/SearchInProjectDialog.py:39
msgid "Configuration"
msgstr "КонфигурациÑ"
@@ -1024,27 +1041,27 @@
msgid "Configurations"
msgstr "Конфигурации"
-#: ../editors/Viewer.py:303 ../editors/Viewer.py:333 ../editors/Viewer.py:355
-#: ../editors/TextViewer.py:289 ../editors/TextViewer.py:340
-#: ../editors/TextViewer.py:363 ../controls/VariablePanel.py:318
+#: ../editors/Viewer.py:307 ../editors/Viewer.py:337 ../editors/Viewer.py:359
+#: ../editors/TextViewer.py:291 ../editors/TextViewer.py:342
+#: ../editors/TextViewer.py:365 ../controls/VariablePanel.py:328
msgid "Confirm or change variable name"
msgstr "Подтвердить или поменÑÑ‚ÑŒ Ð¸Ð¼Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
-#: ../ProjectController.py:1687
+#: ../ProjectController.py:1788
msgid "Connect"
msgstr "ПодключитьÑÑ"
-#: ../ProjectController.py:1688
+#: ../ProjectController.py:1789
msgid "Connect to the target PLC"
msgstr "ПодключитьÑÑ Ðº целевому ПЛК"
-#: ../ProjectController.py:1212
+#: ../ProjectController.py:1292
#, python-format
msgid "Connected to URI: %s"
msgstr "Подключен к URI: %s"
-#: ../dialogs/SFCTransitionDialog.py:75 ../editors/Viewer.py:523
-#: ../editors/Viewer.py:2075
+#: ../dialogs/SFCTransitionDialog.py:76 ../editors/Viewer.py:527
+#: ../editors/Viewer.py:2359
msgid "Connection"
msgstr "Подключение"
@@ -1052,29 +1069,33 @@
msgid "Connection Properties"
msgstr "СвойÑтва подключение"
-#: ../ProjectController.py:1547
+#: ../ProjectController.py:1647
msgid "Connection canceled!\n"
msgstr "Подключение отменено!\n"
-#: ../ProjectController.py:1572
+#: ../ProjectController.py:1672
#, python-format
msgid "Connection failed to %s!\n"
msgstr "Ðеудачное подключение к %s!\n"
-#: ../connectors/PYRO/__init__.py:98
+#: ../connectors/PYRO/__init__.py:115 ../connectors/WAMP/__init__.py:111
+msgid "Connection lost!\n"
+msgstr "Подключение прервано!\n"
+
+#: ../connectors/PYRO/__init__.py:102
#, python-format
msgid "Connection to '%s' failed.\n"
msgstr "Ðеудачное подключение к %s!\n"
-#: ../dialogs/ConnectionDialog.py:64 ../editors/Viewer.py:1569
+#: ../dialogs/ConnectionDialog.py:64 ../editors/Viewer.py:1594
msgid "Connector"
msgstr "Коннектор"
-#: ../dialogs/SFCStepDialog.py:64
+#: ../dialogs/SFCStepDialog.py:65
msgid "Connectors:"
msgstr "Коннекторы:"
-#: ../Beremiz.py:436
+#: ../Beremiz.py:448
msgid "Console"
msgstr "КонÑоль"
@@ -1082,7 +1103,7 @@
msgid "Constant"
msgstr "КонÑтанта"
-#: ../editors/Viewer.py:533 ../editors/Viewer.py:2080
+#: ../editors/Viewer.py:537 ../editors/Viewer.py:2362
msgid "Contact"
msgstr "Контакт"
@@ -1090,7 +1111,7 @@
msgid "Content Description (optional):"
msgstr "ОпиÑание Ñодержимого (опционально):"
-#: ../dialogs/ConnectionDialog.py:65 ../editors/Viewer.py:1570
+#: ../dialogs/ConnectionDialog.py:65 ../editors/Viewer.py:1595
msgid "Continuation"
msgstr "Продолжение"
@@ -1110,12 +1131,12 @@
msgid "Conversion to time-of-day"
msgstr "Преобразование во Ð²Ñ€ÐµÐ¼Ñ Ñуток"
-#: ../editors/Viewer.py:593 ../controls/LogViewer.py:692 ../IDEFrame.py:346
-#: ../IDEFrame.py:401
+#: ../editors/Viewer.py:597 ../controls/LogViewer.py:693 ../IDEFrame.py:370
+#: ../IDEFrame.py:425
msgid "Copy"
msgstr "Копировать"
-#: ../IDEFrame.py:1896
+#: ../IDEFrame.py:1930
msgid "Copy POU"
msgstr "Копировать POU"
@@ -1127,55 +1148,62 @@
msgid "Copy file from right folder to left"
msgstr "Скопировать файл Ñ Ð¿Ñ€Ð°Ð²Ð¾Ð¹ директории в левую"
+msgid "Copy of IN"
+msgstr "ÐšÐ¾Ð¿Ð¸Ñ Ð²Ñ…Ð¾Ð´Ð° IN"
+
#: ../plcopen/iec_std.csv:28
msgid "Cosine"
msgstr "КоÑинуÑ"
-#: ../ConfigTreeNode.py:626
-#, python-format
+#: ../ConfigTreeNode.py:656
+#, python-brace-format
msgid ""
-"Could not add child \"%s\", type %s :\n"
-"%s\n"
+"Could not add child \"{a1}\", type {a2} :\n"
+"{a3}\n"
msgstr ""
-"Ðевозможно добавить дочерний Ñлемент \"%s\", тип %s:\n"
-"%s\n"
-
-#: ../py_ext/PythonFileCTNMixin.py:53
+"Ðевозможно добавить дочерний Ñлемент \"{a1}\", тип {a2}:\n"
+"{a3}\n"
+
+#: ../py_ext/PythonFileCTNMixin.py:77
#, python-format
msgid "Couldn't import old %s file."
msgstr "Ðевозможно импортировать Ñтарый файл %s."
-#: ../ConfigTreeNode.py:598
-#, python-format
+#: ../ConfigTreeNode.py:626
+#, python-brace-format
msgid ""
-"Couldn't load confnode base parameters %s :\n"
-" %s"
-msgstr "Ðевозможно загрузить базовые параметры confnode %s: %s"
-
-#: ../ConfigTreeNode.py:614 ../CodeFileTreeNode.py:99
-#, python-format
+"Couldn't load confnode base parameters {a1} :\n"
+" {a2}"
+msgstr ""
+"Ðевозможно загрузить базовые параметры confnode {a1}:\n"
+" {a2}"
+
+#: ../ConfigTreeNode.py:643 ../CodeFileTreeNode.py:124
+#, python-brace-format
msgid ""
-"Couldn't load confnode parameters %s :\n"
-" %s"
-msgstr "Ðевозможно загрузить параметры confnode %s: %s"
+"Couldn't load confnode parameters {a1} :\n"
+" {a2}"
+msgstr ""
+"Ðевозможно загрузить параметры confnode {a1}:\n"
+" {a2}"
#: ../PLCControler.py:946
msgid "Couldn't paste non-POU object."
msgstr "Ðевозможно вÑтавить не-POU."
-#: ../ProjectController.py:1486
+#: ../ProjectController.py:1589
msgid "Couldn't start PLC !\n"
msgstr "Ðевозможно запуÑтить ПЛК!\n"
-#: ../ProjectController.py:1494
+#: ../ProjectController.py:1597
msgid "Couldn't stop PLC !\n"
msgstr "Ðевозможно оÑтановить ПЛК!\n"
-#: ../ProjectController.py:1458
+#: ../ProjectController.py:1561
msgid "Couldn't stop debugger.\n"
msgstr "Ðевозможно оÑтановить отладчик.\n"
-#: ../svgui/svgui.py:23
+#: ../svgui/svgui.py:47
msgid "Create HMI"
msgstr "Создать HMI"
@@ -1187,71 +1215,79 @@
msgid "Create a new action"
msgstr "Создать новое дейÑтвие"
-#: ../IDEFrame.py:135
+#: ../IDEFrame.py:159
msgid "Create a new action block"
msgstr "Создать новый блок дейÑтвие"
-#: ../IDEFrame.py:84 ../IDEFrame.py:114 ../IDEFrame.py:147
+#: ../IDEFrame.py:108 ../IDEFrame.py:138 ../IDEFrame.py:171
msgid "Create a new block"
msgstr "Создать новый блок"
-#: ../IDEFrame.py:108
+#: ../IDEFrame.py:132
msgid "Create a new branch"
msgstr "Создать новое ветвление"
-#: ../IDEFrame.py:102
+#: ../IDEFrame.py:126
msgid "Create a new coil"
msgstr "Создать новую катушку"
-#: ../IDEFrame.py:78 ../IDEFrame.py:93 ../IDEFrame.py:123
+#: ../IDEFrame.py:102 ../IDEFrame.py:117 ../IDEFrame.py:147
msgid "Create a new comment"
msgstr "Создать новый комментарий"
-#: ../IDEFrame.py:87 ../IDEFrame.py:117 ../IDEFrame.py:150
+#: ../IDEFrame.py:111 ../IDEFrame.py:141 ../IDEFrame.py:174
msgid "Create a new connection"
msgstr "Создать новое подключение"
-#: ../IDEFrame.py:105 ../IDEFrame.py:156
+#: ../IDEFrame.py:129 ../IDEFrame.py:180
msgid "Create a new contact"
msgstr "Создать новый контакт"
-#: ../IDEFrame.py:138
+#: ../IDEFrame.py:162
msgid "Create a new divergence"
msgstr "Создать новое ветвление"
-#: ../dialogs/SFCDivergenceDialog.py:51
+#: ../dialogs/SFCDivergenceDialog.py:53
msgid "Create a new divergence or convergence"
msgstr "Создать новое ветвление или объединение"
-#: ../IDEFrame.py:126
+#: ../IDEFrame.py:150
msgid "Create a new initial step"
msgstr "Создать иÑходный шаг"
-#: ../IDEFrame.py:141
+#: ../IDEFrame.py:165
msgid "Create a new jump"
-msgstr "Создать новый переход"
-
-#: ../IDEFrame.py:96 ../IDEFrame.py:153
+msgstr "Создать новый безуÑловный переход"
+
+#: ../IDEFrame.py:120 ../IDEFrame.py:177
msgid "Create a new power rail"
msgstr "Создать новую линию питаниÑ"
-#: ../IDEFrame.py:99
+#: ../IDEFrame.py:123
msgid "Create a new rung"
msgstr "Создать новую цепь"
-#: ../IDEFrame.py:129
+#: ../IDEFrame.py:153
msgid "Create a new step"
msgstr "Создать новый шаг"
-#: ../dialogs/PouTransitionDialog.py:42 ../IDEFrame.py:132
+#: ../dialogs/PouTransitionDialog.py:47 ../IDEFrame.py:156
msgid "Create a new transition"
msgstr "Создать новый переход"
-#: ../IDEFrame.py:81 ../IDEFrame.py:111 ../IDEFrame.py:144
+#: ../IDEFrame.py:105 ../IDEFrame.py:135 ../IDEFrame.py:168
msgid "Create a new variable"
msgstr "Создать новую переменную"
-#: ../editors/Viewer.py:592 ../IDEFrame.py:344 ../IDEFrame.py:400
+#: ../dialogs/AboutDialog.py:105
+msgid "Credits"
+msgstr "БлагодарноÑти"
+
+#: ../Beremiz_service.py:432
+msgid "Current working directory :"
+msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ñ€Ð°Ð±Ð¾Ñ‡Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ :"
+
+#: ../editors/Viewer.py:596 ../IDEFrame.py:368 ../IDEFrame.py:424
msgid "Cut"
msgstr "Вырезать"
@@ -1267,15 +1303,15 @@
msgid "DEPRECATED"
msgstr "УСТÐРЕЛО"
-#: ../canfestival/SlaveEditor.py:53 ../canfestival/NetworkEditor.py:74
+#: ../canfestival/SlaveEditor.py:76 ../canfestival/NetworkEditor.py:97
msgid "DS-301 Profile"
msgstr "Профиль DS-301"
-#: ../canfestival/SlaveEditor.py:54 ../canfestival/NetworkEditor.py:75
+#: ../canfestival/SlaveEditor.py:77 ../canfestival/NetworkEditor.py:98
msgid "DS-302 Profile"
msgstr "Профиль DS-302"
-#: ../dialogs/SearchInProjectDialog.py:43
+#: ../dialogs/SearchInProjectDialog.py:35
msgid "Data Type"
msgstr "Тип данных"
@@ -1300,11 +1336,14 @@
msgid "Date subtraction"
msgstr "Вычитание дат"
+msgid "Datetime, current or relative to PDT"
+msgstr "Текущие дата и времÑ, абÑолютные или отноÑительные от PDT"
+
#: ../dialogs/DurationEditorDialog.py:43
msgid "Days:"
msgstr "Дни:"
-#: ../ProjectController.py:1594
+#: ../ProjectController.py:1694
msgid "Debug does not match PLC - stop/transfert/start to re-enable\n"
msgstr "ÐžÑ‚Ð»Ð°Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° не ÑоответÑтвует программе в ПЛК - оÑтановите/загрузите/запуÑтите, чтобы разрешить отладку\n"
@@ -1312,42 +1351,42 @@
msgid "Debug instance"
msgstr "Отладка ÑкземплÑра"
-#: ../editors/Viewer.py:1104 ../editors/Viewer.py:3596
+#: ../editors/Viewer.py:1117 ../editors/Viewer.py:3653
#, python-format
msgid "Debug: %s"
msgstr "Отладка: %s"
-#: ../ProjectController.py:1247
+#: ../ProjectController.py:1350
#, python-format
msgid "Debug: Unknown variable '%s'\n"
msgstr "Отладка: неизвеÑÑ‚Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ '%s'\n"
-#: ../ProjectController.py:1245
+#: ../ProjectController.py:1348
#, python-format
msgid "Debug: Unsupported type to debug '%s'\n"
msgstr "Отладка: неподдерживамый отладкой тип '%s'\n"
-#: ../IDEFrame.py:611
+#: ../IDEFrame.py:639
msgid "Debugger"
msgstr "Отладчик"
-#: ../ProjectController.py:1427
+#: ../ProjectController.py:1530
msgid "Debugger disabled\n"
msgstr "Отладчик запрещен\n"
-#: ../ProjectController.py:1591
+#: ../ProjectController.py:1691
msgid "Debugger ready\n"
msgstr "Отладчик готов\n"
-#: ../ProjectController.py:1460
+#: ../ProjectController.py:1563
msgid "Debugger stopped.\n"
msgstr "Отладчик оÑтановлен.\n"
-#: ../editors/Viewer.py:568 ../Beremiz.py:1028 ../IDEFrame.py:1925
+#: ../editors/Viewer.py:572 ../Beremiz.py:1064 ../IDEFrame.py:1959
msgid "Delete"
msgstr "Удалить"
-#: ../editors/Viewer.py:510
+#: ../editors/Viewer.py:514
msgid "Delete Divergence Branch"
msgstr "Удалить ветвь"
@@ -1355,7 +1394,7 @@
msgid "Delete File"
msgstr "Удалить файл"
-#: ../editors/Viewer.py:497
+#: ../editors/Viewer.py:501
msgid "Delete Wire Segment"
msgstr "Удалить Ñегмент цепи"
@@ -1367,35 +1406,29 @@
msgid "Deletion (within)"
msgstr "Удаление подÑтроки"
-#: ../editors/DataTypeEditor.py:152
+#: ../editors/DataTypeEditor.py:153
msgid "Derivation Type:"
msgstr "Механизм ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ‚Ð¸Ð¿Ð°:"
-#: ../plcopen/definitions.py:41
-msgid ""
-"Derivative\n"
-"The derivative function block produces an output XOUT proportional to the rate of change of the input XIN."
-msgstr ""
-"ПроизводнаÑ\n"
-"Функциональный блок формирует выход XOUT пропорционально чаÑтоте Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñ…Ð¾Ð´Ð° XIN."
-
-#: ../editors/CodeFileEditor.py:664
-msgid "Description"
-msgstr "ОпиÑание"
-
-#: ../controls/VariablePanel.py:422
+msgid "Derivative time constant"
+msgstr "ПоÑтоÑÐ½Ð½Ð°Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ дифференцированиÑ"
+
+#: ../controls/VariablePanel.py:432
msgid "Description:"
msgstr "ОпиÑание:"
-#: ../dialogs/ArrayTypeDialog.py:61 ../editors/DataTypeEditor.py:320
+msgid "Differentiated output"
+msgstr "Дифференцированный выход"
+
+#: ../dialogs/ArrayTypeDialog.py:61 ../editors/DataTypeEditor.py:321
msgid "Dimensions:"
msgstr "Размеры:"
-#: ../dialogs/FindInPouDialog.py:67
+#: ../dialogs/FindInPouDialog.py:68
msgid "Direction"
-msgstr "Ðеправление"
-
-#: ../dialogs/BrowseLocationsDialog.py:85
+msgstr "Ðаправление"
+
+#: ../dialogs/BrowseLocationsDialog.py:90
msgid "Direction:"
msgstr "Ðаправление:"
@@ -1406,15 +1439,19 @@
msgid "Disable_Extensions"
msgstr "Запретить раÑширениÑ"
-#: ../ProjectController.py:1696
+#: ../ProjectController.py:1797
msgid "Disconnect"
msgstr "ОтключитьÑÑ"
-#: ../ProjectController.py:1698
+#: ../ProjectController.py:1799
msgid "Disconnect from PLC"
msgstr "ОтключитьÑÑ Ð¾Ñ‚ ПЛК"
-#: ../editors/Viewer.py:552 ../editors/Viewer.py:2061
+#: ../ProjectController.py:1302
+msgid "Disconnected"
+msgstr "Отключено"
+
+#: ../editors/Viewer.py:556 ../editors/Viewer.py:2354
msgid "Divergence"
msgstr "Ветвление"
@@ -1431,27 +1468,19 @@
msgid "Documentation"
msgstr "ОпиÑание"
-#: ../PLCOpenEditor.py:321
+#: ../PLCOpenEditor.py:328
msgid "Done"
msgstr "Завершено"
-#: ../plcopen/definitions.py:34
-msgid ""
-"Down-counter\n"
-"The down-counter can be used to signal when a count has reached zero, on counting down from a preset value."
-msgstr ""
-"Декрементный Ñчетчик\n"
-"Декрементный Ñчетчик может иÑпользоватьÑÑ, когда необходимо Ñигнализировать, что Ñчетчик доÑтиг нулевого Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ Ð¸Ñходного заданного значениÑ."
-
#: ../dialogs/ActionBlockDialog.py:38
msgid "Duration"
msgstr "ДлительноÑÑ‚ÑŒ"
-#: ../canfestival/canfestival.py:139
+#: ../canfestival/canfestival.py:163
msgid "EDS files (*.eds)|*.eds|All files|*.*"
msgstr "Файлы EDS (*.eds)|*.eds|All files|*.*"
-#: ../editors/Viewer.py:566
+#: ../editors/Viewer.py:570
msgid "Edit Block"
msgstr "Редактировать блок"
@@ -1467,11 +1496,11 @@
msgid "Edit Duration"
msgstr "Редактировать длительноÑÑ‚ÑŒ"
-#: ../dialogs/SFCStepDialog.py:49
+#: ../dialogs/SFCStepDialog.py:50
msgid "Edit Step"
msgstr "Редактировать шаг"
-#: ../wxglade_hmi/wxglade_hmi.py:12
+#: ../wxglade_hmi/wxglade_hmi.py:36
msgid "Edit a WxWidgets GUI with WXGlade"
msgstr "Редактировать WxWidgets GUI Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ WXGlade"
@@ -1483,7 +1512,7 @@
msgid "Edit array type properties"
msgstr "Редактировать ÑвойÑтва маÑÑива"
-#: ../editors/Viewer.py:2541 ../editors/Viewer.py:2952
+#: ../editors/Viewer.py:2575 ../editors/Viewer.py:3004
msgid "Edit comment"
msgstr "Редактировать комментарий"
@@ -1495,50 +1524,57 @@
msgid "Edit item"
msgstr "Редактировать Ñлемент"
-#: ../editors/Viewer.py:2916
+#: ../editors/Viewer.py:2963
msgid "Edit jump target"
msgstr "Редактирование безуÑловного перехода"
-#: ../ProjectController.py:1710
+#: ../ProjectController.py:1811
msgid "Edit raw IEC code added to code generated by PLCGenerator"
msgstr "Редактировать ÐœÐК-код добавленный к коду Ñгенерированному PLCGenerator"
-#: ../editors/SFCViewer.py:725
+#: ../editors/SFCViewer.py:799
msgid "Edit step name"
msgstr "Редактировать Ð¸Ð¼Ñ ÑˆÐ°Ð³Ð°"
-#: ../dialogs/SFCTransitionDialog.py:50
+#: ../dialogs/SFCTransitionDialog.py:51
msgid "Edit transition"
msgstr "Редактировать переход"
-#: ../IDEFrame.py:583
+#: ../IDEFrame.py:611
msgid "Editor ToolBar"
msgstr "Редактор панели инÑтрументов"
-#: ../ProjectController.py:1126
+#: ../ProjectController.py:1195
msgid "Editor selection"
msgstr "Редактор выделениÑ"
-#: ../editors/DataTypeEditor.py:347
+msgid "Elapsed time of ramp"
+msgstr "Прошедшее Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ€Ð°ÑтаниÑ"
+
+#: ../editors/DataTypeEditor.py:348
msgid "Elements :"
msgstr "Ðлементы:"
-#: ../IDEFrame.py:341
+#: ../ProjectController.py:1300
+msgid "Empty"
+msgstr "Ðет программы"
+
+#: ../IDEFrame.py:365
msgid "Enable Undo/Redo"
msgstr "Разрешить отмену и повтор операций"
msgid "Enabled"
msgstr "Разрешено"
-#: ../Beremiz_service.py:299
+#: ../Beremiz_service.py:331
msgid "Enter a name "
msgstr "Введите имÑ"
-#: ../Beremiz_service.py:286
+#: ../Beremiz_service.py:316
msgid "Enter a port number "
msgstr "Введите номер порта"
-#: ../Beremiz_service.py:277
+#: ../Beremiz_service.py:307
msgid "Enter the IP of the interface to bind"
msgstr "Введите IP-Ð°Ð´Ñ€ÐµÑ Ð¸Ñпользуемого интерфейÑа"
@@ -1551,66 +1587,67 @@
msgstr "Равно"
#: ../dialogs/ForceVariableDialog.py:179
-#: ../dialogs/SearchInProjectDialog.py:157 ../dialogs/SFCStepNameDialog.py:59
+#: ../dialogs/SearchInProjectDialog.py:168 ../dialogs/SFCStepNameDialog.py:60
#: ../dialogs/DurationEditorDialog.py:121
-#: ../dialogs/DurationEditorDialog.py:163 ../dialogs/PouTransitionDialog.py:107
+#: ../dialogs/DurationEditorDialog.py:163 ../dialogs/PouTransitionDialog.py:112
#: ../dialogs/BlockPreviewDialog.py:236 ../dialogs/ProjectDialog.py:71
#: ../dialogs/ArrayTypeDialog.py:97 ../dialogs/ArrayTypeDialog.py:103
-#: ../dialogs/PouNameDialog.py:53 ../dialogs/BrowseLocationsDialog.py:211
+#: ../dialogs/PouNameDialog.py:54 ../dialogs/BrowseLocationsDialog.py:216
#: ../dialogs/BrowseValuesLibraryDialog.py:83 ../dialogs/PouActionDialog.py:104
-#: ../dialogs/PouDialog.py:134 ../PLCOpenEditor.py:328 ../PLCOpenEditor.py:333
-#: ../PLCOpenEditor.py:407 ../PLCOpenEditor.py:417 ../editors/Viewer.py:419
+#: ../dialogs/PouDialog.py:134 ../PLCOpenEditor.py:335 ../PLCOpenEditor.py:340
+#: ../PLCOpenEditor.py:420 ../PLCOpenEditor.py:430 ../editors/Viewer.py:423
#: ../editors/LDViewer.py:666 ../editors/LDViewer.py:882
-#: ../editors/LDViewer.py:886 ../editors/DataTypeEditor.py:549
-#: ../editors/DataTypeEditor.py:554 ../editors/DataTypeEditor.py:578
-#: ../editors/DataTypeEditor.py:583 ../editors/DataTypeEditor.py:593
-#: ../editors/DataTypeEditor.py:744 ../editors/DataTypeEditor.py:751
-#: ../editors/TextViewer.py:387 ../editors/CodeFileEditor.py:763
-#: ../ProjectController.py:269 ../controls/FolderTree.py:217
+#: ../editors/LDViewer.py:886 ../editors/DataTypeEditor.py:550
+#: ../editors/DataTypeEditor.py:555 ../editors/DataTypeEditor.py:579
+#: ../editors/DataTypeEditor.py:584 ../editors/DataTypeEditor.py:594
+#: ../editors/DataTypeEditor.py:745 ../editors/DataTypeEditor.py:752
+#: ../editors/TextViewer.py:389 ../editors/CodeFileEditor.py:783
+#: ../ProjectController.py:293 ../ProjectController.py:421
+#: ../ProjectController.py:428 ../controls/FolderTree.py:217
#: ../controls/DebugVariablePanel/DebugVariablePanel.py:166
#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:137
-#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:225
-#: ../controls/VariablePanel.py:392 ../controls/VariablePanel.py:754
-#: ../Beremiz.py:1167 ../IDEFrame.py:975 ../IDEFrame.py:1581
-#: ../IDEFrame.py:1618 ../IDEFrame.py:1623 ../IDEFrame.py:1637
-#: ../IDEFrame.py:1642 ../Beremiz_service.py:190
+#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:231
+#: ../controls/VariablePanel.py:402 ../controls/VariablePanel.py:772
+#: ../Beremiz.py:1203 ../IDEFrame.py:1003 ../IDEFrame.py:1614
+#: ../IDEFrame.py:1655 ../IDEFrame.py:1660 ../IDEFrame.py:1674
+#: ../IDEFrame.py:1679 ../Beremiz_service.py:211
msgid "Error"
msgstr "Ошибка"
-#: ../ProjectController.py:663
+#: ../ProjectController.py:727
msgid "Error : At least one configuration and one resource must be declared in PLC !\n"
msgstr "Ошибка: Как минимум одна ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¸ один реÑÑƒÑ€Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ быть задекларированы в ПЛК!\n"
-#: ../ProjectController.py:655
+#: ../ProjectController.py:719
#, python-format
msgid "Error : IEC to C compiler returned %d\n"
msgstr "Ошибка: компилÑтор ÐœÐК в C вернул код ошибки %d\n"
-#: ../ProjectController.py:589
+#: ../ProjectController.py:621
#, python-format
msgid ""
"Error in ST/IL/SFC code generator :\n"
"%s\n"
msgstr "Ошибка в ST/IL/SFC кодогенераторе: %s\n"
-#: ../ConfigTreeNode.py:192
+#: ../ConfigTreeNode.py:216
#, python-format
msgid "Error while saving \"%s\"\n"
msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ \"%s\"\n"
-#: ../canfestival/canfestival.py:144
+#: ../canfestival/canfestival.py:168
msgid "Error: Export slave failed\n"
msgstr "Ошибка: неудачный ÑкÑпорт ведомого\n"
-#: ../canfestival/canfestival.py:345
+#: ../canfestival/canfestival.py:369
msgid "Error: No Master generated\n"
msgstr "Ошибка: маÑтер не Ñгенерирован\n"
-#: ../canfestival/canfestival.py:340
+#: ../canfestival/canfestival.py:364
msgid "Error: No PLC built\n"
msgstr "Ошибка: ПЛК не Ñобран\n"
-#: ../ProjectController.py:1566
+#: ../ProjectController.py:1666
#, python-format
msgid "Exception while connecting %s!\n"
msgstr "ИÑключение во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ %s!\n"
@@ -1623,7 +1660,7 @@
msgid "Execution Order:"
msgstr "ПорÑдок иÑполнениÑ:"
-#: ../features.py:11
+#: ../features.py:35
msgid "Experimental web based HMI"
msgstr "ÐкÑпериментальный WEB-HMI"
@@ -1635,7 +1672,7 @@
msgid "Exponentiation"
msgstr "ВзÑтие ÑкÑпоненты"
-#: ../canfestival/canfestival.py:150
+#: ../canfestival/canfestival.py:174
msgid "Export CanOpen slave to EDS file"
msgstr "ÐкÑпортировать CanOpen ведомое уÑтройÑтво в EDS файл"
@@ -1643,7 +1680,7 @@
msgid "Export graph values to clipboard"
msgstr "ÐкÑпортировать график значений в буфер обмена"
-#: ../canfestival/canfestival.py:149
+#: ../canfestival/canfestival.py:173
msgid "Export slave"
msgstr "ÐкÑпортировать ведомое уÑтройÑтво"
@@ -1655,35 +1692,38 @@
msgid "External"
msgstr "Внешний"
-#: ../ProjectController.py:676
+#: ../ProjectController.py:740
msgid "Extracting Located Variables...\n"
msgstr "ÐкÑпорт локальных переменных...\n"
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
+msgid "FB for derivative term"
+msgstr "ФБ дифференцированиÑ"
+
+msgid "FB for integral term"
+msgstr "ФД интегрированиÑ"
+
+#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:31
#: ../dialogs/PouDialog.py:36 ../controls/ProjectPropertiesPanel.py:143
msgid "FBD"
-msgstr ""
-
-#: ../ProjectController.py:1629
+msgstr "FBD"
+
+#: ../ProjectController.py:1729
msgid "Failed : Must build before transfer.\n"
msgstr "Ошибка: необходима Ñборка перед передачей.\n"
-#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:458
+#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:462
msgid "Falling Edge"
msgstr "Спадающий фронт"
-#: ../plcopen/definitions.py:32
-msgid ""
-"Falling edge detector\n"
-"The output produces a single pulse when a falling edge is detected."
-msgstr ""
-"Детектор падающего фронта\n"
-"Ðа выходе формируетÑÑ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ð¹ импульÑ, еÑли обнаружен падающий фронт."
-
-#: ../ProjectController.py:946
+#: ../ProjectController.py:1008
msgid "Fatal : cannot get builder.\n"
msgstr "Ошибка: невозможно получить Ñборщик.\n"
+#: ../Beremiz.py:118
+#, python-format
+msgid "Fetching %s"
+msgstr "Проверка %s"
+
#: ../dialogs/DurationEditorDialog.py:160
#, python-format
msgid "Field %s hasn't a valid value!"
@@ -1699,16 +1739,16 @@
msgid "File '%s' already exists!"
msgstr "Файл '%s' уже ÑущеÑтвует!"
-#: ../dialogs/FindInPouDialog.py:35 ../dialogs/FindInPouDialog.py:105
-#: ../IDEFrame.py:351
+#: ../dialogs/SearchInProjectDialog.py:100 ../dialogs/FindInPouDialog.py:36
+#: ../dialogs/FindInPouDialog.py:106 ../IDEFrame.py:375
msgid "Find"
msgstr "ПоиÑк"
-#: ../IDEFrame.py:353
+#: ../IDEFrame.py:377
msgid "Find Next"
msgstr "ПоиÑк Ñледующего"
-#: ../IDEFrame.py:355
+#: ../IDEFrame.py:379
msgid "Find Previous"
msgstr "ПоиÑк предыдущего"
@@ -1720,11 +1760,11 @@
msgid "Find:"
msgstr "ПоиÑк:"
-#: ../connectors/PYRO/__init__.py:159
+#: ../connectors/PYRO/__init__.py:163
msgid "Force runtime reload\n"
msgstr "Принудительный перезапуÑк ÑиÑтемы иÑполнениÑ\n"
-#: ../editors/Viewer.py:1528
+#: ../editors/Viewer.py:1553
msgid "Force value"
msgstr "ФикÑировать значение"
@@ -1732,44 +1772,40 @@
msgid "Forcing Variable Value"
msgstr "ФорÑировать значение переменной"
-#: ../dialogs/SFCTransitionDialog.py:178 ../dialogs/PouTransitionDialog.py:97
+#: ../dialogs/SFCTransitionDialog.py:179 ../dialogs/PouTransitionDialog.py:102
#: ../dialogs/ProjectDialog.py:70 ../dialogs/PouActionDialog.py:94
#: ../dialogs/PouDialog.py:116
#, python-format
msgid "Form isn't complete. %s must be filled!"
msgstr "Форма заполнена неполноÑтью. %s должен быть заполнен!"
-#: ../dialogs/SFCStepDialog.py:141 ../dialogs/FBDBlockDialog.py:232
+#: ../dialogs/SFCStepDialog.py:144 ../dialogs/FBDBlockDialog.py:232
#: ../dialogs/ConnectionDialog.py:160
msgid "Form isn't complete. Name must be filled!"
msgstr "Форма заполнена неполноÑтью. Ð˜Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ быть заполнено!"
-#: ../dialogs/SearchInProjectDialog.py:145
-msgid "Form isn't complete. Pattern to search must be filled!"
-msgstr "Форма заполнена неполноÑтью. Шаблон поиÑка должен быть заполнен!"
-
#: ../dialogs/FBDBlockDialog.py:228
msgid "Form isn't complete. Valid block type must be selected!"
msgstr "Форма заполнена неполноÑтью. Должен быть выбран корректный тип блока!"
-#: ../dialogs/FindInPouDialog.py:73
+#: ../dialogs/FindInPouDialog.py:74
msgid "Forward"
msgstr "Вперед"
-#: ../dialogs/SearchInProjectDialog.py:44 ../IDEFrame.py:1712
+#: ../dialogs/SearchInProjectDialog.py:36 ../IDEFrame.py:1746
msgid "Function"
msgstr "ФункциÑ"
-#: ../IDEFrame.py:325
+#: ../IDEFrame.py:349
msgid "Function &Block"
msgstr "Функциональный &блок"
-#: ../dialogs/SearchInProjectDialog.py:45 ../IDEFrame.py:1711
-#: ../IDEFrame.py:1904
+#: ../dialogs/SearchInProjectDialog.py:37 ../IDEFrame.py:1745
+#: ../IDEFrame.py:1938
msgid "Function Block"
msgstr "Функциональный блок"
-#: ../controls/VariablePanel.py:807
+#: ../controls/VariablePanel.py:825
msgid "Function Block Types"
msgstr "Типы функциональных блоков"
@@ -1777,11 +1813,11 @@
msgid "Function Blocks"
msgstr "Функциональные блоки"
-#: ../editors/Viewer.py:244
+#: ../editors/Viewer.py:248
msgid "Function Blocks can't be used in Functions!"
msgstr "Функциональные блоки не могут иÑпользоватьÑÑ Ð² функциÑÑ…!"
-#: ../PLCControler.py:2336
+#: ../PLCControler.py:2337
#, python-format
msgid "FunctionBlock \"%s\" can't be pasted in a Function!!!"
msgstr "Функциональный блок \"%s\" не может быть вÑтавлен в функцию!!!"
@@ -1790,16 +1826,16 @@
msgid "Functions"
msgstr "Функции"
-#: ../PLCOpenEditor.py:109
+#: ../PLCOpenEditor.py:115
msgid "Generate Program"
msgstr "Сгенерировать программу"
-#: ../ProjectController.py:580
+#: ../ProjectController.py:612
msgid "Generating SoftPLC IEC-61131 ST/IL/SFC code...\n"
msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÐœÐК-61131 ST/IL/SFC кода ПЛК...\n"
msgid "Generic"
-msgstr ""
+msgstr "Generic"
#: ../controls/VariablePanel.py:73
msgid "Global"
@@ -1825,6 +1861,10 @@
msgid "Grid Resolution:"
msgstr "Шаг Ñетки:"
+#: ../runtime/NevowServer.py:181
+msgid "HTTP interface port :"
+msgstr "Порт HTTP-интерфейÑа :"
+
#: ../controls/ProjectPropertiesPanel.py:120
msgid "Height:"
msgstr "Ð’Ñ‹Ñота:"
@@ -1841,67 +1881,54 @@
msgid "Hours:"
msgstr "ЧаÑÑ‹:"
-#: ../plcopen/definitions.py:44
-msgid ""
-"Hysteresis\n"
-"The hysteresis function block provides a hysteresis boolean output driven by the difference of two floating point (REAL) inputs XIN1 and XIN2."
-msgstr ""
-"ГиÑтерезиÑ\n"
-"Функциональный блок формирует диÑкретный выход Ñ Ð³Ð¸ÑтерезиÑом в завиÑимоÑти от разницы двух вещеÑтвенных входов XIN1 и XIN2."
-
msgid "IEC_Channel"
msgstr "ÐœÐК-канал"
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
-#: ../dialogs/PouDialog.py:36
+#: ../dialogs/PouActionDialog.py:31 ../dialogs/PouDialog.py:36
msgid "IL"
-msgstr ""
-
-#: ../dialogs/DiscoveryDialog.py:93
+msgstr "IL"
+
+#: ../dialogs/DiscoveryDialog.py:94
msgid "IP"
-msgstr ""
-
-#: ../Beremiz_service.py:278 ../Beremiz_service.py:279
+msgstr "IP"
+
+#: ../Beremiz_service.py:308 ../Beremiz_service.py:309
msgid "IP is not valid!"
msgstr "Ðеверный IP-адреÑ"
-#: ../svgui/svgui.py:18 ../svgui/svgui.py:19
+#: ../svgui/svgui.py:42 ../svgui/svgui.py:43
msgid "Import SVG"
msgstr "Импорт SVG"
-#: ../dialogs/FBDVariableDialog.py:38 ../editors/Viewer.py:1555
+#: ../dialogs/FBDVariableDialog.py:38 ../editors/Viewer.py:1580
#: ../controls/VariablePanel.py:71
msgid "InOut"
msgstr "Вход/Выход"
-#: ../editors/Viewer.py:1087
+#: ../editors/Viewer.py:1100
msgid "Inactive"
msgstr "Ðеактивный"
-#: ../controls/VariablePanel.py:268
-#, python-format
-msgid "Incompatible data types between \"%s\" and \"%s\""
-msgstr "\"%s\" и \"%s\" имеют неÑовмеÑтимые типы данных"
-
-#: ../controls/VariablePanel.py:277
-#, python-format
-msgid "Incompatible size of data between \"%s\" and \"%s\""
-msgstr "\"%s\" и \"%s\" имеют неÑовмеÑтимый размер данных"
-
-#: ../controls/VariablePanel.py:273
+#: ../controls/VariablePanel.py:276
+#, python-brace-format
+msgid "Incompatible data types between \"{a1}\" and \"{a2}\""
+msgstr "\"{a1}\" и \"{a2}\" имеют неÑовмеÑтимые типы данных"
+
+#: ../controls/VariablePanel.py:282
#, python-format
msgid "Incompatible size of data between \"%s\" and \"BOOL\""
msgstr "ÐеÑовмеÑтимый размер данных \"%s\" Ñ Ñ‚Ð¸Ð¿Ð¾Ð¼ \"BOOL\""
+#: ../controls/VariablePanel.py:286
+#, python-brace-format
+msgid "Incompatible size of data between \"{a1}\" and \"{a2}\""
+msgstr "\"{a1}\" и \"{a2}\" имеют неÑовмеÑтимый размер данных"
+
#: ../dialogs/ActionBlockDialog.py:38
msgid "Indicator"
msgstr "Индикатор"
-#: ../editors/CodeFileEditor.py:663
-msgid "Initial"
-msgstr "ИÑходное значение"
-
-#: ../editors/Viewer.py:548 ../editors/Viewer.py:2058
+#: ../editors/Viewer.py:552
msgid "Initial Step"
msgstr "ИÑходный шаг"
@@ -1910,25 +1937,36 @@
msgid "Initial Value"
msgstr "ИÑходное значение"
-#: ../editors/DataTypeEditor.py:184 ../editors/DataTypeEditor.py:215
-#: ../editors/DataTypeEditor.py:271 ../editors/DataTypeEditor.py:309
+#: ../editors/DataTypeEditor.py:185 ../editors/DataTypeEditor.py:216
+#: ../editors/DataTypeEditor.py:272 ../editors/DataTypeEditor.py:310
msgid "Initial Value:"
msgstr "ИÑходное значение:"
-#: ../svgui/svgui.py:22
+msgid "Initial value"
+msgstr "ИÑходное значение"
+
+#: ../svgui/svgui.py:46
msgid "Inkscape"
-msgstr ""
-
-#: ../dialogs/SFCTransitionDialog.py:74 ../dialogs/ActionBlockDialog.py:42
+msgstr "Inkscape"
+
+#: ../dialogs/SFCTransitionDialog.py:75 ../dialogs/ActionBlockDialog.py:42
msgid "Inline"
msgstr "ÐепоÑредÑтвенно"
-#: ../dialogs/SFCStepDialog.py:69 ../dialogs/FBDVariableDialog.py:37
-#: ../dialogs/BrowseLocationsDialog.py:35 ../editors/Viewer.py:1553
-#: ../controls/VariablePanel.py:71
+#: ../dialogs/SFCStepDialog.py:70 ../dialogs/FBDVariableDialog.py:37
+#: ../dialogs/BrowseLocationsDialog.py:40 ../editors/Viewer.py:289
+#: ../editors/Viewer.py:1578 ../editors/TextViewer.py:307
+#: ../controls/LocationCellEditor.py:98 ../controls/VariablePanel.py:71
+#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351
msgid "Input"
msgstr "Вход"
+msgid "Input to be differentiated"
+msgstr "Вход Ð´Ð»Ñ Ð´Ð¸Ñ„Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
+
+msgid "Input variable"
+msgstr "Ð’Ñ…Ð¾Ð´Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ"
+
#: ../dialogs/FBDBlockDialog.py:93
msgid "Inputs:"
msgstr "Входы:"
@@ -1937,7 +1975,7 @@
msgid "Insertion (into)"
msgstr "Ð’Ñтавка подÑтроки"
-#: ../plcopen/plcopen.py:1684
+#: ../plcopen/plcopen.py:1691
#, python-format
msgid "Instance with id %d doesn't exist!"
msgstr "ÐкземплÑÑ€ Ñ id %d не ÑущеÑтвует!"
@@ -1946,13 +1984,8 @@
msgid "Instances:"
msgstr "ÐкземплÑры:"
-#: ../plcopen/definitions.py:40
-msgid ""
-"Integral\n"
-"The integral function block integrates the value of input XIN over time."
-msgstr ""
-"Интеграл\n"
-"Функциональный блок интегрирует входное значение XIN во времени."
+msgid "Integrated output"
+msgstr "Интегрированный выход"
#: ../controls/VariablePanel.py:70
msgid "Interface"
@@ -1966,36 +1999,41 @@
msgid "Interval"
msgstr "Интервал"
-#: ../PLCControler.py:2324
+#: ../PLCControler.py:2325
msgid "Invalid plcopen element(s)!!!"
msgstr "Ðекорректный PlcOpen Ñлемент(Ñ‹)!!!"
-#: ../canfestival/config_utils.py:377 ../canfestival/config_utils.py:638
-#, python-format
-msgid "Invalid type \"%s\"-> %d != %d for location\"%s\""
-msgstr "Ðеправильный тип \"%s\"->\"%d != %d Ð´Ð»Ñ \"%s\""
-
-#: ../dialogs/ForceVariableDialog.py:177
-#, python-format
-msgid "Invalid value \"%s\" for \"%s\" variable!"
-msgstr "Ðеверное значение \"%s\" Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ \"%s\"!"
+#: ../canfestival/config_utils.py:381
+#, python-brace-format
+msgid "Invalid type \"{a1}\"-> {a2} != {a3} for location\"{a4}\""
+msgstr "Ðеправильный тип \"{a1}\"-> {a2} != {a3} Ð´Ð»Ñ \"{a4}\""
+
+#: ../canfestival/config_utils.py:645
+#, python-brace-format
+msgid "Invalid type \"{a1}\"-> {a2} != {a3} for location \"{a4}\""
+msgstr "Ðеправильный тип \"{a1}\"-> {a2} != {a3} Ð´Ð»Ñ \"{a4}\""
#: ../controls/DebugVariablePanel/DebugVariablePanel.py:132
#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:92
-#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:160
+#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:166
#, python-format
msgid "Invalid value \"%s\" for debug variable"
msgstr "Ðеверное значение \"%s\" Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ переменной"
-#: ../controls/VariablePanel.py:247 ../controls/VariablePanel.py:250
+#: ../controls/VariablePanel.py:255 ../controls/VariablePanel.py:258
#, python-format
msgid "Invalid value \"%s\" for variable grid element"
-msgstr ""
-
-#: ../editors/Viewer.py:229 ../editors/Viewer.py:232
+msgstr "Ðеверное значение \"%s\" Ð´Ð»Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
+
+#: ../editors/Viewer.py:233 ../editors/Viewer.py:236
#, python-format
msgid "Invalid value \"%s\" for viewer block"
-msgstr ""
+msgstr "Ðеверное значение \"%s\" Ð´Ð»Ñ Ð²Ñтавки в редактор"
+
+#: ../dialogs/ForceVariableDialog.py:177
+#, python-brace-format
+msgid "Invalid value \"{a1}\" for \"{a2}\" variable!"
+msgstr "Ðеверное значение \"{a1}\" Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ \"{a2}\"!"
#: ../dialogs/DurationEditorDialog.py:121
msgid ""
@@ -2005,24 +2043,24 @@
"Ðеверное значение!\n"
"Ðеобходимо ввеÑти чиÑловое значение."
-#: ../editors/Viewer.py:553 ../editors/Viewer.py:2062
+#: ../editors/Viewer.py:557 ../editors/Viewer.py:2343
msgid "Jump"
-msgstr "Переход"
-
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
+msgstr "БезуÑловный переход"
+
+#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:31
#: ../dialogs/PouDialog.py:36 ../controls/ProjectPropertiesPanel.py:143
msgid "LD"
-msgstr ""
+msgstr "LD"
msgid "LDFLAGS"
-msgstr ""
+msgstr "LDFLAGS"
#: ../editors/LDViewer.py:215 ../editors/LDViewer.py:231
#, python-format
msgid "Ladder element with id %d is on more than one rung."
msgstr "Ðлемент леÑтничной диаграммы Ñ id %d более чем на одной Ñтупени."
-#: ../dialogs/PouTransitionDialog.py:86 ../dialogs/PouActionDialog.py:83
+#: ../dialogs/PouTransitionDialog.py:91 ../dialogs/PouActionDialog.py:83
#: ../dialogs/PouDialog.py:104
msgid "Language"
msgstr "Язык"
@@ -2031,28 +2069,28 @@
msgid "Language (optional):"
msgstr "Язык (опционально):"
-#: ../dialogs/PouTransitionDialog.py:60 ../dialogs/PouActionDialog.py:56
+#: ../dialogs/PouTransitionDialog.py:65 ../dialogs/PouActionDialog.py:56
#: ../dialogs/PouDialog.py:73
msgid "Language:"
msgstr "Язык:"
-#: ../ProjectController.py:1635
+#: ../ProjectController.py:1735
msgid "Latest build already matches current target. Transfering anyway...\n"
msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ñовпадает Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ программой в целевом ПЛК. Загрузка продолжена...\n"
-#: ../Beremiz_service.py:250
+#: ../Beremiz_service.py:271
msgid "Launch WX GUI inspector"
msgstr "ЗапуÑтить WX GUI Inspector"
-#: ../Beremiz_service.py:249
+#: ../Beremiz_service.py:270
msgid "Launch a live Python shell"
msgstr "ЗапуÑтить конÑоль Python"
-#: ../editors/Viewer.py:481
+#: ../editors/Viewer.py:485
msgid "Left"
msgstr "Слева"
-#: ../dialogs/LDPowerRailDialog.py:61
+#: ../dialogs/LDPowerRailDialog.py:62
msgid "Left PowerRail"
msgstr "Ð›ÐµÐ²Ð°Ñ ÑˆÐ¸Ð½Ð° питаниÑ"
@@ -2071,9 +2109,13 @@
msgid "Libraries"
msgstr "Библиотеки"
-#: ../IDEFrame.py:603
+#: ../IDEFrame.py:631
msgid "Library"
-msgstr "Библиотека"
+msgstr "Библиотеки"
+
+#: ../dialogs/AboutDialog.py:143
+msgid "License"
+msgstr "ЛицензиÑ"
#: ../plcopen/iec_std.csv:73
msgid "Limitation"
@@ -2082,22 +2124,22 @@
msgid "Linker"
msgstr "Линковщик"
-#: ../targets/toolchain_gcc.py:142
+#: ../targets/toolchain_gcc.py:166
msgid "Linking :\n"
msgstr "Линковка:\n"
msgid "Linux"
msgstr "GNU/Linux"
-#: ../dialogs/DiscoveryDialog.py:110 ../controls/VariablePanel.py:72
+#: ../dialogs/DiscoveryDialog.py:111 ../controls/VariablePanel.py:72
msgid "Local"
msgstr "Локальный"
-#: ../canfestival/canfestival.py:322
+#: ../canfestival/canfestival.py:346
msgid "Local entries"
msgstr "Локальные запиÑи"
-#: ../ProjectController.py:1541
+#: ../ProjectController.py:1641
msgid "Local service discovery failed!\n"
msgstr "Локальный ÑÐµÑ€Ð²Ð¸Ñ Ð½Ðµ найден!\n"
@@ -2105,7 +2147,7 @@
msgid "Location"
msgstr "Размещение"
-#: ../dialogs/BrowseLocationsDialog.py:67
+#: ../dialogs/BrowseLocationsDialog.py:72
msgid "Locations available:"
msgstr "ДоÑтупные размещениÑ:"
@@ -2113,41 +2155,46 @@
msgid "Logarithm to base 10"
msgstr "ДеÑÑтичный логарифм"
-#: ../connectors/PYRO/__init__.py:90
+#: ../connectors/PYRO/__init__.py:94
#, python-format
msgid "MDNS resolution failure for '%s'\n"
msgstr "MDNS разрешение неудачно Ð´Ð»Ñ '%s'\n"
-#: ../canfestival/SlaveEditor.py:41 ../canfestival/NetworkEditor.py:62
+msgid "Manual output adjustment - Typically from transfer station"
+msgstr "Ручной выход"
+
+#: ../canfestival/SlaveEditor.py:64 ../canfestival/NetworkEditor.py:85
msgid "Map Variable"
msgstr "Отображение переменной"
-#: ../features.py:7
+#: ../features.py:31
msgid "Map located variables over CANopen"
msgstr "Отображение переменных по CANopen"
-#: ../canfestival/NetworkEditor.py:83
+#: ../canfestival/NetworkEditor.py:106
msgid "Master"
msgstr "Ведущий"
-#: ../ConfigTreeNode.py:514
-#, python-format
-msgid "Max count (%d) reached for this confnode of type %s "
-msgstr "ДоÑтигнуто макÑимальное количеÑтво (%d) Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ð° узла конфигурации %s"
+#: ../ConfigTreeNode.py:539
+#, python-brace-format
+msgid "Max count ({a1}) reached for this confnode of type {a2} "
+msgstr "ДоÑтигнуто макÑимальное количеÑтво ({a1}) Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ð° узла конфигурации {a2} "
#: ../plcopen/iec_std.csv:71
msgid "Maximum"
msgstr "МакÑимум"
-#: ../editors/DataTypeEditor.py:238
+#: ../editors/DataTypeEditor.py:239
msgid "Maximum:"
msgstr "МакÑимум:"
-#: ../dialogs/BrowseLocationsDialog.py:37
+#: ../dialogs/BrowseLocationsDialog.py:42 ../editors/Viewer.py:289
+#: ../editors/TextViewer.py:307 ../controls/LocationCellEditor.py:98
+#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351
msgid "Memory"
msgstr "ПамÑÑ‚ÑŒ"
-#: ../IDEFrame.py:571
+#: ../IDEFrame.py:599
msgid "Menu ToolBar"
msgstr "Меню"
@@ -2155,7 +2202,7 @@
msgid "Microseconds:"
msgstr "МикроÑекунды:"
-#: ../editors/Viewer.py:486
+#: ../editors/Viewer.py:490
msgid "Middle"
msgstr "ПоÑередине"
@@ -2167,7 +2214,7 @@
msgid "Minimum"
msgstr "Минимум"
-#: ../editors/DataTypeEditor.py:225
+#: ../editors/DataTypeEditor.py:226
msgid "Minimum:"
msgstr "Минимум:"
@@ -2183,10 +2230,10 @@
msgid "Modifier:"
msgstr "Модификатор:"
-#: ../PLCGenerator.py:778 ../PLCGenerator.py:1217
-#, python-format
-msgid "More than one connector found corresponding to \"%s\" continuation in \"%s\" POU"
-msgstr "Более одного коннектора ÑоответÑтвуют продолжению цепи \"%s\" в POU \"%s\""
+#: ../PLCGenerator.py:786 ../PLCGenerator.py:1230
+#, python-brace-format
+msgid "More than one connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU"
+msgstr "Более одного коннектора ÑоответÑтвуют продолжению цепи \"{a1}\" в POU \"{a2}\""
#: ../dialogs/ActionBlockDialog.py:140
msgid "Move action down"
@@ -2200,11 +2247,11 @@
msgid "Move down"
msgstr "ПеремеÑтить ниже"
-#: ../editors/DataTypeEditor.py:354
+#: ../editors/DataTypeEditor.py:355
msgid "Move element down"
msgstr "ПеремеÑтить Ñлемент ниже"
-#: ../editors/DataTypeEditor.py:353
+#: ../editors/DataTypeEditor.py:354
msgid "Move element up"
msgstr "ПеремеÑтить Ñлементы выше"
@@ -2224,7 +2271,7 @@
msgid "Move task up"
msgstr "ПеремеÑтить задачу выше"
-#: ../IDEFrame.py:75 ../IDEFrame.py:90 ../IDEFrame.py:120 ../IDEFrame.py:161
+#: ../IDEFrame.py:99 ../IDEFrame.py:114 ../IDEFrame.py:144 ../IDEFrame.py:185
msgid "Move the view"
msgstr "ПеремеÑтить отображение"
@@ -2232,11 +2279,11 @@
msgid "Move up"
msgstr "ПеремеÑтить выше"
-#: ../editors/CodeFileEditor.py:643 ../controls/VariablePanel.py:443
+#: ../editors/CodeFileEditor.py:661 ../controls/VariablePanel.py:453
msgid "Move variable down"
msgstr "ПеремеÑтить переменную ниже"
-#: ../editors/CodeFileEditor.py:642 ../controls/VariablePanel.py:442
+#: ../editors/CodeFileEditor.py:660 ../controls/VariablePanel.py:452
msgid "Move variable up"
msgstr "ПеремеÑтить переменную выше"
@@ -2252,21 +2299,24 @@
msgid "My Computer:"
msgstr "Мой компьютер:"
-#: ../dialogs/DiscoveryDialog.py:91
+#: ../dialogs/DiscoveryDialog.py:92
msgid "NAME"
msgstr "ИмÑ"
+msgid "NOT R1"
+msgstr "ÐЕ R1"
+
#: ../editors/ResourceEditor.py:68 ../editors/ResourceEditor.py:83
-#: ../editors/DataTypeEditor.py:50 ../editors/CodeFileEditor.py:663
-#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54
+#: ../editors/DataTypeEditor.py:50 ../controls/VariablePanel.py:53
+#: ../controls/VariablePanel.py:54
msgid "Name"
msgstr "ИмÑ"
-#: ../Beremiz_service.py:300
+#: ../Beremiz_service.py:332
msgid "Name must not be null!"
msgstr "Ð˜Ð¼Ñ Ð½Ðµ может быть null!"
-#: ../dialogs/SFCStepDialog.py:55 ../dialogs/FBDBlockDialog.py:83
+#: ../dialogs/SFCStepDialog.py:56 ../dialogs/FBDBlockDialog.py:83
#: ../dialogs/ConnectionDialog.py:75
msgid "Name:"
msgstr "ИмÑ:"
@@ -2275,12 +2325,20 @@
msgid "Natural logarithm"
msgstr "Ðатуральный логарифм"
-#: ../dialogs/LDElementDialog.py:75 ../editors/Viewer.py:456
+#: ../dialogs/LDElementDialog.py:75 ../editors/Viewer.py:460
msgid "Negated"
msgstr "ИнверÑиÑ"
-#: ../PLCOpenEditor.py:96 ../PLCOpenEditor.py:138 ../Beremiz.py:314
-#: ../Beremiz.py:349
+#: ../Beremiz_service.py:578
+msgid "Nevow Web service failed. "
+msgstr "Ошибка Web ÑервиÑа Nevow. "
+
+#: ../Beremiz_service.py:554
+msgid "Nevow/Athena import failed :"
+msgstr "Ошибка импорта Nevow/Athena :"
+
+#: ../PLCOpenEditor.py:102 ../PLCOpenEditor.py:144 ../Beremiz.py:321
+#: ../Beremiz.py:356
msgid "New"
msgstr "Ðовый"
@@ -2288,25 +2346,25 @@
msgid "New item"
msgstr "Ðовый Ñлемент"
-#: ../editors/Viewer.py:455
+#: ../editors/Viewer.py:459
msgid "No Modifier"
msgstr "Ðет модификатора"
-#: ../ProjectController.py:1662
+#: ../ProjectController.py:1763
msgid "No PLC to transfer (did build succeed ?)\n"
msgstr "Ðет ПЛК Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ (была Ñборка уÑпешна?)\n"
-#: ../PLCGenerator.py:1608
+#: ../PLCGenerator.py:1631
#, python-format
msgid "No body defined in \"%s\" POU"
msgstr "Ðет тела Ð´Ð»Ñ POU \"%s\""
-#: ../PLCGenerator.py:797 ../PLCGenerator.py:1227
-#, python-format
-msgid "No connector found corresponding to \"%s\" continuation in \"%s\" POU"
-msgstr "Ðе найден коннектор, ÑоответÑтвующий продолжению цепи \"%s\" в POU \"%s\""
-
-#: ../PLCOpenEditor.py:340
+#: ../PLCGenerator.py:806 ../PLCGenerator.py:1241
+#, python-brace-format
+msgid "No connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU"
+msgstr "Ðе найден коннектор, ÑоответÑтвующий продолжению цепи \"{a1}\" в POU \"{a2}\""
+
+#: ../PLCOpenEditor.py:347
msgid ""
"No documentation available.\n"
"Coming soon."
@@ -2314,40 +2372,40 @@
"Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð¾Ñ‚ÑутÑтвует.\n"
"В разработке."
-#: ../PLCGenerator.py:819
+#: ../PLCGenerator.py:829
#, python-format
msgid "No informations found for \"%s\" block"
msgstr "Ðе найдена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾ блоку \"%s\""
-#: ../PLCGenerator.py:1183
-#, python-format
-msgid "No output %s variable found in block %s in POU %s. Connection must be broken"
-msgstr "Ð’Ñ‹Ñ…Ð¾Ð´Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s не найдена в блоке %s в POU %s."
+#: ../PLCGenerator.py:1194
+#, python-brace-format
+msgid "No output {a1} variable found in block {a2} in POU {a3}. Connection must be broken"
+msgstr "Ð’Ñ‹Ñ…Ð¾Ð´Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ {a1} не найдена в блоке {a2} в POU {a3}."
#: ../controls/SearchResultPanel.py:169
msgid "No search results available."
msgstr "Ðичего не найдено."
-#: ../svgui/svgui.py:107
+#: ../svgui/svgui.py:131
#, python-format
msgid "No such SVG file: %s\n"
msgstr "Ðет такого SVG файла: %s\n"
-#: ../canfestival/config_utils.py:633
-#, python-format
-msgid "No such index/subindex (%x,%x) (variable %s)"
-msgstr "Ðет индекÑа/подиндекÑа (%x,%x) (Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s)"
+#: ../canfestival/config_utils.py:639
+#, python-brace-format
+msgid "No such index/subindex ({a1},{a2}) (variable {a3})"
+msgstr "Ðет индекÑа/подиндекÑа ({a1},{a2}) (Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ {a3})"
#: ../canfestival/config_utils.py:362
-#, python-format
-msgid "No such index/subindex (%x,%x) in ID : %d (variable %s)"
-msgstr "Ðет индекÑа/подиндекÑа (%x,%x) в ID: %d (Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s)"
+#, python-brace-format
+msgid "No such index/subindex ({a1},{a2}) in ID : {a3} (variable {a4})"
+msgstr "Ðет индекÑа/подиндекÑа ({a1},{a2}) в ID: {a3} (Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ {a4})"
#: ../dialogs/BrowseValuesLibraryDialog.py:83
msgid "No valid value selected!"
msgstr "Ðе выбрано допуÑтимое значение!"
-#: ../PLCGenerator.py:1606
+#: ../PLCGenerator.py:1629
#, python-format
msgid "No variable defined in \"%s\" POU"
msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð½Ðµ определена в POU \"%s\""
@@ -2356,9 +2414,9 @@
msgstr "ID узла"
#: ../canfestival/config_utils.py:355
-#, python-format
-msgid "Non existing node ID : %d (variable %s)"
-msgstr "ÐеÑущеÑтвующий ID узла: %d (Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s)"
+#, python-brace-format
+msgid "Non existing node ID : {a1} (variable {a2})"
+msgstr "ÐеÑущеÑтвующий ID узла: {a1} (Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ {a2})"
#: ../controls/VariablePanel.py:64
msgid "Non-Retain"
@@ -2368,16 +2426,16 @@
msgid "Normal"
msgstr "Обычный"
-#: ../canfestival/config_utils.py:384
-#, python-format
-msgid "Not PDO mappable variable : '%s' (ID:%d,Idx:%x,sIdx:%x))"
-msgstr "Ðе Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² PDO: '%s' (ID:%d,Idx:%x,sIdx:%x))"
+#: ../canfestival/config_utils.py:389
+#, python-brace-format
+msgid "Not PDO mappable variable : '{a1}' (ID:{a2},Idx:{a3},sIdx:{a4}))"
+msgstr "Ðе Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² PDO: '{a1}' (ID:{a2},Idx:{a3},sIdx:{a4}))"
#: ../plcopen/iec_std.csv:80
msgid "Not equal to"
msgstr "Ðе равно"
-#: ../dialogs/SFCDivergenceDialog.py:78
+#: ../dialogs/SFCDivergenceDialog.py:89
msgid "Number of sequences:"
msgstr "ЧиÑло ветвей:"
@@ -2385,44 +2443,28 @@
msgid "Numerical"
msgstr "МатематичеÑкие функции"
-#: ../plcopen/definitions.py:38
-msgid ""
-"Off-delay timer\n"
-"The off-delay timer can be used to delay setting an output false, for fixed period after input goes false."
-msgstr ""
-"Таймер выключениÑ\n"
-"Таймер Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован, чтобы внеÑти задержку уÑтановки выхода в FALSE на фикÑированный период времени поÑле того, как вход Ñтал FALSE."
-
-#: ../plcopen/definitions.py:37
-msgid ""
-"On-delay timer\n"
-"The on-delay timer can be used to delay setting an output true, for fixed period after an input becomes true."
-msgstr ""
-"Таймер включениÑ\n"
-"Таймер Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован, чтобы внеÑти задержку уÑтановки выхода в TRUE на фикÑированный период времени поÑле того, как вход Ñтал TRUE."
-
-#: ../editors/CodeFileEditor.py:664
-msgid "OnChange"
-msgstr ""
-
-#: ../dialogs/SearchInProjectDialog.py:93
+#: ../dialogs/SearchInProjectDialog.py:86
msgid "Only Elements"
msgstr "Только Ñлементы"
-#: ../PLCOpenEditor.py:98 ../PLCOpenEditor.py:139 ../Beremiz.py:316
-#: ../Beremiz.py:350
+#: ../PLCOpenEditor.py:104 ../PLCOpenEditor.py:145 ../Beremiz.py:323
+#: ../Beremiz.py:357
msgid "Open"
msgstr "Открыть"
-#: ../svgui/svgui.py:116
+#: ../svgui/svgui.py:140
msgid "Open Inkscape"
msgstr "Открыть Inkscape"
-#: ../ProjectController.py:1714
+#: ../version.py:66
+msgid "Open Source framework for automation, implemented IEC 61131 IDE with constantly growing set of extensions and flexible PLC runtime."
+msgstr "Свободное программное обеÑпечение Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð¼Ñ‹ÑˆÐ»ÐµÐ½Ð½Ð¾Ð¹ автоматизации, ÑоÑтоÑщие из Ñреды разработки программ по Ñтандарту ÐœÐК 61131 Ñ Ð¿Ð¾ÑтоÑнно раÑширÑющимÑÑ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ плагинов и гибкой ÑиÑтемой иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÐŸÐ›Ðš."
+
+#: ../ProjectController.py:1815
msgid "Open a file explorer to manage project files"
msgstr "Открыть файловый менеджер Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра файлов проекта"
-#: ../wxglade_hmi/wxglade_hmi.py:114
+#: ../wxglade_hmi/wxglade_hmi.py:138
msgid "Open wxGlade"
msgstr "Открыть wxGlade"
@@ -2430,7 +2472,7 @@
msgid "Option"
msgstr "ÐаÑтройка"
-#: ../dialogs/FindInPouDialog.py:82 ../editors/CodeFileEditor.py:664
+#: ../dialogs/FindInPouDialog.py:83
msgid "Options"
msgstr "ÐаÑтройки"
@@ -2438,62 +2480,80 @@
msgid "Organization (optional):"
msgstr "ÐžÑ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ (опционально):"
-#: ../canfestival/SlaveEditor.py:51 ../canfestival/NetworkEditor.py:72
+#: ../canfestival/SlaveEditor.py:74 ../canfestival/NetworkEditor.py:95
msgid "Other Profile"
msgstr "Другой профиль"
-#: ../dialogs/SFCStepDialog.py:70 ../dialogs/FBDVariableDialog.py:39
-#: ../dialogs/BrowseLocationsDialog.py:36 ../editors/Viewer.py:1554
-#: ../controls/VariablePanel.py:71
+#: ../dialogs/SFCStepDialog.py:71 ../dialogs/FBDVariableDialog.py:39
+#: ../dialogs/BrowseLocationsDialog.py:41 ../editors/Viewer.py:289
+#: ../editors/Viewer.py:1579 ../editors/TextViewer.py:307
+#: ../controls/LocationCellEditor.py:98 ../controls/VariablePanel.py:71
+#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351
msgid "Output"
msgstr "Выход"
-#: ../canfestival/SlaveEditor.py:40 ../canfestival/NetworkEditor.py:61
+msgid "Overriding reset"
+msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¸Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ‚Ð¾Ñ€Ð°"
+
+#: ../canfestival/SlaveEditor.py:63 ../canfestival/NetworkEditor.py:84
msgid "PDO Receive"
msgstr "PDO приема"
-#: ../canfestival/SlaveEditor.py:39 ../canfestival/NetworkEditor.py:60
+#: ../canfestival/SlaveEditor.py:62 ../canfestival/NetworkEditor.py:83
msgid "PDO Transmit"
msgstr "PDO передачи"
-#: ../plcopen/definitions.py:42
-msgid ""
-"PID\n"
-"The PID (proportional, Integral, Derivative) function block provides the classical three term controller for closed loop control."
-msgstr ""
-"ПИД\n"
-"ПИД (Пропорциональный Интегральный Дифференциальный) ФБ - клаÑÑичеÑкий регулÑтор, иÑпользуемый в ÑиÑтемах Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¹ ÑвÑзью."
-
-#: ../targets/toolchain_gcc.py:107
+msgid "PLC"
+msgstr "ПЛК"
+
+#: ../targets/toolchain_gcc.py:131
msgid "PLC :\n"
msgstr "ПЛК:\n"
-#: ../Beremiz.py:441
+#: ../Beremiz.py:453
msgid "PLC Log"
msgstr "Лог ПЛК"
-#: ../ProjectController.py:930
+#: ../ProjectController.py:992
msgid "PLC code generation failed !\n"
msgstr "ÐÐµÑƒÐ´Ð°Ñ‡Ð½Ð°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÐºÐ¾Ð´Ð°!\n"
-#: ../PLCOpenEditor.py:189 ../PLCOpenEditor.py:302
-#, python-format
+#: ../Beremiz_service.py:295
+msgid "PLC is empty or already started."
+msgstr "В ПЛК нет программы или он уже запущен."
+
+#: ../Beremiz_service.py:302
+msgid "PLC is not started."
+msgstr "ПЛК незапущен."
+
+#: ../PLCOpenEditor.py:196 ../PLCOpenEditor.py:309
+#, python-brace-format
msgid ""
-"PLC syntax error at line %d:\n"
-"%s"
+"PLC syntax error at line {a1}:\n"
+"{a2}"
msgstr ""
-"СинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в Ñтроке %d:\n"
-"%s"
-
-#: ../PLCOpenEditor.py:285 ../PLCOpenEditor.py:361
+"СинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в Ñтроке {a1}:\n"
+"{a2}"
+
+#: ../PLCOpenEditor.py:292 ../PLCOpenEditor.py:373
msgid "PLCOpen files (*.xml)|*.xml|All files|*.*"
msgstr "PLCOpen файлы (*.xml)|*.xml|All files|*.*"
-#: ../PLCOpenEditor.py:146 ../PLCOpenEditor.py:202
+#: ../PLCOpenEditor.py:152 ../PLCOpenEditor.py:209
msgid "PLCOpenEditor"
+msgstr "PLCOpenEditor"
+
+#: ../PLCOpenEditor.py:355
+msgid ""
+"PLCOpenEditor is part of Beremiz project.\n"
+"\n"
+"Beremiz is an "
msgstr ""
-
-#: ../dialogs/DiscoveryDialog.py:94
+"PLCOpenEditor ÑвлÑетÑÑ Ñ‡Ð°Ñтью проекта Beremiz.\n"
+"\n"
+"Beremiz — "
+
+#: ../dialogs/DiscoveryDialog.py:95
msgid "PORT"
msgstr "Порт"
@@ -2513,17 +2573,20 @@
msgid "POU Type:"
msgstr "Тип POU:"
-#: ../connectors/PYRO/__init__.py:41
+msgid "PV - SP"
+msgstr "Ошибка, PV - SP"
+
+#: ../connectors/PYRO/__init__.py:45
#, python-format
msgid "PYRO connecting to URI : %s\n"
msgstr "PYRO подключение к URI: %s\n"
-#: ../connectors/PYRO/__init__.py:57
+#: ../connectors/PYRO/__init__.py:61
#, python-format
msgid "PYRO using certificates in '%s' \n"
msgstr "PYRO иÑпользует Ñертификаты в '%s'\n"
-#: ../PLCOpenEditor.py:112 ../Beremiz.py:329
+#: ../PLCOpenEditor.py:118 ../Beremiz.py:336
msgid "Page Setup"
msgstr "ÐаÑтройки Ñтраницы"
@@ -2531,7 +2594,7 @@
msgid "Page Size (optional):"
msgstr "Размер Ñтраницы (опционально):"
-#: ../IDEFrame.py:2565
+#: ../IDEFrame.py:2599
#, python-format
msgid "Page: %d"
msgstr "Страница: %d"
@@ -2540,62 +2603,69 @@
msgid "Parent instance"
msgstr "РодительÑкий ÑкземплÑÑ€"
-#: ../editors/Viewer.py:594 ../IDEFrame.py:348 ../IDEFrame.py:402
+#: ../editors/Viewer.py:598 ../IDEFrame.py:372 ../IDEFrame.py:426
msgid "Paste"
msgstr "Ð’Ñтавить"
-#: ../IDEFrame.py:1831
+#: ../IDEFrame.py:1865
msgid "Paste POU"
msgstr "Ð’Ñтавить POU"
-#: ../dialogs/SearchInProjectDialog.py:64
+#: ../dialogs/SearchInProjectDialog.py:56
msgid "Pattern to search:"
msgstr "Шаблон поиÑка:"
-#: ../dialogs/LDPowerRailDialog.py:72
+#: ../dialogs/LDPowerRailDialog.py:73
msgid "Pin number:"
msgstr "Ðомер пина:"
-#: ../editors/Viewer.py:2672 ../editors/Viewer.py:2916
-#: ../editors/SFCViewer.py:696
+#: ../editors/Viewer.py:2706 ../editors/Viewer.py:2963
+#: ../editors/SFCViewer.py:770
msgid "Please choose a target"
-msgstr "Выберете цель перехода"
-
-#: ../editors/TextViewer.py:261
+msgstr "Выберите цель перехода"
+
+#: ../editors/TextViewer.py:262
msgid "Please enter a block name"
msgstr "Введите Ð¸Ð¼Ñ Ð±Ð»Ð¾ÐºÐ°"
-#: ../editors/Viewer.py:2542 ../editors/Viewer.py:2953
+#: ../editors/Viewer.py:2576 ../editors/Viewer.py:3005
msgid "Please enter comment text"
msgstr "Введите текÑÑ‚ комментариÑ"
-#: ../editors/SFCViewer.py:359 ../editors/SFCViewer.py:381
-#: ../editors/SFCViewer.py:725
+#: ../editors/SFCViewer.py:433 ../editors/SFCViewer.py:455
+#: ../editors/SFCViewer.py:799
msgid "Please enter step name"
msgstr "Введите Ð¸Ð¼Ñ ÑˆÐ°Ð³Ð°"
+#: ../Beremiz_service.py:194
+msgid "Please enter text"
+msgstr "Введите текÑÑ‚"
+
#: ../dialogs/ForceVariableDialog.py:163
#, python-format
msgid "Please enter value for a \"%s\" variable:"
msgstr "Введите значение Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ \"%s\":"
-#: ../Beremiz_service.py:287
+#: ../Beremiz_service.py:317
msgid "Port number must be 0 <= port <= 65535!"
msgstr "Ðомер порта должен быть в диапазоне от 0 до 65535!"
-#: ../Beremiz_service.py:287
+#: ../Beremiz_service.py:317
msgid "Port number must be an integer!"
msgstr "Ðомер порта должен быть целым чиÑлом!"
-#: ../editors/Viewer.py:532 ../editors/Viewer.py:2085
+#: ../editors/Viewer.py:536 ../editors/Viewer.py:2367
msgid "Power Rail"
msgstr "Шина питаниÑ"
-#: ../dialogs/LDPowerRailDialog.py:49
+#: ../dialogs/LDPowerRailDialog.py:50
msgid "Power Rail Properties"
msgstr "СвойÑтва шины питаниÑ"
-#: ../PLCOpenEditor.py:114 ../Beremiz.py:331
+msgid "Preset datetime"
+msgstr "ОÑновное времÑ"
+
+#: ../PLCOpenEditor.py:120 ../Beremiz.py:338
msgid "Preview"
msgstr "ПроÑмотр"
@@ -2603,12 +2673,12 @@
msgid "Preview:"
msgstr "ПроÑмотр:"
-#: ../PLCOpenEditor.py:116 ../PLCOpenEditor.py:142 ../Beremiz.py:333
-#: ../Beremiz.py:353
+#: ../PLCOpenEditor.py:122 ../PLCOpenEditor.py:148 ../Beremiz.py:340
+#: ../Beremiz.py:360
msgid "Print"
msgstr "Печать"
-#: ../IDEFrame.py:1047
+#: ../IDEFrame.py:1075
msgid "Print preview"
msgstr "Предварительный проÑмотр"
@@ -2616,15 +2686,18 @@
msgid "Priority"
msgstr "Приоритет"
-#: ../dialogs/SFCTransitionDialog.py:88
+#: ../dialogs/SFCTransitionDialog.py:89
msgid "Priority:"
msgstr "Приоритет:"
-#: ../runtime/PLCObject.py:369
+#: ../runtime/PLCObject.py:370
#, python-format
msgid "Problem starting PLC : error %d"
msgstr "Проблема запуÑка ПЛК: ошибка %d"
+msgid "Process variable"
+msgstr "Текущее значение регулируемой переменной"
+
#: ../dialogs/ProjectDialog.py:55
msgid "Product Name"
msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚Ð°"
@@ -2645,12 +2718,12 @@
msgid "Product Version (required):"
msgstr "ВерÑÐ¸Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚Ð° (обÑзательно):"
-#: ../dialogs/SearchInProjectDialog.py:46 ../IDEFrame.py:1710
-#: ../IDEFrame.py:1907
+#: ../dialogs/SearchInProjectDialog.py:38 ../IDEFrame.py:1744
+#: ../IDEFrame.py:1941
msgid "Program"
msgstr "Программа"
-#: ../PLCOpenEditor.py:330
+#: ../PLCOpenEditor.py:337
msgid "Program was successfully generated!"
msgstr "Программа уÑпешно Ñгенерирована!"
@@ -2658,11 +2731,11 @@
msgid "Programs"
msgstr "Программы"
-#: ../editors/Viewer.py:238
+#: ../editors/Viewer.py:242
msgid "Programs can't be used by other POUs!"
msgstr "Программы не могут иÑпользоватьÑÑ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ POU!"
-#: ../controls/ProjectPropertiesPanel.py:84 ../IDEFrame.py:556
+#: ../controls/ProjectPropertiesPanel.py:84 ../IDEFrame.py:584
msgid "Project"
msgstr "Проект"
@@ -2671,7 +2744,7 @@
msgid "Project '%s':"
msgstr "Проект '%s':"
-#: ../ProjectController.py:1713
+#: ../ProjectController.py:1814
msgid "Project Files"
msgstr "Файлы проекта"
@@ -2687,7 +2760,7 @@
msgid "Project Version (optional):"
msgstr "ВерÑÐ¸Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð° (опционально):"
-#: ../PLCControler.py:3157
+#: ../PLCControler.py:3158
msgid ""
"Project file syntax error:\n"
"\n"
@@ -2695,14 +2768,14 @@
"СинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в файле проекта:\n"
"\n"
-#: ../dialogs/ProjectDialog.py:32 ../editors/ProjectNodeEditor.py:14
+#: ../dialogs/ProjectDialog.py:32 ../editors/ProjectNodeEditor.py:37
msgid "Project properties"
msgstr "СвойÑтва проекта"
-#: ../ConfigTreeNode.py:540
-#, python-format
-msgid "Project tree layout do not match confnode.xml %s!=%s "
-msgstr "Дерево проекта не ÑоответÑтвует confnode.xml %s!=%s"
+#: ../ConfigTreeNode.py:566
+#, python-brace-format
+msgid "Project tree layout do not match confnode.xml {a1}!={a2} "
+msgstr "Дерево проекта не ÑоответÑтвует confnode.xml {a1}!={a2} "
#: ../dialogs/ConnectionDialog.py:94
msgid "Propagate Name"
@@ -2712,19 +2785,31 @@
msgid "Properties"
msgstr "СвойÑтва"
-#: ../plcopen/definitions.py:36
-msgid ""
-"Pulse timer\n"
-"The pulse timer can be used to generate output pulses of a given time duration."
-msgstr ""
-"Генератор импульÑов\n"
-"Функциональный блок иÑпользуетÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ выходных импульÑов заданной длительноÑти."
-
-#: ../py_ext/PythonEditor.py:57
+msgid "Proportionality constant"
+msgstr "КоÑффициент пропорциональноÑти"
+
+#: ../Beremiz_service.py:440
+msgid "Publishing service on local network"
+msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ Ð´Ð¾Ñтупен в локальной Ñети"
+
+#: ../connectors/PYRO/__init__.py:118
+#, python-format
+msgid "Pyro exception: %s\n"
+msgstr "ИÑключение Pyro: %s\n"
+
+#: ../Beremiz_service.py:427
+msgid "Pyro object's uri :"
+msgstr "URI Ð´Ð»Ñ Pyro :"
+
+#: ../Beremiz_service.py:426
+msgid "Pyro port :"
+msgstr "Порт Pyro :"
+
+#: ../py_ext/PythonEditor.py:81
msgid "Python code"
msgstr "Код на python"
-#: ../features.py:9
+#: ../features.py:33
msgid "Python file"
msgstr "Python файл"
@@ -2732,68 +2817,47 @@
msgid "Qualifier"
msgstr "Спецификатор"
-#: ../PLCOpenEditor.py:122 ../Beremiz.py:336 ../Beremiz_service.py:252
+#: ../PLCOpenEditor.py:128 ../Beremiz.py:343 ../Beremiz_service.py:273
msgid "Quit"
msgstr "Выход"
-#: ../plcopen/definitions.py:29
-msgid ""
-"RS bistable\n"
-"The RS bistable is a latch where the Reset dominates."
-msgstr ""
-"RS триггер\n"
-"RS триггер - переключатель Ñ Ð´Ð¾Ð¼Ð¸Ð½Ð°Ð½Ñ‚Ð¾Ð¹ выключениÑ."
-
-#: ../plcopen/definitions.py:43
-msgid ""
-"Ramp\n"
-"The RAMP function block is modelled on example given in the standard."
-msgstr ""
-"Ограничитель ÑкороÑти Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñигнала\n"
-"Функциональный блок напиÑан ÑоглаÑно примеру, приведенному в Ñтандарте."
+msgid "Ramp duration"
+msgstr "ДлительноÑÑ‚ÑŒ нараÑтаниÑ"
#: ../controls/DebugVariablePanel/DebugVariablePanel.py:225
msgid "Range:"
msgstr "Диапазон:"
-#: ../ProjectController.py:1709
+#: ../ProjectController.py:1810
msgid "Raw IEC code"
msgstr "ÐœÐК-код"
-#: ../plcopen/definitions.py:39
-msgid ""
-"Real time clock\n"
-"The real time clock has many uses including time stamping, setting dates and times of day in batch reports, in alarm messages and so on."
-msgstr ""
-"RTC чаÑÑ‹\n"
-"ЧаÑÑ‹ реального времени иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð¾Ðº времени, уÑтановки даты и времени Ð´Ð½Ñ Ð² отчетах, ÑообщениÑÑ… об авариÑÑ… и пр."
-
-#: ../Beremiz.py:1107
+#: ../Beremiz.py:1143
#, python-format
msgid "Really delete node '%s'?"
msgstr "ДейÑтвительно удалить Ñлемент '%s'?"
-#: ../IDEFrame.py:338 ../IDEFrame.py:398
+#: ../IDEFrame.py:362 ../IDEFrame.py:422
msgid "Redo"
msgstr "Повторить"
-#: ../dialogs/SFCTransitionDialog.py:73
+#: ../dialogs/SFCTransitionDialog.py:74
msgid "Reference"
msgstr "СÑылка"
-#: ../dialogs/DiscoveryDialog.py:105 ../IDEFrame.py:408
+#: ../dialogs/DiscoveryDialog.py:106 ../IDEFrame.py:432
msgid "Refresh"
msgstr "Обновить"
-#: ../dialogs/SearchInProjectDialog.py:73
+#: ../dialogs/SearchInProjectDialog.py:66
msgid "Regular expression"
msgstr "РегулÑрное выражение"
-#: ../dialogs/FindInPouDialog.py:97
+#: ../dialogs/FindInPouDialog.py:98
msgid "Regular expressions"
msgstr "РегулÑрные выражениÑ"
-#: ../editors/Viewer.py:1531
+#: ../editors/Viewer.py:1556
msgid "Release value"
msgstr "ОÑвободить значение"
@@ -2801,16 +2865,16 @@
msgid "Remainder (modulo)"
msgstr "ОÑтаток от Ð´ÐµÐ»ÐµÐ½Ð¸Ñ (modulo)"
-#: ../Beremiz.py:1108
+#: ../Beremiz.py:1144
#, python-format
msgid "Remove %s node"
msgstr "Удалить %s Ñлемент"
-#: ../IDEFrame.py:2371
+#: ../IDEFrame.py:2405
msgid "Remove Datatype"
msgstr "Удалить тип данных"
-#: ../IDEFrame.py:2376
+#: ../IDEFrame.py:2410
msgid "Remove Pou"
msgstr "Удалить POU"
@@ -2818,7 +2882,7 @@
msgid "Remove action"
msgstr "Удалить дейÑтвие"
-#: ../editors/DataTypeEditor.py:352
+#: ../editors/DataTypeEditor.py:353
msgid "Remove element"
msgstr "Удалить Ñлемент"
@@ -2830,7 +2894,7 @@
msgid "Remove instance"
msgstr "Удалить ÑкземплÑÑ€"
-#: ../canfestival/NetworkEditor.py:81
+#: ../canfestival/NetworkEditor.py:104
msgid "Remove slave"
msgstr "Удалить ведомое уÑтройÑтво"
@@ -2838,11 +2902,11 @@
msgid "Remove task"
msgstr "Удалить задачу"
-#: ../editors/CodeFileEditor.py:641 ../controls/VariablePanel.py:441
+#: ../editors/CodeFileEditor.py:659 ../controls/VariablePanel.py:451
msgid "Remove variable"
msgstr "Удалить переменную"
-#: ../IDEFrame.py:1911
+#: ../IDEFrame.py:1945
msgid "Rename"
msgstr "Переименовать"
@@ -2850,7 +2914,7 @@
msgid "Replace File"
msgstr "Заменить файл"
-#: ../editors/Viewer.py:498
+#: ../editors/Viewer.py:502
msgid "Replace Wire by connections"
msgstr "Заменить цепь подключениÑми"
@@ -2862,11 +2926,11 @@
msgid "Reset"
msgstr "СброÑ"
-#: ../editors/Viewer.py:578
+#: ../editors/Viewer.py:583
msgid "Reset Execution Order"
msgstr "СброÑить порÑдок иÑполнениÑ"
-#: ../IDEFrame.py:423
+#: ../IDEFrame.py:451
msgid "Reset Perspective"
msgstr "СброÑить предÑтавление"
@@ -2874,38 +2938,33 @@
msgid "Reset search result"
msgstr "СброÑить результаты поиÑка"
-#: ../PLCControler.py:97 ../Beremiz.py:1039
+msgid "Reset time"
+msgstr "ПоÑтоÑÐ½Ð½Ð°Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ интегрированиÑ"
+
+#: ../PLCControler.py:97 ../Beremiz.py:1075
msgid "Resources"
msgstr "РеÑурÑÑ‹"
#: ../controls/VariablePanel.py:62
msgid "Retain"
-msgstr ""
-
-#: ../controls/VariablePanel.py:414
+msgstr "Retain"
+
+#: ../controls/VariablePanel.py:424
msgid "Return Type:"
msgstr "Возвращаемый тип:"
-#: ../editors/Viewer.py:483
+#: ../editors/Viewer.py:487
msgid "Right"
msgstr "Право"
-#: ../dialogs/LDPowerRailDialog.py:62
+#: ../dialogs/LDPowerRailDialog.py:63
msgid "Right PowerRail"
msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ ÑˆÐ¸Ð½Ð° питаниÑ"
-#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:457
+#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:461
msgid "Rising Edge"
msgstr "ÐараÑтающий фронт"
-#: ../plcopen/definitions.py:31
-msgid ""
-"Rising edge detector\n"
-"The output produces a single pulse when a rising edge is detected."
-msgstr ""
-"Детектор нараÑтающего фронта\n"
-"Ðа выходе формируетÑÑ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ð¹ импульÑ, еÑли обнаружен нараÑтающий фронт."
-
#: ../plcopen/iec_std.csv:65
msgid "Rotate left"
msgstr "ЦикличеÑкий Ñдвиг влево"
@@ -2918,77 +2977,86 @@
msgid "Rounding up/down"
msgstr "Округление вверх/вниз"
-#: ../ProjectController.py:1677
+#: ../ProjectController.py:1778
msgid "Run"
msgstr "Старт"
-#: ../ProjectController.py:975
+#: ../ProjectController.py:1037
msgid "Runtime IO extensions C code generation failed !\n"
msgstr "Ошибка генерации C-кода Ð´Ð»Ñ Ñ€Ð°Ñширений ввода-вывода!\n"
-#: ../ProjectController.py:984
+#: ../ProjectController.py:1046
msgid "Runtime library extensions C code generation failed !\n"
msgstr "Ошибка генерации C-кода Ð´Ð»Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñ‚ÐµÐºÐ¸ раÑширений ÑиÑтемы иÑполнениÑ!\n"
-#: ../canfestival/SlaveEditor.py:38 ../canfestival/NetworkEditor.py:59
+#: ../canfestival/SlaveEditor.py:61 ../canfestival/NetworkEditor.py:82
msgid "SDO Client"
msgstr "SDO клиент"
-#: ../canfestival/SlaveEditor.py:37 ../canfestival/NetworkEditor.py:58
+#: ../canfestival/SlaveEditor.py:60 ../canfestival/NetworkEditor.py:81
msgid "SDO Server"
msgstr "SDO Ñервер"
#: ../dialogs/PouDialog.py:36 ../controls/ProjectPropertiesPanel.py:143
msgid "SFC"
-msgstr ""
-
-#: ../plcopen/definitions.py:28
-msgid ""
-"SR bistable\n"
-"The SR bistable is a latch where the Set dominates."
-msgstr ""
-"SR триггер\n"
-"SR триггер - переключатель Ñ Ð´Ð¾Ð¼Ð¸Ð½Ð°Ð½Ñ‚Ð¾Ð¹ включениÑ."
-
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
+msgstr "SFC"
+
+#: ../PLCGenerator.py:1392
+#, python-brace-format
+msgid "SFC jump in pou \"{a1}\" refers to non-existent SFC step \"{a2}\""
+msgstr "БезуÑловный переход в POU \"{a1}\" ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующий SFC шаг \"{a2}\""
+
+#: ../PLCGenerator.py:773
+#, python-format
+msgid "SFC transition in POU \"%s\" must be connected."
+msgstr "SFC переход в POU \"%s\" должен быть подключен."
+
+#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:31
#: ../dialogs/PouDialog.py:36
msgid "ST"
-msgstr ""
-
-#: ../PLCOpenEditor.py:317
+msgstr "ST"
+
+#: ../PLCOpenEditor.py:324
msgid "ST files (*.st)|*.st|All files|*.*"
msgstr "ST файлы (*.st)|*.st|Ð’Ñе файлы|*.*"
-#: ../svgui/svgui.py:101
+#: ../svgui/svgui.py:125
msgid "SVG files (*.svg)|*.svg|All files|*.*"
msgstr "SVG файлы (*.svg)|*.svg|Ð’Ñе файлы|*.*"
-#: ../features.py:11
+#: ../features.py:35
msgid "SVGUI"
-msgstr ""
-
-#: ../PLCOpenEditor.py:105 ../PLCOpenEditor.py:140 ../Beremiz.py:320
-#: ../Beremiz.py:351
+msgstr "SVGUI"
+
+msgid "Sampling period"
+msgstr "Период ÑÑмплированиÑ"
+
+#: ../PLCOpenEditor.py:111 ../PLCOpenEditor.py:146 ../Beremiz.py:327
+#: ../Beremiz.py:358
msgid "Save"
msgstr "Сохранить"
-#: ../PLCOpenEditor.py:107 ../PLCOpenEditor.py:141 ../Beremiz.py:352
+#: ../PLCOpenEditor.py:113 ../PLCOpenEditor.py:147 ../Beremiz.py:359
msgid "Save As..."
msgstr "Сохранить как..."
-#: ../Beremiz.py:322
+#: ../Beremiz.py:329
msgid "Save as"
msgstr "Сохранить как"
-#: ../dialogs/SearchInProjectDialog.py:76
+#: ../ProjectController.py:420
+msgid "Save path is the same as path of a project! \n"
+msgstr "Выбранный путь Ñовпадает Ñ Ð¿ÑƒÑ‚Ñ‘Ð¼ проекта!\n"
+
+#: ../dialogs/SearchInProjectDialog.py:69
msgid "Scope"
msgstr "ОблаÑÑ‚ÑŒ дейÑтвиÑ"
-#: ../dialogs/SearchInProjectDialog.py:105 ../IDEFrame.py:595
+#: ../IDEFrame.py:623
msgid "Search"
msgstr "ПоиÑк"
-#: ../dialogs/SearchInProjectDialog.py:52 ../IDEFrame.py:358 ../IDEFrame.py:404
+#: ../dialogs/SearchInProjectDialog.py:44 ../IDEFrame.py:382 ../IDEFrame.py:428
msgid "Search in Project"
msgstr "ПоиÑк в проекте"
@@ -2996,27 +3064,31 @@
msgid "Seconds:"
msgstr "Секунды:"
-#: ../IDEFrame.py:364
+#: ../IDEFrame.py:388
msgid "Select All"
msgstr "Выделить вÑе"
-#: ../editors/Viewer.py:284 ../editors/TextViewer.py:304
-#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:280
-#: ../controls/VariablePanel.py:340
+#: ../editors/Viewer.py:288 ../editors/TextViewer.py:306
+#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:290
+#: ../controls/VariablePanel.py:350
msgid "Select a variable class:"
-msgstr ""
-
-#: ../ProjectController.py:1126
+msgstr "Выберите клаÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹:"
+
+#: ../ProjectController.py:1195
msgid "Select an editor:"
-msgstr "Выберете редактор:"
+msgstr "Выберите редактор:"
#: ../controls/PouInstanceVariablesPanel.py:276
msgid "Select an instance"
-msgstr "Выберете ÑкземплÑÑ€"
-
-#: ../IDEFrame.py:579
+msgstr "Выберите ÑкземплÑÑ€"
+
+#: ../IDEFrame.py:607
msgid "Select an object"
-msgstr "Выберете объект"
+msgstr "Выберите объект"
+
+#: ../ProjectController.py:427
+msgid "Selected directory already contains another project. Overwrite? \n"
+msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ ÑƒÐ¶Ðµ Ñодержит другой проект. ПерезапиÑать?\n"
#: ../plcopen/iec_std.csv:70
msgid "Selection"
@@ -3030,19 +3102,11 @@
msgid "Selection Divergence"
msgstr "Ðльтернативное ветвление"
-#: ../plcopen/definitions.py:30
-msgid ""
-"Semaphore\n"
-"The semaphore provides a mechanism to allow software elements mutually exclusive access to certain ressources."
-msgstr ""
-"Семафор\n"
-"Семафор предоÑтавлÑет Ñобой программный механизм Ñинхронизации Ð´Ð»Ñ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ñключительного доÑтупа к определенным реÑурÑам."
-
-#: ../dialogs/DiscoveryDialog.py:81
+#: ../dialogs/DiscoveryDialog.py:82
msgid "Service Discovery"
msgstr "ПоиÑк ÑервиÑа"
-#: ../dialogs/DiscoveryDialog.py:84
+#: ../dialogs/DiscoveryDialog.py:85
msgid "Services available:"
msgstr "СервиÑÑ‹ доÑтупны:"
@@ -3050,6 +3114,9 @@
msgid "Set"
msgstr "УÑтановить"
+msgid "Set point"
+msgstr "УÑтавка"
+
#: ../plcopen/iec_std.csv:62
msgid "Shift left"
msgstr "Сдвиг влево"
@@ -3058,19 +3125,19 @@
msgid "Shift right"
msgstr "Сдвиг вправо"
-#: ../ProjectController.py:1703
+#: ../ProjectController.py:1804
msgid "Show IEC code generated by PLCGenerator"
msgstr "Показать год, Ñгенерированный PLCGenerator"
-#: ../canfestival/canfestival.py:363
+#: ../canfestival/canfestival.py:387
msgid "Show Master"
msgstr "Показать ведущего"
-#: ../canfestival/canfestival.py:364
+#: ../canfestival/canfestival.py:388
msgid "Show Master generated by config_utils"
msgstr "Показать ведущий узел Ñгенерированный config_utils"
-#: ../ProjectController.py:1701
+#: ../ProjectController.py:1802
msgid "Show code"
msgstr "Показать код"
@@ -3088,54 +3155,67 @@
#: ../editors/ResourceEditor.py:68
msgid "Single"
-msgstr "ИÑточник прерываниÑ"
-
-#: ../targets/toolchain_makefile.py:112
+msgstr "ИÑточник"
+
+#: ../targets/toolchain_makefile.py:126
msgid "Source didn't change, no build.\n"
msgstr "ИÑходные файлы не изменилиÑÑŒ, Ñборка не нужна.\n"
+#: ../PLCGenerator.py:397
+#, python-brace-format
+msgid "Source signal has to be defined for single task '{a1}' in resource '{a2}.{a3}'."
+msgstr "Ð”Ð»Ñ Ð·Ð°Ð´Ð°Ñ‡Ð¸ '{a1}' в реÑурÑе '{a2}.{a3}' отÑутÑвует задание иÑточника."
+
#: ../plcopen/iec_std.csv:23
msgid "Square root (base 2)"
msgstr "Квадратный корень"
-#: ../plcopen/definitions.py:21
+#: ../plcopen/definitions.py:46
msgid "Standard function blocks"
msgstr "Стандартные функциональные блоки"
-#: ../ProjectController.py:1679 ../Beremiz_service.py:240
+#: ../ProjectController.py:1780 ../Beremiz_service.py:261
msgid "Start PLC"
msgstr "ЗапуÑтить ПЛК"
-#: ../ProjectController.py:922
+#: ../ProjectController.py:984
#, python-format
msgid "Start build in %s\n"
msgstr "Сборка запущена в %s\n"
-#: ../ProjectController.py:1483
+#: ../ProjectController.py:1298
+msgid "Started"
+msgstr "Работа"
+
+#: ../ProjectController.py:1586
msgid "Starting PLC\n"
-msgstr "ПЛК запуÑкаетÑÑ\\n\n"
-
-#: ../Beremiz.py:451
+msgstr "ПЛК запуÑкаетÑÑ\n"
+
+#: ../Beremiz.py:463
msgid "Status ToolBar"
msgstr "Панель ÑтатуÑа"
-#: ../editors/Viewer.py:549 ../editors/Viewer.py:2059
+#: ../editors/Viewer.py:553 ../editors/Viewer.py:2342
msgid "Step"
msgstr "Шаг"
-#: ../ProjectController.py:1682
+#: ../ProjectController.py:1783
msgid "Stop"
msgstr "Стоп"
-#: ../Beremiz_service.py:241
+#: ../Beremiz_service.py:262
msgid "Stop PLC"
msgstr "ОÑтановить ПЛК"
-#: ../ProjectController.py:1684
+#: ../ProjectController.py:1785
msgid "Stop Running PLC"
msgstr "ОÑтановить запущенный ПЛК"
-#: ../ProjectController.py:1455
+#: ../ProjectController.py:1299
+msgid "Stopped"
+msgstr "Стоп"
+
+#: ../ProjectController.py:1558
msgid "Stopping debugger...\n"
msgstr "ОÑтановка отладчика...\n"
@@ -3151,10 +3231,14 @@
msgid "Subtraction"
msgstr "Вычитание"
-#: ../ProjectController.py:961
+#: ../ProjectController.py:1023
msgid "Successfully built.\n"
msgstr "Сборка прошла уÑпешно.\n"
+#: ../IDEFrame.py:447
+msgid "Switch perspective"
+msgstr "Сменить предÑтавление"
+
msgid "Sync_Align"
msgstr ""
@@ -3164,11 +3248,11 @@
msgid "Sync_TPDOs"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:154
+#: ../dialogs/SearchInProjectDialog.py:165 ../dialogs/FindInPouDialog.py:172
msgid "Syntax error in regular expression of pattern to search!"
msgstr "СинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в регулÑрном выражении шаблона поиÑка!"
-#: ../dialogs/DiscoveryDialog.py:92
+#: ../dialogs/DiscoveryDialog.py:93
msgid "TYPE"
msgstr "Тип"
@@ -3191,6 +3275,24 @@
msgid "Temp"
msgstr "Временный"
+msgid "The PID (proportional, Integral, Derivative) function block provides the classical three term controller for closed loop control."
+msgstr "ПИД (Пропорциональный Интегральный Дифференциальный) ФБ - клаÑÑичеÑкий регулÑтор, иÑпользуемый в ÑиÑтемах Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¹ ÑвÑзью."
+
+msgid "The RAMP function block is modelled on example given in the standard."
+msgstr "Ограничитель ÑкороÑти Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñигнала. Функциональный блок напиÑан ÑоглаÑно примеру, приведенному в Ñтандарте."
+
+msgid "The RS bistable is a latch where the Reset dominates."
+msgstr "RS-триггер Ñ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼ выключениÑ."
+
+msgid "The SR bistable is a latch where the Set dominates."
+msgstr "SR-триггер Ñ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼ включениÑ."
+
+msgid "The derivative function block produces an output XOUT proportional to the rate of change of the input XIN."
+msgstr "Функциональный блок формирует выход XOUT пропорционально чаÑтоте Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñ…Ð¾Ð´Ð° XIN."
+
+msgid "The down-counter can be used to signal when a count has reached zero, on counting down from a preset value."
+msgstr "Декрементный Ñчетчик может иÑпользоватьÑÑ, когда необходимо Ñигнализировать, что Ñчетчик доÑтиг нулевого Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ Ð¸Ñходного заданного значениÑ."
+
#: ../editors/FileManagementPanel.py:180
#, python-format
msgid ""
@@ -3202,18 +3304,51 @@
#: ../editors/LDViewer.py:882
msgid "The group of block must be coherent!"
-msgstr ""
-
-#: ../Beremiz.py:614 ../IDEFrame.py:983
+msgstr "Группа блоков должна быть ÑвÑзанной!"
+
+msgid "The hysteresis function block provides a hysteresis boolean output driven by the difference of two floating point (REAL) inputs XIN1 and XIN2."
+msgstr "Функциональный блок формирует диÑкретный выход Ñ Ð³Ð¸ÑтерезиÑом в завиÑимоÑти от разницы двух вещеÑтвенных входов XIN1 и XIN2."
+
+msgid "The integral function block integrates the value of input XIN over time."
+msgstr "Функциональный блок интегрирует входное значение XIN во времени."
+
+msgid "The off-delay timer can be used to delay setting an output false, for fixed period after input goes false."
+msgstr "Таймер Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован, чтобы внеÑти задержку уÑтановки выхода в FALSE на фикÑированный период времени поÑле того, как вход Ñтал FALSE."
+
+msgid "The on-delay timer can be used to delay setting an output true, for fixed period after an input becomes true."
+msgstr "Таймер Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован, чтобы внеÑти задержку уÑтановки выхода в TRUE на фикÑированный период времени поÑле того, как вход Ñтал TRUE."
+
+msgid "The output produces a single pulse when a falling edge is detected."
+msgstr "Детектор падающего фронта. Ðа выходе формируетÑÑ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ð¹ импульÑ, еÑли обнаружен падающий фронт."
+
+msgid "The output produces a single pulse when a rising edge is detected."
+msgstr "Детектор нараÑтающего фронта. Ðа выходе формируетÑÑ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ð¹ импульÑ, еÑли обнаружен нараÑтающий фронт."
+
+msgid "The pulse timer can be used to generate output pulses of a given time duration."
+msgstr "Генератор импульÑов. Функциональный блок иÑпользуетÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ выходных импульÑов заданной длительноÑти."
+
+msgid "The real time clock has many uses including time stamping, setting dates and times of day in batch reports, in alarm messages and so on."
+msgstr "ЧаÑÑ‹ реального времени иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð¾Ðº времени, уÑтановки даты и времени Ð´Ð½Ñ Ð² отчетах, ÑообщениÑÑ… об авариÑÑ… и пр."
+
+msgid "The semaphore provides a mechanism to allow software elements mutually exclusive access to certain ressources."
+msgstr "Семафор предоÑтавлÑет Ñобой программный механизм Ñинхронизации Ð´Ð»Ñ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ñключительного доÑтупа к определенным реÑурÑам."
+
+msgid "The up-counter can be used to signal when a count has reached a maximum value."
+msgstr "Инкрементный Ñчетчик может иÑпользоватьÑÑ, когда необходимо Ñигнализировать, что Ñчетчик доÑтиг макÑимального значениÑ."
+
+msgid "The up-down counter has two inputs CU and CD. It can be used to both count up on one input and down on the other."
+msgstr "Инкрементный/декрементный Ñчетчик имеет два входа CU и CD. Он может иÑпользоватьÑÑ Ð´Ð»Ñ Ñчета вверх по одному входу и Ð´Ð»Ñ Ñчета низ по другому."
+
+#: ../Beremiz.py:640 ../IDEFrame.py:1011
msgid "There are changes, do you want to save?"
msgstr "Хотите Ñохранить изменениÑ?"
-#: ../IDEFrame.py:1618 ../IDEFrame.py:1637
+#: ../IDEFrame.py:1655 ../IDEFrame.py:1674
#, python-format
msgid "There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr "СущеÑтвует POU Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\". Ðто может вызвать конфликт. Хотите продолжить?"
-#: ../IDEFrame.py:1070
+#: ../IDEFrame.py:1098
msgid ""
"There was a problem printing.\n"
"Perhaps your current printer is not set correctly?"
@@ -3225,6 +3360,11 @@
msgid "This option isn't available yet!"
msgstr "Ðто Ð¾Ð¿Ñ†Ð¸Ñ ÐµÑ‰Ðµ не доÑтупна!"
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:565
+#, python-format
+msgid "Tick: %d"
+msgstr "Цикл: %d"
+
#: ../plcopen/iec_std.csv:40
msgid "Time"
msgstr "ВремÑ"
@@ -3258,54 +3398,54 @@
msgid "Time-of-day subtraction"
msgstr "Вычитание времени Ñуток"
-#: ../editors/Viewer.py:485
+#: ../editors/Viewer.py:489
msgid "Top"
msgstr "Верх"
-#: ../ProjectController.py:1691
+#: ../ProjectController.py:1792
msgid "Transfer"
msgstr "Передать"
-#: ../ProjectController.py:1693
+#: ../ProjectController.py:1794
msgid "Transfer PLC"
msgstr "Передать ПЛК"
-#: ../ProjectController.py:1658
+#: ../ProjectController.py:1758
msgid "Transfer completed successfully.\n"
msgstr "Передача уÑпешно завершена.\n"
-#: ../ProjectController.py:1660
+#: ../ProjectController.py:1760
msgid "Transfer failed\n"
msgstr "Ошибка передачи\n"
-#: ../editors/Viewer.py:550 ../editors/Viewer.py:2060 ../editors/Viewer.py:2089
+#: ../editors/Viewer.py:554 ../editors/Viewer.py:2344 ../editors/Viewer.py:2371
msgid "Transition"
msgstr "Переход"
-#: ../PLCGenerator.py:1499
+#: ../PLCGenerator.py:1518
#, python-format
msgid "Transition \"%s\" body must contain an output variable or coil referring to its name"
msgstr "Тело перехода \"%s\" должно Ñодержать выходную переменную или катушку, ÑÑылающуюÑÑ Ð½Ð° его имÑ"
-#: ../dialogs/PouTransitionDialog.py:84
+#: ../dialogs/PouTransitionDialog.py:89
msgid "Transition Name"
msgstr "Ð˜Ð¼Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð°"
-#: ../dialogs/PouTransitionDialog.py:53
+#: ../dialogs/PouTransitionDialog.py:58
msgid "Transition Name:"
msgstr "Ð˜Ð¼Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð°:"
-#: ../PLCGenerator.py:1588
-#, python-format
-msgid "Transition with content \"%s\" not connected to a next step in \"%s\" POU"
-msgstr "Переход Ñ Ñодержимым \"%s\" не подключен к Ñледующему шагу в POU \"%s\""
-
-#: ../PLCGenerator.py:1579
-#, python-format
-msgid "Transition with content \"%s\" not connected to a previous step in \"%s\" POU"
-msgstr "Переход Ñ Ñодержимым \"%s\" не подключен к предыдущему шагу в POU \"%s\""
-
-#: ../plcopen/plcopen.py:1315
+#: ../PLCGenerator.py:1609
+#, python-brace-format
+msgid "Transition with content \"{a1}\" not connected to a next step in \"{a2}\" POU"
+msgstr "Переход Ñ Ñодержимым \"{a1}\" не подключен к Ñледующему шагу в POU \"{a2}\""
+
+#: ../PLCGenerator.py:1598
+#, python-brace-format
+msgid "Transition with content \"{a1}\" not connected to a previous step in \"{a2}\" POU"
+msgstr "Переход Ñ Ñодержимым \"{a1}\" не подключен к предыдущему шагу в POU \"{a2}\""
+
+#: ../plcopen/plcopen.py:1318
#, python-format
msgid "Transition with name %s doesn't exist!"
msgstr "Переход Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s отÑутÑтвует!"
@@ -3314,21 +3454,29 @@
msgid "Transitions"
msgstr "Переходы"
+#: ../dialogs/AboutDialog.py:123
+msgid "Translated by"
+msgstr "Перевод"
+
#: ../editors/ResourceEditor.py:68
msgid "Triggering"
msgstr "ЗапуÑк"
+#: ../Beremiz_service.py:476
+msgid "Twisted unavailable."
+msgstr "Модуль Twisted недоÑтупен."
+
#: ../dialogs/ActionBlockDialog.py:38 ../editors/ResourceEditor.py:83
-#: ../editors/DataTypeEditor.py:50 ../editors/CodeFileEditor.py:663
-#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54
+#: ../editors/DataTypeEditor.py:50 ../controls/VariablePanel.py:53
+#: ../controls/VariablePanel.py:54
msgid "Type"
msgstr "Тип"
-#: ../dialogs/BrowseLocationsDialog.py:43
+#: ../dialogs/BrowseLocationsDialog.py:48
msgid "Type and derivated"
msgstr "Тип и его производные"
-#: ../canfestival/config_utils.py:336 ../canfestival/config_utils.py:618
+#: ../canfestival/config_utils.py:336 ../canfestival/config_utils.py:624
#, python-format
msgid "Type conflict for location \"%s\""
msgstr "Конфликт типов \"%s\""
@@ -3337,16 +3485,16 @@
msgid "Type conversion"
msgstr "Преобразование типов"
-#: ../editors/DataTypeEditor.py:161
+#: ../editors/DataTypeEditor.py:162
msgid "Type infos:"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ типе:"
-#: ../dialogs/BrowseLocationsDialog.py:44
+#: ../dialogs/BrowseLocationsDialog.py:49
msgid "Type strict"
msgstr "Только данный тип"
-#: ../dialogs/SFCDivergenceDialog.py:57 ../dialogs/SFCTransitionDialog.py:56
-#: ../dialogs/LDPowerRailDialog.py:55 ../dialogs/BrowseLocationsDialog.py:94
+#: ../dialogs/SFCDivergenceDialog.py:59 ../dialogs/SFCTransitionDialog.py:57
+#: ../dialogs/LDPowerRailDialog.py:56 ../dialogs/BrowseLocationsDialog.py:99
#: ../dialogs/FBDBlockDialog.py:65 ../dialogs/ConnectionDialog.py:58
msgid "Type:"
msgstr "Тип:"
@@ -3354,74 +3502,58 @@
msgid "URI_location"
msgstr "URI ÑиÑтемы иÑполнениÑ"
-#: ../canfestival/config_utils.py:456 ../canfestival/config_utils.py:470
+#: ../canfestival/config_utils.py:462 ../canfestival/config_utils.py:476
#, python-format
msgid "Unable to define PDO mapping for node %02x"
msgstr "Ðевозможно определить отображение PDO Ð´Ð»Ñ ÑƒÐ·Ð»Ð° %02x"
-#: ../targets/Xenomai/__init__.py:15
+#: ../targets/Xenomai/__init__.py:39
#, python-format
msgid "Unable to get Xenomai's %s \n"
msgstr "Ðевозможно получить Xenomai %s\n"
-#: ../PLCGenerator.py:951 ../PLCGenerator.py:1202
-#, python-format
-msgid "Undefined block type \"%s\" in \"%s\" POU"
-msgstr "Ðеопределенный тип блока \"%s\" в POU \"%s\""
+#: ../PLCGenerator.py:961 ../PLCGenerator.py:1214
+#, python-brace-format
+msgid "Undefined block type \"{a1}\" in \"{a2}\" POU"
+msgstr "Ðеопределенный тип блока \"{a1}\" в POU \"{a2}\""
#: ../PLCGenerator.py:254
#, python-format
msgid "Undefined pou type \"%s\""
msgstr "Ðеопределенный тип POU \"%s\""
-#: ../IDEFrame.py:336 ../IDEFrame.py:397
+#: ../IDEFrame.py:360 ../IDEFrame.py:421
msgid "Undo"
msgstr "Отмена"
-#: ../ProjectController.py:308
+#: ../ProjectController.py:332
msgid "Unknown"
msgstr "ÐеизвеÑтно"
-#: ../editors/Viewer.py:389
+#: ../editors/Viewer.py:393
#, python-format
msgid "Unknown variable \"%s\" for this POU!"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ \"%s\" Ð´Ð»Ñ Ñтого POU!"
-#: ../ProjectController.py:305 ../ProjectController.py:306
+#: ../ProjectController.py:329 ../ProjectController.py:330
msgid "Unnamed"
-msgstr ""
+msgstr "Unnamed"
#: ../PLCControler.py:636
#, python-format
msgid "Unnamed%d"
-msgstr ""
-
-#: ../controls/VariablePanel.py:275
+msgstr "Unnamed%d"
+
+#: ../controls/VariablePanel.py:284
#, python-format
msgid "Unrecognized data size \"%s\""
msgstr "Ðеопределенный размер данных \"%s\""
-#: ../plcopen/definitions.py:33
-msgid ""
-"Up-counter\n"
-"The up-counter can be used to signal when a count has reached a maximum value."
-msgstr ""
-"Инкрементный Ñчетчик\n"
-"Инкрементный Ñчетчик может иÑпользоватьÑÑ, когда необходимо Ñигнализировать, что Ñчетчик доÑтиг макÑимального значениÑ."
-
-#: ../plcopen/definitions.py:35
-msgid ""
-"Up-down counter\n"
-"The up-down counter has two inputs CU and CD. It can be used to both count up on one input and down on the other."
-msgstr ""
-"Инкрементный/декрементный Ñчетчик\n"
-"Инкрементный/декрементный Ñчетчик имеет два входа CU и CD. Он может иÑпользоватьÑÑ Ð´Ð»Ñ Ñчета вверх по одному входу и Ð´Ð»Ñ Ñчета низ по другому."
-
-#: ../editors/DataTypeEditor.py:631 ../controls/VariablePanel.py:780
+#: ../editors/DataTypeEditor.py:632 ../controls/VariablePanel.py:798
msgid "User Data Types"
msgstr "ПользовательÑкие типы данных"
-#: ../canfestival/SlaveEditor.py:42 ../canfestival/NetworkEditor.py:63
+#: ../canfestival/SlaveEditor.py:65 ../canfestival/NetworkEditor.py:86
msgid "User Type"
msgstr "ПользовательÑкий тип"
@@ -3433,26 +3565,32 @@
msgid "Value"
msgstr "Значение"
-#: ../editors/DataTypeEditor.py:258
+#: ../editors/DataTypeEditor.py:259
msgid "Values:"
msgstr "ЗначениÑ:"
-#: ../dialogs/ActionBlockDialog.py:42 ../editors/Viewer.py:522
-#: ../editors/Viewer.py:2074
+#: ../dialogs/ActionBlockDialog.py:42 ../editors/Viewer.py:526
+#: ../editors/Viewer.py:2374
msgid "Variable"
msgstr "ПеременнаÑ"
+#: ../editors/Viewer.py:308 ../editors/Viewer.py:338 ../editors/Viewer.py:360
+#: ../editors/TextViewer.py:292 ../editors/TextViewer.py:343
+#: ../editors/TextViewer.py:366 ../controls/VariablePanel.py:329
+msgid "Variable Drop"
+msgstr "ПеретаÑкивание переменной"
+
#: ../dialogs/FBDVariableDialog.py:63
msgid "Variable Properties"
msgstr "СвойÑтва переменных"
-#: ../editors/Viewer.py:284 ../editors/TextViewer.py:304
-#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:280
-#: ../controls/VariablePanel.py:340
+#: ../editors/Viewer.py:288 ../editors/TextViewer.py:306
+#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:290
+#: ../controls/VariablePanel.py:350
msgid "Variable class"
-msgstr ""
-
-#: ../editors/Viewer.py:391 ../editors/TextViewer.py:385
+msgstr "КлаÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
+
+#: ../editors/Viewer.py:395 ../editors/TextViewer.py:387
msgid "Variable don't belong to this POU!"
msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð½Ðµ принадлежит Ñтому POU!"
@@ -3468,33 +3606,41 @@
msgid "Vertical:"
msgstr "Вертикальный:"
-#: ../connectors/WAMP/__init__.py:88
+#: ../Beremiz_service.py:586
+msgid "WAMP client startup failed. "
+msgstr "Ошибка импорта WAMP. "
+
+#: ../connectors/WAMP/__init__.py:91
#, python-format
msgid "WAMP connecting to URL : %s\n"
msgstr "WAMP подключение к URI: %s\n"
-#: ../connectors/WAMP/__init__.py:128
+#: ../connectors/WAMP/__init__.py:131
msgid "WAMP connection timeout"
msgstr "Тайм-аут WAMP Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ "
-#: ../connectors/WAMP/__init__.py:147
+#: ../connectors/WAMP/__init__.py:150
#, python-format
msgid "WAMP connection to '%s' failed.\n"
msgstr "Ðе удалоÑÑŒ уÑтановить WAMP подключение к %s.\n"
-#: ../wxglade_hmi/wxglade_hmi.py:11
+#: ../Beremiz_service.py:562
+msgid "WAMP import failed :"
+msgstr "Ошибка импорта WAMP :"
+
+#: ../wxglade_hmi/wxglade_hmi.py:35
msgid "WXGLADE GUI"
-msgstr ""
+msgstr "WXGLADE GUI"
#: ../dialogs/PouDialog.py:128 ../editors/LDViewer.py:891
msgid "Warning"
msgstr "Предупреждение"
-#: ../ProjectController.py:584
+#: ../ProjectController.py:616
msgid "Warnings in ST/IL/SFC code generator :\n"
msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð² ST/IL/SFC коде генераторе:\n"
-#: ../dialogs/SearchInProjectDialog.py:85
+#: ../dialogs/SearchInProjectDialog.py:78
msgid "Whole Project"
msgstr "Целый проект"
@@ -3503,23 +3649,27 @@
msgstr "Ширина:"
msgid "Win32"
-msgstr ""
-
-#: ../dialogs/FindInPouDialog.py:92
+msgstr "Win32"
+
+#: ../dialogs/FindInPouDialog.py:93
msgid "Wrap search"
msgstr "Продолжить поиÑк Ñначала"
-#: ../features.py:10
+#: ../dialogs/AboutDialog.py:122
+msgid "Written by"
+msgstr "Ðвторы"
+
+#: ../features.py:34
msgid "WxGlade GUI"
-msgstr ""
+msgstr "WxGlade GUI"
msgid "XenoConfig"
msgstr "ÐаÑтройки Xenomai"
msgid "Xenomai"
-msgstr ""
-
-#: ../svgui/svgui.py:115
+msgstr "Xenomai"
+
+#: ../svgui/svgui.py:139
msgid ""
"You don't have write permissions.\n"
"Open Inkscape anyway ?"
@@ -3527,7 +3677,7 @@
"У Ð²Ð°Ñ Ð½ÐµÐ´Ð¾Ñтаточно прав Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи.\n"
"Открыть Inkscape вÑе равно?"
-#: ../wxglade_hmi/wxglade_hmi.py:113
+#: ../wxglade_hmi/wxglade_hmi.py:137
msgid ""
"You don't have write permissions.\n"
"Open wxGlade anyway ?"
@@ -3535,7 +3685,7 @@
"У Ð²Ð°Ñ Ð½ÐµÐ´Ð¾Ñтаточно прав Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи.\n"
"Открыть wxGlade вÑе равно?"
-#: ../ProjectController.py:268
+#: ../ProjectController.py:292
msgid ""
"You must have permission to work on the project\n"
"Work on a project copy ?"
@@ -3545,13 +3695,13 @@
#: ../editors/LDViewer.py:886
msgid "You must select the block or group of blocks around which a branch should be added!"
-msgstr "Выберете блок или группу блоков, вокруг которых нужно добавить ветвление!"
+msgstr "Выберите блок или группу блоков, вокруг которых нужно добавить ветвление!"
#: ../editors/LDViewer.py:666
msgid "You must select the wire where a contact should be added!"
-msgstr "Выберете провод, куда должен быть добавлен контакт!"
-
-#: ../dialogs/SFCStepNameDialog.py:47 ../dialogs/PouNameDialog.py:45
+msgstr "Выберите провод, куда должен быть добавлен контакт!"
+
+#: ../dialogs/SFCStepNameDialog.py:48 ../dialogs/PouNameDialog.py:46
msgid "You must type a name!"
msgstr "Введите имÑ!"
@@ -3559,14 +3709,10 @@
msgid "You must type a value!"
msgstr "Введите значение!"
-#: ../IDEFrame.py:414
+#: ../IDEFrame.py:438
msgid "Zoom"
msgstr "Приближение"
-#: ../Beremiz.py:997
-msgid "about.html"
-msgstr "about.ru.html"
-
msgid "class"
msgstr "клаÑÑ"
@@ -3577,25 +3723,31 @@
msgid "desc"
msgstr ""
-#: ../PLCOpenEditor.py:326
+#: ../PLCOpenEditor.py:333
#, python-format
msgid "error: %s\n"
msgstr "ошибка: %s\n"
-#: ../util/ProcessLogger.py:166
-#, python-format
-msgid "exited with status %s (pid %s)\n"
-msgstr "завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %s (pid %s)\n"
-
-#: ../PLCOpenEditor.py:384 ../PLCOpenEditor.py:386
+#: ../util/ProcessLogger.py:169
+#, python-brace-format
+msgid "exited with status {a1} (pid {a2})\n"
+msgstr "завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ {a1} (pid {a2})\n"
+
+#: ../PLCOpenEditor.py:396 ../PLCOpenEditor.py:398
msgid "file : "
msgstr "файл:"
+msgid "first input parameter"
+msgstr "первый входной параметр"
+
+msgid "first output parameter"
+msgstr "первый выходной параметр"
+
#: ../dialogs/PouDialog.py:31
msgid "function"
msgstr "функциÑ"
-#: ../PLCOpenEditor.py:387
+#: ../PLCOpenEditor.py:399
msgid "function : "
msgstr "функциÑ: "
@@ -3610,7 +3762,10 @@
msgid "initial"
msgstr "иÑходный"
-#: ../PLCOpenEditor.py:387
+msgid "internal state: 0-reset, 1-counting, 2-set"
+msgstr "ÑоÑтоÑние: 0 - ÑброÑ, 1 - Ñчёт, 2 - уÑтановка"
+
+#: ../PLCOpenEditor.py:399
msgid "line : "
msgstr "Ñтрока:"
@@ -3631,14 +3786,16 @@
msgid "opts"
msgstr ""
-#: ../PLCOpenEditor.py:346
-msgid "plcopen_about.html"
-msgstr "plcopen_about.ru.html"
-
#: ../dialogs/PouDialog.py:31
msgid "program"
msgstr "программа"
+msgid "second input parameter"
+msgstr "второй входной параметр"
+
+msgid "second output parameter"
+msgstr "второй выходной параметр"
+
#: ../dialogs/DurationEditorDialog.py:152
msgid "seconds"
msgstr "Ñекунды"
@@ -3658,29 +3815,130 @@
msgid "type"
msgstr "тип"
+#: ../Beremiz.py:126
+msgid "update info unavailable."
+msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± обновлениÑÑ… недоÑтупна."
+
msgid "variable"
msgstr "переменнаÑ"
msgid "variables"
msgstr "переменные"
-#: ../PLCOpenEditor.py:324
+#: ../PLCOpenEditor.py:331
#, python-format
msgid "warning: %s\n"
msgstr "предупреждение: %s\n"
+#: ../PLCControler.py:970
+#, python-brace-format
+msgid "{a1} \"{a2}\" can't be pasted as a {a3}."
+msgstr "{a1} \"{a2}\" не может быть вÑтавлен как {a3}."
+
+#: ../ConfigTreeNode.py:56
+#, python-brace-format
+msgid ""
+"{a1} XML file doesn't follow XSD schema at line %{a2}:\n"
+"{a3}"
+msgstr ""
+"{a1} XML файл не Ñледует XSD-Ñхеме в Ñтроке {a2}:\n"
+"{a3}"
+
+#~ msgid ""
+#~ "\n"
+#~ "An error has occurred.\n"
+#~ "\n"
+#~ "Click OK to save an error report.\n"
+#~ "\n"
+#~ "Please be kind enough to send this file to:\n"
+#~ "edouard.tisserant@gmail.com\n"
+#~ "\n"
+#~ "Error:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Произошла ошибка.\n"
+#~ "\n"
+#~ "Ðажмите OK, чтобы Ñохранить репорт об ошибке.\n"
+#~ "\n"
+#~ "Будьте так добры, пошлите Ñтот файл:\n"
+#~ "edouard.tisserant@gmail.com\n"
+#~ "\n"
+#~ "Ошибка:\n"
+
+#~ msgid " -> Nothing to do\n"
+#~ msgstr " -> Ðичего не нужно делать\n"
+
+#~ msgid " : "
+#~ msgstr " : "
+
#~ msgid "\"%s\" element can't be pasted here!!!"
#~ msgstr "Ðлемент \"%s\" не может быть вÑтавлен Ñюда!!!"
#~ msgid "... debugger recovered\n"
#~ msgstr "... отладчик воÑÑтановлен\n"
+#~ msgid "About Beremiz"
+#~ msgstr "О Beremiz"
+
+#~ msgid "About PLCOpenEditor"
+#~ msgstr "О PLCOpenEditor"
+
#~ msgid "Clear the graph values"
#~ msgstr "ОчиÑтить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð½Ð° графике"
+#~ msgid ""
+#~ "Derivative\n"
+#~ "The derivative function block produces an output XOUT proportional to the rate of change of the input XIN."
+#~ msgstr ""
+#~ "ПроизводнаÑ\n"
+#~ "Функциональный блок формирует выход XOUT пропорционально чаÑтоте Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñ…Ð¾Ð´Ð° XIN."
+
+#~ msgid "Description"
+#~ msgstr "ОпиÑание"
+
+#~ msgid ""
+#~ "Down-counter\n"
+#~ "The down-counter can be used to signal when a count has reached zero, on counting down from a preset value."
+#~ msgstr ""
+#~ "Декрементный Ñчетчик\n"
+#~ "Декрементный Ñчетчик может иÑпользоватьÑÑ, когда необходимо Ñигнализировать, что Ñчетчик доÑтиг нулевого Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ Ð¸Ñходного заданного значениÑ."
+
+#~ msgid "Enable_Native_Library"
+#~ msgstr "Разрешить библиотеку Native"
+
+#~ msgid ""
+#~ "Falling edge detector\n"
+#~ "The output produces a single pulse when a falling edge is detected."
+#~ msgstr ""
+#~ "Детектор падающего фронта\n"
+#~ "Ðа выходе формируетÑÑ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ð¹ импульÑ, еÑли обнаружен падающий фронт."
+
+#~ msgid "Form isn't complete. Pattern to search must be filled!"
+#~ msgstr "Форма заполнена неполноÑтью. Шаблон поиÑка должен быть заполнен!"
+
+#~ msgid ""
+#~ "Hysteresis\n"
+#~ "The hysteresis function block provides a hysteresis boolean output driven by the difference of two floating point (REAL) inputs XIN1 and XIN2."
+#~ msgstr ""
+#~ "ГиÑтерезиÑ\n"
+#~ "Функциональный блок формирует диÑкретный выход Ñ Ð³Ð¸ÑтерезиÑом в завиÑимоÑти от разницы двух вещеÑтвенных входов XIN1 и XIN2."
+
#~ msgid "IEC-61131-3 code generation failed !\n"
#~ msgstr "ÐÐµÑƒÐ´Ð°Ñ‡Ð½Ð°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÐœÐК-61131-3 кода!\n"
+#~ msgid "In section: "
+#~ msgstr "Ð’ Ñекции: "
+
+#~ msgid "Initial"
+#~ msgstr "ИÑходное значение"
+
+#~ msgid ""
+#~ "Integral\n"
+#~ "The integral function block integrates the value of input XIN over time."
+#~ msgstr ""
+#~ "Интеграл\n"
+#~ "Функциональный блок интегрирует входное значение XIN во времени."
+
#~ msgid "Move debug variable down"
#~ msgstr "ПеремеÑтить отлаживаемую переменную ниже"
@@ -3693,18 +3951,102 @@
#~ msgid "No output variable found"
#~ msgstr "Ð’Ñ‹Ñ…Ð¾Ð´Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð½Ðµ найдена"
+#~ msgid ""
+#~ "Off-delay timer\n"
+#~ "The off-delay timer can be used to delay setting an output false, for fixed period after input goes false."
+#~ msgstr ""
+#~ "Таймер выключениÑ\n"
+#~ "Таймер Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован, чтобы внеÑти задержку уÑтановки выхода в FALSE на фикÑированный период времени поÑле того, как вход Ñтал FALSE."
+
+#~ msgid ""
+#~ "On-delay timer\n"
+#~ "The on-delay timer can be used to delay setting an output true, for fixed period after an input becomes true."
+#~ msgstr ""
+#~ "Таймер включениÑ\n"
+#~ "Таймер Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользован, чтобы внеÑти задержку уÑтановки выхода в TRUE на фикÑированный период времени поÑле того, как вход Ñтал TRUE."
+
+#~ msgid ""
+#~ "PID\n"
+#~ "The PID (proportional, Integral, Derivative) function block provides the classical three term controller for closed loop control."
+#~ msgstr ""
+#~ "ПИД\n"
+#~ "ПИД (Пропорциональный Интегральный Дифференциальный) ФБ - клаÑÑичеÑкий регулÑтор, иÑпользуемый в ÑиÑтемах Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¹ ÑвÑзью."
+
#~ msgid "Position:"
#~ msgstr "ПозициÑ:"
+#~ msgid ""
+#~ "Pulse timer\n"
+#~ "The pulse timer can be used to generate output pulses of a given time duration."
+#~ msgstr ""
+#~ "Генератор импульÑов\n"
+#~ "Функциональный блок иÑпользуетÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ выходных импульÑов заданной длительноÑти."
+
+#~ msgid ""
+#~ "RS bistable\n"
+#~ "The RS bistable is a latch where the Reset dominates."
+#~ msgstr ""
+#~ "RS триггер\n"
+#~ "RS триггер - переключатель Ñ Ð´Ð¾Ð¼Ð¸Ð½Ð°Ð½Ñ‚Ð¾Ð¹ выключениÑ."
+
+#~ msgid ""
+#~ "Ramp\n"
+#~ "The RAMP function block is modelled on example given in the standard."
+#~ msgstr ""
+#~ "Ограничитель ÑкороÑти Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñигнала\n"
+#~ "Функциональный блок напиÑан ÑоглаÑно примеру, приведенному в Ñтандарте."
+
+#~ msgid ""
+#~ "Real time clock\n"
+#~ "The real time clock has many uses including time stamping, setting dates and times of day in batch reports, in alarm messages and so on."
+#~ msgstr ""
+#~ "RTC чаÑÑ‹\n"
+#~ "ЧаÑÑ‹ реального времени иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð¾Ðº времени, уÑтановки даты и времени Ð´Ð½Ñ Ð² отчетах, ÑообщениÑÑ… об авариÑÑ… и пр."
+
#~ msgid "Remove debug variable"
#~ msgstr "Удалить отлаживаемую переменную"
#~ msgid "Reset zoom and offset"
#~ msgstr "СброÑить приближение и Ñмещение"
+#~ msgid ""
+#~ "Rising edge detector\n"
+#~ "The output produces a single pulse when a rising edge is detected."
+#~ msgstr ""
+#~ "Детектор нараÑтающего фронта\n"
+#~ "Ðа выходе формируетÑÑ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ð¹ импульÑ, еÑли обнаружен нараÑтающий фронт."
+
+#~ msgid ""
+#~ "SR bistable\n"
+#~ "The SR bistable is a latch where the Set dominates."
+#~ msgstr ""
+#~ "SR триггер\n"
+#~ "SR триггер - переключатель Ñ Ð´Ð¾Ð¼Ð¸Ð½Ð°Ð½Ñ‚Ð¾Ð¹ включениÑ."
+
+#~ msgid ""
+#~ "Semaphore\n"
+#~ "The semaphore provides a mechanism to allow software elements mutually exclusive access to certain ressources."
+#~ msgstr ""
+#~ "Семафор\n"
+#~ "Семафор предоÑтавлÑет Ñобой программный механизм Ñинхронизации Ð´Ð»Ñ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ñключительного доÑтупа к определенным реÑурÑам."
+
#~ msgid "Tick"
#~ msgstr "Тик"
+#~ msgid ""
+#~ "Up-counter\n"
+#~ "The up-counter can be used to signal when a count has reached a maximum value."
+#~ msgstr ""
+#~ "Инкрементный Ñчетчик\n"
+#~ "Инкрементный Ñчетчик может иÑпользоватьÑÑ, когда необходимо Ñигнализировать, что Ñчетчик доÑтиг макÑимального значениÑ."
+
+#~ msgid ""
+#~ "Up-down counter\n"
+#~ "The up-down counter has two inputs CU and CD. It can be used to both count up on one input and down on the other."
+#~ msgstr ""
+#~ "Инкрементный/декрементный Ñчетчик\n"
+#~ "Инкрементный/декрементный Ñчетчик имеет два входа CU и CD. Он может иÑпользоватьÑÑ Ð´Ð»Ñ Ñчета вверх по одному входу и Ð´Ð»Ñ Ñчета низ по другому."
+
#~ msgid "Values"
#~ msgstr "ЗначениÑ"
@@ -3713,3 +4055,9 @@
#~ msgid "Zoom:"
#~ msgstr "Приближение:"
+
+#~ msgid "about.html"
+#~ msgstr "about.ru.html"
+
+#~ msgid "plcopen_about.html"
+#~ msgstr "plcopen_about.ru.html"
diff -r 6431f26aa501 -r 3291024e00da i18n/app.fil
--- a/i18n/app.fil Thu Feb 16 14:34:40 2017 +0500
+++ b/i18n/app.fil Thu Feb 16 14:35:12 2017 +0500
@@ -14,6 +14,7 @@
../dialogs/PouTransitionDialog.py
../dialogs/FBDVariableDialog.py
../dialogs/BlockPreviewDialog.py
+../dialogs/AboutDialog.py
../dialogs/ProjectDialog.py
../dialogs/LDPowerRailDialog.py
../dialogs/ArrayTypeDialog.py
@@ -41,6 +42,7 @@
../targets/Xenomai/__init__.py
../targets/Xenomai/XSD
../targets/XSD_toolchain_gcc
+../targets/PLC/XSD
../targets/__init__.py
../targets/toolchain_gcc.py
../targets/toolchain_makefile.py
@@ -97,6 +99,7 @@
../xmlclass/xsdschema.py
../xmlclass/xmlclass.py
../Beremiz.py
+../version.py
../POULibrary.py
../util/MiniTextControler.py
../util/Zeroconf.py
@@ -113,3 +116,5 @@
../IDEFrame.py
../PLCGenerator.py
../Beremiz_service.py
+../plcopen/Additional_Function_Blocks.xml
+../plcopen/Standard_Function_Blocks.xml
\ No newline at end of file
diff -r 6431f26aa501 -r 3291024e00da i18n/messages.pot
--- a/i18n/messages.pot Thu Feb 16 14:34:40 2017 +0500
+++ b/i18n/messages.pot Thu Feb 16 14:35:12 2017 +0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-21 17:11+0300\n"
+"POT-Creation-Date: 2017-01-12 14:39+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,7 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../PLCOpenEditor.py:396
-msgid ""
-"\n"
-"An error has occurred.\n"
-"\n"
-"Click OK to save an error report.\n"
-"\n"
-"Please be kind enough to send this file to:\n"
-"edouard.tisserant@gmail.com\n"
-"\n"
-"Error:\n"
-msgstr ""
-
-#: ../Beremiz.py:1155
+#: ../PLCOpenEditor.py:408 ../Beremiz.py:1191
#, python-format
msgid ""
"\n"
@@ -40,7 +27,7 @@
"Please be kind enough to send this file to:\n"
"beremiz-devel@lists.sourceforge.net\n"
"\n"
-"You should now restart Beremiz.\n"
+"You should now restart program.\n"
"\n"
"Traceback:\n"
msgstr ""
@@ -69,355 +56,369 @@
msgid " Temp"
msgstr ""
-#: ../PLCOpenEditor.py:406
-msgid " : "
-msgstr ""
-
-#: ../dialogs/PouTransitionDialog.py:94 ../dialogs/ProjectDialog.py:66
+#: ../dialogs/PouTransitionDialog.py:99 ../dialogs/ProjectDialog.py:66
#: ../dialogs/PouActionDialog.py:91 ../dialogs/PouDialog.py:113
#, python-format
msgid " and %s"
msgstr ""
-#: ../ProjectController.py:1027
+#: ../ProjectController.py:1089
msgid " generation failed !\n"
msgstr ""
-#: ../plcopen/plcopen.py:883
+#: ../plcopen/plcopen.py:881
#, python-format
msgid "\"%s\" Data Type doesn't exist !!!"
msgstr ""
-#: ../plcopen/plcopen.py:901
+#: ../plcopen/plcopen.py:899
#, python-format
msgid "\"%s\" POU already exists !!!"
msgstr ""
-#: ../plcopen/plcopen.py:922
+#: ../plcopen/plcopen.py:920
#, python-format
msgid "\"%s\" POU doesn't exist !!!"
msgstr ""
-#: ../editors/Viewer.py:242
+#: ../editors/Viewer.py:246
#, python-format
msgid "\"%s\" can't use itself!"
msgstr ""
-#: ../IDEFrame.py:1615 ../IDEFrame.py:1634
+#: ../IDEFrame.py:1652 ../IDEFrame.py:1671
#, python-format
msgid "\"%s\" config already exists!"
msgstr ""
-#: ../plcopen/plcopen.py:471
+#: ../plcopen/plcopen.py:467
#, python-format
msgid "\"%s\" configuration already exists !!!"
msgstr ""
-#: ../IDEFrame.py:1569
+#: ../IDEFrame.py:1602
#, python-format
msgid "\"%s\" data type already exists!"
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:105 ../dialogs/BlockPreviewDialog.py:219
-#: ../dialogs/PouActionDialog.py:102 ../editors/Viewer.py:258
-#: ../editors/Viewer.py:326 ../editors/Viewer.py:350 ../editors/Viewer.py:370
-#: ../editors/TextViewer.py:270 ../editors/TextViewer.py:299
-#: ../controls/VariablePanel.py:386
+#: ../dialogs/PouTransitionDialog.py:110 ../dialogs/BlockPreviewDialog.py:219
+#: ../dialogs/PouActionDialog.py:102 ../editors/Viewer.py:262
+#: ../editors/Viewer.py:330 ../editors/Viewer.py:354 ../editors/Viewer.py:374
+#: ../editors/TextViewer.py:272 ../editors/TextViewer.py:301
+#: ../controls/VariablePanel.py:396
#, python-format
msgid "\"%s\" element for this pou already exists!"
msgstr ""
-#: ../Beremiz.py:962
+#: ../Beremiz.py:994
#, python-format
msgid "\"%s\" folder is not a valid Beremiz project\n"
msgstr ""
-#: ../PLCGenerator.py:1091
-#, python-format
-msgid "\"%s\" function cancelled in \"%s\" POU: No input connected"
-msgstr ""
-
-#: ../dialogs/SFCStepNameDialog.py:51 ../dialogs/PouTransitionDialog.py:101
-#: ../dialogs/BlockPreviewDialog.py:207 ../dialogs/PouNameDialog.py:49
+#: ../dialogs/SFCStepNameDialog.py:52 ../dialogs/PouTransitionDialog.py:106
+#: ../dialogs/BlockPreviewDialog.py:207 ../dialogs/PouNameDialog.py:50
#: ../dialogs/PouActionDialog.py:98 ../dialogs/PouDialog.py:120
-#: ../editors/DataTypeEditor.py:554 ../editors/DataTypeEditor.py:583
-#: ../editors/CodeFileEditor.py:750 ../controls/VariablePanel.py:733
-#: ../IDEFrame.py:1560
+#: ../editors/DataTypeEditor.py:555 ../editors/DataTypeEditor.py:584
+#: ../editors/CodeFileEditor.py:770 ../controls/VariablePanel.py:751
+#: ../IDEFrame.py:1593
#, python-format
msgid "\"%s\" is a keyword. It can't be used!"
msgstr ""
-#: ../editors/Viewer.py:246
-#, python-format
-msgid "\"%s\" is already used by \"%s\"!"
-msgstr ""
-
-#: ../plcopen/plcopen.py:2405
+#: ../plcopen/plcopen.py:2412
#, python-format
msgid "\"%s\" is an invalid value!"
msgstr ""
-#: ../PLCOpenEditor.py:332 ../PLCOpenEditor.py:369
+#: ../PLCOpenEditor.py:339 ../PLCOpenEditor.py:381
#, python-format
msgid "\"%s\" is not a valid folder!"
msgstr ""
-#: ../dialogs/SFCStepNameDialog.py:49 ../dialogs/PouTransitionDialog.py:99
-#: ../dialogs/BlockPreviewDialog.py:203 ../dialogs/PouNameDialog.py:47
+#: ../dialogs/SFCStepNameDialog.py:50 ../dialogs/PouTransitionDialog.py:104
+#: ../dialogs/BlockPreviewDialog.py:203 ../dialogs/PouNameDialog.py:48
#: ../dialogs/PouActionDialog.py:96 ../dialogs/PouDialog.py:118
-#: ../editors/DataTypeEditor.py:578 ../editors/CodeFileEditor.py:748
-#: ../controls/VariablePanel.py:731 ../IDEFrame.py:1558
+#: ../editors/DataTypeEditor.py:579 ../editors/CodeFileEditor.py:768
+#: ../controls/VariablePanel.py:749 ../IDEFrame.py:1591
#, python-format
msgid "\"%s\" is not a valid identifier!"
msgstr ""
-#: ../IDEFrame.py:2362
+#: ../IDEFrame.py:2396
#, python-format
msgid "\"%s\" is used by one or more POUs. Do you wish to continue?"
msgstr ""
#: ../dialogs/BlockPreviewDialog.py:211 ../dialogs/PouDialog.py:122
-#: ../editors/Viewer.py:256 ../editors/Viewer.py:311 ../editors/Viewer.py:341
-#: ../editors/Viewer.py:363 ../editors/TextViewer.py:268
-#: ../editors/TextViewer.py:297 ../editors/TextViewer.py:348
-#: ../editors/TextViewer.py:371 ../controls/VariablePanel.py:328
-#: ../IDEFrame.py:1578
+#: ../editors/Viewer.py:260 ../editors/Viewer.py:315 ../editors/Viewer.py:345
+#: ../editors/Viewer.py:367 ../editors/TextViewer.py:270
+#: ../editors/TextViewer.py:299 ../editors/TextViewer.py:350
+#: ../editors/TextViewer.py:373 ../controls/VariablePanel.py:338
+#: ../IDEFrame.py:1611
#, python-format
msgid "\"%s\" pou already exists!"
msgstr ""
-#: ../plcopen/plcopen.py:495
-#, python-format
-msgid "\"%s\" resource already exists in \"%s\" configuration !!!"
-msgstr ""
-
-#: ../plcopen/plcopen.py:512
-#, python-format
-msgid "\"%s\" resource doesn't exist in \"%s\" configuration !!!"
-msgstr ""
-
-#: ../dialogs/SFCStepNameDialog.py:57
+#: ../dialogs/SFCStepNameDialog.py:58
#, python-format
msgid "\"%s\" step already exists!"
msgstr ""
-#: ../editors/DataTypeEditor.py:549
+#: ../editors/DataTypeEditor.py:550
#, python-format
msgid "\"%s\" value already defined!"
msgstr ""
-#: ../dialogs/ArrayTypeDialog.py:97 ../editors/DataTypeEditor.py:744
+#: ../dialogs/ArrayTypeDialog.py:97 ../editors/DataTypeEditor.py:745
#, python-format
msgid "\"%s\" value isn't a valid array dimension!"
msgstr ""
-#: ../dialogs/ArrayTypeDialog.py:103 ../editors/DataTypeEditor.py:751
+#: ../dialogs/ArrayTypeDialog.py:103 ../editors/DataTypeEditor.py:752
#, python-format
msgid ""
"\"%s\" value isn't a valid array dimension!\n"
"Right value must be greater than left value."
msgstr ""
-#: ../editors/CodeFileEditor.py:663
-msgid "#"
-msgstr ""
-
-#: ../PLCControler.py:970
-#, python-format
-msgid "%s \"%s\" can't be pasted as a %s."
-msgstr ""
-
-#: ../PLCControler.py:1530
+#: ../PLCGenerator.py:1101
+#, python-brace-format
+msgid "\"{a1}\" function cancelled in \"{a2}\" POU: No input connected"
+msgstr ""
+
+#: ../editors/Viewer.py:250
+#, python-brace-format
+msgid "\"{a1}\" is already used by \"{a2}\"!"
+msgstr ""
+
+#: ../plcopen/plcopen.py:491
+#, python-brace-format
+msgid "\"{a1}\" resource already exists in \"{a2}\" configuration !!!"
+msgstr ""
+
+#: ../plcopen/plcopen.py:509
+#, python-brace-format
+msgid "\"{a1}\" resource doesn't exist in \"{a2}\" configuration !!!"
+msgstr ""
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:578
+#, python-format
+msgid "%03gms"
+msgstr ""
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:569
+#, python-format
+msgid "%dd"
+msgstr ""
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:56
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:570
+#, python-format
+msgid "%dh"
+msgstr ""
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:55
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:571
+#, python-format
+msgid "%dm"
+msgstr ""
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:53
+#, python-format
+msgid "%dms"
+msgstr ""
+
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:54
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:572
+#, python-format
+msgid "%ds"
+msgstr ""
+
+#: ../PLCControler.py:1531
#, python-format
msgid "%s Data Types"
msgstr ""
-#: ../PLCControler.py:1513
+#: ../PLCControler.py:1514
#, python-format
msgid "%s POUs"
msgstr ""
-#: ../canfestival/SlaveEditor.py:46 ../canfestival/NetworkEditor.py:67
+#: ../canfestival/SlaveEditor.py:69 ../canfestival/NetworkEditor.py:90
#, python-format
msgid "%s Profile"
msgstr ""
-#: ../ConfigTreeNode.py:32
-#, python-format
-msgid ""
-"%s XML file doesn't follow XSD schema at line %d:\n"
-"%s"
-msgstr ""
-
-#: ../plcopen/plcopen.py:1638 ../plcopen/plcopen.py:1645
-#: ../plcopen/plcopen.py:1657 ../plcopen/plcopen.py:1665
-#: ../plcopen/plcopen.py:1675
+#: ../plcopen/plcopen.py:1645 ../plcopen/plcopen.py:1652
+#: ../plcopen/plcopen.py:1664 ../plcopen/plcopen.py:1672
+#: ../plcopen/plcopen.py:1682
#, python-format
msgid "%s body don't have instances!"
msgstr ""
-#: ../plcopen/plcopen.py:1693 ../plcopen/plcopen.py:1700
-#: ../plcopen/plcopen.py:1707
+#: ../plcopen/plcopen.py:1700 ../plcopen/plcopen.py:1707
+#: ../plcopen/plcopen.py:1714
#, python-format
msgid "%s body don't have text!"
msgstr ""
-#: ../IDEFrame.py:362
+#: ../IDEFrame.py:386
msgid "&Add Element"
msgstr ""
-#: ../IDEFrame.py:332
+#: ../dialogs/AboutDialog.py:65 ../dialogs/AboutDialog.py:113
+#: ../dialogs/AboutDialog.py:150
+msgid "&Close"
+msgstr ""
+
+#: ../IDEFrame.py:356
msgid "&Configuration"
msgstr ""
-#: ../IDEFrame.py:321
+#: ../IDEFrame.py:345
msgid "&Data Type"
msgstr ""
-#: ../IDEFrame.py:366
+#: ../IDEFrame.py:390
msgid "&Delete"
msgstr ""
-#: ../IDEFrame.py:313
+#: ../IDEFrame.py:337
msgid "&Display"
msgstr ""
-#: ../IDEFrame.py:312
+#: ../IDEFrame.py:336
msgid "&Edit"
msgstr ""
-#: ../IDEFrame.py:311
+#: ../IDEFrame.py:335
msgid "&File"
msgstr ""
-#: ../IDEFrame.py:323
+#: ../IDEFrame.py:347
msgid "&Function"
msgstr ""
-#: ../IDEFrame.py:314
+#: ../IDEFrame.py:338
msgid "&Help"
msgstr ""
-#: ../IDEFrame.py:327
+#: ../dialogs/AboutDialog.py:64
+msgid "&License"
+msgstr ""
+
+#: ../IDEFrame.py:351
msgid "&Program"
msgstr ""
-#: ../PLCOpenEditor.py:119
+#: ../PLCOpenEditor.py:125
msgid "&Properties"
msgstr ""
-#: ../Beremiz.py:317
+#: ../Beremiz.py:324
msgid "&Recent Projects"
msgstr ""
-#: ../IDEFrame.py:329
+#: ../IDEFrame.py:353
msgid "&Resource"
msgstr ""
-#: ../controls/SearchResultPanel.py:252
-#, python-format
-msgid "'%s' - %d match in project"
-msgstr ""
-
-#: ../controls/SearchResultPanel.py:254
-#, python-format
-msgid "'%s' - %d matches in project"
-msgstr ""
-
-#: ../connectors/PYRO/__init__.py:86
-#, python-format
-msgid "'%s' is located at %s\n"
-msgstr ""
-
-#: ../controls/SearchResultPanel.py:304
+#: ../controls/SearchResultPanel.py:239
+#, python-brace-format
+msgid "'{a1}' - {a2} match in project"
+msgstr ""
+
+#: ../controls/SearchResultPanel.py:241
+#, python-brace-format
+msgid "'{a1}' - {a2} matches in project"
+msgstr ""
+
+#: ../connectors/PYRO/__init__.py:90
+#, python-brace-format
+msgid "'{a1}' is located at {a2}\n"
+msgstr ""
+
+#: ../controls/SearchResultPanel.py:291
#, python-format
msgid "(%d matches)"
msgstr ""
-#: ../PLCOpenEditor.py:384 ../PLCOpenEditor.py:386 ../PLCOpenEditor.py:387
+#: ../PLCOpenEditor.py:396 ../PLCOpenEditor.py:398 ../PLCOpenEditor.py:399
msgid ", "
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:96 ../dialogs/PouActionDialog.py:93
+#: ../dialogs/PouTransitionDialog.py:101 ../dialogs/PouActionDialog.py:93
#: ../dialogs/PouDialog.py:115
#, python-format
msgid ", %s"
msgstr ""
-#: ../PLCOpenEditor.py:382
+#: ../PLCOpenEditor.py:394
msgid ". "
msgstr ""
-#: ../controls/LogViewer.py:278
+#: ../controls/LogViewer.py:279
msgid "1d"
msgstr ""
-#: ../controls/LogViewer.py:279
+#: ../controls/LogViewer.py:280
msgid "1h"
msgstr ""
-#: ../controls/LogViewer.py:280
+#: ../controls/LogViewer.py:281
msgid "1m"
msgstr ""
-#: ../controls/LogViewer.py:281
+#: ../controls/LogViewer.py:282
msgid "1s"
msgstr ""
-#: ../dialogs/PouDialog.py:124 ../IDEFrame.py:1581 ../IDEFrame.py:1623
-#: ../IDEFrame.py:1642
+#: ../dialogs/PouDialog.py:124 ../IDEFrame.py:1614 ../IDEFrame.py:1660
+#: ../IDEFrame.py:1679
#, python-format
msgid "A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr ""
-#: ../dialogs/SFCStepNameDialog.py:53 ../dialogs/PouTransitionDialog.py:103
-#: ../dialogs/PouNameDialog.py:51 ../dialogs/PouActionDialog.py:100
-#: ../controls/VariablePanel.py:735 ../IDEFrame.py:1593 ../IDEFrame.py:1604
+#: ../dialogs/SFCStepNameDialog.py:54 ../dialogs/PouTransitionDialog.py:108
+#: ../dialogs/PouNameDialog.py:52 ../dialogs/PouActionDialog.py:100
+#: ../controls/VariablePanel.py:753 ../IDEFrame.py:1628 ../IDEFrame.py:1641
#, python-format
msgid "A POU named \"%s\" already exists!"
msgstr ""
-#: ../ConfigTreeNode.py:400
-#, python-format
-msgid "A child named \"%s\" already exist -> \"%s\"\n"
-msgstr ""
-
-#: ../dialogs/BrowseLocationsDialog.py:211
+#: ../ConfigTreeNode.py:424
+#, python-brace-format
+msgid "A child named \"{a1}\" already exists -> \"{a2}\"\n"
+msgstr ""
+
+#: ../dialogs/BrowseLocationsDialog.py:216
msgid "A location must be selected!"
msgstr ""
-#: ../dialogs/SFCStepNameDialog.py:55 ../controls/VariablePanel.py:737
-#: ../IDEFrame.py:1595 ../IDEFrame.py:1606
+#: ../dialogs/SFCStepNameDialog.py:56 ../controls/VariablePanel.py:755
+#: ../IDEFrame.py:1630 ../IDEFrame.py:1643
#, python-format
msgid "A variable with \"%s\" as name already exists in this pou!"
msgstr ""
-#: ../editors/CodeFileEditor.py:754
+#: ../editors/CodeFileEditor.py:774
#, python-format
msgid "A variable with \"%s\" as name already exists!"
msgstr ""
-#: ../PLCOpenEditor.py:152 ../Beremiz.py:374
+#: ../dialogs/AboutDialog.py:40 ../PLCOpenEditor.py:158 ../Beremiz.py:381
msgid "About"
msgstr ""
-#: ../Beremiz.py:997
-msgid "About Beremiz"
-msgstr ""
-
-#: ../PLCOpenEditor.py:346
-msgid "About PLCOpenEditor"
-msgstr ""
-
#: ../plcopen/iec_std.csv:22
msgid "Absolute number"
msgstr ""
-#: ../dialogs/SFCStepDialog.py:71 ../dialogs/ActionBlockDialog.py:42
+#: ../dialogs/SFCStepDialog.py:72 ../dialogs/ActionBlockDialog.py:42
msgid "Action"
msgstr ""
-#: ../editors/Viewer.py:551 ../editors/Viewer.py:2069
+#: ../editors/Viewer.py:555 ../editors/Viewer.py:2345
msgid "Action Block"
msgstr ""
@@ -429,7 +430,7 @@
msgid "Action Name:"
msgstr ""
-#: ../plcopen/plcopen.py:1356
+#: ../plcopen/plcopen.py:1359
#, python-format
msgid "Action with name %s doesn't exist!"
msgstr ""
@@ -442,72 +443,72 @@
msgid "Actions:"
msgstr ""
-#: ../editors/Viewer.py:1087
+#: ../editors/Viewer.py:1100
msgid "Active"
msgstr ""
-#: ../canfestival/SlaveEditor.py:57 ../canfestival/NetworkEditor.py:78
-#: ../editors/Viewer.py:584 ../Beremiz.py:1024
+#: ../canfestival/SlaveEditor.py:80 ../canfestival/NetworkEditor.py:101
+#: ../editors/Viewer.py:588 ../Beremiz.py:1060
msgid "Add"
msgstr ""
-#: ../IDEFrame.py:1856 ../IDEFrame.py:1891
+#: ../IDEFrame.py:1890 ../IDEFrame.py:1925
msgid "Add Action"
msgstr ""
-#: ../features.py:8
+#: ../features.py:32
msgid "Add C code accessing located variables synchronously"
msgstr ""
-#: ../IDEFrame.py:1839
+#: ../IDEFrame.py:1873
msgid "Add Configuration"
msgstr ""
-#: ../IDEFrame.py:1819
+#: ../IDEFrame.py:1853
msgid "Add DataType"
msgstr ""
-#: ../editors/Viewer.py:509
+#: ../editors/Viewer.py:513
msgid "Add Divergence Branch"
msgstr ""
-#: ../dialogs/DiscoveryDialog.py:115
+#: ../dialogs/DiscoveryDialog.py:116
msgid "Add IP"
msgstr ""
-#: ../IDEFrame.py:1827
+#: ../IDEFrame.py:1861
msgid "Add POU"
msgstr ""
-#: ../features.py:9
+#: ../features.py:33
msgid "Add Python code executed asynchronously"
msgstr ""
-#: ../IDEFrame.py:1867 ../IDEFrame.py:1917
+#: ../IDEFrame.py:1901 ../IDEFrame.py:1951
msgid "Add Resource"
msgstr ""
-#: ../IDEFrame.py:1845 ../IDEFrame.py:1888
+#: ../IDEFrame.py:1879 ../IDEFrame.py:1922
msgid "Add Transition"
msgstr ""
-#: ../editors/Viewer.py:496
+#: ../editors/Viewer.py:500
msgid "Add Wire Segment"
msgstr ""
-#: ../editors/SFCViewer.py:359
+#: ../editors/SFCViewer.py:433
msgid "Add a new initial step"
msgstr ""
-#: ../editors/Viewer.py:2672 ../editors/SFCViewer.py:696
+#: ../editors/Viewer.py:2706 ../editors/SFCViewer.py:770
msgid "Add a new jump"
msgstr ""
-#: ../editors/SFCViewer.py:381
+#: ../editors/SFCViewer.py:455
msgid "Add a new step"
msgstr ""
-#: ../features.py:10
+#: ../features.py:34
msgid "Add a simple WxGlade based GUI."
msgstr ""
@@ -515,7 +516,7 @@
msgid "Add action"
msgstr ""
-#: ../editors/DataTypeEditor.py:351
+#: ../editors/DataTypeEditor.py:352
msgid "Add element"
msgstr ""
@@ -523,7 +524,7 @@
msgid "Add instance"
msgstr ""
-#: ../canfestival/NetworkEditor.py:80
+#: ../canfestival/NetworkEditor.py:103
msgid "Add slave"
msgstr ""
@@ -531,7 +532,7 @@
msgid "Add task"
msgstr ""
-#: ../editors/CodeFileEditor.py:640 ../controls/VariablePanel.py:440
+#: ../editors/CodeFileEditor.py:658 ../controls/VariablePanel.py:450
msgid "Add variable"
msgstr ""
@@ -539,22 +540,22 @@
msgid "Addition"
msgstr ""
-#: ../plcopen/definitions.py:22
+#: ../plcopen/definitions.py:47
msgid "Additional function blocks"
msgstr ""
-#: ../editors/Viewer.py:567
+#: ../editors/Viewer.py:571
msgid "Adjust Block Size"
msgstr ""
-#: ../editors/Viewer.py:1612
+#: ../editors/Viewer.py:1637
msgid "Alignment"
msgstr ""
-#: ../dialogs/BrowseLocationsDialog.py:34
-#: ../dialogs/BrowseLocationsDialog.py:42
-#: ../dialogs/BrowseLocationsDialog.py:135
-#: ../dialogs/BrowseLocationsDialog.py:138 ../controls/LogViewer.py:297
+#: ../dialogs/BrowseLocationsDialog.py:39
+#: ../dialogs/BrowseLocationsDialog.py:47
+#: ../dialogs/BrowseLocationsDialog.py:140
+#: ../dialogs/BrowseLocationsDialog.py:143 ../controls/LogViewer.py:298
#: ../controls/VariablePanel.py:70
msgid "All"
msgstr ""
@@ -563,11 +564,11 @@
msgid "All files (*.*)|*.*|CSV files (*.csv)|*.csv"
msgstr ""
-#: ../ProjectController.py:1523
+#: ../ProjectController.py:1623
msgid "Already connected. Please disconnect\n"
msgstr ""
-#: ../editors/DataTypeEditor.py:593
+#: ../editors/DataTypeEditor.py:594
#, python-format
msgid "An element named \"%s\" already exists in this structure!"
msgstr ""
@@ -592,8 +593,8 @@
msgid "Arithmetic"
msgstr ""
-#: ../editors/DataTypeEditor.py:54 ../editors/DataTypeEditor.py:634
-#: ../controls/VariablePanel.py:811
+#: ../editors/DataTypeEditor.py:54 ../editors/DataTypeEditor.py:635
+#: ../controls/VariablePanel.py:829
msgid "Array"
msgstr ""
@@ -613,7 +614,7 @@
msgid "Author Name (optional):"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:78
+#: ../dialogs/FindInPouDialog.py:79
msgid "Backward"
msgstr ""
@@ -625,21 +626,21 @@
msgid "Bad domain name at "
msgstr ""
-#: ../canfestival/config_utils.py:342 ../canfestival/config_utils.py:624
+#: ../canfestival/config_utils.py:342 ../canfestival/config_utils.py:630
#, python-format
msgid "Bad location size : %s"
msgstr ""
-#: ../dialogs/ArrayTypeDialog.py:55 ../editors/DataTypeEditor.py:174
-#: ../editors/DataTypeEditor.py:204 ../editors/DataTypeEditor.py:296
+#: ../dialogs/ArrayTypeDialog.py:55 ../editors/DataTypeEditor.py:175
+#: ../editors/DataTypeEditor.py:205 ../editors/DataTypeEditor.py:297
msgid "Base Type:"
msgstr ""
-#: ../editors/DataTypeEditor.py:624 ../controls/VariablePanel.py:769
+#: ../editors/DataTypeEditor.py:625 ../controls/VariablePanel.py:787
msgid "Base Types"
msgstr ""
-#: ../Beremiz.py:527
+#: ../Beremiz.py:553
msgid "Beremiz"
msgstr ""
@@ -671,7 +672,7 @@
msgid "Bitwise inverting"
msgstr ""
-#: ../editors/Viewer.py:521 ../editors/Viewer.py:2073
+#: ../editors/Viewer.py:525 ../editors/Viewer.py:2358
msgid "Block"
msgstr ""
@@ -679,151 +680,159 @@
msgid "Block Properties"
msgstr ""
-#: ../editors/TextViewer.py:261
+#: ../editors/TextViewer.py:262
msgid "Block name"
msgstr ""
-#: ../editors/Viewer.py:487
+#: ../editors/Viewer.py:491
msgid "Bottom"
msgstr ""
+#: ../ProjectController.py:1301
+msgid "Broken"
+msgstr ""
+
#: ../dialogs/BrowseValuesLibraryDialog.py:37
#, python-format
msgid "Browse %s values library"
msgstr ""
-#: ../dialogs/BrowseLocationsDialog.py:60
+#: ../dialogs/BrowseLocationsDialog.py:65
msgid "Browse Locations"
msgstr ""
-#: ../ProjectController.py:1668
+#: ../ProjectController.py:1769
msgid "Build"
msgstr ""
-#: ../ProjectController.py:1166
+#: ../ProjectController.py:1235
msgid "Build directory already clean\n"
msgstr ""
-#: ../ProjectController.py:1669
+#: ../ProjectController.py:1770
msgid "Build project into build folder"
msgstr ""
-#: ../ProjectController.py:956
+#: ../ProjectController.py:1018
msgid "C Build crashed !\n"
msgstr ""
-#: ../ProjectController.py:953
+#: ../ProjectController.py:1015
msgid "C Build failed.\n"
msgstr ""
-#: ../c_ext/CFileEditor.py:40
+#: ../c_ext/CFileEditor.py:63
msgid "C code"
msgstr ""
-#: ../ProjectController.py:1031
+#: ../ProjectController.py:1093
msgid "C code generated successfully.\n"
msgstr ""
-#: ../targets/toolchain_makefile.py:108
+#: ../targets/toolchain_makefile.py:122
msgid "C compilation failed.\n"
msgstr ""
-#: ../targets/toolchain_gcc.py:132
+#: ../targets/toolchain_gcc.py:156
#, python-format
msgid "C compilation of %s failed.\n"
msgstr ""
-#: ../features.py:8
+#: ../features.py:32
msgid "C extension"
msgstr ""
-#: ../canfestival/NetworkEditor.py:29
+#: ../dialogs/AboutDialog.py:63
+msgid "C&redits"
+msgstr ""
+
+#: ../canfestival/NetworkEditor.py:52
msgid "CANOpen network"
msgstr ""
-#: ../canfestival/SlaveEditor.py:21
+#: ../canfestival/SlaveEditor.py:44
msgid "CANOpen slave"
msgstr ""
-#: ../features.py:7
+#: ../features.py:31
msgid "CANopen support"
msgstr ""
-#: ../plcopen/plcopen.py:1580 ../plcopen/plcopen.py:1594
-#: ../plcopen/plcopen.py:1615 ../plcopen/plcopen.py:1631
+#: ../plcopen/plcopen.py:1584 ../plcopen/plcopen.py:1598
+#: ../plcopen/plcopen.py:1622 ../plcopen/plcopen.py:1638
msgid "Can only generate execution order on FBD networks!"
msgstr ""
-#: ../controls/VariablePanel.py:259
+#: ../controls/VariablePanel.py:267
msgid "Can only give a location to local or global variables"
msgstr ""
-#: ../PLCOpenEditor.py:327
+#: ../PLCOpenEditor.py:334
#, python-format
msgid "Can't generate program to file %s!"
msgstr ""
-#: ../controls/VariablePanel.py:257
+#: ../controls/VariablePanel.py:265
msgid "Can't give a location to a function block instance"
msgstr ""
-#: ../PLCOpenEditor.py:367
+#: ../PLCOpenEditor.py:379
#, python-format
msgid "Can't save project to file %s!"
msgstr ""
-#: ../controls/VariablePanel.py:303
+#: ../controls/VariablePanel.py:313
msgid "Can't set an initial value to a function block instance"
msgstr ""
-#: ../ConfigTreeNode.py:504
-#, python-format
-msgid "Cannot create child %s of type %s "
-msgstr ""
-
-#: ../ConfigTreeNode.py:429
+#: ../ConfigTreeNode.py:529
+#, python-brace-format
+msgid "Cannot create child {a1} of type {a2} "
+msgstr ""
+
+#: ../ConfigTreeNode.py:454
#, python-format
msgid "Cannot find lower free IEC channel than %d\n"
msgstr ""
-#: ../connectors/PYRO/__init__.py:127
+#: ../connectors/PYRO/__init__.py:131
msgid "Cannot get PLC status - connection failed.\n"
msgstr ""
-#: ../ProjectController.py:817
+#: ../ProjectController.py:881
msgid "Cannot open/parse VARIABLES.csv!\n"
msgstr ""
-#: ../canfestival/config_utils.py:372
-#, python-format
-msgid "Cannot set bit offset for non bool '%s' variable (ID:%d,Idx:%x,sIdx:%x))"
-msgstr ""
-
-#: ../dialogs/SearchInProjectDialog.py:67 ../dialogs/FindInPouDialog.py:87
+#: ../canfestival/config_utils.py:374
+#, python-brace-format
+msgid "Cannot set bit offset for non bool '{a1}' variable (ID:{a2},Idx:{a3},sIdx:{a4}))"
+msgstr ""
+
+#: ../dialogs/SearchInProjectDialog.py:59 ../dialogs/FindInPouDialog.py:88
msgid "Case sensitive"
msgstr ""
-#: ../editors/Viewer.py:482
+#: ../editors/Viewer.py:486
msgid "Center"
msgstr ""
-#: ../Beremiz_service.py:245
+#: ../Beremiz_service.py:266
msgid "Change IP of interface to bind"
msgstr ""
-#: ../Beremiz_service.py:244
+#: ../Beremiz_service.py:265
msgid "Change Name"
msgstr ""
-#: ../IDEFrame.py:1909
+#: ../IDEFrame.py:1943
msgid "Change POU Type To"
msgstr ""
-#: ../Beremiz_service.py:246
+#: ../Beremiz_service.py:267
msgid "Change Port Number"
msgstr ""
-#: ../Beremiz_service.py:247
+#: ../Beremiz_service.py:268
msgid "Change working directory"
msgstr ""
@@ -831,20 +840,20 @@
msgid "Character string"
msgstr ""
-#: ../svgui/svgui.py:101
+#: ../svgui/svgui.py:125
msgid "Choose a SVG file"
msgstr ""
-#: ../ProjectController.py:420
+#: ../ProjectController.py:451
msgid "Choose a directory to save project"
msgstr ""
-#: ../canfestival/canfestival.py:136 ../PLCOpenEditor.py:285
-#: ../PLCOpenEditor.py:317 ../PLCOpenEditor.py:361
+#: ../canfestival/canfestival.py:160 ../PLCOpenEditor.py:292
+#: ../PLCOpenEditor.py:324 ../PLCOpenEditor.py:373
msgid "Choose a file"
msgstr ""
-#: ../Beremiz.py:899 ../Beremiz.py:934
+#: ../Beremiz.py:931 ../Beremiz.py:966
msgid "Choose a project"
msgstr ""
@@ -853,15 +862,15 @@
msgid "Choose a value for %s:"
msgstr ""
-#: ../Beremiz_service.py:293
+#: ../Beremiz_service.py:323
msgid "Choose a working directory "
msgstr ""
-#: ../ProjectController.py:334
+#: ../ProjectController.py:358
msgid "Chosen folder doesn't contain a program. It's not a valid project!"
msgstr ""
-#: ../ProjectController.py:301
+#: ../ProjectController.py:325
msgid "Chosen folder isn't empty. You can't use it for a new project!"
msgstr ""
@@ -869,7 +878,7 @@
msgid "Class"
msgstr ""
-#: ../controls/VariablePanel.py:431
+#: ../controls/VariablePanel.py:441
msgid "Class Filter:"
msgstr ""
@@ -877,52 +886,52 @@
msgid "Class:"
msgstr ""
-#: ../ProjectController.py:1672
+#: ../ProjectController.py:1773
msgid "Clean"
msgstr ""
-#: ../controls/LogViewer.py:317
+#: ../controls/LogViewer.py:318
msgid "Clean log messages"
msgstr ""
-#: ../ProjectController.py:1674
+#: ../ProjectController.py:1775
msgid "Clean project build folder"
msgstr ""
-#: ../ProjectController.py:1163
+#: ../ProjectController.py:1232
msgid "Cleaning the build directory\n"
msgstr ""
-#: ../IDEFrame.py:411
+#: ../IDEFrame.py:435
msgid "Clear Errors"
msgstr ""
-#: ../editors/Viewer.py:577
+#: ../editors/Viewer.py:582
msgid "Clear Execution Order"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:110
+#: ../dialogs/SearchInProjectDialog.py:105 ../dialogs/FindInPouDialog.py:111
msgid "Close"
msgstr ""
-#: ../PLCOpenEditor.py:192 ../Beremiz.py:667
+#: ../PLCOpenEditor.py:199 ../Beremiz.py:693
msgid "Close Application"
msgstr ""
-#: ../PLCOpenEditor.py:102 ../Beremiz.py:326 ../Beremiz.py:611
-#: ../IDEFrame.py:981
+#: ../PLCOpenEditor.py:108 ../Beremiz.py:333 ../Beremiz.py:637
+#: ../IDEFrame.py:1009
msgid "Close Project"
msgstr ""
-#: ../PLCOpenEditor.py:100 ../Beremiz.py:324
+#: ../PLCOpenEditor.py:106 ../Beremiz.py:331
msgid "Close Tab"
msgstr ""
-#: ../editors/Viewer.py:537 ../editors/Viewer.py:2084
+#: ../editors/Viewer.py:541 ../editors/Viewer.py:2366
msgid "Coil"
msgstr ""
-#: ../editors/Viewer.py:557 ../editors/LDViewer.py:506
+#: ../editors/Viewer.py:561 ../editors/LDViewer.py:506
msgid "Comment"
msgstr ""
@@ -942,7 +951,7 @@
msgid "Comparison"
msgstr ""
-#: ../ProjectController.py:609
+#: ../ProjectController.py:672
msgid "Compiling IEC Program into C code...\n"
msgstr ""
@@ -950,15 +959,15 @@
msgid "Concatenation"
msgstr ""
-#: ../editors/ConfTreeNodeEditor.py:206
+#: ../editors/ConfTreeNodeEditor.py:229
msgid "Config"
msgstr ""
-#: ../editors/ProjectNodeEditor.py:13
+#: ../editors/ProjectNodeEditor.py:36
msgid "Config variables"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:47
+#: ../dialogs/SearchInProjectDialog.py:39
msgid "Configuration"
msgstr ""
@@ -966,27 +975,27 @@
msgid "Configurations"
msgstr ""
-#: ../editors/Viewer.py:303 ../editors/Viewer.py:333 ../editors/Viewer.py:355
-#: ../editors/TextViewer.py:289 ../editors/TextViewer.py:340
-#: ../editors/TextViewer.py:363 ../controls/VariablePanel.py:318
+#: ../editors/Viewer.py:307 ../editors/Viewer.py:337 ../editors/Viewer.py:359
+#: ../editors/TextViewer.py:291 ../editors/TextViewer.py:342
+#: ../editors/TextViewer.py:365 ../controls/VariablePanel.py:328
msgid "Confirm or change variable name"
msgstr ""
-#: ../ProjectController.py:1687
+#: ../ProjectController.py:1788
msgid "Connect"
msgstr ""
-#: ../ProjectController.py:1688
+#: ../ProjectController.py:1789
msgid "Connect to the target PLC"
msgstr ""
-#: ../ProjectController.py:1212
+#: ../ProjectController.py:1292
#, python-format
msgid "Connected to URI: %s"
msgstr ""
-#: ../dialogs/SFCTransitionDialog.py:75 ../editors/Viewer.py:523
-#: ../editors/Viewer.py:2075
+#: ../dialogs/SFCTransitionDialog.py:76 ../editors/Viewer.py:527
+#: ../editors/Viewer.py:2359
msgid "Connection"
msgstr ""
@@ -994,29 +1003,33 @@
msgid "Connection Properties"
msgstr ""
-#: ../ProjectController.py:1547
+#: ../ProjectController.py:1647
msgid "Connection canceled!\n"
msgstr ""
-#: ../ProjectController.py:1572
+#: ../ProjectController.py:1672
#, python-format
msgid "Connection failed to %s!\n"
msgstr ""
-#: ../connectors/PYRO/__init__.py:98
+#: ../connectors/PYRO/__init__.py:115 ../connectors/WAMP/__init__.py:111
+msgid "Connection lost!\n"
+msgstr ""
+
+#: ../connectors/PYRO/__init__.py:102
#, python-format
msgid "Connection to '%s' failed.\n"
msgstr ""
-#: ../dialogs/ConnectionDialog.py:64 ../editors/Viewer.py:1569
+#: ../dialogs/ConnectionDialog.py:64 ../editors/Viewer.py:1594
msgid "Connector"
msgstr ""
-#: ../dialogs/SFCStepDialog.py:64
+#: ../dialogs/SFCStepDialog.py:65
msgid "Connectors:"
msgstr ""
-#: ../Beremiz.py:436
+#: ../Beremiz.py:448
msgid "Console"
msgstr ""
@@ -1024,7 +1037,7 @@
msgid "Constant"
msgstr ""
-#: ../editors/Viewer.py:533 ../editors/Viewer.py:2080
+#: ../editors/Viewer.py:537 ../editors/Viewer.py:2362
msgid "Contact"
msgstr ""
@@ -1032,7 +1045,7 @@
msgid "Content Description (optional):"
msgstr ""
-#: ../dialogs/ConnectionDialog.py:65 ../editors/Viewer.py:1570
+#: ../dialogs/ConnectionDialog.py:65 ../editors/Viewer.py:1595
msgid "Continuation"
msgstr ""
@@ -1052,12 +1065,12 @@
msgid "Conversion to time-of-day"
msgstr ""
-#: ../editors/Viewer.py:593 ../controls/LogViewer.py:692 ../IDEFrame.py:346
-#: ../IDEFrame.py:401
+#: ../editors/Viewer.py:597 ../controls/LogViewer.py:693 ../IDEFrame.py:370
+#: ../IDEFrame.py:425
msgid "Copy"
msgstr ""
-#: ../IDEFrame.py:1896
+#: ../IDEFrame.py:1930
msgid "Copy POU"
msgstr ""
@@ -1073,49 +1086,49 @@
msgid "Cosine"
msgstr ""
+#: ../ConfigTreeNode.py:656
+#, python-brace-format
+msgid ""
+"Could not add child \"{a1}\", type {a2} :\n"
+"{a3}\n"
+msgstr ""
+
+#: ../py_ext/PythonFileCTNMixin.py:77
+#, python-format
+msgid "Couldn't import old %s file."
+msgstr ""
+
#: ../ConfigTreeNode.py:626
-#, python-format
+#, python-brace-format
msgid ""
-"Could not add child \"%s\", type %s :\n"
-"%s\n"
-msgstr ""
-
-#: ../py_ext/PythonFileCTNMixin.py:53
-#, python-format
-msgid "Couldn't import old %s file."
-msgstr ""
-
-#: ../ConfigTreeNode.py:598
-#, python-format
+"Couldn't load confnode base parameters {a1} :\n"
+" {a2}"
+msgstr ""
+
+#: ../ConfigTreeNode.py:643 ../CodeFileTreeNode.py:124
+#, python-brace-format
msgid ""
-"Couldn't load confnode base parameters %s :\n"
-" %s"
-msgstr ""
-
-#: ../ConfigTreeNode.py:614 ../CodeFileTreeNode.py:99
-#, python-format
-msgid ""
-"Couldn't load confnode parameters %s :\n"
-" %s"
+"Couldn't load confnode parameters {a1} :\n"
+" {a2}"
msgstr ""
#: ../PLCControler.py:946
msgid "Couldn't paste non-POU object."
msgstr ""
-#: ../ProjectController.py:1486
+#: ../ProjectController.py:1589
msgid "Couldn't start PLC !\n"
msgstr ""
-#: ../ProjectController.py:1494
+#: ../ProjectController.py:1597
msgid "Couldn't stop PLC !\n"
msgstr ""
-#: ../ProjectController.py:1458
+#: ../ProjectController.py:1561
msgid "Couldn't stop debugger.\n"
msgstr ""
-#: ../svgui/svgui.py:23
+#: ../svgui/svgui.py:47
msgid "Create HMI"
msgstr ""
@@ -1127,71 +1140,79 @@
msgid "Create a new action"
msgstr ""
-#: ../IDEFrame.py:135
+#: ../IDEFrame.py:159
msgid "Create a new action block"
msgstr ""
-#: ../IDEFrame.py:84 ../IDEFrame.py:114 ../IDEFrame.py:147
+#: ../IDEFrame.py:108 ../IDEFrame.py:138 ../IDEFrame.py:171
msgid "Create a new block"
msgstr ""
-#: ../IDEFrame.py:108
+#: ../IDEFrame.py:132
msgid "Create a new branch"
msgstr ""
-#: ../IDEFrame.py:102
+#: ../IDEFrame.py:126
msgid "Create a new coil"
msgstr ""
-#: ../IDEFrame.py:78 ../IDEFrame.py:93 ../IDEFrame.py:123
+#: ../IDEFrame.py:102 ../IDEFrame.py:117 ../IDEFrame.py:147
msgid "Create a new comment"
msgstr ""
-#: ../IDEFrame.py:87 ../IDEFrame.py:117 ../IDEFrame.py:150
+#: ../IDEFrame.py:111 ../IDEFrame.py:141 ../IDEFrame.py:174
msgid "Create a new connection"
msgstr ""
-#: ../IDEFrame.py:105 ../IDEFrame.py:156
+#: ../IDEFrame.py:129 ../IDEFrame.py:180
msgid "Create a new contact"
msgstr ""
-#: ../IDEFrame.py:138
+#: ../IDEFrame.py:162
msgid "Create a new divergence"
msgstr ""
-#: ../dialogs/SFCDivergenceDialog.py:51
+#: ../dialogs/SFCDivergenceDialog.py:53
msgid "Create a new divergence or convergence"
msgstr ""
-#: ../IDEFrame.py:126
+#: ../IDEFrame.py:150
msgid "Create a new initial step"
msgstr ""
-#: ../IDEFrame.py:141
+#: ../IDEFrame.py:165
msgid "Create a new jump"
msgstr ""
-#: ../IDEFrame.py:96 ../IDEFrame.py:153
+#: ../IDEFrame.py:120 ../IDEFrame.py:177
msgid "Create a new power rail"
msgstr ""
-#: ../IDEFrame.py:99
+#: ../IDEFrame.py:123
msgid "Create a new rung"
msgstr ""
-#: ../IDEFrame.py:129
+#: ../IDEFrame.py:153
msgid "Create a new step"
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:42 ../IDEFrame.py:132
+#: ../dialogs/PouTransitionDialog.py:47 ../IDEFrame.py:156
msgid "Create a new transition"
msgstr ""
-#: ../IDEFrame.py:81 ../IDEFrame.py:111 ../IDEFrame.py:144
+#: ../IDEFrame.py:105 ../IDEFrame.py:135 ../IDEFrame.py:168
msgid "Create a new variable"
msgstr ""
-#: ../editors/Viewer.py:592 ../IDEFrame.py:344 ../IDEFrame.py:400
+#: ../dialogs/AboutDialog.py:105
+msgid "Credits"
+msgstr ""
+
+#: ../Beremiz_service.py:432
+msgid "Current working directory :"
+msgstr ""
+
+#: ../editors/Viewer.py:596 ../IDEFrame.py:368 ../IDEFrame.py:424
msgid "Cut"
msgstr ""
@@ -1207,15 +1228,15 @@
msgid "DEPRECATED"
msgstr ""
-#: ../canfestival/SlaveEditor.py:53 ../canfestival/NetworkEditor.py:74
+#: ../canfestival/SlaveEditor.py:76 ../canfestival/NetworkEditor.py:97
msgid "DS-301 Profile"
msgstr ""
-#: ../canfestival/SlaveEditor.py:54 ../canfestival/NetworkEditor.py:75
+#: ../canfestival/SlaveEditor.py:77 ../canfestival/NetworkEditor.py:98
msgid "DS-302 Profile"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:43
+#: ../dialogs/SearchInProjectDialog.py:35
msgid "Data Type"
msgstr ""
@@ -1244,7 +1265,7 @@
msgid "Days:"
msgstr ""
-#: ../ProjectController.py:1594
+#: ../ProjectController.py:1694
msgid "Debug does not match PLC - stop/transfert/start to re-enable\n"
msgstr ""
@@ -1252,42 +1273,42 @@
msgid "Debug instance"
msgstr ""
-#: ../editors/Viewer.py:1104 ../editors/Viewer.py:3596
+#: ../editors/Viewer.py:1117 ../editors/Viewer.py:3653
#, python-format
msgid "Debug: %s"
msgstr ""
-#: ../ProjectController.py:1247
+#: ../ProjectController.py:1350
#, python-format
msgid "Debug: Unknown variable '%s'\n"
msgstr ""
-#: ../ProjectController.py:1245
+#: ../ProjectController.py:1348
#, python-format
msgid "Debug: Unsupported type to debug '%s'\n"
msgstr ""
-#: ../IDEFrame.py:611
+#: ../IDEFrame.py:639
msgid "Debugger"
msgstr ""
-#: ../ProjectController.py:1427
+#: ../ProjectController.py:1530
msgid "Debugger disabled\n"
msgstr ""
-#: ../ProjectController.py:1591
+#: ../ProjectController.py:1691
msgid "Debugger ready\n"
msgstr ""
-#: ../ProjectController.py:1460
+#: ../ProjectController.py:1563
msgid "Debugger stopped.\n"
msgstr ""
-#: ../editors/Viewer.py:568 ../Beremiz.py:1028 ../IDEFrame.py:1925
+#: ../editors/Viewer.py:572 ../Beremiz.py:1064 ../IDEFrame.py:1959
msgid "Delete"
msgstr ""
-#: ../editors/Viewer.py:510
+#: ../editors/Viewer.py:514
msgid "Delete Divergence Branch"
msgstr ""
@@ -1295,7 +1316,7 @@
msgid "Delete File"
msgstr ""
-#: ../editors/Viewer.py:497
+#: ../editors/Viewer.py:501
msgid "Delete Wire Segment"
msgstr ""
@@ -1307,33 +1328,23 @@
msgid "Deletion (within)"
msgstr ""
-#: ../editors/DataTypeEditor.py:152
+#: ../editors/DataTypeEditor.py:153
msgid "Derivation Type:"
msgstr ""
-#: ../plcopen/definitions.py:41
-msgid ""
-"Derivative\n"
-"The derivative function block produces an output XOUT proportional to the rate of change of the input XIN."
-msgstr ""
-
-#: ../editors/CodeFileEditor.py:664
-msgid "Description"
-msgstr ""
-
-#: ../controls/VariablePanel.py:422
+#: ../controls/VariablePanel.py:432
msgid "Description:"
msgstr ""
-#: ../dialogs/ArrayTypeDialog.py:61 ../editors/DataTypeEditor.py:320
+#: ../dialogs/ArrayTypeDialog.py:61 ../editors/DataTypeEditor.py:321
msgid "Dimensions:"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:67
+#: ../dialogs/FindInPouDialog.py:68
msgid "Direction"
msgstr ""
-#: ../dialogs/BrowseLocationsDialog.py:85
+#: ../dialogs/BrowseLocationsDialog.py:90
msgid "Direction:"
msgstr ""
@@ -1341,15 +1352,19 @@
msgid "Directly"
msgstr ""
-#: ../ProjectController.py:1696
+#: ../ProjectController.py:1797
msgid "Disconnect"
msgstr ""
-#: ../ProjectController.py:1698
+#: ../ProjectController.py:1799
msgid "Disconnect from PLC"
msgstr ""
-#: ../editors/Viewer.py:552 ../editors/Viewer.py:2061
+#: ../ProjectController.py:1302
+msgid "Disconnected"
+msgstr ""
+
+#: ../editors/Viewer.py:556 ../editors/Viewer.py:2354
msgid "Divergence"
msgstr ""
@@ -1366,25 +1381,19 @@
msgid "Documentation"
msgstr ""
-#: ../PLCOpenEditor.py:321
+#: ../PLCOpenEditor.py:328
msgid "Done"
msgstr ""
-#: ../plcopen/definitions.py:34
-msgid ""
-"Down-counter\n"
-"The down-counter can be used to signal when a count has reached zero, on counting down from a preset value."
-msgstr ""
-
#: ../dialogs/ActionBlockDialog.py:38
msgid "Duration"
msgstr ""
-#: ../canfestival/canfestival.py:139
+#: ../canfestival/canfestival.py:163
msgid "EDS files (*.eds)|*.eds|All files|*.*"
msgstr ""
-#: ../editors/Viewer.py:566
+#: ../editors/Viewer.py:570
msgid "Edit Block"
msgstr ""
@@ -1400,11 +1409,11 @@
msgid "Edit Duration"
msgstr ""
-#: ../dialogs/SFCStepDialog.py:49
+#: ../dialogs/SFCStepDialog.py:50
msgid "Edit Step"
msgstr ""
-#: ../wxglade_hmi/wxglade_hmi.py:12
+#: ../wxglade_hmi/wxglade_hmi.py:36
msgid "Edit a WxWidgets GUI with WXGlade"
msgstr ""
@@ -1416,7 +1425,7 @@
msgid "Edit array type properties"
msgstr ""
-#: ../editors/Viewer.py:2541 ../editors/Viewer.py:2952
+#: ../editors/Viewer.py:2575 ../editors/Viewer.py:3004
msgid "Edit comment"
msgstr ""
@@ -1428,47 +1437,51 @@
msgid "Edit item"
msgstr ""
-#: ../editors/Viewer.py:2916
+#: ../editors/Viewer.py:2963
msgid "Edit jump target"
msgstr ""
-#: ../ProjectController.py:1710
+#: ../ProjectController.py:1811
msgid "Edit raw IEC code added to code generated by PLCGenerator"
msgstr ""
-#: ../editors/SFCViewer.py:725
+#: ../editors/SFCViewer.py:799
msgid "Edit step name"
msgstr ""
-#: ../dialogs/SFCTransitionDialog.py:50
+#: ../dialogs/SFCTransitionDialog.py:51
msgid "Edit transition"
msgstr ""
-#: ../IDEFrame.py:583
+#: ../IDEFrame.py:611
msgid "Editor ToolBar"
msgstr ""
-#: ../ProjectController.py:1126
+#: ../ProjectController.py:1195
msgid "Editor selection"
msgstr ""
-#: ../editors/DataTypeEditor.py:347
+#: ../editors/DataTypeEditor.py:348
msgid "Elements :"
msgstr ""
-#: ../IDEFrame.py:341
+#: ../ProjectController.py:1300
+msgid "Empty"
+msgstr ""
+
+#: ../IDEFrame.py:365
msgid "Enable Undo/Redo"
msgstr ""
-#: ../Beremiz_service.py:299
+#: ../Beremiz_service.py:331
msgid "Enter a name "
msgstr ""
-#: ../Beremiz_service.py:286
+#: ../Beremiz_service.py:316
msgid "Enter a port number "
msgstr ""
-#: ../Beremiz_service.py:277
+#: ../Beremiz_service.py:307
msgid "Enter the IP of the interface to bind"
msgstr ""
@@ -1481,66 +1494,67 @@
msgstr ""
#: ../dialogs/ForceVariableDialog.py:179
-#: ../dialogs/SearchInProjectDialog.py:157 ../dialogs/SFCStepNameDialog.py:59
+#: ../dialogs/SearchInProjectDialog.py:168 ../dialogs/SFCStepNameDialog.py:60
#: ../dialogs/DurationEditorDialog.py:121
-#: ../dialogs/DurationEditorDialog.py:163 ../dialogs/PouTransitionDialog.py:107
+#: ../dialogs/DurationEditorDialog.py:163 ../dialogs/PouTransitionDialog.py:112
#: ../dialogs/BlockPreviewDialog.py:236 ../dialogs/ProjectDialog.py:71
#: ../dialogs/ArrayTypeDialog.py:97 ../dialogs/ArrayTypeDialog.py:103
-#: ../dialogs/PouNameDialog.py:53 ../dialogs/BrowseLocationsDialog.py:211
+#: ../dialogs/PouNameDialog.py:54 ../dialogs/BrowseLocationsDialog.py:216
#: ../dialogs/BrowseValuesLibraryDialog.py:83 ../dialogs/PouActionDialog.py:104
-#: ../dialogs/PouDialog.py:134 ../PLCOpenEditor.py:328 ../PLCOpenEditor.py:333
-#: ../PLCOpenEditor.py:407 ../PLCOpenEditor.py:417 ../editors/Viewer.py:419
+#: ../dialogs/PouDialog.py:134 ../PLCOpenEditor.py:335 ../PLCOpenEditor.py:340
+#: ../PLCOpenEditor.py:420 ../PLCOpenEditor.py:430 ../editors/Viewer.py:423
#: ../editors/LDViewer.py:666 ../editors/LDViewer.py:882
-#: ../editors/LDViewer.py:886 ../editors/DataTypeEditor.py:549
-#: ../editors/DataTypeEditor.py:554 ../editors/DataTypeEditor.py:578
-#: ../editors/DataTypeEditor.py:583 ../editors/DataTypeEditor.py:593
-#: ../editors/DataTypeEditor.py:744 ../editors/DataTypeEditor.py:751
-#: ../editors/TextViewer.py:387 ../editors/CodeFileEditor.py:763
-#: ../ProjectController.py:269 ../controls/FolderTree.py:217
+#: ../editors/LDViewer.py:886 ../editors/DataTypeEditor.py:550
+#: ../editors/DataTypeEditor.py:555 ../editors/DataTypeEditor.py:579
+#: ../editors/DataTypeEditor.py:584 ../editors/DataTypeEditor.py:594
+#: ../editors/DataTypeEditor.py:745 ../editors/DataTypeEditor.py:752
+#: ../editors/TextViewer.py:389 ../editors/CodeFileEditor.py:783
+#: ../ProjectController.py:293 ../ProjectController.py:421
+#: ../ProjectController.py:428 ../controls/FolderTree.py:217
#: ../controls/DebugVariablePanel/DebugVariablePanel.py:166
#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:137
-#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:225
-#: ../controls/VariablePanel.py:392 ../controls/VariablePanel.py:754
-#: ../Beremiz.py:1167 ../IDEFrame.py:975 ../IDEFrame.py:1581
-#: ../IDEFrame.py:1618 ../IDEFrame.py:1623 ../IDEFrame.py:1637
-#: ../IDEFrame.py:1642 ../Beremiz_service.py:190
+#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:231
+#: ../controls/VariablePanel.py:402 ../controls/VariablePanel.py:772
+#: ../Beremiz.py:1203 ../IDEFrame.py:1003 ../IDEFrame.py:1614
+#: ../IDEFrame.py:1655 ../IDEFrame.py:1660 ../IDEFrame.py:1674
+#: ../IDEFrame.py:1679 ../Beremiz_service.py:211
msgid "Error"
msgstr ""
-#: ../ProjectController.py:663
+#: ../ProjectController.py:727
msgid "Error : At least one configuration and one resource must be declared in PLC !\n"
msgstr ""
-#: ../ProjectController.py:655
+#: ../ProjectController.py:719
#, python-format
msgid "Error : IEC to C compiler returned %d\n"
msgstr ""
-#: ../ProjectController.py:589
+#: ../ProjectController.py:621
#, python-format
msgid ""
"Error in ST/IL/SFC code generator :\n"
"%s\n"
msgstr ""
-#: ../ConfigTreeNode.py:192
+#: ../ConfigTreeNode.py:216
#, python-format
msgid "Error while saving \"%s\"\n"
msgstr ""
-#: ../canfestival/canfestival.py:144
+#: ../canfestival/canfestival.py:168
msgid "Error: Export slave failed\n"
msgstr ""
-#: ../canfestival/canfestival.py:345
+#: ../canfestival/canfestival.py:369
msgid "Error: No Master generated\n"
msgstr ""
-#: ../canfestival/canfestival.py:340
+#: ../canfestival/canfestival.py:364
msgid "Error: No PLC built\n"
msgstr ""
-#: ../ProjectController.py:1566
+#: ../ProjectController.py:1666
#, python-format
msgid "Exception while connecting %s!\n"
msgstr ""
@@ -1553,7 +1567,7 @@
msgid "Execution Order:"
msgstr ""
-#: ../features.py:11
+#: ../features.py:35
msgid "Experimental web based HMI"
msgstr ""
@@ -1565,7 +1579,7 @@
msgid "Exponentiation"
msgstr ""
-#: ../canfestival/canfestival.py:150
+#: ../canfestival/canfestival.py:174
msgid "Export CanOpen slave to EDS file"
msgstr ""
@@ -1573,7 +1587,7 @@
msgid "Export graph values to clipboard"
msgstr ""
-#: ../canfestival/canfestival.py:149
+#: ../canfestival/canfestival.py:173
msgid "Export slave"
msgstr ""
@@ -1585,33 +1599,32 @@
msgid "External"
msgstr ""
-#: ../ProjectController.py:676
+#: ../ProjectController.py:740
msgid "Extracting Located Variables...\n"
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
+#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:31
#: ../dialogs/PouDialog.py:36 ../controls/ProjectPropertiesPanel.py:143
msgid "FBD"
msgstr ""
-#: ../ProjectController.py:1629
+#: ../ProjectController.py:1729
msgid "Failed : Must build before transfer.\n"
msgstr ""
-#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:458
+#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:462
msgid "Falling Edge"
msgstr ""
-#: ../plcopen/definitions.py:32
-msgid ""
-"Falling edge detector\n"
-"The output produces a single pulse when a falling edge is detected."
-msgstr ""
-
-#: ../ProjectController.py:946
+#: ../ProjectController.py:1008
msgid "Fatal : cannot get builder.\n"
msgstr ""
+#: ../Beremiz.py:118
+#, python-format
+msgid "Fetching %s"
+msgstr ""
+
#: ../dialogs/DurationEditorDialog.py:160
#, python-format
msgid "Field %s hasn't a valid value!"
@@ -1627,16 +1640,16 @@
msgid "File '%s' already exists!"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:35 ../dialogs/FindInPouDialog.py:105
-#: ../IDEFrame.py:351
+#: ../dialogs/SearchInProjectDialog.py:100 ../dialogs/FindInPouDialog.py:36
+#: ../dialogs/FindInPouDialog.py:106 ../IDEFrame.py:375
msgid "Find"
msgstr ""
-#: ../IDEFrame.py:353
+#: ../IDEFrame.py:377
msgid "Find Next"
msgstr ""
-#: ../IDEFrame.py:355
+#: ../IDEFrame.py:379
msgid "Find Previous"
msgstr ""
@@ -1648,11 +1661,11 @@
msgid "Find:"
msgstr ""
-#: ../connectors/PYRO/__init__.py:159
+#: ../connectors/PYRO/__init__.py:163
msgid "Force runtime reload\n"
msgstr ""
-#: ../editors/Viewer.py:1528
+#: ../editors/Viewer.py:1553
msgid "Force value"
msgstr ""
@@ -1660,44 +1673,40 @@
msgid "Forcing Variable Value"
msgstr ""
-#: ../dialogs/SFCTransitionDialog.py:178 ../dialogs/PouTransitionDialog.py:97
+#: ../dialogs/SFCTransitionDialog.py:179 ../dialogs/PouTransitionDialog.py:102
#: ../dialogs/ProjectDialog.py:70 ../dialogs/PouActionDialog.py:94
#: ../dialogs/PouDialog.py:116
#, python-format
msgid "Form isn't complete. %s must be filled!"
msgstr ""
-#: ../dialogs/SFCStepDialog.py:141 ../dialogs/FBDBlockDialog.py:232
+#: ../dialogs/SFCStepDialog.py:144 ../dialogs/FBDBlockDialog.py:232
#: ../dialogs/ConnectionDialog.py:160
msgid "Form isn't complete. Name must be filled!"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:145
-msgid "Form isn't complete. Pattern to search must be filled!"
-msgstr ""
-
#: ../dialogs/FBDBlockDialog.py:228
msgid "Form isn't complete. Valid block type must be selected!"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:73
+#: ../dialogs/FindInPouDialog.py:74
msgid "Forward"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:44 ../IDEFrame.py:1712
+#: ../dialogs/SearchInProjectDialog.py:36 ../IDEFrame.py:1746
msgid "Function"
msgstr ""
-#: ../IDEFrame.py:325
+#: ../IDEFrame.py:349
msgid "Function &Block"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:45 ../IDEFrame.py:1711
-#: ../IDEFrame.py:1904
+#: ../dialogs/SearchInProjectDialog.py:37 ../IDEFrame.py:1745
+#: ../IDEFrame.py:1938
msgid "Function Block"
msgstr ""
-#: ../controls/VariablePanel.py:807
+#: ../controls/VariablePanel.py:825
msgid "Function Block Types"
msgstr ""
@@ -1705,11 +1714,11 @@
msgid "Function Blocks"
msgstr ""
-#: ../editors/Viewer.py:244
+#: ../editors/Viewer.py:248
msgid "Function Blocks can't be used in Functions!"
msgstr ""
-#: ../PLCControler.py:2336
+#: ../PLCControler.py:2337
#, python-format
msgid "FunctionBlock \"%s\" can't be pasted in a Function!!!"
msgstr ""
@@ -1718,11 +1727,11 @@
msgid "Functions"
msgstr ""
-#: ../PLCOpenEditor.py:109
+#: ../PLCOpenEditor.py:115
msgid "Generate Program"
msgstr ""
-#: ../ProjectController.py:580
+#: ../ProjectController.py:612
msgid "Generating SoftPLC IEC-61131 ST/IL/SFC code...\n"
msgstr ""
@@ -1750,6 +1759,10 @@
msgid "Grid Resolution:"
msgstr ""
+#: ../runtime/NevowServer.py:181
+msgid "HTTP interface port :"
+msgstr ""
+
#: ../controls/ProjectPropertiesPanel.py:120
msgid "Height:"
msgstr ""
@@ -1766,62 +1779,51 @@
msgid "Hours:"
msgstr ""
-#: ../plcopen/definitions.py:44
-msgid ""
-"Hysteresis\n"
-"The hysteresis function block provides a hysteresis boolean output driven by the difference of two floating point (REAL) inputs XIN1 and XIN2."
-msgstr ""
-
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
-#: ../dialogs/PouDialog.py:36
+#: ../dialogs/PouActionDialog.py:31 ../dialogs/PouDialog.py:36
msgid "IL"
msgstr ""
-#: ../dialogs/DiscoveryDialog.py:93
+#: ../dialogs/DiscoveryDialog.py:94
msgid "IP"
msgstr ""
-#: ../Beremiz_service.py:278 ../Beremiz_service.py:279
+#: ../Beremiz_service.py:308 ../Beremiz_service.py:309
msgid "IP is not valid!"
msgstr ""
-#: ../svgui/svgui.py:18 ../svgui/svgui.py:19
+#: ../svgui/svgui.py:42 ../svgui/svgui.py:43
msgid "Import SVG"
msgstr ""
-#: ../dialogs/FBDVariableDialog.py:38 ../editors/Viewer.py:1555
+#: ../dialogs/FBDVariableDialog.py:38 ../editors/Viewer.py:1580
#: ../controls/VariablePanel.py:71
msgid "InOut"
msgstr ""
-#: ../editors/Viewer.py:1087
+#: ../editors/Viewer.py:1100
msgid "Inactive"
msgstr ""
-#: ../controls/VariablePanel.py:268
-#, python-format
-msgid "Incompatible data types between \"%s\" and \"%s\""
-msgstr ""
-
-#: ../controls/VariablePanel.py:277
-#, python-format
-msgid "Incompatible size of data between \"%s\" and \"%s\""
-msgstr ""
-
-#: ../controls/VariablePanel.py:273
+#: ../controls/VariablePanel.py:276
+#, python-brace-format
+msgid "Incompatible data types between \"{a1}\" and \"{a2}\""
+msgstr ""
+
+#: ../controls/VariablePanel.py:282
#, python-format
msgid "Incompatible size of data between \"%s\" and \"BOOL\""
msgstr ""
+#: ../controls/VariablePanel.py:286
+#, python-brace-format
+msgid "Incompatible size of data between \"{a1}\" and \"{a2}\""
+msgstr ""
+
#: ../dialogs/ActionBlockDialog.py:38
msgid "Indicator"
msgstr ""
-#: ../editors/CodeFileEditor.py:663
-msgid "Initial"
-msgstr ""
-
-#: ../editors/Viewer.py:548 ../editors/Viewer.py:2058
+#: ../editors/Viewer.py:552
msgid "Initial Step"
msgstr ""
@@ -1830,22 +1832,24 @@
msgid "Initial Value"
msgstr ""
-#: ../editors/DataTypeEditor.py:184 ../editors/DataTypeEditor.py:215
-#: ../editors/DataTypeEditor.py:271 ../editors/DataTypeEditor.py:309
+#: ../editors/DataTypeEditor.py:185 ../editors/DataTypeEditor.py:216
+#: ../editors/DataTypeEditor.py:272 ../editors/DataTypeEditor.py:310
msgid "Initial Value:"
msgstr ""
-#: ../svgui/svgui.py:22
+#: ../svgui/svgui.py:46
msgid "Inkscape"
msgstr ""
-#: ../dialogs/SFCTransitionDialog.py:74 ../dialogs/ActionBlockDialog.py:42
+#: ../dialogs/SFCTransitionDialog.py:75 ../dialogs/ActionBlockDialog.py:42
msgid "Inline"
msgstr ""
-#: ../dialogs/SFCStepDialog.py:69 ../dialogs/FBDVariableDialog.py:37
-#: ../dialogs/BrowseLocationsDialog.py:35 ../editors/Viewer.py:1553
-#: ../controls/VariablePanel.py:71
+#: ../dialogs/SFCStepDialog.py:70 ../dialogs/FBDVariableDialog.py:37
+#: ../dialogs/BrowseLocationsDialog.py:40 ../editors/Viewer.py:289
+#: ../editors/Viewer.py:1578 ../editors/TextViewer.py:307
+#: ../controls/LocationCellEditor.py:98 ../controls/VariablePanel.py:71
+#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351
msgid "Input"
msgstr ""
@@ -1857,7 +1861,7 @@
msgid "Insertion (into)"
msgstr ""
-#: ../plcopen/plcopen.py:1684
+#: ../plcopen/plcopen.py:1691
#, python-format
msgid "Instance with id %d doesn't exist!"
msgstr ""
@@ -1866,12 +1870,6 @@
msgid "Instances:"
msgstr ""
-#: ../plcopen/definitions.py:40
-msgid ""
-"Integral\n"
-"The integral function block integrates the value of input XIN over time."
-msgstr ""
-
#: ../controls/VariablePanel.py:70
msgid "Interface"
msgstr ""
@@ -1884,48 +1882,53 @@
msgid "Interval"
msgstr ""
-#: ../PLCControler.py:2324
+#: ../PLCControler.py:2325
msgid "Invalid plcopen element(s)!!!"
msgstr ""
-#: ../canfestival/config_utils.py:377 ../canfestival/config_utils.py:638
-#, python-format
-msgid "Invalid type \"%s\"-> %d != %d for location\"%s\""
-msgstr ""
-
-#: ../dialogs/ForceVariableDialog.py:177
-#, python-format
-msgid "Invalid value \"%s\" for \"%s\" variable!"
+#: ../canfestival/config_utils.py:381
+#, python-brace-format
+msgid "Invalid type \"{a1}\"-> {a2} != {a3} for location\"{a4}\""
+msgstr ""
+
+#: ../canfestival/config_utils.py:645
+#, python-brace-format
+msgid "Invalid type \"{a1}\"-> {a2} != {a3} for location \"{a4}\""
msgstr ""
#: ../controls/DebugVariablePanel/DebugVariablePanel.py:132
#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:92
-#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:160
+#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:166
#, python-format
msgid "Invalid value \"%s\" for debug variable"
msgstr ""
-#: ../controls/VariablePanel.py:247 ../controls/VariablePanel.py:250
+#: ../controls/VariablePanel.py:255 ../controls/VariablePanel.py:258
#, python-format
msgid "Invalid value \"%s\" for variable grid element"
msgstr ""
-#: ../editors/Viewer.py:229 ../editors/Viewer.py:232
+#: ../editors/Viewer.py:233 ../editors/Viewer.py:236
#, python-format
msgid "Invalid value \"%s\" for viewer block"
msgstr ""
+#: ../dialogs/ForceVariableDialog.py:177
+#, python-brace-format
+msgid "Invalid value \"{a1}\" for \"{a2}\" variable!"
+msgstr ""
+
#: ../dialogs/DurationEditorDialog.py:121
msgid ""
"Invalid value!\n"
"You must fill a numeric value."
msgstr ""
-#: ../editors/Viewer.py:553 ../editors/Viewer.py:2062
+#: ../editors/Viewer.py:557 ../editors/Viewer.py:2343
msgid "Jump"
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
+#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:31
#: ../dialogs/PouDialog.py:36 ../controls/ProjectPropertiesPanel.py:143
msgid "LD"
msgstr ""
@@ -1935,7 +1938,7 @@
msgid "Ladder element with id %d is on more than one rung."
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:86 ../dialogs/PouActionDialog.py:83
+#: ../dialogs/PouTransitionDialog.py:91 ../dialogs/PouActionDialog.py:83
#: ../dialogs/PouDialog.py:104
msgid "Language"
msgstr ""
@@ -1944,28 +1947,28 @@
msgid "Language (optional):"
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:60 ../dialogs/PouActionDialog.py:56
+#: ../dialogs/PouTransitionDialog.py:65 ../dialogs/PouActionDialog.py:56
#: ../dialogs/PouDialog.py:73
msgid "Language:"
msgstr ""
-#: ../ProjectController.py:1635
+#: ../ProjectController.py:1735
msgid "Latest build already matches current target. Transfering anyway...\n"
msgstr ""
-#: ../Beremiz_service.py:250
+#: ../Beremiz_service.py:271
msgid "Launch WX GUI inspector"
msgstr ""
-#: ../Beremiz_service.py:249
+#: ../Beremiz_service.py:270
msgid "Launch a live Python shell"
msgstr ""
-#: ../editors/Viewer.py:481
+#: ../editors/Viewer.py:485
msgid "Left"
msgstr ""
-#: ../dialogs/LDPowerRailDialog.py:61
+#: ../dialogs/LDPowerRailDialog.py:62
msgid "Left PowerRail"
msgstr ""
@@ -1981,27 +1984,31 @@
msgid "Less than or equal to"
msgstr ""
-#: ../IDEFrame.py:603
+#: ../IDEFrame.py:631
msgid "Library"
msgstr ""
+#: ../dialogs/AboutDialog.py:143
+msgid "License"
+msgstr ""
+
#: ../plcopen/iec_std.csv:73
msgid "Limitation"
msgstr ""
-#: ../targets/toolchain_gcc.py:142
+#: ../targets/toolchain_gcc.py:166
msgid "Linking :\n"
msgstr ""
-#: ../dialogs/DiscoveryDialog.py:110 ../controls/VariablePanel.py:72
+#: ../dialogs/DiscoveryDialog.py:111 ../controls/VariablePanel.py:72
msgid "Local"
msgstr ""
-#: ../canfestival/canfestival.py:322
+#: ../canfestival/canfestival.py:346
msgid "Local entries"
msgstr ""
-#: ../ProjectController.py:1541
+#: ../ProjectController.py:1641
msgid "Local service discovery failed!\n"
msgstr ""
@@ -2009,7 +2016,7 @@
msgid "Location"
msgstr ""
-#: ../dialogs/BrowseLocationsDialog.py:67
+#: ../dialogs/BrowseLocationsDialog.py:72
msgid "Locations available:"
msgstr ""
@@ -2017,41 +2024,43 @@
msgid "Logarithm to base 10"
msgstr ""
-#: ../connectors/PYRO/__init__.py:90
+#: ../connectors/PYRO/__init__.py:94
#, python-format
msgid "MDNS resolution failure for '%s'\n"
msgstr ""
-#: ../canfestival/SlaveEditor.py:41 ../canfestival/NetworkEditor.py:62
+#: ../canfestival/SlaveEditor.py:64 ../canfestival/NetworkEditor.py:85
msgid "Map Variable"
msgstr ""
-#: ../features.py:7
+#: ../features.py:31
msgid "Map located variables over CANopen"
msgstr ""
-#: ../canfestival/NetworkEditor.py:83
+#: ../canfestival/NetworkEditor.py:106
msgid "Master"
msgstr ""
-#: ../ConfigTreeNode.py:514
-#, python-format
-msgid "Max count (%d) reached for this confnode of type %s "
+#: ../ConfigTreeNode.py:539
+#, python-brace-format
+msgid "Max count ({a1}) reached for this confnode of type {a2} "
msgstr ""
#: ../plcopen/iec_std.csv:71
msgid "Maximum"
msgstr ""
-#: ../editors/DataTypeEditor.py:238
+#: ../editors/DataTypeEditor.py:239
msgid "Maximum:"
msgstr ""
-#: ../dialogs/BrowseLocationsDialog.py:37
+#: ../dialogs/BrowseLocationsDialog.py:42 ../editors/Viewer.py:289
+#: ../editors/TextViewer.py:307 ../controls/LocationCellEditor.py:98
+#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351
msgid "Memory"
msgstr ""
-#: ../IDEFrame.py:571
+#: ../IDEFrame.py:599
msgid "Menu ToolBar"
msgstr ""
@@ -2059,7 +2068,7 @@
msgid "Microseconds:"
msgstr ""
-#: ../editors/Viewer.py:486
+#: ../editors/Viewer.py:490
msgid "Middle"
msgstr ""
@@ -2071,7 +2080,7 @@
msgid "Minimum"
msgstr ""
-#: ../editors/DataTypeEditor.py:225
+#: ../editors/DataTypeEditor.py:226
msgid "Minimum:"
msgstr ""
@@ -2087,9 +2096,9 @@
msgid "Modifier:"
msgstr ""
-#: ../PLCGenerator.py:778 ../PLCGenerator.py:1217
-#, python-format
-msgid "More than one connector found corresponding to \"%s\" continuation in \"%s\" POU"
+#: ../PLCGenerator.py:786 ../PLCGenerator.py:1230
+#, python-brace-format
+msgid "More than one connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU"
msgstr ""
#: ../dialogs/ActionBlockDialog.py:140
@@ -2104,11 +2113,11 @@
msgid "Move down"
msgstr ""
+#: ../editors/DataTypeEditor.py:355
+msgid "Move element down"
+msgstr ""
+
#: ../editors/DataTypeEditor.py:354
-msgid "Move element down"
-msgstr ""
-
-#: ../editors/DataTypeEditor.py:353
msgid "Move element up"
msgstr ""
@@ -2128,7 +2137,7 @@
msgid "Move task up"
msgstr ""
-#: ../IDEFrame.py:75 ../IDEFrame.py:90 ../IDEFrame.py:120 ../IDEFrame.py:161
+#: ../IDEFrame.py:99 ../IDEFrame.py:114 ../IDEFrame.py:144 ../IDEFrame.py:185
msgid "Move the view"
msgstr ""
@@ -2136,11 +2145,11 @@
msgid "Move up"
msgstr ""
-#: ../editors/CodeFileEditor.py:643 ../controls/VariablePanel.py:443
+#: ../editors/CodeFileEditor.py:661 ../controls/VariablePanel.py:453
msgid "Move variable down"
msgstr ""
-#: ../editors/CodeFileEditor.py:642 ../controls/VariablePanel.py:442
+#: ../editors/CodeFileEditor.py:660 ../controls/VariablePanel.py:452
msgid "Move variable up"
msgstr ""
@@ -2156,21 +2165,21 @@
msgid "My Computer:"
msgstr ""
-#: ../dialogs/DiscoveryDialog.py:91
+#: ../dialogs/DiscoveryDialog.py:92
msgid "NAME"
msgstr ""
#: ../editors/ResourceEditor.py:68 ../editors/ResourceEditor.py:83
-#: ../editors/DataTypeEditor.py:50 ../editors/CodeFileEditor.py:663
-#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54
+#: ../editors/DataTypeEditor.py:50 ../controls/VariablePanel.py:53
+#: ../controls/VariablePanel.py:54
msgid "Name"
msgstr ""
-#: ../Beremiz_service.py:300
+#: ../Beremiz_service.py:332
msgid "Name must not be null!"
msgstr ""
-#: ../dialogs/SFCStepDialog.py:55 ../dialogs/FBDBlockDialog.py:83
+#: ../dialogs/SFCStepDialog.py:56 ../dialogs/FBDBlockDialog.py:83
#: ../dialogs/ConnectionDialog.py:75
msgid "Name:"
msgstr ""
@@ -2179,12 +2188,20 @@
msgid "Natural logarithm"
msgstr ""
-#: ../dialogs/LDElementDialog.py:75 ../editors/Viewer.py:456
+#: ../dialogs/LDElementDialog.py:75 ../editors/Viewer.py:460
msgid "Negated"
msgstr ""
-#: ../PLCOpenEditor.py:96 ../PLCOpenEditor.py:138 ../Beremiz.py:314
-#: ../Beremiz.py:349
+#: ../Beremiz_service.py:578
+msgid "Nevow Web service failed. "
+msgstr ""
+
+#: ../Beremiz_service.py:554
+msgid "Nevow/Athena import failed :"
+msgstr ""
+
+#: ../PLCOpenEditor.py:102 ../PLCOpenEditor.py:144 ../Beremiz.py:321
+#: ../Beremiz.py:356
msgid "New"
msgstr ""
@@ -2192,71 +2209,71 @@
msgid "New item"
msgstr ""
-#: ../editors/Viewer.py:455
+#: ../editors/Viewer.py:459
msgid "No Modifier"
msgstr ""
-#: ../ProjectController.py:1662
+#: ../ProjectController.py:1763
msgid "No PLC to transfer (did build succeed ?)\n"
msgstr ""
-#: ../PLCGenerator.py:1608
+#: ../PLCGenerator.py:1631
#, python-format
msgid "No body defined in \"%s\" POU"
msgstr ""
-#: ../PLCGenerator.py:797 ../PLCGenerator.py:1227
-#, python-format
-msgid "No connector found corresponding to \"%s\" continuation in \"%s\" POU"
-msgstr ""
-
-#: ../PLCOpenEditor.py:340
+#: ../PLCGenerator.py:806 ../PLCGenerator.py:1241
+#, python-brace-format
+msgid "No connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU"
+msgstr ""
+
+#: ../PLCOpenEditor.py:347
msgid ""
"No documentation available.\n"
"Coming soon."
msgstr ""
-#: ../PLCGenerator.py:819
+#: ../PLCGenerator.py:829
#, python-format
msgid "No informations found for \"%s\" block"
msgstr ""
-#: ../PLCGenerator.py:1183
-#, python-format
-msgid "No output %s variable found in block %s in POU %s. Connection must be broken"
+#: ../PLCGenerator.py:1194
+#, python-brace-format
+msgid "No output {a1} variable found in block {a2} in POU {a3}. Connection must be broken"
msgstr ""
#: ../controls/SearchResultPanel.py:169
msgid "No search results available."
msgstr ""
-#: ../svgui/svgui.py:107
+#: ../svgui/svgui.py:131
#, python-format
msgid "No such SVG file: %s\n"
msgstr ""
-#: ../canfestival/config_utils.py:633
-#, python-format
-msgid "No such index/subindex (%x,%x) (variable %s)"
+#: ../canfestival/config_utils.py:639
+#, python-brace-format
+msgid "No such index/subindex ({a1},{a2}) (variable {a3})"
msgstr ""
#: ../canfestival/config_utils.py:362
-#, python-format
-msgid "No such index/subindex (%x,%x) in ID : %d (variable %s)"
+#, python-brace-format
+msgid "No such index/subindex ({a1},{a2}) in ID : {a3} (variable {a4})"
msgstr ""
#: ../dialogs/BrowseValuesLibraryDialog.py:83
msgid "No valid value selected!"
msgstr ""
-#: ../PLCGenerator.py:1606
+#: ../PLCGenerator.py:1629
#, python-format
msgid "No variable defined in \"%s\" POU"
msgstr ""
#: ../canfestival/config_utils.py:355
-#, python-format
-msgid "Non existing node ID : %d (variable %s)"
+#, python-brace-format
+msgid "Non existing node ID : {a1} (variable {a2})"
msgstr ""
#: ../controls/VariablePanel.py:64
@@ -2267,16 +2284,16 @@
msgid "Normal"
msgstr ""
-#: ../canfestival/config_utils.py:384
-#, python-format
-msgid "Not PDO mappable variable : '%s' (ID:%d,Idx:%x,sIdx:%x))"
+#: ../canfestival/config_utils.py:389
+#, python-brace-format
+msgid "Not PDO mappable variable : '{a1}' (ID:{a2},Idx:{a3},sIdx:{a4}))"
msgstr ""
#: ../plcopen/iec_std.csv:80
msgid "Not equal to"
msgstr ""
-#: ../dialogs/SFCDivergenceDialog.py:78
+#: ../dialogs/SFCDivergenceDialog.py:89
msgid "Number of sequences:"
msgstr ""
@@ -2284,40 +2301,28 @@
msgid "Numerical"
msgstr ""
-#: ../plcopen/definitions.py:38
-msgid ""
-"Off-delay timer\n"
-"The off-delay timer can be used to delay setting an output false, for fixed period after input goes false."
-msgstr ""
-
-#: ../plcopen/definitions.py:37
-msgid ""
-"On-delay timer\n"
-"The on-delay timer can be used to delay setting an output true, for fixed period after an input becomes true."
-msgstr ""
-
-#: ../editors/CodeFileEditor.py:664
-msgid "OnChange"
-msgstr ""
-
-#: ../dialogs/SearchInProjectDialog.py:93
+#: ../dialogs/SearchInProjectDialog.py:86
msgid "Only Elements"
msgstr ""
-#: ../PLCOpenEditor.py:98 ../PLCOpenEditor.py:139 ../Beremiz.py:316
-#: ../Beremiz.py:350
+#: ../PLCOpenEditor.py:104 ../PLCOpenEditor.py:145 ../Beremiz.py:323
+#: ../Beremiz.py:357
msgid "Open"
msgstr ""
-#: ../svgui/svgui.py:116
+#: ../svgui/svgui.py:140
msgid "Open Inkscape"
msgstr ""
-#: ../ProjectController.py:1714
+#: ../version.py:66
+msgid "Open Source framework for automation, implemented IEC 61131 IDE with constantly growing set of extensions and flexible PLC runtime."
+msgstr ""
+
+#: ../ProjectController.py:1815
msgid "Open a file explorer to manage project files"
msgstr ""
-#: ../wxglade_hmi/wxglade_hmi.py:114
+#: ../wxglade_hmi/wxglade_hmi.py:138
msgid "Open wxGlade"
msgstr ""
@@ -2325,7 +2330,7 @@
msgid "Option"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:82 ../editors/CodeFileEditor.py:664
+#: ../dialogs/FindInPouDialog.py:83
msgid "Options"
msgstr ""
@@ -2333,58 +2338,69 @@
msgid "Organization (optional):"
msgstr ""
-#: ../canfestival/SlaveEditor.py:51 ../canfestival/NetworkEditor.py:72
+#: ../canfestival/SlaveEditor.py:74 ../canfestival/NetworkEditor.py:95
msgid "Other Profile"
msgstr ""
-#: ../dialogs/SFCStepDialog.py:70 ../dialogs/FBDVariableDialog.py:39
-#: ../dialogs/BrowseLocationsDialog.py:36 ../editors/Viewer.py:1554
-#: ../controls/VariablePanel.py:71
+#: ../dialogs/SFCStepDialog.py:71 ../dialogs/FBDVariableDialog.py:39
+#: ../dialogs/BrowseLocationsDialog.py:41 ../editors/Viewer.py:289
+#: ../editors/Viewer.py:1579 ../editors/TextViewer.py:307
+#: ../controls/LocationCellEditor.py:98 ../controls/VariablePanel.py:71
+#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351
msgid "Output"
msgstr ""
-#: ../canfestival/SlaveEditor.py:40 ../canfestival/NetworkEditor.py:61
+#: ../canfestival/SlaveEditor.py:63 ../canfestival/NetworkEditor.py:84
msgid "PDO Receive"
msgstr ""
-#: ../canfestival/SlaveEditor.py:39 ../canfestival/NetworkEditor.py:60
+#: ../canfestival/SlaveEditor.py:62 ../canfestival/NetworkEditor.py:83
msgid "PDO Transmit"
msgstr ""
-#: ../plcopen/definitions.py:42
+#: ../targets/toolchain_gcc.py:131
+msgid "PLC :\n"
+msgstr ""
+
+#: ../Beremiz.py:453
+msgid "PLC Log"
+msgstr ""
+
+#: ../ProjectController.py:992
+msgid "PLC code generation failed !\n"
+msgstr ""
+
+#: ../Beremiz_service.py:295
+msgid "PLC is empty or already started."
+msgstr ""
+
+#: ../Beremiz_service.py:302
+msgid "PLC is not started."
+msgstr ""
+
+#: ../PLCOpenEditor.py:196 ../PLCOpenEditor.py:309
+#, python-brace-format
msgid ""
-"PID\n"
-"The PID (proportional, Integral, Derivative) function block provides the classical three term controller for closed loop control."
-msgstr ""
-
-#: ../targets/toolchain_gcc.py:107
-msgid "PLC :\n"
-msgstr ""
-
-#: ../Beremiz.py:441
-msgid "PLC Log"
-msgstr ""
-
-#: ../ProjectController.py:930
-msgid "PLC code generation failed !\n"
-msgstr ""
-
-#: ../PLCOpenEditor.py:189 ../PLCOpenEditor.py:302
-#, python-format
+"PLC syntax error at line {a1}:\n"
+"{a2}"
+msgstr ""
+
+#: ../PLCOpenEditor.py:292 ../PLCOpenEditor.py:373
+msgid "PLCOpen files (*.xml)|*.xml|All files|*.*"
+msgstr ""
+
+#: ../PLCOpenEditor.py:152 ../PLCOpenEditor.py:209
+msgid "PLCOpenEditor"
+msgstr ""
+
+#: ../PLCOpenEditor.py:355
msgid ""
-"PLC syntax error at line %d:\n"
-"%s"
-msgstr ""
-
-#: ../PLCOpenEditor.py:285 ../PLCOpenEditor.py:361
-msgid "PLCOpen files (*.xml)|*.xml|All files|*.*"
-msgstr ""
-
-#: ../PLCOpenEditor.py:146 ../PLCOpenEditor.py:202
-msgid "PLCOpenEditor"
-msgstr ""
-
-#: ../dialogs/DiscoveryDialog.py:94
+"PLCOpenEditor is part of Beremiz project.\n"
+"\n"
+"Beremiz is an "
+msgstr ""
+
+#: ../dialogs/DiscoveryDialog.py:95
msgid "PORT"
msgstr ""
@@ -2404,17 +2420,17 @@
msgid "POU Type:"
msgstr ""
-#: ../connectors/PYRO/__init__.py:41
+#: ../connectors/PYRO/__init__.py:45
#, python-format
msgid "PYRO connecting to URI : %s\n"
msgstr ""
-#: ../connectors/PYRO/__init__.py:57
+#: ../connectors/PYRO/__init__.py:61
#, python-format
msgid "PYRO using certificates in '%s' \n"
msgstr ""
-#: ../PLCOpenEditor.py:112 ../Beremiz.py:329
+#: ../PLCOpenEditor.py:118 ../Beremiz.py:336
msgid "Page Setup"
msgstr ""
@@ -2422,7 +2438,7 @@
msgid "Page Size (optional):"
msgstr ""
-#: ../IDEFrame.py:2565
+#: ../IDEFrame.py:2599
#, python-format
msgid "Page: %d"
msgstr ""
@@ -2431,62 +2447,66 @@
msgid "Parent instance"
msgstr ""
-#: ../editors/Viewer.py:594 ../IDEFrame.py:348 ../IDEFrame.py:402
+#: ../editors/Viewer.py:598 ../IDEFrame.py:372 ../IDEFrame.py:426
msgid "Paste"
msgstr ""
-#: ../IDEFrame.py:1831
+#: ../IDEFrame.py:1865
msgid "Paste POU"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:64
+#: ../dialogs/SearchInProjectDialog.py:56
msgid "Pattern to search:"
msgstr ""
-#: ../dialogs/LDPowerRailDialog.py:72
+#: ../dialogs/LDPowerRailDialog.py:73
msgid "Pin number:"
msgstr ""
-#: ../editors/Viewer.py:2672 ../editors/Viewer.py:2916
-#: ../editors/SFCViewer.py:696
+#: ../editors/Viewer.py:2706 ../editors/Viewer.py:2963
+#: ../editors/SFCViewer.py:770
msgid "Please choose a target"
msgstr ""
-#: ../editors/TextViewer.py:261
+#: ../editors/TextViewer.py:262
msgid "Please enter a block name"
msgstr ""
-#: ../editors/Viewer.py:2542 ../editors/Viewer.py:2953
+#: ../editors/Viewer.py:2576 ../editors/Viewer.py:3005
msgid "Please enter comment text"
msgstr ""
-#: ../editors/SFCViewer.py:359 ../editors/SFCViewer.py:381
-#: ../editors/SFCViewer.py:725
+#: ../editors/SFCViewer.py:433 ../editors/SFCViewer.py:455
+#: ../editors/SFCViewer.py:799
msgid "Please enter step name"
msgstr ""
+#: ../Beremiz_service.py:194
+msgid "Please enter text"
+msgstr ""
+
#: ../dialogs/ForceVariableDialog.py:163
#, python-format
msgid "Please enter value for a \"%s\" variable:"
msgstr ""
-#: ../Beremiz_service.py:287
+#: ../Beremiz_service.py:317
msgid "Port number must be 0 <= port <= 65535!"
msgstr ""
-#: ../Beremiz_service.py:287
+#: ../Beremiz_service.py:317
msgid "Port number must be an integer!"
msgstr ""
-#: ../editors/Viewer.py:532 ../editors/Viewer.py:2085
+#: ../editors/Viewer.py:536 ../editors/Viewer.py:2367
msgid "Power Rail"
msgstr ""
-#: ../dialogs/LDPowerRailDialog.py:49
+#: ../dialogs/LDPowerRailDialog.py:50
msgid "Power Rail Properties"
msgstr ""
-#: ../PLCOpenEditor.py:114 ../Beremiz.py:331
+#: ../PLCOpenEditor.py:120 ../Beremiz.py:338
msgid "Preview"
msgstr ""
@@ -2494,12 +2514,12 @@
msgid "Preview:"
msgstr ""
-#: ../PLCOpenEditor.py:116 ../PLCOpenEditor.py:142 ../Beremiz.py:333
-#: ../Beremiz.py:353
+#: ../PLCOpenEditor.py:122 ../PLCOpenEditor.py:148 ../Beremiz.py:340
+#: ../Beremiz.py:360
msgid "Print"
msgstr ""
-#: ../IDEFrame.py:1047
+#: ../IDEFrame.py:1075
msgid "Print preview"
msgstr ""
@@ -2507,11 +2527,11 @@
msgid "Priority"
msgstr ""
-#: ../dialogs/SFCTransitionDialog.py:88
+#: ../dialogs/SFCTransitionDialog.py:89
msgid "Priority:"
msgstr ""
-#: ../runtime/PLCObject.py:369
+#: ../runtime/PLCObject.py:370
#, python-format
msgid "Problem starting PLC : error %d"
msgstr ""
@@ -2536,12 +2556,12 @@
msgid "Product Version (required):"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:46 ../IDEFrame.py:1710
-#: ../IDEFrame.py:1907
+#: ../dialogs/SearchInProjectDialog.py:38 ../IDEFrame.py:1744
+#: ../IDEFrame.py:1941
msgid "Program"
msgstr ""
-#: ../PLCOpenEditor.py:330
+#: ../PLCOpenEditor.py:337
msgid "Program was successfully generated!"
msgstr ""
@@ -2549,11 +2569,11 @@
msgid "Programs"
msgstr ""
-#: ../editors/Viewer.py:238
+#: ../editors/Viewer.py:242
msgid "Programs can't be used by other POUs!"
msgstr ""
-#: ../controls/ProjectPropertiesPanel.py:84 ../IDEFrame.py:556
+#: ../controls/ProjectPropertiesPanel.py:84 ../IDEFrame.py:584
msgid "Project"
msgstr ""
@@ -2562,7 +2582,7 @@
msgid "Project '%s':"
msgstr ""
-#: ../ProjectController.py:1713
+#: ../ProjectController.py:1814
msgid "Project Files"
msgstr ""
@@ -2578,19 +2598,19 @@
msgid "Project Version (optional):"
msgstr ""
-#: ../PLCControler.py:3157
+#: ../PLCControler.py:3158
msgid ""
"Project file syntax error:\n"
"\n"
msgstr ""
-#: ../dialogs/ProjectDialog.py:32 ../editors/ProjectNodeEditor.py:14
+#: ../dialogs/ProjectDialog.py:32 ../editors/ProjectNodeEditor.py:37
msgid "Project properties"
msgstr ""
-#: ../ConfigTreeNode.py:540
-#, python-format
-msgid "Project tree layout do not match confnode.xml %s!=%s "
+#: ../ConfigTreeNode.py:566
+#, python-brace-format
+msgid "Project tree layout do not match confnode.xml {a1}!={a2} "
msgstr ""
#: ../dialogs/ConnectionDialog.py:94
@@ -2601,17 +2621,28 @@
msgid "Properties"
msgstr ""
-#: ../plcopen/definitions.py:36
-msgid ""
-"Pulse timer\n"
-"The pulse timer can be used to generate output pulses of a given time duration."
-msgstr ""
-
-#: ../py_ext/PythonEditor.py:57
+#: ../Beremiz_service.py:440
+msgid "Publishing service on local network"
+msgstr ""
+
+#: ../connectors/PYRO/__init__.py:118
+#, python-format
+msgid "Pyro exception: %s\n"
+msgstr ""
+
+#: ../Beremiz_service.py:427
+msgid "Pyro object's uri :"
+msgstr ""
+
+#: ../Beremiz_service.py:426
+msgid "Pyro port :"
+msgstr ""
+
+#: ../py_ext/PythonEditor.py:81
msgid "Python code"
msgstr ""
-#: ../features.py:9
+#: ../features.py:33
msgid "Python file"
msgstr ""
@@ -2619,62 +2650,44 @@
msgid "Qualifier"
msgstr ""
-#: ../PLCOpenEditor.py:122 ../Beremiz.py:336 ../Beremiz_service.py:252
+#: ../PLCOpenEditor.py:128 ../Beremiz.py:343 ../Beremiz_service.py:273
msgid "Quit"
msgstr ""
-#: ../plcopen/definitions.py:29
-msgid ""
-"RS bistable\n"
-"The RS bistable is a latch where the Reset dominates."
-msgstr ""
-
-#: ../plcopen/definitions.py:43
-msgid ""
-"Ramp\n"
-"The RAMP function block is modelled on example given in the standard."
-msgstr ""
-
#: ../controls/DebugVariablePanel/DebugVariablePanel.py:225
msgid "Range:"
msgstr ""
-#: ../ProjectController.py:1709
+#: ../ProjectController.py:1810
msgid "Raw IEC code"
msgstr ""
-#: ../plcopen/definitions.py:39
-msgid ""
-"Real time clock\n"
-"The real time clock has many uses including time stamping, setting dates and times of day in batch reports, in alarm messages and so on."
-msgstr ""
-
-#: ../Beremiz.py:1107
+#: ../Beremiz.py:1143
#, python-format
msgid "Really delete node '%s'?"
msgstr ""
-#: ../IDEFrame.py:338 ../IDEFrame.py:398
+#: ../IDEFrame.py:362 ../IDEFrame.py:422
msgid "Redo"
msgstr ""
-#: ../dialogs/SFCTransitionDialog.py:73
+#: ../dialogs/SFCTransitionDialog.py:74
msgid "Reference"
msgstr ""
-#: ../dialogs/DiscoveryDialog.py:105 ../IDEFrame.py:408
+#: ../dialogs/DiscoveryDialog.py:106 ../IDEFrame.py:432
msgid "Refresh"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:73
+#: ../dialogs/SearchInProjectDialog.py:66
msgid "Regular expression"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:97
+#: ../dialogs/FindInPouDialog.py:98
msgid "Regular expressions"
msgstr ""
-#: ../editors/Viewer.py:1531
+#: ../editors/Viewer.py:1556
msgid "Release value"
msgstr ""
@@ -2682,16 +2695,16 @@
msgid "Remainder (modulo)"
msgstr ""
-#: ../Beremiz.py:1108
+#: ../Beremiz.py:1144
#, python-format
msgid "Remove %s node"
msgstr ""
-#: ../IDEFrame.py:2371
+#: ../IDEFrame.py:2405
msgid "Remove Datatype"
msgstr ""
-#: ../IDEFrame.py:2376
+#: ../IDEFrame.py:2410
msgid "Remove Pou"
msgstr ""
@@ -2699,7 +2712,7 @@
msgid "Remove action"
msgstr ""
-#: ../editors/DataTypeEditor.py:352
+#: ../editors/DataTypeEditor.py:353
msgid "Remove element"
msgstr ""
@@ -2711,7 +2724,7 @@
msgid "Remove instance"
msgstr ""
-#: ../canfestival/NetworkEditor.py:81
+#: ../canfestival/NetworkEditor.py:104
msgid "Remove slave"
msgstr ""
@@ -2719,11 +2732,11 @@
msgid "Remove task"
msgstr ""
-#: ../editors/CodeFileEditor.py:641 ../controls/VariablePanel.py:441
+#: ../editors/CodeFileEditor.py:659 ../controls/VariablePanel.py:451
msgid "Remove variable"
msgstr ""
-#: ../IDEFrame.py:1911
+#: ../IDEFrame.py:1945
msgid "Rename"
msgstr ""
@@ -2731,7 +2744,7 @@
msgid "Replace File"
msgstr ""
-#: ../editors/Viewer.py:498
+#: ../editors/Viewer.py:502
msgid "Replace Wire by connections"
msgstr ""
@@ -2743,11 +2756,11 @@
msgid "Reset"
msgstr ""
-#: ../editors/Viewer.py:578
+#: ../editors/Viewer.py:583
msgid "Reset Execution Order"
msgstr ""
-#: ../IDEFrame.py:423
+#: ../IDEFrame.py:451
msgid "Reset Perspective"
msgstr ""
@@ -2755,7 +2768,7 @@
msgid "Reset search result"
msgstr ""
-#: ../PLCControler.py:97 ../Beremiz.py:1039
+#: ../PLCControler.py:97 ../Beremiz.py:1075
msgid "Resources"
msgstr ""
@@ -2763,28 +2776,22 @@
msgid "Retain"
msgstr ""
-#: ../controls/VariablePanel.py:414
+#: ../controls/VariablePanel.py:424
msgid "Return Type:"
msgstr ""
-#: ../editors/Viewer.py:483
+#: ../editors/Viewer.py:487
msgid "Right"
msgstr ""
-#: ../dialogs/LDPowerRailDialog.py:62
+#: ../dialogs/LDPowerRailDialog.py:63
msgid "Right PowerRail"
msgstr ""
-#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:457
+#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:461
msgid "Rising Edge"
msgstr ""
-#: ../plcopen/definitions.py:31
-msgid ""
-"Rising edge detector\n"
-"The output produces a single pulse when a rising edge is detected."
-msgstr ""
-
#: ../plcopen/iec_std.csv:65
msgid "Rotate left"
msgstr ""
@@ -2797,23 +2804,23 @@
msgid "Rounding up/down"
msgstr ""
-#: ../ProjectController.py:1677
+#: ../ProjectController.py:1778
msgid "Run"
msgstr ""
-#: ../ProjectController.py:975
+#: ../ProjectController.py:1037
msgid "Runtime IO extensions C code generation failed !\n"
msgstr ""
-#: ../ProjectController.py:984
+#: ../ProjectController.py:1046
msgid "Runtime library extensions C code generation failed !\n"
msgstr ""
-#: ../canfestival/SlaveEditor.py:38 ../canfestival/NetworkEditor.py:59
+#: ../canfestival/SlaveEditor.py:61 ../canfestival/NetworkEditor.py:82
msgid "SDO Client"
msgstr ""
-#: ../canfestival/SlaveEditor.py:37 ../canfestival/NetworkEditor.py:58
+#: ../canfestival/SlaveEditor.py:60 ../canfestival/NetworkEditor.py:81
msgid "SDO Server"
msgstr ""
@@ -2821,51 +2828,59 @@
msgid "SFC"
msgstr ""
-#: ../plcopen/definitions.py:28
-msgid ""
-"SR bistable\n"
-"The SR bistable is a latch where the Set dominates."
-msgstr ""
-
-#: ../dialogs/PouTransitionDialog.py:35 ../dialogs/PouActionDialog.py:31
+#: ../PLCGenerator.py:1392
+#, python-brace-format
+msgid "SFC jump in pou \"{a1}\" refers to non-existent SFC step \"{a2}\""
+msgstr ""
+
+#: ../PLCGenerator.py:773
+#, python-format
+msgid "SFC transition in POU \"%s\" must be connected."
+msgstr ""
+
+#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:31
#: ../dialogs/PouDialog.py:36
msgid "ST"
msgstr ""
-#: ../PLCOpenEditor.py:317
+#: ../PLCOpenEditor.py:324
msgid "ST files (*.st)|*.st|All files|*.*"
msgstr ""
-#: ../svgui/svgui.py:101
+#: ../svgui/svgui.py:125
msgid "SVG files (*.svg)|*.svg|All files|*.*"
msgstr ""
-#: ../features.py:11
+#: ../features.py:35
msgid "SVGUI"
msgstr ""
-#: ../PLCOpenEditor.py:105 ../PLCOpenEditor.py:140 ../Beremiz.py:320
-#: ../Beremiz.py:351
+#: ../PLCOpenEditor.py:111 ../PLCOpenEditor.py:146 ../Beremiz.py:327
+#: ../Beremiz.py:358
msgid "Save"
msgstr ""
-#: ../PLCOpenEditor.py:107 ../PLCOpenEditor.py:141 ../Beremiz.py:352
+#: ../PLCOpenEditor.py:113 ../PLCOpenEditor.py:147 ../Beremiz.py:359
msgid "Save As..."
msgstr ""
-#: ../Beremiz.py:322
+#: ../Beremiz.py:329
msgid "Save as"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:76
+#: ../ProjectController.py:420
+msgid "Save path is the same as path of a project! \n"
+msgstr ""
+
+#: ../dialogs/SearchInProjectDialog.py:69
msgid "Scope"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:105 ../IDEFrame.py:595
+#: ../IDEFrame.py:623
msgid "Search"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:52 ../IDEFrame.py:358 ../IDEFrame.py:404
+#: ../dialogs/SearchInProjectDialog.py:44 ../IDEFrame.py:382 ../IDEFrame.py:428
msgid "Search in Project"
msgstr ""
@@ -2873,17 +2888,17 @@
msgid "Seconds:"
msgstr ""
-#: ../IDEFrame.py:364
+#: ../IDEFrame.py:388
msgid "Select All"
msgstr ""
-#: ../editors/Viewer.py:284 ../editors/TextViewer.py:304
-#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:280
-#: ../controls/VariablePanel.py:340
+#: ../editors/Viewer.py:288 ../editors/TextViewer.py:306
+#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:290
+#: ../controls/VariablePanel.py:350
msgid "Select a variable class:"
msgstr ""
-#: ../ProjectController.py:1126
+#: ../ProjectController.py:1195
msgid "Select an editor:"
msgstr ""
@@ -2891,10 +2906,14 @@
msgid "Select an instance"
msgstr ""
-#: ../IDEFrame.py:579
+#: ../IDEFrame.py:607
msgid "Select an object"
msgstr ""
+#: ../ProjectController.py:427
+msgid "Selected directory already contains another project. Overwrite? \n"
+msgstr ""
+
#: ../plcopen/iec_std.csv:70
msgid "Selection"
msgstr ""
@@ -2907,17 +2926,11 @@
msgid "Selection Divergence"
msgstr ""
-#: ../plcopen/definitions.py:30
-msgid ""
-"Semaphore\n"
-"The semaphore provides a mechanism to allow software elements mutually exclusive access to certain ressources."
-msgstr ""
-
-#: ../dialogs/DiscoveryDialog.py:81
+#: ../dialogs/DiscoveryDialog.py:82
msgid "Service Discovery"
msgstr ""
-#: ../dialogs/DiscoveryDialog.py:84
+#: ../dialogs/DiscoveryDialog.py:85
msgid "Services available:"
msgstr ""
@@ -2933,19 +2946,19 @@
msgid "Shift right"
msgstr ""
-#: ../ProjectController.py:1703
+#: ../ProjectController.py:1804
msgid "Show IEC code generated by PLCGenerator"
msgstr ""
-#: ../canfestival/canfestival.py:363
+#: ../canfestival/canfestival.py:387
msgid "Show Master"
msgstr ""
-#: ../canfestival/canfestival.py:364
+#: ../canfestival/canfestival.py:388
msgid "Show Master generated by config_utils"
msgstr ""
-#: ../ProjectController.py:1701
+#: ../ProjectController.py:1802
msgid "Show code"
msgstr ""
@@ -2965,52 +2978,65 @@
msgid "Single"
msgstr ""
-#: ../targets/toolchain_makefile.py:112
+#: ../targets/toolchain_makefile.py:126
msgid "Source didn't change, no build.\n"
msgstr ""
+#: ../PLCGenerator.py:397
+#, python-brace-format
+msgid "Source signal has to be defined for single task '{a1}' in resource '{a2}.{a3}'."
+msgstr ""
+
#: ../plcopen/iec_std.csv:23
msgid "Square root (base 2)"
msgstr ""
-#: ../plcopen/definitions.py:21
+#: ../plcopen/definitions.py:46
msgid "Standard function blocks"
msgstr ""
-#: ../ProjectController.py:1679 ../Beremiz_service.py:240
+#: ../ProjectController.py:1780 ../Beremiz_service.py:261
msgid "Start PLC"
msgstr ""
-#: ../ProjectController.py:922
+#: ../ProjectController.py:984
#, python-format
msgid "Start build in %s\n"
msgstr ""
-#: ../ProjectController.py:1483
+#: ../ProjectController.py:1298
+msgid "Started"
+msgstr ""
+
+#: ../ProjectController.py:1586
msgid "Starting PLC\n"
msgstr ""
-#: ../Beremiz.py:451
+#: ../Beremiz.py:463
msgid "Status ToolBar"
msgstr ""
-#: ../editors/Viewer.py:549 ../editors/Viewer.py:2059
+#: ../editors/Viewer.py:553 ../editors/Viewer.py:2342
msgid "Step"
msgstr ""
-#: ../ProjectController.py:1682
+#: ../ProjectController.py:1783
msgid "Stop"
msgstr ""
-#: ../Beremiz_service.py:241
+#: ../Beremiz_service.py:262
msgid "Stop PLC"
msgstr ""
-#: ../ProjectController.py:1684
+#: ../ProjectController.py:1785
msgid "Stop Running PLC"
msgstr ""
-#: ../ProjectController.py:1455
+#: ../ProjectController.py:1299
+msgid "Stopped"
+msgstr ""
+
+#: ../ProjectController.py:1558
msgid "Stopping debugger...\n"
msgstr ""
@@ -3026,15 +3052,19 @@
msgid "Subtraction"
msgstr ""
-#: ../ProjectController.py:961
+#: ../ProjectController.py:1023
msgid "Successfully built.\n"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:154
+#: ../IDEFrame.py:447
+msgid "Switch perspective"
+msgstr ""
+
+#: ../dialogs/SearchInProjectDialog.py:165 ../dialogs/FindInPouDialog.py:172
msgid "Syntax error in regular expression of pattern to search!"
msgstr ""
-#: ../dialogs/DiscoveryDialog.py:92
+#: ../dialogs/DiscoveryDialog.py:93
msgid "TYPE"
msgstr ""
@@ -3065,16 +3095,16 @@
msgid "The group of block must be coherent!"
msgstr ""
-#: ../Beremiz.py:614 ../IDEFrame.py:983
+#: ../Beremiz.py:640 ../IDEFrame.py:1011
msgid "There are changes, do you want to save?"
msgstr ""
-#: ../IDEFrame.py:1618 ../IDEFrame.py:1637
+#: ../IDEFrame.py:1655 ../IDEFrame.py:1674
#, python-format
msgid "There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr ""
-#: ../IDEFrame.py:1070
+#: ../IDEFrame.py:1098
msgid ""
"There was a problem printing.\n"
"Perhaps your current printer is not set correctly?"
@@ -3084,6 +3114,11 @@
msgid "This option isn't available yet!"
msgstr ""
+#: ../controls/DebugVariablePanel/DebugVariablePanel.py:565
+#, python-format
+msgid "Tick: %d"
+msgstr ""
+
#: ../plcopen/iec_std.csv:40
msgid "Time"
msgstr ""
@@ -3117,54 +3152,54 @@
msgid "Time-of-day subtraction"
msgstr ""
-#: ../editors/Viewer.py:485
+#: ../editors/Viewer.py:489
msgid "Top"
msgstr ""
-#: ../ProjectController.py:1691
+#: ../ProjectController.py:1792
msgid "Transfer"
msgstr ""
-#: ../ProjectController.py:1693
+#: ../ProjectController.py:1794
msgid "Transfer PLC"
msgstr ""
-#: ../ProjectController.py:1658
+#: ../ProjectController.py:1758
msgid "Transfer completed successfully.\n"
msgstr ""
-#: ../ProjectController.py:1660
+#: ../ProjectController.py:1760
msgid "Transfer failed\n"
msgstr ""
-#: ../editors/Viewer.py:550 ../editors/Viewer.py:2060 ../editors/Viewer.py:2089
+#: ../editors/Viewer.py:554 ../editors/Viewer.py:2344 ../editors/Viewer.py:2371
msgid "Transition"
msgstr ""
-#: ../PLCGenerator.py:1499
+#: ../PLCGenerator.py:1518
#, python-format
msgid "Transition \"%s\" body must contain an output variable or coil referring to its name"
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:84
+#: ../dialogs/PouTransitionDialog.py:89
msgid "Transition Name"
msgstr ""
-#: ../dialogs/PouTransitionDialog.py:53
+#: ../dialogs/PouTransitionDialog.py:58
msgid "Transition Name:"
msgstr ""
-#: ../PLCGenerator.py:1588
-#, python-format
-msgid "Transition with content \"%s\" not connected to a next step in \"%s\" POU"
-msgstr ""
-
-#: ../PLCGenerator.py:1579
-#, python-format
-msgid "Transition with content \"%s\" not connected to a previous step in \"%s\" POU"
-msgstr ""
-
-#: ../plcopen/plcopen.py:1315
+#: ../PLCGenerator.py:1609
+#, python-brace-format
+msgid "Transition with content \"{a1}\" not connected to a next step in \"{a2}\" POU"
+msgstr ""
+
+#: ../PLCGenerator.py:1598
+#, python-brace-format
+msgid "Transition with content \"{a1}\" not connected to a previous step in \"{a2}\" POU"
+msgstr ""
+
+#: ../plcopen/plcopen.py:1318
#, python-format
msgid "Transition with name %s doesn't exist!"
msgstr ""
@@ -3173,21 +3208,29 @@
msgid "Transitions"
msgstr ""
+#: ../dialogs/AboutDialog.py:123
+msgid "Translated by"
+msgstr ""
+
#: ../editors/ResourceEditor.py:68
msgid "Triggering"
msgstr ""
+#: ../Beremiz_service.py:476
+msgid "Twisted unavailable."
+msgstr ""
+
#: ../dialogs/ActionBlockDialog.py:38 ../editors/ResourceEditor.py:83
-#: ../editors/DataTypeEditor.py:50 ../editors/CodeFileEditor.py:663
-#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54
+#: ../editors/DataTypeEditor.py:50 ../controls/VariablePanel.py:53
+#: ../controls/VariablePanel.py:54
msgid "Type"
msgstr ""
-#: ../dialogs/BrowseLocationsDialog.py:43
+#: ../dialogs/BrowseLocationsDialog.py:48
msgid "Type and derivated"
msgstr ""
-#: ../canfestival/config_utils.py:336 ../canfestival/config_utils.py:618
+#: ../canfestival/config_utils.py:336 ../canfestival/config_utils.py:624
#, python-format
msgid "Type conflict for location \"%s\""
msgstr ""
@@ -3196,33 +3239,33 @@
msgid "Type conversion"
msgstr ""
-#: ../editors/DataTypeEditor.py:161
+#: ../editors/DataTypeEditor.py:162
msgid "Type infos:"
msgstr ""
-#: ../dialogs/BrowseLocationsDialog.py:44
+#: ../dialogs/BrowseLocationsDialog.py:49
msgid "Type strict"
msgstr ""
-#: ../dialogs/SFCDivergenceDialog.py:57 ../dialogs/SFCTransitionDialog.py:56
-#: ../dialogs/LDPowerRailDialog.py:55 ../dialogs/BrowseLocationsDialog.py:94
+#: ../dialogs/SFCDivergenceDialog.py:59 ../dialogs/SFCTransitionDialog.py:57
+#: ../dialogs/LDPowerRailDialog.py:56 ../dialogs/BrowseLocationsDialog.py:99
#: ../dialogs/FBDBlockDialog.py:65 ../dialogs/ConnectionDialog.py:58
msgid "Type:"
msgstr ""
-#: ../canfestival/config_utils.py:456 ../canfestival/config_utils.py:470
+#: ../canfestival/config_utils.py:462 ../canfestival/config_utils.py:476
#, python-format
msgid "Unable to define PDO mapping for node %02x"
msgstr ""
-#: ../targets/Xenomai/__init__.py:15
+#: ../targets/Xenomai/__init__.py:39
#, python-format
msgid "Unable to get Xenomai's %s \n"
msgstr ""
-#: ../PLCGenerator.py:951 ../PLCGenerator.py:1202
-#, python-format
-msgid "Undefined block type \"%s\" in \"%s\" POU"
+#: ../PLCGenerator.py:961 ../PLCGenerator.py:1214
+#, python-brace-format
+msgid "Undefined block type \"{a1}\" in \"{a2}\" POU"
msgstr ""
#: ../PLCGenerator.py:254
@@ -3230,20 +3273,20 @@
msgid "Undefined pou type \"%s\""
msgstr ""
-#: ../IDEFrame.py:336 ../IDEFrame.py:397
+#: ../IDEFrame.py:360 ../IDEFrame.py:421
msgid "Undo"
msgstr ""
-#: ../ProjectController.py:308
+#: ../ProjectController.py:332
msgid "Unknown"
msgstr ""
-#: ../editors/Viewer.py:389
+#: ../editors/Viewer.py:393
#, python-format
msgid "Unknown variable \"%s\" for this POU!"
msgstr ""
-#: ../ProjectController.py:305 ../ProjectController.py:306
+#: ../ProjectController.py:329 ../ProjectController.py:330
msgid "Unnamed"
msgstr ""
@@ -3252,28 +3295,16 @@
msgid "Unnamed%d"
msgstr ""
-#: ../controls/VariablePanel.py:275
+#: ../controls/VariablePanel.py:284
#, python-format
msgid "Unrecognized data size \"%s\""
msgstr ""
-#: ../plcopen/definitions.py:33
-msgid ""
-"Up-counter\n"
-"The up-counter can be used to signal when a count has reached a maximum value."
-msgstr ""
-
-#: ../plcopen/definitions.py:35
-msgid ""
-"Up-down counter\n"
-"The up-down counter has two inputs CU and CD. It can be used to both count up on one input and down on the other."
-msgstr ""
-
-#: ../editors/DataTypeEditor.py:631 ../controls/VariablePanel.py:780
+#: ../editors/DataTypeEditor.py:632 ../controls/VariablePanel.py:798
msgid "User Data Types"
msgstr ""
-#: ../canfestival/SlaveEditor.py:42 ../canfestival/NetworkEditor.py:63
+#: ../canfestival/SlaveEditor.py:65 ../canfestival/NetworkEditor.py:86
msgid "User Type"
msgstr ""
@@ -3285,26 +3316,32 @@
msgid "Value"
msgstr ""
-#: ../editors/DataTypeEditor.py:258
+#: ../editors/DataTypeEditor.py:259
msgid "Values:"
msgstr ""
-#: ../dialogs/ActionBlockDialog.py:42 ../editors/Viewer.py:522
-#: ../editors/Viewer.py:2074
+#: ../dialogs/ActionBlockDialog.py:42 ../editors/Viewer.py:526
+#: ../editors/Viewer.py:2374
msgid "Variable"
msgstr ""
+#: ../editors/Viewer.py:308 ../editors/Viewer.py:338 ../editors/Viewer.py:360
+#: ../editors/TextViewer.py:292 ../editors/TextViewer.py:343
+#: ../editors/TextViewer.py:366 ../controls/VariablePanel.py:329
+msgid "Variable Drop"
+msgstr ""
+
#: ../dialogs/FBDVariableDialog.py:63
msgid "Variable Properties"
msgstr ""
-#: ../editors/Viewer.py:284 ../editors/TextViewer.py:304
-#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:280
-#: ../controls/VariablePanel.py:340
+#: ../editors/Viewer.py:288 ../editors/TextViewer.py:306
+#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:290
+#: ../controls/VariablePanel.py:350
msgid "Variable class"
msgstr ""
-#: ../editors/Viewer.py:391 ../editors/TextViewer.py:385
+#: ../editors/Viewer.py:395 ../editors/TextViewer.py:387
msgid "Variable don't belong to this POU!"
msgstr ""
@@ -3320,21 +3357,29 @@
msgid "Vertical:"
msgstr ""
-#: ../connectors/WAMP/__init__.py:88
+#: ../Beremiz_service.py:586
+msgid "WAMP client startup failed. "
+msgstr ""
+
+#: ../connectors/WAMP/__init__.py:91
#, python-format
msgid "WAMP connecting to URL : %s\n"
msgstr ""
-#: ../connectors/WAMP/__init__.py:128
+#: ../connectors/WAMP/__init__.py:131
msgid "WAMP connection timeout"
msgstr ""
-#: ../connectors/WAMP/__init__.py:147
+#: ../connectors/WAMP/__init__.py:150
#, python-format
msgid "WAMP connection to '%s' failed.\n"
msgstr ""
-#: ../wxglade_hmi/wxglade_hmi.py:11
+#: ../Beremiz_service.py:562
+msgid "WAMP import failed :"
+msgstr ""
+
+#: ../wxglade_hmi/wxglade_hmi.py:35
msgid "WXGLADE GUI"
msgstr ""
@@ -3342,11 +3387,11 @@
msgid "Warning"
msgstr ""
-#: ../ProjectController.py:584
+#: ../ProjectController.py:616
msgid "Warnings in ST/IL/SFC code generator :\n"
msgstr ""
-#: ../dialogs/SearchInProjectDialog.py:85
+#: ../dialogs/SearchInProjectDialog.py:78
msgid "Whole Project"
msgstr ""
@@ -3354,27 +3399,31 @@
msgid "Width:"
msgstr ""
-#: ../dialogs/FindInPouDialog.py:92
+#: ../dialogs/FindInPouDialog.py:93
msgid "Wrap search"
msgstr ""
-#: ../features.py:10
+#: ../dialogs/AboutDialog.py:122
+msgid "Written by"
+msgstr ""
+
+#: ../features.py:34
msgid "WxGlade GUI"
msgstr ""
-#: ../svgui/svgui.py:115
+#: ../svgui/svgui.py:139
msgid ""
"You don't have write permissions.\n"
"Open Inkscape anyway ?"
msgstr ""
-#: ../wxglade_hmi/wxglade_hmi.py:113
+#: ../wxglade_hmi/wxglade_hmi.py:137
msgid ""
"You don't have write permissions.\n"
"Open wxGlade anyway ?"
msgstr ""
-#: ../ProjectController.py:268
+#: ../ProjectController.py:292
msgid ""
"You must have permission to work on the project\n"
"Work on a project copy ?"
@@ -3388,7 +3437,7 @@
msgid "You must select the wire where a contact should be added!"
msgstr ""
-#: ../dialogs/SFCStepNameDialog.py:47 ../dialogs/PouNameDialog.py:45
+#: ../dialogs/SFCStepNameDialog.py:48 ../dialogs/PouNameDialog.py:46
msgid "You must type a name!"
msgstr ""
@@ -3396,29 +3445,25 @@
msgid "You must type a value!"
msgstr ""
-#: ../IDEFrame.py:414
+#: ../IDEFrame.py:438
msgid "Zoom"
msgstr ""
-#: ../Beremiz.py:997
-msgid "about.html"
-msgstr ""
-
#: ../dialogs/DurationEditorDialog.py:151
msgid "days"
msgstr ""
-#: ../PLCOpenEditor.py:326
+#: ../PLCOpenEditor.py:333
#, python-format
msgid "error: %s\n"
msgstr ""
-#: ../util/ProcessLogger.py:166
-#, python-format
-msgid "exited with status %s (pid %s)\n"
-msgstr ""
-
-#: ../PLCOpenEditor.py:384 ../PLCOpenEditor.py:386
+#: ../util/ProcessLogger.py:169
+#, python-brace-format
+msgid "exited with status {a1} (pid {a2})\n"
+msgstr ""
+
+#: ../PLCOpenEditor.py:396 ../PLCOpenEditor.py:398
msgid "file : "
msgstr ""
@@ -3426,7 +3471,7 @@
msgid "function"
msgstr ""
-#: ../PLCOpenEditor.py:387
+#: ../PLCOpenEditor.py:399
msgid "function : "
msgstr ""
@@ -3438,7 +3483,7 @@
msgid "hours"
msgstr ""
-#: ../PLCOpenEditor.py:387
+#: ../PLCOpenEditor.py:399
msgid "line : "
msgstr ""
@@ -3450,10 +3495,6 @@
msgid "minutes"
msgstr ""
-#: ../PLCOpenEditor.py:346
-msgid "plcopen_about.html"
-msgstr ""
-
#: ../dialogs/PouDialog.py:31
msgid "program"
msgstr ""
@@ -3474,13 +3515,30 @@
msgid "string right of"
msgstr ""
-#: ../PLCOpenEditor.py:324
+#: ../Beremiz.py:126
+msgid "update info unavailable."
+msgstr ""
+
+#: ../PLCOpenEditor.py:331
#, python-format
msgid "warning: %s\n"
msgstr ""
+#: ../PLCControler.py:970
+#, python-brace-format
+msgid "{a1} \"{a2}\" can't be pasted as a {a3}."
+msgstr ""
+
+#: ../ConfigTreeNode.py:56
+#, python-brace-format
+msgid ""
+"{a1} XML file doesn't follow XSD schema at line %{a2}:\n"
+"{a3}"
+msgstr ""
+
#: Extra XSD strings
+
msgid "CanFestivalSlaveNode"
msgstr ""
@@ -3535,6 +3593,9 @@
msgid "LDFLAGS"
msgstr ""
+msgid "PLC"
+msgstr ""
+
msgid "Linux"
msgstr ""
@@ -3594,3 +3655,156 @@
msgid "opts"
msgstr ""
+
+#: Extra TC6 documentation strings
+
+
+msgid "0 - current time, 1 - load time from PDT"
+msgstr ""
+
+msgid "Preset datetime"
+msgstr ""
+
+msgid "Copy of IN"
+msgstr ""
+
+msgid "Datetime, current or relative to PDT"
+msgstr ""
+
+msgid "The real time clock has many uses including time stamping, setting dates and times of day in batch reports, in alarm messages and so on."
+msgstr ""
+
+msgid "1 = integrate, 0 = hold"
+msgstr ""
+
+msgid "Overriding reset"
+msgstr ""
+
+msgid "Input variable"
+msgstr ""
+
+msgid "Initial value"
+msgstr ""
+
+msgid "Sampling period"
+msgstr ""
+
+msgid "NOT R1"
+msgstr ""
+
+msgid "Integrated output"
+msgstr ""
+
+msgid "The integral function block integrates the value of input XIN over time."
+msgstr ""
+
+msgid "0 = reset"
+msgstr ""
+
+msgid "Input to be differentiated"
+msgstr ""
+
+msgid "Differentiated output"
+msgstr ""
+
+msgid "The derivative function block produces an output XOUT proportional to the rate of change of the input XIN."
+msgstr ""
+
+msgid "0 - manual , 1 - automatic"
+msgstr ""
+
+msgid "Process variable"
+msgstr ""
+
+msgid "Set point"
+msgstr ""
+
+msgid "Manual output adjustment - Typically from transfer station"
+msgstr ""
+
+msgid "Proportionality constant"
+msgstr ""
+
+msgid "Reset time"
+msgstr ""
+
+msgid "Derivative time constant"
+msgstr ""
+
+msgid "PV - SP"
+msgstr ""
+
+msgid "FB for integral term"
+msgstr ""
+
+msgid "FB for derivative term"
+msgstr ""
+
+msgid "The PID (proportional, Integral, Derivative) function block provides the classical three term controller for closed loop control."
+msgstr ""
+
+msgid "0 - track X0, 1 - ramp to/track X1"
+msgstr ""
+
+msgid "Ramp duration"
+msgstr ""
+
+msgid "BUSY = 1 during ramping period"
+msgstr ""
+
+msgid "Elapsed time of ramp"
+msgstr ""
+
+msgid "The RAMP function block is modelled on example given in the standard."
+msgstr ""
+
+msgid "The hysteresis function block provides a hysteresis boolean output driven by the difference of two floating point (REAL) inputs XIN1 and XIN2."
+msgstr ""
+
+msgid "The SR bistable is a latch where the Set dominates."
+msgstr ""
+
+msgid "The RS bistable is a latch where the Reset dominates."
+msgstr ""
+
+msgid "The semaphore provides a mechanism to allow software elements mutually exclusive access to certain ressources."
+msgstr ""
+
+msgid "The output produces a single pulse when a rising edge is detected."
+msgstr ""
+
+msgid "The output produces a single pulse when a falling edge is detected."
+msgstr ""
+
+msgid "The up-counter can be used to signal when a count has reached a maximum value."
+msgstr ""
+
+msgid "The down-counter can be used to signal when a count has reached zero, on counting down from a preset value."
+msgstr ""
+
+msgid "The up-down counter has two inputs CU and CD. It can be used to both count up on one input and down on the other."
+msgstr ""
+
+msgid "first input parameter"
+msgstr ""
+
+msgid "second input parameter"
+msgstr ""
+
+msgid "first output parameter"
+msgstr ""
+
+msgid "second output parameter"
+msgstr ""
+
+msgid "internal state: 0-reset, 1-counting, 2-set"
+msgstr ""
+
+msgid "The pulse timer can be used to generate output pulses of a given time duration."
+msgstr ""
+
+msgid "The on-delay timer can be used to delay setting an output true, for fixed period after an input becomes true."
+msgstr ""
+
+msgid "The off-delay timer can be used to delay setting an output false, for fixed period after input goes false."
+msgstr ""
diff -r 6431f26aa501 -r 3291024e00da i18n/mki18n.py
--- a/i18n/mki18n.py Thu Feb 16 14:34:40 2017 +0500
+++ b/i18n/mki18n.py Thu Feb 16 14:35:12 2017 +0500
@@ -108,7 +108,33 @@
return languageDict
-XSD_STRING_MODEL = re.compile("<xsd\:(?:element|attribute) name=\"([^\"]*)\"[^\>]*\>")
+
+
+def processCustomFiles(filein, fileout, regexp, prefix = ''):
+ appfil_file = open(filein, 'r')
+ messages_file = open(fileout, 'r')
+ messages = messages_file.read()
+ messages_file.close()
+ messages_file = open(fileout, 'a')
+ messages_file.write('\n')
+ messages_file.write('#: %s\n' % prefix)
+ messages_file.write('\n')
+
+ words_found = {}
+ for filepath in appfil_file.xreadlines():
+ code_file = open(filepath.strip(), 'r')
+ for match in regexp.finditer(code_file.read()):
+ word = match.group(1)
+ if not words_found.get(word, False) and messages.find("msgid \"%s\"\nmsgstr \"\"" % word) == -1:
+ words_found[word] = True
+ messages_file.write('\n')
+ messages_file.write("msgid \"%s\"\n"%word)
+ messages_file.write("msgstr \"\"\n")
+ code_file.close()
+
+ messages_file.close()
+ appfil_file.close()
+
# -----------------------------------------------------------------------------
# m a k e P O ( ) -- Build the Portable Object file for the application --
@@ -143,10 +169,12 @@
else:
applicationName = applicationDomain
currentDir = os.getcwd()
- os.chdir(applicationDirectoryPath)
- if not os.path.exists('app.fil'):
- raise IOError(2,'No module file: app.fil')
-
+ os.chdir(applicationDirectoryPath)
+ filelist = 'app.fil'
+ if not os.path.exists(filelist):
+ raise IOError(2,'No module file: ' % filelist)
+
+ fileout = 'messages.pot'
# Steps:
# Use xgettext to parse all application modules
# The following switches are used:
@@ -154,33 +182,16 @@
# -s : sort output by string content (easier to use when we need to merge several .po files)
# --files-from=app.fil : The list of files is taken from the file: app.fil
# --output= : specifies the name of the output file (using a .pot extension)
- cmd = 'xgettext -s --no-wrap --language=Python --files-from=app.fil --output=messages.pot'
+ cmd = 'xgettext -s --no-wrap --language=Python --files-from=' + filelist + ' --output=' + fileout
if verbose: print cmd
os.system(cmd)
- appfil_file = open("app.fil", 'r')
- messages_file = open("messages.pot", 'r')
- messages = messages_file.read()
- messages_file.close()
- messages_file = open("messages.pot", 'a')
- messages_file.write("""
-#: Extra XSD strings
-""")
- words_found = {}
- for filepath in appfil_file.xreadlines():
- code_file = open(filepath.strip(), 'r')
- for match in XSD_STRING_MODEL.finditer(code_file.read()):
- word = match.group(1)
- if not words_found.get(word, False) and messages.find("msgid \"%s\"\nmsgstr \"\"" % word) == -1:
- words_found[word] = True
- messages_file.write("""
-msgid "%s"
-msgstr ""
-"""%word)
- code_file.close()
- messages_file.close()
- appfil_file.close()
-
+ XSD_STRING_MODEL = re.compile("<xsd\:(?:element|attribute) name=\"([^\"]*)\"[^\>]*\>")
+ processCustomFiles(filelist, fileout, XSD_STRING_MODEL, 'Extra XSD strings')
+
+ XML_TC6_STRING_MODEL = re.compile("<documentation>\s*<xhtml\:p><!\[CDATA\[([^\]]*)\]\]></xhtml\:p>\s*</documentation>", re.MULTILINE | re.DOTALL)
+ processCustomFiles(filelist, fileout, XML_TC6_STRING_MODEL, 'Extra TC6 documentation strings')
+
languageDict = getlanguageDict()
for langCode in languageDict.keys():
@@ -189,7 +200,7 @@
else:
langPOfileName = "%s_%s.po" % (applicationName , langCode)
if os.path.exists(langPOfileName):
- cmd = 'msgmerge -s --no-wrap "%s" messages.pot > "%s.new"' % (langPOfileName, langPOfileName)
+ cmd = 'msgmerge -s --no-wrap "%s" %s > "%s.new"' % (langPOfileName, fileout, langPOfileName)
if verbose: print cmd
os.system(cmd)
os.chdir(currentDir)
diff -r 6431f26aa501 -r 3291024e00da images/about_brz_logo.png
Binary file images/about_brz_logo.png has changed
diff -r 6431f26aa501 -r 3291024e00da images/icons.svg
--- a/images/icons.svg Thu Feb 16 14:34:40 2017 +0500
+++ b/images/icons.svg Thu Feb 16 14:35:12 2017 +0500
@@ -15,7 +15,7 @@
height="1052.3622"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.91 r13725"
sodipodi:docname="icons.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
@@ -31,7 +31,7 @@
</rdf:RDF>
</metadata>
<sodipodi:namedview
- inkscape:window-height="1056"
+ inkscape:window-height="1043"
inkscape:window-width="1920"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
@@ -43,11 +43,11 @@
pagecolor="#ffffff"
id="base"
showgrid="false"
- inkscape:zoom="4.0000001"
- inkscape:cx="590.44587"
- inkscape:cy="681.55725"
+ inkscape:zoom="1"
+ inkscape:cx="618.65047"
+ inkscape:cy="-188.15697"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="0"
inkscape:current-layer="svg2"
showguides="true"
inkscape:guide-bbox="true"
@@ -87959,6 +87959,148 @@
width="1"
height="1" />
</clipPath>
+ <mask
+ id="mask6467-7">
+ <rect
+ width="462.6499"
+ height="418.20319"
+ x="145.46196"
+ y="-576.94458"
+ id="use6469-5"
+ style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6885);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+ </mask>
+ <filter
+ x="-0.021624813"
+ width="1.0432496"
+ y="-0.10738391"
+ height="1.2147678"
+ id="filter17760-6">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="10.250707"
+ id="feGaussianBlur17762-2" />
+ </filter>
+ <mask
+ id="mask18563">
+ <rect
+ width="462.6499"
+ height="418.20319"
+ x="145.46196"
+ y="-576.94458"
+ id="rect18565"
+ style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6885);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+ </mask>
+ <linearGradient
+ x1="361.4903"
+ y1="-285.12421"
+ x2="454.45035"
+ y2="-474.94891"
+ id="linearGradient18567"
+ xlink:href="#linearGradient59108"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ id="filter6447-9">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="10.172821"
+ id="feGaussianBlur6449-1" />
+ </filter>
+ <mask
+ id="mask18577">
+ <rect
+ width="462.6499"
+ height="418.20319"
+ x="145.46196"
+ y="-576.94458"
+ id="rect18579"
+ style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6885);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+ </mask>
+ <linearGradient
+ x1="361.4903"
+ y1="-285.12421"
+ x2="454.45035"
+ y2="-474.94891"
+ id="linearGradient18581"
+ xlink:href="#linearGradient59108"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ id="filter18589">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="10.172821"
+ id="feGaussianBlur18591" />
+ </filter>
+ <mask
+ id="mask6467-7-2">
+ <rect
+ width="462.6499"
+ height="418.20319"
+ x="145.46196"
+ y="-576.94458"
+ id="use6469-5-2"
+ style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6885);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+ </mask>
+ <filter
+ x="-0.021624813"
+ width="1.0432496"
+ y="-0.10738391"
+ height="1.2147678"
+ id="filter17760-6-7">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="10.250707"
+ id="feGaussianBlur17762-2-3" />
+ </filter>
+ <mask
+ id="mask23060">
+ <rect
+ width="462.6499"
+ height="418.20319"
+ x="145.46196"
+ y="-576.94458"
+ id="rect23062"
+ style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6885);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+ </mask>
+ <linearGradient
+ x1="361.4903"
+ y1="-285.12421"
+ x2="454.45035"
+ y2="-474.94891"
+ id="linearGradient23064"
+ xlink:href="#linearGradient59108"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ id="filter6447-9-6">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="10.172821"
+ id="feGaussianBlur6449-1-1" />
+ </filter>
+ <mask
+ id="mask23074">
+ <rect
+ width="462.6499"
+ height="418.20319"
+ x="145.46196"
+ y="-576.94458"
+ id="rect23076"
+ style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6885);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+ </mask>
+ <linearGradient
+ x1="361.4903"
+ y1="-285.12421"
+ x2="454.45035"
+ y2="-474.94891"
+ id="linearGradient23078"
+ xlink:href="#linearGradient59108"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ id="filter23086">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="10.172821"
+ id="feGaussianBlur23088" />
+ </filter>
</defs>
<g
id="g19063"
@@ -88093,7 +88235,7 @@
sodipodi:cy="1.7575644"
sodipodi:rx="12.374369"
sodipodi:ry="12.374369"
- d="m 51.012705,1.7575644 c 0,6.8341751 -5.540194,12.3743686 -12.374369,12.3743686 -6.834175,0 -12.374368,-5.5401935 -12.374368,-12.3743686 0,-6.8341751 5.540193,-12.3743684 12.374368,-12.3743684 6.834175,0 12.374369,5.5401933 12.374369,12.3743684 z"
+ d="M 51.012705,1.7575644 A 12.374369,12.374369 0 0 1 38.638336,14.131933 12.374369,12.374369 0 0 1 26.263968,1.7575644 12.374369,12.374369 0 0 1 38.638336,-10.616804 12.374369,12.374369 0 0 1 51.012705,1.7575644 Z"
transform="matrix(1.5916608,0,0,1.5916608,-4.534839,45.738269)" />
<path
sodipodi:type="arc"
@@ -88103,7 +88245,7 @@
sodipodi:cy="1.7575644"
sodipodi:rx="12.374369"
sodipodi:ry="12.374369"
- d="m 51.012705,1.7575644 c 0,6.8341751 -5.540194,12.3743686 -12.374369,12.3743686 -6.834175,0 -12.374368,-5.5401935 -12.374368,-12.3743686 0,-6.8341751 5.540193,-12.3743684 12.374368,-12.3743684 6.834175,0 12.374369,5.5401933 12.374369,12.3743684 z"
+ d="M 51.012705,1.7575644 A 12.374369,12.374369 0 0 1 38.638336,14.131933 12.374369,12.374369 0 0 1 26.263968,1.7575644 12.374369,12.374369 0 0 1 38.638336,-10.616804 12.374369,12.374369 0 0 1 51.012705,1.7575644 Z"
transform="translate(18.32595,46.778151)" />
</g>
<g
@@ -88112,7 +88254,7 @@
transform="matrix(0.2172196,0,0,0.2172196,-856.56407,380.74931)">
<path
transform="translate(58.32595,48.778151)"
- d="m 51.012705,1.7575644 c 0,6.8341751 -5.540194,12.3743686 -12.374369,12.3743686 -6.834175,0 -12.374368,-5.5401935 -12.374368,-12.3743686 0,-6.8341751 5.540193,-12.3743684 12.374368,-12.3743684 6.834175,0 12.374369,5.5401933 12.374369,12.3743684 z"
+ d="M 51.012705,1.7575644 A 12.374369,12.374369 0 0 1 38.638336,14.131933 12.374369,12.374369 0 0 1 26.263968,1.7575644 12.374369,12.374369 0 0 1 38.638336,-10.616804 12.374369,12.374369 0 0 1 51.012705,1.7575644 Z"
sodipodi:ry="12.374369"
sodipodi:rx="12.374369"
sodipodi:cy="1.7575644"
@@ -88122,7 +88264,7 @@
sodipodi:type="arc" />
<path
transform="matrix(0.9170232,0,0,0.9170232,61.532035,48.923988)"
- d="m 51.012705,1.7575644 c 0,6.8341751 -5.540194,12.3743686 -12.374369,12.3743686 -6.834175,0 -12.374368,-5.5401935 -12.374368,-12.3743686 0,-6.8341751 5.540193,-12.3743684 12.374368,-12.3743684 6.834175,0 12.374369,5.5401933 12.374369,12.3743684 z"
+ d="M 51.012705,1.7575644 A 12.374369,12.374369 0 0 1 38.638336,14.131933 12.374369,12.374369 0 0 1 26.263968,1.7575644 12.374369,12.374369 0 0 1 38.638336,-10.616804 12.374369,12.374369 0 0 1 51.012705,1.7575644 Z"
sodipodi:ry="12.374369"
sodipodi:rx="12.374369"
sodipodi:cy="1.7575644"
@@ -88834,8 +88976,7 @@
r="34.144001"
transform="matrix(0.3316761,0,0,0.3316761,48.927852,9.2318583)"
id="circle29"
- style="fill:#84c225;fill-rule:evenodd;stroke:#5d9d35;stroke-width:2.82220006"
- d="m 134.431,110.081 c 0,18.85721 -15.28679,34.144 -34.144,34.144 -18.857208,0 -34.143998,-15.28679 -34.143998,-34.144 0,-18.85721 15.28679,-34.144 34.143998,-34.144 18.85721,0 34.144,15.28679 34.144,34.144 z" />
+ style="fill:#84c225;fill-rule:evenodd;stroke:#5d9d35;stroke-width:2.82220006" />
<path
d="m 84.515333,38.943636 0,3.981494 3.981494,0 0,4.799639 -3.981494,0 0,3.981494 -4.782372,0 0,-3.981494 -3.981494,0 0,-4.799639 3.981494,0 0,-3.981494 4.782372,0"
id="text1332"
@@ -88888,8 +89029,7 @@
r="34.144001"
transform="matrix(0.3316761,0,0,0.3316761,48.927852,9.2318583)"
id="circle99164"
- style="fill:#84c225;fill-rule:evenodd;stroke:#5d9d35;stroke-width:2.82220006"
- d="m 134.431,110.081 c 0,18.85721 -15.28679,34.144 -34.144,34.144 -18.857208,0 -34.143998,-15.28679 -34.143998,-34.144 0,-18.85721 15.28679,-34.144 34.143998,-34.144 18.85721,0 34.144,15.28679 34.144,34.144 z" />
+ style="fill:#84c225;fill-rule:evenodd;stroke:#5d9d35;stroke-width:2.82220006" />
<path
d="m 84.515333,38.943636 0,3.981494 3.981494,0 0,4.799639 -3.981494,0 0,3.981494 -4.782372,0 0,-3.981494 -3.981494,0 0,-4.799639 3.981494,0 0,-3.981494 4.782372,0"
id="path99166"
@@ -88919,7 +89059,7 @@
<path
sodipodi:type="inkscape:offset"
inkscape:radius="1"
- inkscape:original="M 70 192.375 L 70 214.375 L 87 214.375 L 87 197.375 L 82 192.375 L 70 192.375 z "
+ inkscape:original="M 70 192.36133 L 70 214.36133 L 87 214.36133 L 87 197.36133 L 82 192.36133 L 70 192.36133 z "
xlink:href="#path18378"
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path18380"
@@ -89795,8 +89935,7 @@
transform="matrix(1,0,0,-1,1028.5714,378.07647)"
r="226"
cy="0"
- cx="0"
- d="M 226,0 C 226,124.81635 124.81635,226 0,226 -124.81635,226 -226,124.81635 -226,0 c 0,-124.81635 101.18365,-226 226,-226 124.81635,0 226,101.18365 226,226 z" />
+ cx="0" />
<circle
sodipodi:ry="169.5"
sodipodi:rx="169.5"
@@ -89807,8 +89946,7 @@
transform="matrix(1,0,0,-1,1028.5714,378.07647)"
r="169.5"
cy="0"
- cx="0"
- d="M 169.5,0 C 169.5,93.612265 93.612265,169.5 0,169.5 -93.612265,169.5 -169.5,93.612265 -169.5,0 c 0,-93.612265 75.887735,-169.5 169.5,-169.5 93.612265,0 169.5,75.887735 169.5,169.5 z" />
+ cx="0" />
<circle
sodipodi:ry="106.5"
sodipodi:rx="106.5"
@@ -89819,8 +89957,7 @@
transform="matrix(1.0610323,0,0,-1.0610323,1028.5714,378.07647)"
r="106.5"
cy="0"
- cx="0"
- d="M 106.5,0 C 106.5,58.818326 58.818326,106.5 0,106.5 -58.818326,106.5 -106.5,58.818326 -106.5,0 c 0,-58.818326 47.681674,-106.5 106.5,-106.5 58.818326,0 106.5,47.681674 106.5,106.5 z" />
+ cx="0" />
<circle
sodipodi:ry="106.5"
sodipodi:rx="106.5"
@@ -89831,8 +89968,7 @@
transform="matrix(0.5305159,0,0,-0.5305159,1028.5714,378.07647)"
r="106.5"
cy="0"
- cx="0"
- d="M 106.5,0 C 106.5,58.818326 58.818326,106.5 0,106.5 -58.818326,106.5 -106.5,58.818326 -106.5,0 c 0,-58.818326 47.681674,-106.5 106.5,-106.5 58.818326,0 106.5,47.681674 106.5,106.5 z" />
+ cx="0" />
<circle
sodipodi:ry="106.5"
sodipodi:rx="106.5"
@@ -89843,8 +89979,7 @@
transform="matrix(0.1768394,0,0,-0.1768394,1028.5714,378.07647)"
r="106.5"
cy="0"
- cx="0"
- d="M 106.5,0 C 106.5,58.818326 58.818326,106.5 0,106.5 -58.818326,106.5 -106.5,58.818326 -106.5,0 c 0,-58.818326 47.681674,-106.5 106.5,-106.5 58.818326,0 106.5,47.681674 106.5,106.5 z" />
+ cx="0" />
</g>
<text
style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
@@ -90329,7 +90464,7 @@
transform="matrix(0.7823622,0,0,-0.7804636,146.35389,367.13373)"
sodipodi:end="3.1415927"
sodipodi:start="0"
- d="m 209.99999,218.57143 c 0,42.40757 -34.37813,76.78571 -76.78571,76.78571 -42.407579,0 -76.785714,-34.37814 -76.785714,-76.78571 0,0 0,-1e-5 0,-1e-5 l 76.785714,1e-5 z"
+ d="m 209.99999,218.57143 a 76.785713,76.785713 0 0 1 -38.39286,66.49838 76.785713,76.785713 0 0 1 -76.785709,-1e-5 76.785713,76.785713 0 0 1 -38.392855,-66.49838 l 76.785714,1e-5 z"
sodipodi:ry="76.785713"
sodipodi:rx="76.785713"
sodipodi:cy="218.57143"
@@ -90421,7 +90556,7 @@
sodipodi:cy="199.42668"
sodipodi:rx="4.9244938"
sodipodi:ry="4.8613591"
- d="m 96.848375,199.42668 c 0,2.68486 -2.204771,4.86136 -4.924493,4.86136 -2.719723,0 -4.924494,-2.1765 -4.924494,-4.86136 0,-2.68485 2.204771,-4.86136 4.924494,-4.86136 2.719722,0 4.924493,2.17651 4.924493,4.86136 z"
+ d="m 96.848375,199.42668 a 4.9244938,4.8613591 0 0 1 -4.924493,4.86136 4.9244938,4.8613591 0 0 1 -4.924494,-4.86136 4.9244938,4.8613591 0 0 1 4.924494,-4.86136 4.9244938,4.8613591 0 0 1 4.924493,4.86136 z"
transform="matrix(0.5324675,0,0,0.5324675,-889.75288,329.57107)" />
</g>
<text
@@ -92676,8 +92811,7 @@
r="34.144001"
transform="matrix(0.3316761,0,0,0.3316761,48.927852,9.2318583)"
id="circle29-8"
- style="fill:#84c225;fill-rule:evenodd;stroke:#5d9d35;stroke-width:2.82220006"
- d="m 134.431,110.081 c 0,18.85721 -15.28679,34.144 -34.144,34.144 -18.857208,0 -34.143998,-15.28679 -34.143998,-34.144 0,-18.85721 15.28679,-34.144 34.143998,-34.144 18.85721,0 34.144,15.28679 34.144,34.144 z" />
+ style="fill:#84c225;fill-rule:evenodd;stroke:#5d9d35;stroke-width:2.82220006" />
<path
d="m 84.515333,38.943636 0,3.981494 3.981494,0 0,4.799639 -3.981494,0 0,3.981494 -4.782372,0 0,-3.981494 -3.981494,0 0,-4.799639 3.981494,0 0,-3.981494 4.782372,0"
id="text1332-4"
@@ -93482,7 +93616,7 @@
<path
sodipodi:type="inkscape:offset"
inkscape:radius="1"
- inkscape:original="M 108 192.375 L 108 214.375 L 110 214.375 L 110 203.375 L 111 203.375 L 111 213.375 L 113 213.375 L 113 201.375 L 114 201.375 L 114 214.375 L 117 214.375 L 117 202.375 L 118 202.375 L 118 215.375 L 120 215.375 L 120 201.375 L 121 201.375 L 121 212.375 L 123 212.375 L 123 202.375 L 124 202.375 L 124 214.375 L 125 214.375 L 125 197.375 L 120 192.375 L 108 192.375 z "
+ inkscape:original="M 108 192.36133 L 108 214.36133 L 110 214.36133 L 110 203.36133 L 111 203.36133 L 111 213.36133 L 113 213.36133 L 113 201.36133 L 114 201.36133 L 114 214.36133 L 117 214.36133 L 117 202.36133 L 118 202.36133 L 118 215.36133 L 120 215.36133 L 120 201.36133 L 121 201.36133 L 121 212.36133 L 123 212.36133 L 123 202.36133 L 124 202.36133 L 124 214.36133 L 125 214.36133 L 125 197.36133 L 120 192.36133 L 108 192.36133 z "
xlink:href="#path18406"
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path18446"
@@ -93643,4 +93777,97 @@
id="path19324"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
+ <text
+ style="font-style:normal;font-weight:normal;font-size:51.04000092px;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none"
+ xml:space="preserve"
+ id="text18989-5"
+ y="1168.443"
+ x="94.936478"><tspan
+ id="tspan18991-9"
+ y="1168.443"
+ x="94.936478"
+ style="font-size:51.04000092px">%% about_brz_logo %%</tspan></text>
+ <g
+ transform="matrix(0.2224431,0,0,0.2224431,608.34301,805.59922)"
+ id="about_brz_logo"
+ inkscape:label="#g17803-0">
+ <g
+ transform="translate(-1840,2339.9999)"
+ mask="url(#mask6467-7-2)"
+ id="use16743-9" />
+ <g
+ transform="translate(0,89.910633)"
+ id="g7269-3">
+ <path
+ inkscape:connector-curvature="0"
+ d="m -1470.2813,1725.0291 c -56.0138,0.054 -112.0828,20.5177 -156.0937,61.5937 -85.0794,79.4058 -95.9453,209.1111 -29.5938,301.1563 l 9.7813,69.3437 0.9062,6.4375 5.125,-4 30.5938,-23.9687 c 87.5525,67.3697 213.0935,63.1007 295.9375,-14.2188 18.4642,-17.2329 33.4323,-36.8343 44.875,-57.9062 6.4003,0.736 13.3613,1.0937 20.875,1.0937 24.9087,0 44.0178,-3.5634 57.3437,-10.6875 13.3257,-7.1242 24.6943,-18.8804 34.125,-35.2812 l -61.6562,-5.6875 c -3.8953,4.9202 -7.5237,8.3649 -10.9063,10.3125 -5.5355,3.0752 -11.381,4.5937 -17.5312,4.5937 -2.2646,0 -4.435,-0.18 -6.5,-0.5625 3.5746,-10.6475 6.37,-21.5105 8.3437,-32.5 l 91.8125,0 0,-7.0625 c -10e-5,-21.5262 -3.5522,-39.0091 -10.625,-52.4375 -7.0731,-13.4281 -17.3756,-23.6769 -30.9062,-30.75 -13.3838,-6.9958 -31.5824,-10.5176 -54.5938,-10.5937 -7.0146,-25.9757 -18.6908,-50.9762 -35.0625,-73.6875 l -9.7812,-69.3438 -0.9063,-6.4375 -5.125,4 -30.5937,23.9688 c -41.0402,-31.5796 -90.4197,-47.4228 -139.8438,-47.375 z m 228.125,206.2187 c 6.3617,0.8346 11.6486,3.3459 15.875,7.5313 5.279,5.2278 8.5511,13.9044 9.7813,26 l -24.7813,0 c 0.5248,-11.1718 0.225,-22.3843 -0.875,-33.5313 z m 118.9731,-33.6623 58.582,0 0,26.754 c 5.6377,-11.583 11.4549,-19.5528 17.4516,-23.9095 5.9965,-4.3563 13.4025,-6.5346 22.2182,-6.5347 9.2253,1e-4 19.3222,2.8703 30.2904,8.6104 l -19.3736,44.5901 c -7.3805,-3.0751 -13.2233,-4.6127 -17.5285,-4.6128 -8.2005,10e-5 -14.5559,3.3828 -19.066,10.1481 -6.458,9.5331 -9.6869,27.3691 -9.6868,53.508 l 0,54.7381 -62.8873,0 0,-163.2917 z m 320.2793,97.1755 -125.46709,0 c 1.12748,10.0456 3.84388,17.5285 8.14921,22.4487 6.04775,7.073 13.94069,10.6094 23.67883,10.6094 6.15024,0 11.99306,-1.5376 17.5285,-4.6128 3.38256,-1.9476 7.02151,-5.3815 10.91686,-10.3018 l 61.65724,5.6891 c -9.43072,16.4009 -20.80885,28.1634 -34.13443,35.2876 -13.3259,7.1241 -32.44322,10.6862 -57.35199,10.6862 -21.62881,0 -38.64475,-3.0495 -51.04789,-9.1486 -12.40324,-6.0991 -22.67944,-15.7859 -30.82862,-29.0604 -8.14922,-13.2745 -12.22382,-28.881 -12.22382,-46.8195 0,-25.5239 8.17483,-46.1788 24.52452,-61.9648 16.34962,-15.7857 38.9265,-23.6787 67.7307,-23.6788 23.3712,1e-4 41.82222,3.5366 55.35313,10.6093 13.53059,7.0731 23.83241,17.3236 30.9055,30.7517 7.0727,13.4284 10.60915,30.9056 10.60935,52.4318 l 0,7.0729 z m -63.6561,-29.983 c -1.23021,-12.0956 -4.48476,-20.7573 -9.76368,-25.9852 -5.27917,-5.2277 -12.22393,-7.8416 -20.8343,-7.8417 -9.94316,10e-5 -17.88735,3.9466 -23.8326,11.8394 -3.79279,4.9204 -6.20167,12.2496 -7.22666,21.9875 l 61.65724,0 z m 93.17774,-67.1925 58.4283,0 0,23.8326 c 8.40539,-9.9429 16.88773,-17.0158 25.44706,-21.2187 8.55912,-4.2026 18.88657,-6.304 30.98238,-6.3041 13.01809,1e-4 23.31991,2.3065 30.90549,6.9191 7.58526,4.6129 13.78685,11.4808 18.6048,20.6037 9.84037,-10.6605 18.80962,-17.9128 26.90778,-21.7569 8.09773,-3.8438 18.09204,-5.7658 29.98294,-5.7659 17.52823,1e-4 31.21274,5.2023 41.05357,15.6065 9.84026,10.4044 14.76054,26.6772 14.76083,48.8184 l 0,102.557 -62.73354,0 0,-93.024 c -2.3e-4,-7.3803 -1.43531,-12.8644 -4.30524,-16.4522 -4.20297,-5.6377 -9.43076,-8.4566 -15.68339,-8.4567 -7.38062,10e-5 -13.32595,2.6652 -17.83601,7.9954 -4.51044,5.3304 -6.76557,13.8897 -6.76538,25.6777 l 0,84.2598 -62.73355,0 0,-89.9488 c -1.2e-4,-7.1753 -0.41015,-12.0444 -1.23007,-14.6071 -1.3327,-4.1001 -3.63907,-7.4059 -6.91914,-9.9174 -3.2803,-2.5113 -7.12426,-3.767 -11.5319,-3.7671 -7.1755,10e-5 -13.06958,2.7165 -17.68225,8.1492 -4.61284,5.4329 -6.91922,14.3509 -6.91914,26.754 l 0,83.3372 -62.73354,0 0,-163.2917 z m 316.74293,-62.1185 62.57978,0 0,42.5911 -62.57978,0 0,-42.5911 z m 0,62.1185 62.57978,0 0,163.2917 -62.57978,0 0,-163.2917 z m 95.79168,0 151.45231,0 0,36.5945 -82.41466,83.9523 87.48869,0 0,42.7449 -162.67669,0 0,-40.5923 78.10941,-79.9545 -71.95906,0 0,-42.7449 z"
+ id="path17845-6"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:314.89779663px;line-height:125%;font-family:'Arial Black';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;filter:url(#filter17760-6-7);enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -1336.1632,1788.2263 c 0,0 56.3913,141.5671 -147.8368,147.7737 -204.2612,6.2076 -147.8368,147.7737 -147.8368,147.7737 -37.8479,-37.8317 -61.2676,-90.0855 -61.2676,-147.7737 0,-57.6882 23.4197,-109.942 61.2676,-147.7737 37.8479,-37.8318 90.124,-61.2415 147.8368,-61.2415 57.7128,0 109.9889,23.4097 147.8368,61.2415 z"
+ id="use16735-0"
+ style="display:inline;overflow:visible;visibility:visible;fill:#d19f34;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:40;marker:none;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -1631.8368,2083.7737 c 0,0 -56.3913,-141.5671 147.8368,-147.7737 204.2612,-6.2076 147.8368,-147.7737 147.8368,-147.7737 37.8479,37.8317 61.2676,90.0855 61.2676,147.7737 0,57.6882 -23.4197,109.942 -61.2676,147.7737 -37.8479,37.8318 -90.124,61.2415 -147.8368,61.2415 -57.7128,0 -109.9889,-23.4097 -147.8368,-61.2415 z"
+ id="use16737-6"
+ style="display:inline;overflow:visible;visibility:visible;fill:#469837;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:40;marker:none;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 1021.2642,207.94408 c 0,143.9361 -116.68326,260.61936 -260.61936,260.61936 -143.9361,0 -260.61936,-116.68326 -260.61936,-260.61936 0,-143.936098 116.68326,-260.61936 260.61936,-260.61936 143.9361,0 260.61936,116.683262 260.61936,260.61936 l 0,0 z"
+ transform="matrix(0.8023362,0,0,0.8019941,-2094.2929,1769.2301)"
+ id="path16739-2"
+ style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#4c4c4c;stroke-width:49.86504364;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -1577.2331,1825.1726 127.038,0 c 21.1728,2e-4 37.4271,5.2435 48.7628,15.7299 11.3353,10.4868 17.0031,23.4703 17.0033,38.9503 -2e-4,12.9836 -4.045,24.1194 -12.1345,33.4074 -5.3933,6.1923 -13.2833,11.086 -23.6698,14.6813 15.7797,3.7953 27.3898,10.312 34.8306,19.5501 7.4402,9.2383 11.1605,20.8485 11.1607,34.8306 -2e-4,11.3855 -2.6468,21.6224 -7.9399,30.7108 -5.2934,9.0884 -12.5342,16.2792 -21.7223,21.5725 -5.6929,3.2958 -14.2819,5.6927 -25.7671,7.1908 -15.2807,1.9975 -25.4177,2.9962 -30.4112,2.9962 l -117.1506,0 0,-219.6199 z m 68.4627,86.1401 29.5124,0 c 10.5863,10e-5 17.9519,-1.8225 22.0968,-5.468 4.1445,-3.6452 6.2169,-8.9135 6.217,-15.8049 -1e-4,-6.3916 -2.0725,-11.3853 -6.217,-14.9809 -4.1449,-3.5952 -11.3607,-5.3929 -21.6474,-5.3931 l -29.9618,0 0,41.6469 z m 0,86.29 34.6059,0 c 11.6849,0 19.9244,-2.0723 24.7184,-6.2171 4.7938,-4.1447 7.1907,-9.7126 7.1909,-16.7037 -2e-4,-6.4916 -2.3722,-11.71 -7.116,-15.655 -4.7441,-3.9449 -13.0584,-5.9174 -24.9432,-5.9175 l -34.456,0 0,44.4933 z"
+ id="path16741-6"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:306.80871582px;line-height:125%;font-family:'Arial Black';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:40;marker:none;enable-background:accumulate" />
+ <g
+ transform="matrix(-1,0,0,-1,-1127.9999,1532)"
+ mask="url(#mask6467-7-2)"
+ id="use16745-1">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 507.8125,-566.84375 c -7.54052,0.31127 -14.32442,4.87714 -17.4375,11.84375 -3.32061,7.43106 -1.79456,16.12851 3.84375,22 71.38742,76.4228 67.29917,195.79932 -9.15625,267.15625 C 418.92868,-204.1201 321.00173,-198.52349 249.15625,-248 l 26.65625,-20.875 5.125,-4 -6.03125,-2.40625 -105.9375,-42.59375 -6,-2.4375 0.90625,6.4375 15.9375,113 0.90625,6.4375 5.125,-4 30.59375,-23.96875 c 87.55252,67.36975 213.09347,63.10079 295.9375,-14.21875 92.27769,-86.12407 97.25455,-231.41793 11.09375,-323.65625 -3.63563,-4.00109 -8.72059,-6.38195 -14.125,-6.5625 -0.50858,-0.0174 -1.02855,-0.0208 -1.53125,0 z"
+ id="use6863-8"
+ style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter6447-9-6);enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 507.8125,-566.84375 c -7.54052,0.31127 -14.32442,4.87714 -17.4375,11.84375 -3.32061,7.43106 -1.79456,16.12851 3.84375,22 71.38742,76.4228 67.29917,195.79932 -9.15625,267.15625 C 418.92868,-204.1201 321.00173,-198.52349 249.15625,-248 l 26.65625,-20.875 5.125,-4 -6.03125,-2.40625 -105.9375,-42.59375 -6,-2.4375 0.90625,6.4375 15.9375,113 0.90625,6.4375 5.125,-4 30.59375,-23.96875 c 87.55252,67.36975 213.09347,63.10079 295.9375,-14.21875 92.27769,-86.12407 97.25455,-231.41793 11.09375,-323.65625 -3.63563,-4.00109 -8.72059,-6.38195 -14.125,-6.5625 -0.50858,-0.0174 -1.02855,-0.0208 -1.53125,0 z"
+ id="use6865-7"
+ style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;marker:none;enable-background:accumulate" />
+ </g>
+ <g
+ transform="translate(-1839.8676,2340.0508)"
+ mask="url(#mask6467-7-2)"
+ id="g7285-9">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 507.8125,-566.84375 c -7.54052,0.31127 -14.32442,4.87714 -17.4375,11.84375 -3.32061,7.43106 -1.79456,16.12851 3.84375,22 71.38742,76.4228 67.29917,195.79932 -9.15625,267.15625 C 418.92868,-204.1201 321.00173,-198.52349 249.15625,-248 l 26.65625,-20.875 5.125,-4 -6.03125,-2.40625 -105.9375,-42.59375 -6,-2.4375 0.90625,6.4375 15.9375,113 0.90625,6.4375 5.125,-4 30.59375,-23.96875 c 87.55252,67.36975 213.09347,63.10079 295.9375,-14.21875 92.27769,-86.12407 97.25455,-231.41793 11.09375,-323.65625 -3.63563,-4.00109 -8.72059,-6.38195 -14.125,-6.5625 -0.50858,-0.0174 -1.02855,-0.0208 -1.53125,0 z"
+ id="path7287-2"
+ style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter6447-9-6);enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 507.8125,-566.84375 c -7.54052,0.31127 -14.32442,4.87714 -17.4375,11.84375 -3.32061,7.43106 -1.79456,16.12851 3.84375,22 71.38742,76.4228 67.29917,195.79932 -9.15625,267.15625 C 418.92868,-204.1201 321.00173,-198.52349 249.15625,-248 l 26.65625,-20.875 5.125,-4 -6.03125,-2.40625 -105.9375,-42.59375 -6,-2.4375 0.90625,6.4375 15.9375,113 0.90625,6.4375 5.125,-4 30.59375,-23.96875 c 87.55252,67.36975 213.09347,63.10079 295.9375,-14.21875 92.27769,-86.12407 97.25455,-231.41793 11.09375,-323.65625 -3.63563,-4.00109 -8.72059,-6.38195 -14.125,-6.5625 -0.50858,-0.0174 -1.02855,-0.0208 -1.53125,0 z"
+ id="path7289-0"
+ style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.86504364;marker:none;enable-background:accumulate" />
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ d="m -1166.8587,1976.761 -125.4671,0 c 1.1275,10.0456 3.8439,17.5285 8.1492,22.4487 6.0478,7.073 13.9407,10.6094 23.6789,10.6094 6.1502,0 11.993,-1.5376 17.5285,-4.6128 3.3825,-1.9476 7.0215,-5.3815 10.9168,-10.3018 l 61.6573,5.6891 c -9.4307,16.4009 -20.8089,28.1634 -34.1345,35.2876 -13.3259,7.1241 -32.4432,10.6862 -57.3519,10.6862 -21.6289,0 -38.6448,-3.0495 -51.0479,-9.1486 -12.4033,-6.0991 -22.6795,-15.7859 -30.8286,-29.0604 -8.1493,-13.2745 -12.2239,-28.881 -12.2239,-46.8195 0,-25.5239 8.1749,-46.1788 24.5245,-61.9648 16.3497,-15.7857 38.9265,-23.6787 67.7307,-23.6788 23.3712,1e-4 41.8223,3.5366 55.3532,10.6093 13.5306,7.0731 23.8324,17.3236 30.9055,30.7517 7.0727,13.4284 10.6091,30.9056 10.6093,52.4318 l 0,7.0729 z m -63.6561,-29.983 c -1.2302,-12.0956 -4.4847,-20.7573 -9.7637,-25.9852 -5.2791,-5.2277 -12.2239,-7.8416 -20.8343,-7.8417 -9.9431,10e-5 -17.8873,3.9466 -23.8325,11.8394 -3.7928,4.9204 -6.2017,12.2496 -7.2267,21.9875 l 61.6572,0 z m 93.3316,-67.1925 58.582,0 0,26.754 c 5.6377,-11.583 11.4549,-19.5528 17.4516,-23.9095 5.9965,-4.3563 13.4025,-6.5346 22.2182,-6.5347 9.2253,1e-4 19.3222,2.8703 30.2904,8.6104 l -19.3736,44.5901 c -7.3805,-3.0751 -13.2233,-4.6127 -17.5285,-4.6128 -8.2005,10e-5 -14.5559,3.3828 -19.066,10.1481 -6.458,9.5331 -9.6869,27.3691 -9.6868,53.508 l 0,54.7381 -62.8873,0 0,-163.2917 z m 320.2793,97.1755 -125.46709,0 c 1.12748,10.0456 3.84388,17.5285 8.14921,22.4487 6.04775,7.073 13.94069,10.6094 23.67883,10.6094 6.15024,0 11.99306,-1.5376 17.5285,-4.6128 3.38256,-1.9476 7.02151,-5.3815 10.91686,-10.3018 l 61.65724,5.6891 c -9.43072,16.4009 -20.80885,28.1634 -34.13443,35.2876 -13.3259,7.1241 -32.44322,10.6862 -57.35199,10.6862 -21.62881,0 -38.64475,-3.0495 -51.04789,-9.1486 -12.40324,-6.0991 -22.67944,-15.7859 -30.82862,-29.0604 -8.14922,-13.2745 -12.22382,-28.881 -12.22382,-46.8195 0,-25.5239 8.17483,-46.1788 24.52452,-61.9648 16.34962,-15.7857 38.9265,-23.6787 67.7307,-23.6788 23.3712,1e-4 41.82222,3.5366 55.35313,10.6093 13.53059,7.0731 23.83241,17.3236 30.9055,30.7517 7.0727,13.4284 10.60915,30.9056 10.60935,52.4318 l 0,7.0729 z m -63.6561,-29.983 c -1.23021,-12.0956 -4.48476,-20.7573 -9.76368,-25.9852 -5.27917,-5.2277 -12.22393,-7.8416 -20.8343,-7.8417 -9.94316,10e-5 -17.88735,3.9466 -23.8326,11.8394 -3.79279,4.9204 -6.20167,12.2496 -7.22666,21.9875 l 61.65724,0 z m 93.17774,-67.1925 58.4283,0 0,23.8326 c 8.40539,-9.9429 16.88773,-17.0158 25.44706,-21.2187 8.55912,-4.2026 18.88657,-6.304 30.98238,-6.3041 13.01809,1e-4 23.31991,2.3065 30.90549,6.9191 7.58526,4.6129 13.78685,11.4808 18.6048,20.6037 9.84037,-10.6605 18.80962,-17.9128 26.90778,-21.7569 8.09773,-3.8438 18.09204,-5.7658 29.98294,-5.7659 17.52823,1e-4 31.21274,5.2023 41.05357,15.6065 9.84026,10.4044 14.76054,26.6772 14.76083,48.8184 l 0,102.557 -62.73354,0 0,-93.024 c -2.3e-4,-7.3803 -1.43531,-12.8644 -4.30524,-16.4522 -4.20297,-5.6377 -9.43076,-8.4566 -15.68339,-8.4567 -7.38062,10e-5 -13.32595,2.6652 -17.83601,7.9954 -4.51044,5.3304 -6.76557,13.8897 -6.76538,25.6777 l 0,84.2598 -62.73355,0 0,-89.9488 c -1.2e-4,-7.1753 -0.41015,-12.0444 -1.23007,-14.6071 -1.3327,-4.1001 -3.63907,-7.4059 -6.91914,-9.9174 -3.2803,-2.5113 -7.12426,-3.767 -11.5319,-3.7671 -7.1755,10e-5 -13.06958,2.7165 -17.68225,8.1492 -4.61284,5.4329 -6.91922,14.3509 -6.91914,26.754 l 0,83.3372 -62.73354,0 0,-163.2917 z m 316.74293,-62.1185 62.57978,0 0,42.5911 -62.57978,0 0,-42.5911 z m 0,62.1185 62.57978,0 0,163.2917 -62.57978,0 0,-163.2917 z m 95.79168,0 151.45231,0 0,36.5945 -82.41466,83.9523 87.48869,0 0,42.7449 -162.67669,0 0,-40.5923 78.10941,-79.9545 -71.95906,0 0,-42.7449 z"
+ id="text16729-2"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:314.89779663px;line-height:125%;font-family:'Arial Black';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dadada;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <text
+ x="-1259.6362"
+ y="2147.7705"
+ id="text3172-3"
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:71.35877228px;font-family:'Bitstream Vera Sans';display:inline;fill:#000000;fill-opacity:1;stroke:none"><tspan
+ x="-1259.6362"
+ y="2147.7705"
+ id="tspan3174-7">Free Software for Automation </tspan></text>
+ </g>
+ </g>
</svg>
diff -r 6431f26aa501 -r 3291024e00da locale/ru_RU/LC_MESSAGES/Beremiz.mo
Binary file locale/ru_RU/LC_MESSAGES/Beremiz.mo has changed
diff -r 6431f26aa501 -r 3291024e00da plcopen/.cvsignore
--- a/plcopen/.cvsignore Thu Feb 16 14:34:40 2017 +0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-*.pyc
diff -r 6431f26aa501 -r 3291024e00da plcopen/__init__.py
--- a/plcopen/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/plcopen/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Package initialisation
diff -r 6431f26aa501 -r 3291024e00da plcopen/definitions.py
--- a/plcopen/definitions.py Thu Feb 16 14:34:40 2017 +0500
+++ b/plcopen/definitions.py Thu Feb 16 14:35:12 2017 +0500
@@ -48,35 +48,8 @@
StdFuncsCSV = join(sd,"iec_std.csv")
-# FIXME : since std fb now loaded from TC6 file, is that still necessary ?
-StdBlockComments = {
- "SR": _("SR bistable\nThe SR bistable is a latch where the Set dominates."),
- "RS": _("RS bistable\nThe RS bistable is a latch where the Reset dominates."),
- "SEMA": _("Semaphore\nThe semaphore provides a mechanism to allow software elements mutually exclusive access to certain ressources."),
- "R_TRIG": _("Rising edge detector\nThe output produces a single pulse when a rising edge is detected."),
- "F_TRIG": _("Falling edge detector\nThe output produces a single pulse when a falling edge is detected."),
- "CTU": _("Up-counter\nThe up-counter can be used to signal when a count has reached a maximum value."),
- "CTD": _("Down-counter\nThe down-counter can be used to signal when a count has reached zero, on counting down from a preset value."),
- "CTUD": _("Up-down counter\nThe up-down counter has two inputs CU and CD. It can be used to both count up on one input and down on the other."),
- "TP": _("Pulse timer\nThe pulse timer can be used to generate output pulses of a given time duration."),
- "TON": _("On-delay timer\nThe on-delay timer can be used to delay setting an output true, for fixed period after an input becomes true."),
- "TOF": _("Off-delay timer\nThe off-delay timer can be used to delay setting an output false, for fixed period after input goes false."),
- "RTC": _("Real time clock\nThe real time clock has many uses including time stamping, setting dates and times of day in batch reports, in alarm messages and so on."),
- "INTEGRAL": _("Integral\nThe integral function block integrates the value of input XIN over time."),
- "DERIVATIVE": _("Derivative\nThe derivative function block produces an output XOUT proportional to the rate of change of the input XIN."),
- "PID": _("PID\nThe PID (proportional, Integral, Derivative) function block provides the classical three term controller for closed loop control."),
- "RAMP": _("Ramp\nThe RAMP function block is modelled on example given in the standard."),
- "HYSTERESIS": _("Hysteresis\nThe hysteresis function block provides a hysteresis boolean output driven by the difference of two floating point (REAL) inputs XIN1 and XIN2."),
-}
-
-for block_type in ["CTU", "CTD", "CTUD"]:
- for return_type in ["DINT", "LINT", "UDINT", "ULINT"]:
- StdBlockComments["%s_%s" % (block_type, return_type)] = StdBlockComments[block_type]
-
def GetBlockInfos(pou):
infos = pou.getblockInfos()
- # FIXME : as well
- infos["comment"] = StdBlockComments[infos["name"]]
infos["inputs"] = [
(var_name, var_type, "rising")
if var_name in ["CU", "CD"]
diff -r 6431f26aa501 -r 3291024e00da plcopen/plcopen.py
--- a/plcopen/plcopen.py Thu Feb 16 14:34:40 2017 +0500
+++ b/plcopen/plcopen.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from xmlclass import *
from types import *
@@ -111,10 +111,15 @@
lines = text.split("\n")
return len(lines) - 1, len(lines[-1])
+def CompilePattern(criteria):
+ flag = 0 if criteria["case_sensitive"] else re.IGNORECASE
+ find_pattern = criteria["find_pattern"]
+ if not criteria["regular_expression"]:
+ find_pattern = re.escape(find_pattern)
+ criteria["pattern"] = re.compile(find_pattern, flag)
+
def TestTextElement(text, criteria):
lines = text.splitlines()
- if not criteria["case_sensitive"]:
- text = text.upper()
test_result = []
result = criteria["pattern"].search(text)
while result is not None:
@@ -124,6 +129,9 @@
result = criteria["pattern"].search(text, result.end())
return test_result
+def TextMatched(str1, str2):
+ return str1 and str2 and (str1.upper() == str2.upper())
+
PLCOpenParser = GenerateParserFromXSD(os.path.join(os.path.split(__file__)[0], "tc6_xml_v201.xsd"))
PLCOpen_XPath = lambda xpath: etree.XPath(xpath, namespaces=PLCOpenParser.NSMAP)
@@ -285,15 +293,8 @@
if cls:
def updateElementName(self, old_name, new_name):
text = self.getanyText()
- index = text.find(old_name)
- while index != -1:
- if index > 0 and (text[index - 1].isalnum() or text[index - 1] == "_"):
- index = text.find(old_name, index + len(old_name))
- elif index < len(text) - len(old_name) and (text[index + len(old_name)].isalnum() or text[index + len(old_name)] == "_"):
- index = text.find(old_name, index + len(old_name))
- else:
- text = text[:index] + new_name + text[index + len(old_name):]
- index = text.find(old_name, index + len(new_name))
+ pattern = re.compile('\\b' + old_name + '\\b', re.IGNORECASE)
+ text = pattern.sub(new_name, text)
self.setanyText(text)
setattr(cls, "updateElementName", updateElementName)
@@ -311,14 +312,9 @@
setattr(cls, "updateElementAddress", updateElementAddress)
def hasblock(self, block_type):
- text = self.getanyText().upper()
- index = text.find(block_type.upper())
- while index != -1:
- if (not (index > 0 and (text[index - 1].isalnum() or text[index - 1] == "_")) and
- not (index < len(text) - len(block_type) and text[index + len(block_type)] != "(")):
- return True
- index = text.find(block_type.upper(), index + len(block_type))
- return False
+ text = self.getanyText()
+ pattern = re.compile('\\b' + block_type + '\\b', re.IGNORECASE)
+ return pattern.search(text) is not None
setattr(cls, "hasblock", hasblock)
def Search(self, criteria, parent_infos):
@@ -492,7 +488,8 @@
def addconfigurationResource(self, config_name, name):
if self.getconfigurationResource(config_name, name) is not None:
- raise ValueError, _("\"%s\" resource already exists in \"%s\" configuration !!!") % (name, config_name)
+ msg = _("\"{a1}\" resource already exists in \"{a2}\" configuration !!!").format(a1 = name, a2 = config_name)
+ raise ValueError, msg
configuration = self.getconfiguration(config_name)
if configuration is not None:
new_resource = PLCOpenParser.CreateElement("resource", "configuration")
@@ -509,7 +506,8 @@
configuration.remove(resource)
found = True
if not found:
- raise ValueError, _("\"%s\" resource doesn't exist in \"%s\" configuration !!!")%(name, config_name)
+ msg = _("\"{a1}\" resource doesn't exist in \"{a2}\" configuration !!!").format(a1 = name, a2 = config_name)
+ raise ValueError, msg
setattr(cls, "removeconfigurationResource", removeconfigurationResource)
def updateElementName(self, old_name, new_name):
@@ -633,9 +631,9 @@
for var in varlist.getvariable():
var_address = var.getaddress()
if var_address is not None:
- if var_address == old_name:
+ if TextMatched(var_address, old_name):
var.setaddress(new_name)
- if var.getname() == old_name:
+ if TextMatched(var.getname(), old_name):
var.setname(new_name)
def _updateConfigurationResourceElementAddress(self, address_model, new_leading):
@@ -769,9 +767,9 @@
cls = PLCOpenParser.GetElementClass("task", "resource")
if cls:
def updateElementName(self, old_name, new_name):
- if self.single == old_name:
+ if TextMatched(self.single, old_name):
self.single = new_name
- if self.interval == old_name:
+ if TextMatched(self.interval, old_name):
self.interval = new_name
for instance in self.getpouInstance():
instance.updateElementName(old_name, new_name)
@@ -794,7 +792,7 @@
cls = PLCOpenParser.GetElementClass("pouInstance")
if cls:
def updateElementName(self, old_name, new_name):
- if self.typeName == old_name:
+ if TextMatched(self.typeName, old_name):
self.typeName = new_name
setattr(cls, "updateElementName", updateElementName)
@@ -856,7 +854,7 @@
def getdataTypeElement(self, name):
elements = self.dataTypes.getdataType()
for element in elements:
- if element.getname() == name:
+ if TextMatched(element.getname(), name):
return element
return None
setattr(cls, "getdataTypeElement", getdataTypeElement)
@@ -875,7 +873,7 @@
def removedataTypeElement(self, name):
found = False
for element in self.dataTypes.getdataType():
- if element.getname() == name:
+ if TextMatched(element.getname(), name):
self.dataTypes.remove(element)
found = True
break
@@ -890,14 +888,14 @@
def getpouElement(self, name):
elements = self.pous.getpou()
for element in elements:
- if element.getname() == name:
+ if TextMatched(element.getname(), name):
return element
return None
setattr(cls, "getpouElement", getpouElement)
def appendpouElement(self, name, pou_type, body_type):
for element in self.pous.getpou():
- if element.getname() == name:
+ if TextMatched(element.getname(), name):
raise ValueError, _("\"%s\" POU already exists !!!")%name
new_pou = PLCOpenParser.CreateElement("pou", "pous")
self.pous.appendpou(new_pou)
@@ -914,7 +912,7 @@
def removepouElement(self, name):
found = False
for element in self.pous.getpou():
- if element.getname() == name:
+ if TextMatched(element.getname(), name):
self.pous.remove(element)
found = True
break
@@ -981,7 +979,7 @@
cls = PLCOpenParser.GetElementClass("derived", "dataType")
if cls:
def updateElementName(self, old_name, new_name):
- if self.name == old_name:
+ if TextMatched(self.name, old_name):
self.name = new_name
setattr(cls, "updateElementName", updateElementName)
@@ -1226,9 +1224,9 @@
for varlist in content:
variables = varlist.getvariable()
for var in variables:
- if var.getname() == old_name:
+ if TextMatched(var.getname(), old_name):
vartype_content = var.gettype().getcontent()
- if vartype_content.getLocalTag() == "derived" and vartype_content.getname() == old_type:
+ if vartype_content.getLocalTag() == "derived" and TextMatched(vartype_content.getname(), old_type):
var.setname(new_name)
vartype_content.setname(new_type)
return
@@ -1239,21 +1237,28 @@
content = self.interface.getcontent()
for varlist in content:
for var in varlist.getvariable():
- if var.getname() == name:
+ if TextMatched(var.getname(), name):
vartype_content = var.gettype().getcontent()
- if vartype_content.getLocalTag() == "derived" and vartype_content.getname() == var_type:
+ if vartype_content.getLocalTag() == "derived" and TextMatched(vartype_content.getname(), var_type):
varlist.remove(var)
if len(varlist.getvariable()) == 0:
self.interface.remove(varlist)
break
setattr(cls, "removepouVar", removepouVar)
+
+ def hasstep(self, name=None):
+ if self.getbodyType() in ["SFC"]:
+ for instance in self.getinstances():
+ if isinstance(instance, PLCOpenParser.GetElementClass("step", "sfcObjects")) and TextMatched(instance.getname(), name):
+ return True
+ return False
+ setattr(cls, "hasstep", hasstep)
def hasblock(self, name=None, block_type=None):
if self.getbodyType() in ["FBD", "LD", "SFC"]:
for instance in self.getinstances():
if (isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")) and
- (name and instance.getinstanceName() == name or
- block_type and instance.gettypeName() == block_type)):
+ (TextMatched(instance.getinstanceName(), name) or TextMatched(instance.gettypeName(), block_type))):
return True
if self.transitions:
for transition in self.transitions.gettransition():
@@ -1279,15 +1284,13 @@
transition.setname(name)
transition.setbodyType(body_type)
if body_type == "ST":
- transition.setanyText(":= ;")
- elif body_type == "IL":
- transition.setanyText("\tST\t%s"%name)
+ transition.settext(":= ;")
setattr(cls, "addtransition", addtransition)
def gettransition(self, name):
if self.transitions is not None:
for transition in self.transitions.gettransition():
- if transition.getname() == name:
+ if TextMatched(transition.getname(), name):
return transition
return None
setattr(cls, "gettransition", gettransition)
@@ -1302,7 +1305,7 @@
if self.transitions is not None:
removed = False
for transition in self.transitions.gettransition():
- if transition.getname() == name:
+ if TextMatched(transition.getname(), name):
if transition.getbodyType() in ["FBD", "LD", "SFC"]:
for instance in transition.getinstances():
if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")):
@@ -1328,7 +1331,7 @@
def getaction(self, name):
if self.actions is not None:
for action in self.actions.getaction():
- if action.getname() == name:
+ if TextMatched(action.getname(), name):
return action
return None
setattr(cls, "getaction", getaction)
@@ -1343,7 +1346,7 @@
if self.actions is not None:
removed = False
for action in self.actions.getaction():
- if action.getname() == name:
+ if TextMatched(action.getname(), name):
if action.getbodyType() in ["FBD", "LD", "SFC"]:
for instance in action.getinstances():
if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")):
@@ -1362,13 +1365,13 @@
for var in content.getvariable():
var_address = var.getaddress()
if var_address is not None:
- if var_address == old_name:
+ if TextMatched(var_address, old_name):
var.setaddress(new_name)
- if var.getname() == old_name:
+ if TextMatched(var.getname(), old_name):
var.setname(new_name)
var_type_content = var.gettype().getcontent()
if var_type_content.getLocalTag() == "derived":
- if var_type_content.getname() == old_name:
+ if TextMatched(var_type_content.getname(), old_name):
var_type_content.setname(new_name)
self.body[0].updateElementName(old_name, new_name)
for action in self.getactionList():
@@ -1395,7 +1398,7 @@
if self.interface is not None:
for content in self.interface.getcontent():
for variable in content.getvariable():
- if variable.getaddress() == address:
+ if TextMatched(variable.getaddress(), address):
content.remove(variable)
setattr(cls, "removeVariableByAddress", removeVariableByAddress)
@@ -1414,7 +1417,8 @@
search_result = []
filter = criteria["filter"]
if filter == "all" or self.getpouType() in filter:
- parent_infos = parent_infos + ["P::%s" % self.getname()]
+ if parent_infos == []:
+ parent_infos = parent_infos + ["P::%s" % self.getname()]
search_result.extend(_Search([("name", self.getname())], criteria, parent_infos))
if self.interface is not None:
var_number = 0
@@ -1486,8 +1490,7 @@
if self.getbodyType() in ["FBD", "LD", "SFC"]:
for instance in self.getinstances():
if (isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")) and
- (name and instance.getinstanceName() == name or
- block_type and instance.gettypeName() == block_type)):
+ (TextMatched(instance.getinstanceName(), name) or TextMatched(instance.gettypeName(), block_type))):
return True
elif block_type is not None:
return self.body.hasblock(block_type)
@@ -1559,7 +1562,7 @@
cls = PLCOpenParser.GetElementClass("body")
if cls:
cls.currentExecutionOrderId = 0
-
+ cls.checkedBlocksDict = {}
def resetcurrentExecutionOrderId(self):
object.__setattr__(self, "currentExecutionOrderId", 0)
setattr(cls, "resetcurrentExecutionOrderId", resetcurrentExecutionOrderId)
@@ -1576,6 +1579,7 @@
PLCOpenParser.GetElementClass("connector", "commonObjects"),
PLCOpenParser.GetElementClass("continuation", "commonObjects"))):
element.setexecutionOrderId(0)
+ self.checkedBlocksDict.clear()
else:
raise TypeError, _("Can only generate execution order on FBD networks!")
setattr(cls, "resetexecutionOrder", resetexecutionOrder)
@@ -1598,16 +1602,19 @@
if self.content.getLocalTag() == "FBD":
localid = link.getrefLocalId()
instance = self.getcontentInstance(localid)
+ self.checkedBlocksDict[localid] = True
if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")) and instance.getexecutionOrderId() == 0:
for variable in instance.inputVariables.getvariable():
connections = variable.connectionPointIn.getconnections()
if connections and len(connections) == 1:
- self.compileelementExecutionOrder(connections[0])
- instance.setexecutionOrderId(self.getnewExecutionOrderId())
+ if (self.checkedBlocksDict.has_key(connections[0].getrefLocalId()) == False):
+ self.compileelementExecutionOrder(connections[0])
+ if instance.getexecutionOrderId() == 0:
+ instance.setexecutionOrderId(self.getnewExecutionOrderId())
elif isinstance(instance, PLCOpenParser.GetElementClass("continuation", "commonObjects")) and instance.getexecutionOrderId() == 0:
- name = instance.getname()
for tmp_instance in self.getcontentInstances():
- if isinstance(tmp_instance, PLCOpenParser.GetElementClass("connector", "commonObjects")) and tmp_instance.getname() == name and tmp_instance.getexecutionOrderId() == 0:
+ if (isinstance(tmp_instance, PLCOpenParser.GetElementClass("connector", "commonObjects")) and
+ TextMatched(tmp_instance.getname(), instance.getname()) and tmp_instance.getexecutionOrderId() == 0):
connections = tmp_instance.connectionPointIn.getconnections()
if connections and len(connections) == 1:
self.compileelementExecutionOrder(connections[0])
@@ -1907,7 +1914,7 @@
setattr(cls, "getBoundingBox", getBoundingBox)
def updateElementName(self, old_name, new_name):
- if self.typeName == old_name:
+ if TextMatched(self.typeName, old_name):
self.typeName = new_name
setattr(cls, "updateElementName", updateElementName)
@@ -1947,7 +1954,7 @@
_initElementClass("rightPowerRail", "ldObjects", "multiple")
def _UpdateLDElementName(self, old_name, new_name):
- if self.variable == old_name:
+ if TextMatched(self.variable, old_name):
self.variable = new_name
def _UpdateLDElementAddress(self, address_model, new_leading):
@@ -2053,7 +2060,7 @@
content = self.condition.getcontent()
content_name = content.getLocalTag()
if content_name == "reference":
- if content.getname() == old_name:
+ if TextMatched(content.getname(), old_name):
content.setname(new_name)
elif content_name == "inline":
content.updateElementName(old_name, new_name)
@@ -2125,7 +2132,7 @@
setattr(cls, "getinlineContent", getinlineContent)
def updateElementName(self, old_name, new_name):
- if self.reference is not None and self.reference.getname() == old_name:
+ if self.reference is not None and TextMatched(self.reference.getname(), old_name):
self.reference.setname(new_name)
if self.inline is not None:
self.inline.updateElementName(old_name, new_name)
@@ -2215,7 +2222,7 @@
return _Search([("expression", self.expression)], criteria, parent_infos + ["io_variable", self.getlocalId()])
def _UpdateIOElementName(self, old_name, new_name):
- if self.expression == old_name:
+ if TextMatched(self.expression, old_name):
self.expression = new_name
def _UpdateIOElementAddress(self, address_model, new_leading):
@@ -2248,7 +2255,7 @@
setattr(cls, "Search", _SearchInConnector)
def updateElementName(self, old_name, new_name):
- if self.name == old_name:
+ if TextMatched(self.name, old_name):
self.name = new_name
setattr(cls, "updateElementName", updateElementName)
@@ -2257,7 +2264,7 @@
setattr(cls, "Search", _SearchInConnector)
def updateElementName(self, old_name, new_name):
- if self.name == old_name:
+ if TextMatched(self.name, old_name):
self.name = new_name
setattr(cls, "updateElementName", updateElementName)
diff -r 6431f26aa501 -r 3291024e00da plcopen/structures.py
--- a/plcopen/structures.py Thu Feb 16 14:34:40 2017 +0500
+++ b/plcopen/structures.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import string, re
from plcopen import LoadProject
diff -r 6431f26aa501 -r 3291024e00da runtime/NevowServer.py
--- a/runtime/NevowServer.py Thu Feb 16 14:34:40 2017 +0500
+++ b/runtime/NevowServer.py Thu Feb 16 14:35:12 2017 +0500
@@ -178,7 +178,7 @@
listening = False
reactor.listenTCP(port, site)
- print "Http interface port :",port
+ print _("HTTP interface port :"), port
return website
class statuslistener:
diff -r 6431f26aa501 -r 3291024e00da runtime/PLCObject.py
--- a/runtime/PLCObject.py Thu Feb 16 14:34:40 2017 +0500
+++ b/runtime/PLCObject.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import Pyro.core as pyro
from threading import Timer, Thread, Lock, Semaphore, Event
@@ -79,7 +79,8 @@
self.CurrentPLCFilename=open(
self._GetMD5FileName(),
"r").read().strip() + lib_ext
- self.LoadPLC()
+ if self.LoadPLC():
+ self.PLCStatus = "Stopped"
except Exception, e:
self.PLCStatus = "Empty"
self.CurrentPLCFilename=None
diff -r 6431f26aa501 -r 3291024e00da runtime/ServicePublisher.py
--- a/runtime/ServicePublisher.py Thu Feb 16 14:34:40 2017 +0500
+++ b/runtime/ServicePublisher.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import socket, threading
from util import Zeroconf
diff -r 6431f26aa501 -r 3291024e00da targets/Win32/plc_Win32_main.c
--- a/targets/Win32/plc_Win32_main.c Thu Feb 16 14:34:40 2017 +0500
+++ b/targets/Win32/plc_Win32_main.c Thu Feb 16 14:35:12 2017 +0500
@@ -84,7 +84,7 @@
if (debug_sem == NULL)
{
printf("startPLC CreateSemaphore debug_sem error: %d\n", GetLastError());
- return;
+ return 1;
}
debug_wait_sem = CreateSemaphore(
@@ -96,7 +96,7 @@
if (debug_wait_sem == NULL)
{
printf("startPLC CreateSemaphore debug_wait_sem error: %d\n", GetLastError());
- return;
+ return 1;
}
python_sem = CreateSemaphore(
@@ -108,7 +108,7 @@
if (python_sem == NULL)
{
printf("startPLC CreateSemaphore python_sem error: %d\n", GetLastError());
- return;
+ return 1;
}
python_wait_sem = CreateSemaphore(
NULL, // default security attributes
@@ -120,7 +120,7 @@
if (python_wait_sem == NULL)
{
printf("startPLC CreateSemaphore python_wait_sem error: %d\n", GetLastError());
- return;
+ return 1;
}
diff -r 6431f26aa501 -r 3291024e00da targets/__init__.py
--- a/targets/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/targets/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,23 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Package initialisation
#import targets
diff -r 6431f26aa501 -r 3291024e00da targets/toolchain_makefile.py
--- a/targets/toolchain_makefile.py Thu Feb 16 14:34:40 2017 +0500
+++ b/targets/toolchain_makefile.py Thu Feb 16 14:35:12 2017 +0500
@@ -30,15 +30,6 @@
includes_re = re.compile('\s*#include\s*["<]([^">]*)[">].*')
-
-if os.name == 'nt':
- # on windows, desktop shortcut launches Beremiz.py
- # with working dir set to mingw/bin.
- # then we prefix CWD to PATH in order to ensure that
- # commands invoked from Makefiles will first resolve
- # to here.
- os.environ["PATH"] = os.getcwd()+';'+os.environ["PATH"]
-
class toolchain_makefile():
def __init__(self, CTRInstance):
self.CTRInstance = CTRInstance
@@ -104,11 +95,7 @@
oldmd5 = self.md5key
self.md5key = hashlib.md5(wholesrcdata).hexdigest()
- props = self.CTRInstance.GetProjectProperties()
- self.md5key += '#'.join([props[key] for key in ['companyName',
- 'projectName',
- 'productName']])
- self.md5key += '#' #+','.join(map(str,time.localtime()))
+
# Store new PLC filename based on md5 key
f = open(self._GetMD5FileName(), "w")
f.write(self.md5key)
@@ -122,7 +109,10 @@
"buildpath": self.buildpath
}
- command = [ token % beremizcommand for token in target.getCommand().split(' ')]
+ # clean sequence of multiple whitespaces
+ cmd = re.sub(r"[ ]+", " ", target.getCommand())
+
+ command = [ token % beremizcommand for token in cmd.split(' ')]
# Call Makefile to build PLC code and link it with target specific code
status, result, err_result = ProcessLogger(self.CTRInstance.logger,
diff -r 6431f26aa501 -r 3291024e00da targets/typemapping.py
--- a/targets/typemapping.py Thu Feb 16 14:34:40 2017 +0500
+++ b/targets/typemapping.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,23 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2011: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2011: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import ctypes
ctypes.pythonapi.PyString_AsString.argtypes = (ctypes.c_void_p,)
diff -r 6431f26aa501 -r 3291024e00da tests/first_steps/beremiz.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/first_steps/beremiz.xml Thu Feb 16 14:35:12 2017 +0500
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='utf-8'?>
+<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="LOCAL://">
+ <TargetType/>
+</BeremizRoot>
diff -r 6431f26aa501 -r 3291024e00da tests/first_steps/plc.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/first_steps/plc.xml Thu Feb 16 14:35:12 2017 +0500
@@ -0,0 +1,1019 @@
+<?xml version='1.0' encoding='utf-8'?>
+<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
+ <fileHeader companyName="Beremiz" productName="Beremiz" productVersion="1" creationDateTime="2016-10-24T18:09:22"/>
+ <contentHeader name="First Steps" modificationDateTime="2016-10-26T20:18:02">
+ <coordinateInfo>
+ <fbd>
+ <scaling x="0" y="0"/>
+ </fbd>
+ <ld>
+ <scaling x="0" y="0"/>
+ </ld>
+ <sfc>
+ <scaling x="0" y="0"/>
+ </sfc>
+ </coordinateInfo>
+ </contentHeader>
+ <types>
+ <dataTypes/>
+ <pous>
+ <pou name="plc_prg" pouType="program">
+ <interface>
+ <inputVars>
+ <variable name="Reset">
+ <type>
+ <BOOL/>
+ </type>
+ </variable>
+ </inputVars>
+ <outputVars>
+ <variable name="Cnt1">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ <variable name="Cnt2">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ <variable name="Cnt3">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ <variable name="Cnt4">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ <variable name="Cnt5">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </outputVars>
+ <localVars>
+ <variable name="CounterST0">
+ <type>
+ <derived name="CounterST"/>
+ </type>
+ </variable>
+ <variable name="CounterFBD0">
+ <type>
+ <derived name="CounterFBD"/>
+ </type>
+ </variable>
+ <variable name="CounterSFC0">
+ <type>
+ <derived name="CounterSFC"/>
+ </type>
+ </variable>
+ <variable name="CounterIL0">
+ <type>
+ <derived name="CounterIL"/>
+ </type>
+ </variable>
+ <variable name="CounterLD0">
+ <type>
+ <derived name="CounterLD"/>
+ </type>
+ </variable>
+ </localVars>
+ </interface>
+ <body>
+ <FBD>
+ <block localId="1" typeName="CounterST" instanceName="CounterST0" executionOrderId="0" height="60" width="125">
+ <position x="207" y="53"/>
+ <inputVariables>
+ <variable formalParameter="Reset">
+ <connectionPointIn>
+ <relPosition x="0" y="40"/>
+ <connection refLocalId="2">
+ <position x="207" y="93"/>
+ <position x="114" y="93"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="125" y="40"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="2" executionOrderId="0" height="24" width="79" negated="false">
+ <position x="35" y="81"/>
+ <connectionPointOut>
+ <relPosition x="79" y="12"/>
+ </connectionPointOut>
+ <expression>Reset</expression>
+ </inVariable>
+ <outVariable localId="3" executionOrderId="0" height="24" width="106" negated="false">
+ <position x="424" y="81"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="1" formalParameter="OUT">
+ <position x="424" y="93"/>
+ <position x="332" y="93"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Cnt1</expression>
+ </outVariable>
+ <block localId="4" typeName="CounterFBD" instanceName="CounterFBD0" executionOrderId="0" height="54" width="121">
+ <position x="211" y="145"/>
+ <inputVariables>
+ <variable formalParameter="Reset">
+ <connectionPointIn>
+ <relPosition x="0" y="37"/>
+ <connection refLocalId="13">
+ <position x="211" y="182"/>
+ <position x="115" y="182"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="121" y="37"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <outVariable localId="5" executionOrderId="0" height="24" width="103" negated="false">
+ <position x="426" y="170"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="4" formalParameter="OUT">
+ <position x="426" y="182"/>
+ <position x="332" y="182"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Cnt2</expression>
+ </outVariable>
+ <comment localId="6" height="264" width="417">
+ <position x="569" y="55"/>
+ <content>
+ <xhtml:p><![CDATA[In this example function block with the same functionality
+is created using all five IEC 61131-3 programing languages:
+- IL;
+- FBD;
+- LD;
+- ST;
+- SFC.
+
+
+
+
+Function block is a counter with reset control input.
+If reset is True counter value is reset to the value defined by
+global configuration constant ResetCounterValue.
+If reset is False, counter is incremented every cycle.
+]]></xhtml:p>
+ </content>
+ </comment>
+ <block localId="7" typeName="CounterSFC" instanceName="CounterSFC0" executionOrderId="0" height="52" width="121">
+ <position x="211" y="237"/>
+ <inputVariables>
+ <variable formalParameter="Reset">
+ <connectionPointIn>
+ <relPosition x="0" y="36"/>
+ <connection refLocalId="12">
+ <position x="211" y="273"/>
+ <position x="103" y="273"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="121" y="36"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <outVariable localId="8" executionOrderId="0" height="24" width="97" negated="false">
+ <position x="431" y="261"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="7" formalParameter="OUT">
+ <position x="431" y="273"/>
+ <position x="332" y="273"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Cnt3</expression>
+ </outVariable>
+ <block localId="9" typeName="CounterIL" instanceName="CounterIL0" executionOrderId="0" height="62" width="121">
+ <position x="211" y="322"/>
+ <inputVariables>
+ <variable formalParameter="Reset">
+ <connectionPointIn>
+ <relPosition x="0" y="41"/>
+ <connection refLocalId="10">
+ <position x="211" y="363"/>
+ <position x="101" y="363"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="121" y="41"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="10" executionOrderId="0" height="24" width="67" negated="false">
+ <position x="34" y="351"/>
+ <connectionPointOut>
+ <relPosition x="67" y="12"/>
+ </connectionPointOut>
+ <expression>Reset</expression>
+ </inVariable>
+ <outVariable localId="11" executionOrderId="0" height="24" width="91" negated="false">
+ <position x="434" y="351"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="9" formalParameter="OUT">
+ <position x="434" y="363"/>
+ <position x="332" y="363"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Cnt4</expression>
+ </outVariable>
+ <inVariable localId="12" executionOrderId="0" height="24" width="67" negated="false">
+ <position x="36" y="261"/>
+ <connectionPointOut>
+ <relPosition x="67" y="12"/>
+ </connectionPointOut>
+ <expression>Reset</expression>
+ </inVariable>
+ <inVariable localId="13" executionOrderId="0" height="24" width="79" negated="false">
+ <position x="36" y="170"/>
+ <connectionPointOut>
+ <relPosition x="79" y="12"/>
+ </connectionPointOut>
+ <expression>Reset</expression>
+ </inVariable>
+ <block localId="14" typeName="CounterLD" instanceName="CounterLD0" executionOrderId="0" height="62" width="124">
+ <position x="210" y="411"/>
+ <inputVariables>
+ <variable formalParameter="Reset">
+ <connectionPointIn>
+ <relPosition x="0" y="41"/>
+ <connection refLocalId="16">
+ <position x="210" y="452"/>
+ <position x="100" y="452"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="Out">
+ <connectionPointOut>
+ <relPosition x="124" y="41"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <outVariable localId="15" executionOrderId="0" height="24" width="88" negated="false">
+ <position x="437" y="440"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="14" formalParameter="Out">
+ <position x="437" y="452"/>
+ <position x="334" y="452"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Cnt5</expression>
+ </outVariable>
+ <inVariable localId="16" executionOrderId="0" height="24" width="64" negated="false">
+ <position x="36" y="440"/>
+ <connectionPointOut>
+ <relPosition x="64" y="12"/>
+ </connectionPointOut>
+ <expression>Reset</expression>
+ </inVariable>
+ </FBD>
+ </body>
+ </pou>
+ <pou name="CounterST" pouType="functionBlock">
+ <interface>
+ <inputVars>
+ <variable name="Reset">
+ <type>
+ <BOOL/>
+ </type>
+ </variable>
+ </inputVars>
+ <localVars>
+ <variable name="Cnt">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </localVars>
+ <outputVars>
+ <variable name="OUT">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </outputVars>
+ <externalVars constant="true">
+ <variable name="ResetCounterValue">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </externalVars>
+ </interface>
+ <body>
+ <ST>
+ <xhtml:p><![CDATA[IF Reset THEN
+ Cnt := ResetCounterValue;
+ELSE
+ Cnt := Cnt + 1;
+END_IF;
+
+Out := Cnt;]]></xhtml:p>
+ </ST>
+ </body>
+ </pou>
+ <pou name="CounterFBD" pouType="functionBlock">
+ <interface>
+ <inputVars>
+ <variable name="Reset">
+ <type>
+ <BOOL/>
+ </type>
+ </variable>
+ </inputVars>
+ <outputVars>
+ <variable name="OUT">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </outputVars>
+ <localVars>
+ <variable name="Cnt">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </localVars>
+ <externalVars constant="true">
+ <variable name="ResetCounterValue">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </externalVars>
+ </interface>
+ <body>
+ <FBD>
+ <inVariable localId="1" executionOrderId="0" height="24" width="61" negated="false">
+ <position x="321" y="58"/>
+ <connectionPointOut>
+ <relPosition x="61" y="12"/>
+ </connectionPointOut>
+ <expression>Reset</expression>
+ </inVariable>
+ <outVariable localId="2" executionOrderId="0" height="24" width="34" negated="false">
+ <position x="675" y="137"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="3">
+ <position x="675" y="149"/>
+ <position x="586" y="149"/>
+ </connection>
+ </connectionPointIn>
+ <expression>OUT</expression>
+ </outVariable>
+ <inOutVariable localId="3" executionOrderId="0" height="24" width="29" negatedOut="false" negatedIn="false">
+ <position x="557" y="137"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="7" formalParameter="OUT">
+ <position x="557" y="149"/>
+ <position x="524" y="149"/>
+ <position x="524" y="130"/>
+ <position x="505" y="130"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="29" y="12"/>
+ </connectionPointOut>
+ <expression>Cnt</expression>
+ </inOutVariable>
+ <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="57">
+ <position x="328" y="115"/>
+ <inputVariables>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="35"/>
+ <connection refLocalId="6">
+ <position x="328" y="150"/>
+ <position x="275" y="150"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN2">
+ <connectionPointIn>
+ <relPosition x="0" y="65"/>
+ <connection refLocalId="3">
+ <position x="328" y="180"/>
+ <position x="317" y="180"/>
+ <position x="317" y="213"/>
+ <position x="596" y="213"/>
+ <position x="596" y="149"/>
+ <position x="586" y="149"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="57" y="35"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="5" executionOrderId="0" height="24" width="158" negated="false">
+ <position x="222" y="256"/>
+ <connectionPointOut>
+ <relPosition x="158" y="12"/>
+ </connectionPointOut>
+ <expression>ResetCounterValue</expression>
+ </inVariable>
+ <inVariable localId="6" executionOrderId="0" height="24" width="21" negated="false">
+ <position x="254" y="138"/>
+ <connectionPointOut>
+ <relPosition x="21" y="12"/>
+ </connectionPointOut>
+ <expression>1</expression>
+ </inVariable>
+ <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="57">
+ <position x="448" y="100"/>
+ <inputVariables>
+ <variable formalParameter="G">
+ <connectionPointIn>
+ <relPosition x="0" y="30"/>
+ <connection refLocalId="1">
+ <position x="448" y="130"/>
+ <position x="415" y="130"/>
+ <position x="415" y="70"/>
+ <position x="382" y="70"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN0">
+ <connectionPointIn>
+ <relPosition x="0" y="50"/>
+ <connection refLocalId="4" formalParameter="OUT">
+ <position x="448" y="150"/>
+ <position x="385" y="150"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="70"/>
+ <connection refLocalId="5">
+ <position x="448" y="170"/>
+ <position x="414" y="170"/>
+ <position x="414" y="268"/>
+ <position x="380" y="268"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="57" y="30"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ </FBD>
+ </body>
+ </pou>
+ <pou name="CounterSFC" pouType="functionBlock">
+ <interface>
+ <inputVars>
+ <variable name="Reset">
+ <type>
+ <BOOL/>
+ </type>
+ </variable>
+ </inputVars>
+ <outputVars>
+ <variable name="OUT">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </outputVars>
+ <localVars>
+ <variable name="Cnt">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </localVars>
+ <externalVars constant="true">
+ <variable name="ResetCounterValue">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </externalVars>
+ </interface>
+ <actions/>
+ <body>
+ <SFC>
+ <step localId="1" name="Start" initialStep="true" height="28" width="90">
+ <position x="241" y="14"/>
+ <connectionPointOut formalParameter="">
+ <relPosition x="45" y="28"/>
+ </connectionPointOut>
+ </step>
+ <selectionDivergence localId="2" height="1" width="431">
+ <position x="70" y="86"/>
+ <connectionPointIn>
+ <relPosition x="216" y="0"/>
+ <connection refLocalId="1">
+ <position x="286" y="86"/>
+ <position x="286" y="42"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut formalParameter="">
+ <relPosition x="0" y="1"/>
+ </connectionPointOut>
+ <connectionPointOut formalParameter="">
+ <relPosition x="431" y="1"/>
+ </connectionPointOut>
+ </selectionDivergence>
+ <transition localId="3" height="2" width="20">
+ <position x="491" y="132"/>
+ <connectionPointIn>
+ <relPosition x="10" y="0"/>
+ <connection refLocalId="2">
+ <position x="501" y="132"/>
+ <position x="501" y="87"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="10" y="2"/>
+ </connectionPointOut>
+ <condition>
+ <inline name="">
+ <ST>
+ <xhtml:p><![CDATA[Reset]]></xhtml:p>
+ </ST>
+ </inline>
+ </condition>
+ </transition>
+ <transition localId="4" height="2" width="20" executionOrderId="0">
+ <position x="60" y="135"/>
+ <connectionPointIn>
+ <relPosition x="10" y="0"/>
+ <connection refLocalId="2">
+ <position x="70" y="135"/>
+ <position x="70" y="87"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="10" y="2"/>
+ </connectionPointOut>
+ <condition>
+ <inline name="">
+ <ST>
+ <xhtml:p><![CDATA[NOT Reset]]></xhtml:p>
+ </ST>
+ </inline>
+ </condition>
+ </transition>
+ <step localId="5" name="ResetCounter" initialStep="false" height="24" width="104">
+ <position x="449" y="190"/>
+ <connectionPointIn>
+ <relPosition x="52" y="0"/>
+ <connection refLocalId="3">
+ <position x="501" y="190"/>
+ <position x="501" y="134"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut formalParameter="">
+ <relPosition x="52" y="24"/>
+ </connectionPointOut>
+ <connectionPointOutAction formalParameter="">
+ <relPosition x="104" y="12"/>
+ </connectionPointOutAction>
+ </step>
+ <actionBlock localId="6" height="63" width="222">
+ <position x="600" y="187"/>
+ <connectionPointIn>
+ <relPosition x="0" y="15"/>
+ <connection refLocalId="5">
+ <position x="600" y="202"/>
+ <position x="553" y="202"/>
+ </connection>
+ </connectionPointIn>
+ <action localId="0">
+ <relPosition x="0" y="0"/>
+ <inline>
+ <ST>
+ <xhtml:p><![CDATA[Cnt := ResetCounterValue;]]></xhtml:p>
+ </ST>
+ </inline>
+ </action>
+ <action localId="0">
+ <relPosition x="0" y="0"/>
+ <inline>
+ <ST>
+ <xhtml:p><![CDATA[OUT := Cnt;]]></xhtml:p>
+ </ST>
+ </inline>
+ </action>
+ </actionBlock>
+ <step localId="7" name="Count" initialStep="false" height="24" width="85" executionOrderId="0">
+ <position x="28" y="191"/>
+ <connectionPointIn>
+ <relPosition x="42" y="0"/>
+ <connection refLocalId="4">
+ <position x="70" y="191"/>
+ <position x="70" y="137"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut formalParameter="">
+ <relPosition x="42" y="24"/>
+ </connectionPointOut>
+ <connectionPointOutAction formalParameter="">
+ <relPosition x="85" y="12"/>
+ </connectionPointOutAction>
+ </step>
+ <actionBlock localId="8" height="52" width="148" executionOrderId="0">
+ <position x="135" y="188"/>
+ <connectionPointIn>
+ <relPosition x="0" y="15"/>
+ <connection refLocalId="7">
+ <position x="135" y="203"/>
+ <position x="113" y="203"/>
+ </connection>
+ </connectionPointIn>
+ <action localId="0">
+ <relPosition x="0" y="0"/>
+ <inline>
+ <ST>
+ <xhtml:p><![CDATA[Cnt := Cnt + 1;]]></xhtml:p>
+ </ST>
+ </inline>
+ </action>
+ <action localId="0">
+ <relPosition x="0" y="0"/>
+ <inline>
+ <ST>
+ <xhtml:p><![CDATA[OUT := Cnt;]]></xhtml:p>
+ </ST>
+ </inline>
+ </action>
+ </actionBlock>
+ <selectionConvergence localId="10" height="1" width="431">
+ <position x="70" y="273"/>
+ <connectionPointIn>
+ <relPosition x="0" y="0"/>
+ <connection refLocalId="13">
+ <position x="70" y="273"/>
+ <position x="70" y="244"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointIn>
+ <relPosition x="431" y="0"/>
+ <connection refLocalId="14">
+ <position x="501" y="273"/>
+ <position x="501" y="250"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="216" y="1"/>
+ </connectionPointOut>
+ </selectionConvergence>
+ <jumpStep localId="12" targetName="Start" height="13" width="12">
+ <position x="280" y="317"/>
+ <connectionPointIn>
+ <relPosition x="6" y="0"/>
+ <connection refLocalId="10">
+ <position x="286" y="317"/>
+ <position x="286" y="274"/>
+ </connection>
+ </connectionPointIn>
+ </jumpStep>
+ <transition localId="13" height="2" width="20" executionOrderId="0">
+ <position x="60" y="242"/>
+ <connectionPointIn>
+ <relPosition x="10" y="0"/>
+ <connection refLocalId="7">
+ <position x="70" y="242"/>
+ <position x="70" y="215"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="10" y="2"/>
+ </connectionPointOut>
+ <condition>
+ <inline name="">
+ <ST>
+ <xhtml:p><![CDATA[Reset]]></xhtml:p>
+ </ST>
+ </inline>
+ </condition>
+ </transition>
+ <transition localId="14" height="2" width="20" executionOrderId="0">
+ <position x="491" y="248"/>
+ <connectionPointIn>
+ <relPosition x="10" y="0"/>
+ <connection refLocalId="5">
+ <position x="501" y="248"/>
+ <position x="501" y="214"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="10" y="2"/>
+ </connectionPointOut>
+ <condition>
+ <inline name="">
+ <ST>
+ <xhtml:p><![CDATA[NOT Reset]]></xhtml:p>
+ </ST>
+ </inline>
+ </condition>
+ </transition>
+ </SFC>
+ </body>
+ </pou>
+ <pou name="CounterIL" pouType="functionBlock">
+ <interface>
+ <localVars>
+ <variable name="Cnt">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </localVars>
+ <inputVars>
+ <variable name="Reset">
+ <type>
+ <BOOL/>
+ </type>
+ </variable>
+ </inputVars>
+ <outputVars>
+ <variable name="OUT">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </outputVars>
+ <externalVars constant="true">
+ <variable name="ResetCounterValue">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </externalVars>
+ </interface>
+ <body>
+ <IL>
+ <xhtml:p><![CDATA[LD Reset
+JMPC ResetCnt
+
+(* increment counter *)
+LD Cnt
+ADD 1
+JMP QuitFb
+
+ResetCnt:
+(* reset counter *)
+LD ResetCounterValue
+
+QuitFb:
+(* save results *)
+ST Cnt
+ST Out
+]]></xhtml:p>
+ </IL>
+ </body>
+ </pou>
+ <pou name="CounterLD" pouType="functionBlock">
+ <interface>
+ <inputVars>
+ <variable name="Reset">
+ <type>
+ <BOOL/>
+ </type>
+ </variable>
+ </inputVars>
+ <outputVars>
+ <variable name="Out">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </outputVars>
+ <localVars>
+ <variable name="Cnt">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </localVars>
+ <externalVars constant="true">
+ <variable name="ResetCounterValue">
+ <type>
+ <INT/>
+ </type>
+ </variable>
+ </externalVars>
+ </interface>
+ <body>
+ <LD>
+ <outVariable localId="2" executionOrderId="0" height="24" width="34" negated="false">
+ <position x="527" y="90"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="3">
+ <position x="527" y="102"/>
+ <position x="438" y="102"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Out</expression>
+ </outVariable>
+ <inOutVariable localId="3" executionOrderId="0" height="24" width="29" negatedOut="false" negatedIn="false">
+ <position x="409" y="90"/>
+ <connectionPointIn>
+ <relPosition x="0" y="12"/>
+ <connection refLocalId="7" formalParameter="OUT">
+ <position x="409" y="102"/>
+ <position x="357" y="102"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="29" y="12"/>
+ </connectionPointOut>
+ <expression>Cnt</expression>
+ </inOutVariable>
+ <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="57">
+ <position x="180" y="87"/>
+ <inputVariables>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="35"/>
+ <connection refLocalId="6">
+ <position x="180" y="122"/>
+ <position x="127" y="122"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN2">
+ <connectionPointIn>
+ <relPosition x="0" y="65"/>
+ <connection refLocalId="3">
+ <position x="180" y="152"/>
+ <position x="169" y="152"/>
+ <position x="169" y="185"/>
+ <position x="448" y="185"/>
+ <position x="448" y="102"/>
+ <position x="438" y="102"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="57" y="35"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="5" executionOrderId="0" height="24" width="158" negated="false">
+ <position x="74" y="228"/>
+ <connectionPointOut>
+ <relPosition x="158" y="12"/>
+ </connectionPointOut>
+ <expression>ResetCounterValue</expression>
+ </inVariable>
+ <inVariable localId="6" executionOrderId="0" height="24" width="21" negated="false">
+ <position x="106" y="110"/>
+ <connectionPointOut>
+ <relPosition x="21" y="12"/>
+ </connectionPointOut>
+ <expression>1</expression>
+ </inVariable>
+ <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="57">
+ <position x="300" y="72"/>
+ <inputVariables>
+ <variable formalParameter="G">
+ <connectionPointIn>
+ <relPosition x="0" y="30"/>
+ <connection refLocalId="9">
+ <position x="300" y="102"/>
+ <position x="266" y="102"/>
+ <position x="266" y="62"/>
+ <position x="134" y="62"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN0">
+ <connectionPointIn>
+ <relPosition x="0" y="50"/>
+ <connection refLocalId="4" formalParameter="OUT">
+ <position x="300" y="122"/>
+ <position x="237" y="122"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="70"/>
+ <connection refLocalId="5">
+ <position x="300" y="142"/>
+ <position x="266" y="142"/>
+ <position x="266" y="240"/>
+ <position x="232" y="240"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="57" y="30"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <leftPowerRail localId="8" height="40" width="3">
+ <position x="46" y="42"/>
+ <connectionPointOut formalParameter="">
+ <relPosition x="3" y="20"/>
+ </connectionPointOut>
+ </leftPowerRail>
+ <contact localId="9" height="15" width="21" negated="false">
+ <position x="113" y="54"/>
+ <connectionPointIn>
+ <relPosition x="0" y="8"/>
+ <connection refLocalId="8">
+ <position x="113" y="62"/>
+ <position x="49" y="62"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="21" y="8"/>
+ </connectionPointOut>
+ <variable>Reset</variable>
+ </contact>
+ </LD>
+ </body>
+ </pou>
+ </pous>
+ </types>
+ <instances>
+ <configurations>
+ <configuration name="config">
+ <resource name="resource1">
+ <task name="plc_task" priority="1" interval="T#100ms">
+ <pouInstance name="plc_task_instance" typeName="plc_prg"/>
+ </task>
+ </resource>
+ <globalVars constant="true">
+ <variable name="ResetCounterValue">
+ <type>
+ <INT/>
+ </type>
+ <initialValue>
+ <simpleValue value="17"/>
+ </initialValue>
+ </variable>
+ </globalVars>
+ </configuration>
+ </configurations>
+ </instances>
+</project>
diff -r 6431f26aa501 -r 3291024e00da tests/genericmake/plc.xml
--- a/tests/genericmake/plc.xml Thu Feb 16 14:34:40 2017 +0500
+++ b/tests/genericmake/plc.xml Thu Feb 16 14:35:12 2017 +0500
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
- <fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2014-01-19T11:14:47"/>
- <contentHeader name="Unnamed" modificationDateTime="2014-01-20T01:37:01">
+ <fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2014-01-19T11:14:47" contentDescription="This example shows how you can customize build process by using 'make'. "/>
+ <contentHeader name="Makefile Example" modificationDateTime="2016-10-14T14:00:01">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -35,25 +35,44 @@
<body>
<FBD>
<inVariable localId="1" executionOrderId="0" height="27" width="77" negated="false">
- <position x="196" y="224"/>
+ <position x="52" y="368"/>
<connectionPointOut>
<relPosition x="77" y="13"/>
</connectionPointOut>
<expression>LocalVara</expression>
</inVariable>
<outVariable localId="2" executionOrderId="0" height="27" width="77" negated="false">
- <position x="305" y="227"/>
+ <position x="167" y="368"/>
<connectionPointIn>
<relPosition x="0" y="13"/>
<connection refLocalId="1">
- <position x="305" y="240"/>
- <position x="288" y="240"/>
- <position x="288" y="237"/>
- <position x="273" y="237"/>
+ <position x="167" y="381"/>
+ <position x="129" y="381"/>
</connection>
</connectionPointIn>
<expression>LocalVarb</expression>
</outVariable>
+ <comment localId="3" height="310" width="760">
+ <position x="32" y="23"/>
+ <content>
+ <xhtml:p><![CDATA[This example shows how you can customize build process by using 'make'.
+
+Sometimes special steps need to be done to build entire project.
+But it's not necessary to create another target in Beremiz every time you need to customize something in build process. Just use for that 'Generic' target and describe all necessary steps in Makefile.
+
+For example, you can
+ - preprocess generated by Beremiz C source files,
+ - do some fancy source code transformation using any tools you want,
+ - use any compiler you want,
+ - call static analyzers,
+ - run integration tests on the project,
+ - upload source code to external build server,
+ - upload to the target and compile it there,
+ - flash/transfer your compiled binary to the target,
+ and much much more.
+]]></xhtml:p>
+ </content>
+ </comment>
</FBD>
</body>
</pou>
diff -r 6431f26aa501 -r 3291024e00da tests/genericmake/project_files/Makefile
--- a/tests/genericmake/project_files/Makefile Thu Feb 16 14:34:40 2017 +0500
+++ b/tests/genericmake/project_files/Makefile Thu Feb 16 14:35:12 2017 +0500
@@ -9,5 +9,5 @@
some_binary: $(BEREMIZ_OBJS)
@echo "* Would link $^ -> $@"
-%o : %c
+%.o: %.c
@echo "* Would compile $< -> $@"
diff -r 6431f26aa501 -r 3291024e00da tests/logging/plc.xml
--- a/tests/logging/plc.xml Thu Feb 16 14:34:40 2017 +0500
+++ b/tests/logging/plc.xml Thu Feb 16 14:35:12 2017 +0500
@@ -1,14 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.plcopen.org/xml/tc6.xsd"
- xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xhtml="http://www.w3.org/1999/xhtml">
- <fileHeader companyName="Unknown"
- productName="Unnamed"
- productVersion="1"
- creationDateTime="2013-01-29T14:01:00"/>
- <contentHeader name="Unnamed"
- modificationDateTime="2013-04-04T11:06:06">
+<?xml version='1.0' encoding='utf-8'?>
+<project xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201">
+ <fileHeader companyName="Unknown" productName="Generic PLC" productVersion="1" creationDateTime="2013-01-29T14:01:00" contentDescription="This example shows logging functionality in Beremiz. Here are shown two ways of logging: - from IEC PLC program; - from python extension. "/>
+ <contentHeader name="Logging example" modificationDateTime="2016-09-09T17:54:15">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -47,29 +40,34 @@
<derived name="LOGLEVEL"/>
</type>
<initialValue>
- <simpleValue value="WARNING"/>
+ <simpleValue value="INFO"/>
</initialValue>
</variable>
+ <variable name="Timer">
+ <type>
+ <derived name="TOF"/>
+ </type>
+ </variable>
</localVars>
</interface>
<body>
<FBD>
- <inVariable localId="2" height="27" width="85">
- <position x="732" y="188"/>
- <connectionPointOut>
- <relPosition x="85" y="13"/>
- </connectionPointOut>
- <expression>'Moooooo'</expression>
+ <inVariable localId="2" height="30" width="170" executionOrderId="0" negated="false">
+ <position x="507" y="347"/>
+ <connectionPointOut>
+ <relPosition x="170" y="15"/>
+ </connectionPointOut>
+ <expression>'IEC side logging: beat #'</expression>
</inVariable>
- <block localId="3" width="59" height="40" typeName="NOT">
- <position x="213" y="64"/>
+ <block localId="3" width="59" height="40" typeName="NOT" executionOrderId="0">
+ <position x="241" y="269"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
- <connection refLocalId="4">
- <position x="213" y="94"/>
- <position x="179" y="94"/>
+ <connection refLocalId="14" formalParameter="Q">
+ <position x="241" y="299"/>
+ <position x="195" y="299"/>
</connection>
</connectionPointIn>
</variable>
@@ -83,121 +81,117 @@
</variable>
</outputVariables>
</block>
- <inOutVariable localId="4" height="27" width="41">
- <position x="138" y="81"/>
+ <inOutVariable localId="4" height="27" width="51" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="66" y="286"/>
<connectionPointIn>
<relPosition x="0" y="13"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="138" y="94"/>
- <position x="123" y="94"/>
- <position x="123" y="124"/>
- <position x="282" y="124"/>
- <position x="282" y="94"/>
- <position x="272" y="94"/>
+ <position x="66" y="299"/>
+ <position x="37" y="299"/>
+ <position x="37" y="372"/>
+ <position x="314" y="372"/>
+ <position x="314" y="299"/>
+ <position x="300" y="299"/>
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="41" y="13"/>
+ <relPosition x="51" y="13"/>
</connectionPointOut>
<expression>beat</expression>
</inOutVariable>
- <block localId="5" width="68" height="80" typeName="ADD">
- <position x="482" y="209"/>
+ <block localId="5" width="68" height="98" typeName="ADD" executionOrderId="0">
+ <position x="463" y="385"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
- <relPosition x="0" y="35"/>
+ <relPosition x="0" y="39"/>
<connection refLocalId="10" formalParameter="OUT">
- <position x="482" y="244"/>
- <position x="459" y="244"/>
- <position x="459" y="230"/>
- <position x="449" y="230"/>
+ <position x="463" y="424"/>
+ <position x="452" y="424"/>
+ <position x="452" y="424"/>
+ <position x="454" y="424"/>
+ <position x="454" y="424"/>
+ <position x="444" y="424"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN2">
<connectionPointIn>
- <relPosition x="0" y="65"/>
+ <relPosition x="0" y="78"/>
<connection refLocalId="6">
- <position x="482" y="274"/>
- <position x="397" y="274"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="68" y="35"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inOutVariable localId="6" height="27" width="48">
- <position x="349" y="261"/>
+ <position x="463" y="463"/>
+ <position x="444" y="463"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="68" y="39"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inOutVariable localId="6" height="27" width="103" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="341" y="450"/>
<connectionPointIn>
<relPosition x="0" y="13"/>
<connection refLocalId="5" formalParameter="OUT">
- <position x="349" y="274"/>
- <position x="339" y="274"/>
- <position x="339" y="306"/>
- <position x="563" y="306"/>
- <position x="563" y="244"/>
- <position x="550" y="244"/>
+ <position x="341" y="463"/>
+ <position x="320" y="463"/>
+ <position x="320" y="500"/>
+ <position x="544" y="500"/>
+ <position x="544" y="424"/>
+ <position x="531" y="424"/>
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="48" y="13"/>
+ <relPosition x="103" y="13"/>
</connectionPointOut>
<expression>count</expression>
</inOutVariable>
- <block localId="8" width="67" height="60" typeName="CONCAT">
- <position x="868" y="174"/>
+ <block localId="8" width="67" height="144" typeName="CONCAT" executionOrderId="0">
+ <position x="727" y="311"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="51"/>
<connection refLocalId="2">
- <position x="868" y="204"/>
- <position x="843" y="204"/>
- <position x="843" y="201"/>
- <position x="817" y="201"/>
+ <position x="727" y="362"/>
+ <position x="677" y="362"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN2">
<connectionPointIn>
- <relPosition x="0" y="50"/>
+ <relPosition x="0" y="113"/>
<connection refLocalId="9" formalParameter="OUT">
- <position x="868" y="224"/>
- <position x="765" y="224"/>
- <position x="765" y="232"/>
- <position x="712" y="232"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="67" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <block localId="9" width="116" height="40" typeName="INT_TO_STRING">
- <position x="596" y="202"/>
+ <position x="727" y="424"/>
+ <position x="677" y="424"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="67" y="51"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="9" width="116" height="40" typeName="INT_TO_STRING" executionOrderId="0">
+ <position x="561" y="394"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="5" formalParameter="OUT">
- <position x="596" y="232"/>
- <position x="573" y="232"/>
- <position x="573" y="244"/>
- <position x="550" y="244"/>
+ <position x="561" y="424"/>
+ <position x="531" y="424"/>
</connection>
</connectionPointIn>
</variable>
@@ -211,19 +205,17 @@
</variable>
</outputVariables>
</block>
- <block localId="10" width="105" height="40" typeName="BOOL_TO_INT">
- <position x="344" y="200"/>
+ <block localId="10" width="105" height="40" typeName="BOOL_TO_INT" executionOrderId="0">
+ <position x="339" y="394"/>
<inputVariables>
<variable formalParameter="IN" edge="rising">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="344" y="230"/>
- <position x="242" y="230"/>
- <position x="242" y="163"/>
- <position x="282" y="163"/>
- <position x="282" y="94"/>
- <position x="272" y="94"/>
+ <position x="339" y="424"/>
+ <position x="314" y="424"/>
+ <position x="314" y="299"/>
+ <position x="300" y="299"/>
</connection>
</connectionPointIn>
</variable>
@@ -237,39 +229,33 @@
</variable>
</outputVariables>
</block>
- <block localId="11" width="65" height="80" typeName="LOGGER" instanceName="LOGGER0">
- <position x="1100" y="98"/>
+ <block localId="11" width="65" height="209" typeName="LOGGER" instanceName="LOGGER0" executionOrderId="0">
+ <position x="907" y="248"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="52"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="1100" y="128"/>
- <position x="631" y="128"/>
- <position x="631" y="94"/>
- <position x="272" y="94"/>
+ <position x="907" y="300"/>
+ <position x="300" y="300"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="MSG">
<connectionPointIn>
- <relPosition x="0" y="50"/>
+ <relPosition x="0" y="112"/>
<connection refLocalId="8" formalParameter="OUT">
- <position x="1100" y="148"/>
- <position x="963" y="148"/>
- <position x="963" y="204"/>
- <position x="935" y="204"/>
+ <position x="907" y="360"/>
+ <position x="794" y="360"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="LEVEL">
<connectionPointIn>
- <relPosition x="0" y="70"/>
+ <relPosition x="0" y="177"/>
<connection refLocalId="12">
- <position x="1100" y="168"/>
- <position x="1090" y="168"/>
- <position x="1090" y="168"/>
- <position x="1057" y="168"/>
+ <position x="907" y="425"/>
+ <position x="879" y="425"/>
</connection>
</connectionPointIn>
</variable>
@@ -277,13 +263,72 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="12" height="27" width="79">
- <position x="978" y="155"/>
+ <inVariable localId="12" height="27" width="79" executionOrderId="0" negated="false">
+ <position x="800" y="412"/>
<connectionPointOut>
<relPosition x="79" y="13"/>
</connectionPointOut>
- <expression>WARNING</expression>
+ <expression>lvl</expression>
</inVariable>
+ <block localId="14" typeName="TOF" instanceName="Timer" executionOrderId="0" height="98" width="45">
+ <position x="150" y="260"/>
+ <inputVariables>
+ <variable formalParameter="IN">
+ <connectionPointIn>
+ <relPosition x="0" y="39"/>
+ <connection refLocalId="4">
+ <position x="150" y="299"/>
+ <position x="117" y="299"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="PT">
+ <connectionPointIn>
+ <relPosition x="0" y="78"/>
+ <connection refLocalId="1">
+ <position x="150" y="338"/>
+ <position x="117" y="338"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="Q">
+ <connectionPointOut>
+ <relPosition x="45" y="39"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="ET">
+ <connectionPointOut>
+ <relPosition x="45" y="78"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="1" executionOrderId="0" height="24" width="52" negated="false">
+ <position x="65" y="326"/>
+ <connectionPointOut>
+ <relPosition x="52" y="12"/>
+ </connectionPointOut>
+ <expression>T#3s</expression>
+ </inVariable>
+ <comment localId="15" height="212" width="675">
+ <position x="27" y="16"/>
+ <content>
+ <xhtml:p><![CDATA[This example shows logging functionality in Beremiz.
+Here are shown two ways of logging:
+- from IEC PLC program;
+- from python extension.
+
+In IEC PLC program every third second (beat) new message is generated and put in PLC log.
+See function blocks below.
+
+Every 15 seconds status of PLC program is put in PLC log from python extension.
+For more information about logging from python look at 0.x: py_ext_0 implementation in project tree.
+]]></xhtml:p>
+ </content>
+ </comment>
</FBD>
</body>
</pou>
@@ -293,8 +338,8 @@
<configurations>
<configuration name="config">
<resource name="resource1">
- <task name="blob" interval="T#100ms" priority="0">
- <pouInstance name="blub" typeName="program0"/>
+ <task name="task0" priority="0" interval="T#100ms">
+ <pouInstance name="prg" typeName="program0"/>
</task>
</resource>
</configuration>
diff -r 6431f26aa501 -r 3291024e00da tests/python/plc.xml
--- a/tests/python/plc.xml Thu Feb 16 14:34:40 2017 +0500
+++ b/tests/python/plc.xml Thu Feb 16 14:35:12 2017 +0500
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201">
- <fileHeader companyName="" productName="Beremiz" productVersion="0.0" creationDateTime="2008-12-14T16:21:19"/>
- <contentHeader name="Beremiz Python Support Tests" modificationDateTime="2015-03-13T22:06:10">
+ <fileHeader companyName="" productName="Beremiz" productVersion="0.0" creationDateTime="2008-12-14T16:21:19" contentDescription="This example shows many features in Beremiz: 1. How to implement python extensions. 2. How to implement basic C extension. 3. How to use C code in IEC POUs. 4. How to call C functions from python code. 5. How to avoid race conditions between IEC, C and python code. 6. How to convert betweet different IEC types. "/>
+ <contentHeader name="Beremiz Python Support Tests" modificationDateTime="2016-10-12T14:15:35">
<coordinateInfo>
<pageSize x="1024" y="1024"/>
<fbd>
@@ -54,6 +54,22 @@
<pou name="main_pytest" pouType="program">
<interface>
<localVars>
+ <variable name="mux1_sel">
+ <type>
+ <INT/>
+ </type>
+ <initialValue>
+ <simpleValue value="3"/>
+ </initialValue>
+ </variable>
+ <variable name="mux2_sel">
+ <type>
+ <INT/>
+ </type>
+ <initialValue>
+ <simpleValue value="3"/>
+ </initialValue>
+ </variable>
<variable name="pytest_var1">
<type>
<string/>
@@ -128,17 +144,30 @@
<WORD/>
</type>
<initialValue>
- <simpleValue value="300"/>
+ <simpleValue value="151"/>
</initialValue>
</variable>
+ <variable name="Test_BCD_WRONG">
+ <type>
+ <WORD/>
+ </type>
+ <initialValue>
+ <simpleValue value="154"/>
+ </initialValue>
+ </variable>
+ <variable name="Test_BCD_CONVERTED">
+ <type>
+ <BOOL/>
+ </type>
+ </variable>
<variable name="Test_BCD_RESULT">
<type>
<UINT/>
</type>
</variable>
- <variable name="Test_BCD_ENO">
- <type>
- <BOOL/>
+ <variable name="Test_BCD_WRONG_RESULT">
+ <type>
+ <UINT/>
</type>
</variable>
<variable name="Test_DT">
@@ -208,24 +237,24 @@
</interface>
<body>
<FBD>
- <inVariable localId="4" height="30" width="160">
- <position x="295" y="230"/>
+ <inVariable localId="4" height="30" width="160" executionOrderId="0" negated="false">
+ <position x="295" y="450"/>
<connectionPointOut>
<relPosition x="160" y="15"/>
</connectionPointOut>
<expression>'time.sleep(1)'</expression>
</inVariable>
- <block localId="5" width="125" height="80" typeName="python_eval" instanceName="py1">
- <position x="650" y="180"/>
+ <block localId="5" width="125" height="80" typeName="python_eval" instanceName="py1" executionOrderId="0">
+ <position x="650" y="400"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="215"/>
- <position x="285" y="215"/>
- <position x="285" y="260"/>
- <position x="250" y="260"/>
+ <position x="650" y="435"/>
+ <position x="285" y="435"/>
+ <position x="285" y="480"/>
+ <position x="250" y="480"/>
</connection>
</connectionPointIn>
</variable>
@@ -233,8 +262,8 @@
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="4">
- <position x="650" y="245"/>
- <position x="455" y="245"/>
+ <position x="650" y="465"/>
+ <position x="455" y="465"/>
</connection>
</connectionPointIn>
</variable>
@@ -253,15 +282,15 @@
</variable>
</outputVariables>
</block>
- <block localId="7" width="70" height="45" typeName="NOT">
- <position x="180" y="230"/>
+ <block localId="7" width="70" height="45" typeName="NOT" executionOrderId="0">
+ <position x="180" y="450"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="3">
- <position x="180" y="260"/>
- <position x="155" y="260"/>
+ <position x="180" y="480"/>
+ <position x="155" y="480"/>
</connection>
</connectionPointIn>
</variable>
@@ -275,17 +304,17 @@
</variable>
</outputVariables>
</block>
- <inOutVariable localId="3" height="30" width="120">
- <position x="35" y="245"/>
+ <inOutVariable localId="3" height="30" width="120" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="35" y="465"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="35" y="260"/>
- <position x="25" y="260"/>
- <position x="25" y="220"/>
- <position x="270" y="220"/>
- <position x="270" y="260"/>
- <position x="250" y="260"/>
+ <position x="35" y="480"/>
+ <position x="25" y="480"/>
+ <position x="25" y="440"/>
+ <position x="270" y="440"/>
+ <position x="270" y="480"/>
+ <position x="250" y="480"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -293,17 +322,17 @@
</connectionPointOut>
<expression>pytest_var2</expression>
</inOutVariable>
- <block localId="8" width="125" height="80" typeName="python_eval" instanceName="Block1">
- <position x="650" y="295"/>
+ <block localId="8" width="125" height="80" typeName="python_eval" instanceName="Block1" executionOrderId="0">
+ <position x="650" y="515"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="330"/>
- <position x="285" y="330"/>
- <position x="285" y="260"/>
- <position x="250" y="260"/>
+ <position x="650" y="550"/>
+ <position x="285" y="550"/>
+ <position x="285" y="480"/>
+ <position x="250" y="480"/>
</connection>
</connectionPointIn>
</variable>
@@ -311,8 +340,8 @@
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="9">
- <position x="650" y="360"/>
- <position x="585" y="360"/>
+ <position x="650" y="580"/>
+ <position x="585" y="580"/>
</connection>
</connectionPointIn>
</variable>
@@ -331,31 +360,31 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="9" height="30" width="290">
- <position x="295" y="345"/>
+ <inVariable localId="9" height="30" width="290" executionOrderId="0" negated="false">
+ <position x="295" y="565"/>
<connectionPointOut>
<relPosition x="290" y="15"/>
</connectionPointOut>
<expression>'sys.stdout.write("FBID :"+str(FBID)+"\n")'</expression>
</inVariable>
- <inVariable localId="11" height="30" width="290">
- <position x="295" y="465"/>
+ <inVariable localId="11" height="30" width="290" executionOrderId="0" negated="false">
+ <position x="295" y="685"/>
<connectionPointOut>
<relPosition x="290" y="15"/>
</connectionPointOut>
<expression>'PLCBinary.Simple_C_Call(5678)'</expression>
</inVariable>
- <block localId="12" width="125" height="80" typeName="python_eval" instanceName="Block2">
- <position x="650" y="417"/>
+ <block localId="12" width="125" height="80" typeName="python_eval" instanceName="Block2" executionOrderId="0">
+ <position x="650" y="637"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="33"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="450"/>
- <position x="285" y="450"/>
- <position x="285" y="260"/>
- <position x="250" y="260"/>
+ <position x="650" y="670"/>
+ <position x="285" y="670"/>
+ <position x="285" y="480"/>
+ <position x="250" y="480"/>
</connection>
</connectionPointIn>
</variable>
@@ -363,8 +392,8 @@
<connectionPointIn>
<relPosition x="0" y="63"/>
<connection refLocalId="11">
- <position x="650" y="480"/>
- <position x="585" y="480"/>
+ <position x="650" y="700"/>
+ <position x="585" y="700"/>
</connection>
</connectionPointIn>
</variable>
@@ -383,24 +412,24 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="14" height="30" width="290">
- <position x="290" y="590"/>
+ <inVariable localId="14" height="30" width="290" executionOrderId="0" negated="false">
+ <position x="290" y="810"/>
<connectionPointOut>
<relPosition x="290" y="15"/>
</connectionPointOut>
<expression>'MyPythonFunc(42)'</expression>
</inVariable>
- <block localId="15" width="125" height="80" typeName="python_eval" instanceName="Block3">
- <position x="650" y="542"/>
+ <block localId="15" width="125" height="80" typeName="python_eval" instanceName="Block3" executionOrderId="0">
+ <position x="650" y="762"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="33"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="575"/>
- <position x="285" y="575"/>
- <position x="285" y="260"/>
- <position x="250" y="260"/>
+ <position x="650" y="795"/>
+ <position x="285" y="795"/>
+ <position x="285" y="480"/>
+ <position x="250" y="480"/>
</connection>
</connectionPointIn>
</variable>
@@ -408,8 +437,8 @@
<connectionPointIn>
<relPosition x="0" y="63"/>
<connection refLocalId="14">
- <position x="650" y="605"/>
- <position x="580" y="605"/>
+ <position x="650" y="825"/>
+ <position x="580" y="825"/>
</connection>
</connectionPointIn>
</variable>
@@ -429,20 +458,22 @@
</outputVariables>
</block>
<comment localId="16" height="90" width="680">
- <position x="50" y="25"/>
+ <position x="35" y="275"/>
<content>
- <xhtml:p><![CDATA[This example test that, despite of 2T period clock stimulating TRIG pin of pyth_eval blocks, blocks keep executing one after the other, in respect of execution order.]]></xhtml:p>
+ <xhtml:p><![CDATA[This part of the example test that, despite of 2T period clock stimulating TRIG pin of pyth_eval blocks, blocks keep executing one after the other, in respect of execution order.]]></xhtml:p>
</content>
</comment>
- <block localId="17" width="80" height="120" typeName="MUX">
- <position x="1065" y="495"/>
+ <block localId="17" width="80" height="120" typeName="MUX" executionOrderId="0">
+ <position x="1065" y="715"/>
<inputVariables>
<variable formalParameter="K">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="18">
- <position x="1065" y="525"/>
- <position x="1030" y="525"/>
+ <position x="1065" y="745"/>
+ <position x="1040" y="745"/>
+ <position x="1040" y="735"/>
+ <position x="1015" y="735"/>
</connection>
</connectionPointIn>
</variable>
@@ -450,10 +481,10 @@
<connectionPointIn>
<relPosition x="0" y="50"/>
<connection refLocalId="5" formalParameter="RESULT">
- <position x="1065" y="545"/>
- <position x="905" y="545"/>
- <position x="905" y="245"/>
- <position x="775" y="245"/>
+ <position x="1065" y="765"/>
+ <position x="905" y="765"/>
+ <position x="905" y="465"/>
+ <position x="775" y="465"/>
</connection>
</connectionPointIn>
</variable>
@@ -461,10 +492,10 @@
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="8" formalParameter="RESULT">
- <position x="1065" y="565"/>
- <position x="890" y="565"/>
- <position x="890" y="360"/>
- <position x="775" y="360"/>
+ <position x="1065" y="785"/>
+ <position x="890" y="785"/>
+ <position x="890" y="580"/>
+ <position x="775" y="580"/>
</connection>
</connectionPointIn>
</variable>
@@ -472,10 +503,10 @@
<connectionPointIn>
<relPosition x="0" y="90"/>
<connection refLocalId="12" formalParameter="RESULT">
- <position x="1065" y="585"/>
- <position x="875" y="585"/>
- <position x="875" y="480"/>
- <position x="775" y="480"/>
+ <position x="1065" y="805"/>
+ <position x="875" y="805"/>
+ <position x="875" y="700"/>
+ <position x="775" y="700"/>
</connection>
</connectionPointIn>
</variable>
@@ -483,8 +514,8 @@
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="15" formalParameter="RESULT">
- <position x="1065" y="605"/>
- <position x="775" y="605"/>
+ <position x="1065" y="825"/>
+ <position x="775" y="825"/>
</connection>
</connectionPointIn>
</variable>
@@ -498,33 +529,28 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="18" height="30" width="20">
- <position x="1010" y="510"/>
- <connectionPointOut>
- <relPosition x="20" y="15"/>
- </connectionPointOut>
- <expression>3</expression>
- </inVariable>
- <outVariable localId="19" height="35" width="125">
- <position x="1185" y="510"/>
+ <outVariable localId="19" height="35" width="125" executionOrderId="0" negated="false">
+ <position x="1235" y="730"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="17" formalParameter="OUT">
- <position x="1185" y="525"/>
- <position x="1145" y="525"/>
+ <position x="1235" y="745"/>
+ <position x="1145" y="745"/>
</connection>
</connectionPointIn>
<expression>pytest_var1</expression>
</outVariable>
- <block localId="21" width="80" height="120" typeName="MUX">
- <position x="985" y="165"/>
+ <block localId="21" width="80" height="120" typeName="MUX" executionOrderId="0">
+ <position x="1070" y="385"/>
<inputVariables>
<variable formalParameter="K">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="22">
- <position x="985" y="195"/>
- <position x="950" y="195"/>
+ <position x="1070" y="415"/>
+ <position x="1040" y="415"/>
+ <position x="1040" y="405"/>
+ <position x="1010" y="405"/>
</connection>
</connectionPointIn>
</variable>
@@ -532,8 +558,8 @@
<connectionPointIn>
<relPosition x="0" y="50"/>
<connection refLocalId="5" formalParameter="ACK">
- <position x="985" y="215"/>
- <position x="775" y="215"/>
+ <position x="1070" y="435"/>
+ <position x="775" y="435"/>
</connection>
</connectionPointIn>
</variable>
@@ -541,10 +567,10 @@
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="8" formalParameter="ACK">
- <position x="985" y="235"/>
- <position x="805" y="235"/>
- <position x="805" y="330"/>
- <position x="775" y="330"/>
+ <position x="1070" y="455"/>
+ <position x="805" y="455"/>
+ <position x="805" y="550"/>
+ <position x="775" y="550"/>
</connection>
</connectionPointIn>
</variable>
@@ -552,10 +578,10 @@
<connectionPointIn>
<relPosition x="0" y="90"/>
<connection refLocalId="12" formalParameter="ACK">
- <position x="985" y="255"/>
- <position x="820" y="255"/>
- <position x="820" y="450"/>
- <position x="775" y="450"/>
+ <position x="1070" y="475"/>
+ <position x="820" y="475"/>
+ <position x="820" y="670"/>
+ <position x="775" y="670"/>
</connection>
</connectionPointIn>
</variable>
@@ -563,10 +589,10 @@
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="15" formalParameter="ACK">
- <position x="985" y="275"/>
- <position x="835" y="275"/>
- <position x="835" y="575"/>
- <position x="775" y="575"/>
+ <position x="1070" y="495"/>
+ <position x="835" y="495"/>
+ <position x="835" y="795"/>
+ <position x="775" y="795"/>
</connection>
</connectionPointIn>
</variable>
@@ -580,51 +606,51 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="22" height="30" width="20">
- <position x="930" y="180"/>
- <connectionPointOut>
- <relPosition x="20" y="15"/>
- </connectionPointOut>
- <expression>3</expression>
- </inVariable>
- <outVariable localId="23" height="35" width="125">
- <position x="1150" y="180"/>
+ <inVariable localId="22" height="30" width="65" executionOrderId="0" negated="false">
+ <position x="945" y="390"/>
+ <connectionPointOut>
+ <relPosition x="65" y="15"/>
+ </connectionPointOut>
+ <expression>mux1_sel</expression>
+ </inVariable>
+ <outVariable localId="23" height="35" width="125" executionOrderId="0" negated="false">
+ <position x="1235" y="400"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="21" formalParameter="OUT">
- <position x="1150" y="195"/>
- <position x="1065" y="195"/>
+ <position x="1235" y="415"/>
+ <position x="1150" y="415"/>
</connection>
</connectionPointIn>
<expression>pytest_var3</expression>
</outVariable>
- <outVariable localId="25" height="30" width="60">
- <position x="520" y="655"/>
+ <outVariable localId="25" height="30" width="60" executionOrderId="0" negated="false">
+ <position x="320" y="1075"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="26" formalParameter="OUT">
- <position x="520" y="670"/>
- <position x="465" y="670"/>
+ <position x="320" y="1090"/>
+ <position x="265" y="1090"/>
</connection>
</connectionPointIn>
<expression>FromC</expression>
</outVariable>
- <inVariable localId="1" height="30" width="30">
- <position x="305" y="655"/>
+ <inVariable localId="1" height="30" width="30" executionOrderId="0" negated="false">
+ <position x="105" y="1075"/>
<connectionPointOut>
<relPosition x="30" y="15"/>
</connectionPointOut>
<expression>23</expression>
</inVariable>
- <block localId="26" width="80" height="45" typeName="C_Pragma" instanceName="C_Pragma0">
- <position x="385" y="640"/>
+ <block localId="26" width="80" height="45" typeName="C_Pragma" instanceName="C_Pragma0" executionOrderId="0">
+ <position x="185" y="1060"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="1">
- <position x="385" y="670"/>
- <position x="335" y="670"/>
+ <position x="185" y="1090"/>
+ <position x="135" y="1090"/>
</connection>
</connectionPointIn>
</variable>
@@ -638,139 +664,129 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="27" height="30" width="90">
- <position x="300" y="770"/>
+ <inVariable localId="27" height="30" width="90" executionOrderId="0" negated="false">
+ <position x="100" y="1190"/>
<connectionPointOut>
<relPosition x="90" y="15"/>
</connectionPointOut>
<expression>TestInput</expression>
</inVariable>
- <outVariable localId="28" height="30" width="105">
- <position x="395" y="705"/>
+ <outVariable localId="28" height="30" width="105" executionOrderId="0" negated="false">
+ <position x="195" y="1125"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="2">
- <position x="395" y="720"/>
- <position x="340" y="720"/>
+ <position x="195" y="1140"/>
+ <position x="140" y="1140"/>
</connection>
</connectionPointIn>
<expression>TestOutput</expression>
</outVariable>
- <outVariable localId="29" height="30" width="85">
- <position x="415" y="770"/>
+ <outVariable localId="29" height="30" width="85" executionOrderId="0" negated="false">
+ <position x="215" y="1190"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="27">
- <position x="415" y="785"/>
- <position x="390" y="785"/>
+ <position x="215" y="1205"/>
+ <position x="190" y="1205"/>
</connection>
</connectionPointIn>
<expression>FromInput</expression>
</outVariable>
- <inVariable localId="2" height="30" width="30">
- <position x="310" y="705"/>
+ <inVariable localId="2" height="30" width="30" executionOrderId="0" negated="false">
+ <position x="110" y="1125"/>
<connectionPointOut>
<relPosition x="30" y="15"/>
</connectionPointOut>
<expression>10</expression>
</inVariable>
- <comment localId="30" height="90" width="405">
- <position x="245" y="825"/>
+ <comment localId="30" height="75" width="465">
+ <position x="50" y="945"/>
<content>
<xhtml:p><![CDATA[You will be ready to use beremiz with C and Python when you will understand why "FromInput" is equal to 75.
-Enjoy. ]]></xhtml:p>
+Happy hacking! ]]></xhtml:p>
</content>
</comment>
<comment localId="31" height="60" width="345">
- <position x="295" y="265"/>
+ <position x="295" y="485"/>
<content>
<xhtml:p><![CDATA[Sleep here is bad. It blocks other py_eval instances. Whith a wxGlade GUI, GUI freeze for a second.]]></xhtml:p>
</content>
</comment>
<comment localId="6" height="60" width="345">
- <position x="295" y="380"/>
+ <position x="295" y="600"/>
<content>
<xhtml:p><![CDATA[Prints FBID to stdout of PLC runtime. FBID is a unique reference to py_eval instance.]]></xhtml:p>
</content>
</comment>
<comment localId="10" height="60" width="345">
- <position x="295" y="500"/>
+ <position x="295" y="720"/>
<content>
<xhtml:p><![CDATA[Simple_C_Call is declared in C_File "1.x:c_code". See python ctypes manual for details on typing.]]></xhtml:p>
</content>
</comment>
<comment localId="32" height="105" width="235">
- <position x="25" y="285"/>
+ <position x="25" y="505"/>
<content>
<xhtml:p><![CDATA[Fast clock, at least faster that sleep(1). See what happens when python takes time to answer : PLC continues.]]></xhtml:p>
</content>
</comment>
- <outVariable localId="33" height="30" width="130">
- <position x="1060" y="740"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
+ <outVariable localId="33" height="30" width="130" executionOrderId="0" negated="false">
+ <position x="580" y="1564"/>
+ <connectionPointIn>
+ <relPosition x="0" y="16"/>
<connection refLocalId="35" formalParameter="OUT">
- <position x="1060" y="755"/>
- <position x="1005" y="755"/>
+ <position x="580" y="1580"/>
+ <position x="370" y="1580"/>
</connection>
</connectionPointIn>
<expression>Test_BCD_RESULT</expression>
</outVariable>
- <inVariable localId="34" height="30" width="75">
- <position x="785" y="740"/>
- <connectionPointOut>
- <relPosition x="75" y="15"/>
+ <inVariable localId="34" height="30" width="75" executionOrderId="0" negated="false">
+ <position x="60" y="1564"/>
+ <connectionPointOut>
+ <relPosition x="75" y="16"/>
</connectionPointOut>
<expression>Test_BCD</expression>
</inVariable>
- <block localId="35" width="105" height="60" typeName="BCD_TO_UINT">
- <position x="900" y="705"/>
- <inputVariables>
- <variable formalParameter="EN">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- </connectionPointIn>
- </variable>
+ <block localId="35" width="105" height="60" typeName="BCD_TO_UINT" executionOrderId="0">
+ <position x="265" y="1539"/>
+ <inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
- <relPosition x="0" y="50"/>
+ <relPosition x="0" y="41"/>
<connection refLocalId="34">
- <position x="900" y="755"/>
- <position x="860" y="755"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="ENO">
- <connectionPointOut>
- <relPosition x="105" y="30"/>
- </connectionPointOut>
- </variable>
+ <position x="265" y="1580"/>
+ <position x="135" y="1580"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="105" y="50"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="36" height="30" width="65">
- <position x="790" y="815"/>
- <connectionPointOut>
- <relPosition x="65" y="15"/>
+ <relPosition x="105" y="41"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="36" height="30" width="65" executionOrderId="0" negated="false">
+ <position x="60" y="1774"/>
+ <connectionPointOut>
+ <relPosition x="65" y="16"/>
</connectionPointOut>
<expression>Test_DT</expression>
</inVariable>
- <block localId="37" width="255" height="45" typeName="DATE_AND_TIME_TO_TIME_OF_DAY">
- <position x="900" y="800"/>
+ <block localId="37" width="255" height="45" typeName="DATE_AND_TIME_TO_TIME_OF_DAY" executionOrderId="0">
+ <position x="265" y="1759"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="31"/>
<connection refLocalId="36">
- <position x="900" y="830"/>
- <position x="855" y="830"/>
+ <position x="265" y="1790"/>
+ <position x="125" y="1790"/>
</connection>
</connectionPointIn>
</variable>
@@ -779,22 +795,22 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="255" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <block localId="38" width="195" height="45" typeName="DATE_AND_TIME_TO_DATE">
- <position x="900" y="875"/>
+ <relPosition x="255" y="31"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="38" width="195" height="45" typeName="DATE_AND_TIME_TO_DATE" executionOrderId="0">
+ <position x="265" y="1834"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="31"/>
<connection refLocalId="36">
- <position x="900" y="905"/>
- <position x="877" y="905"/>
- <position x="877" y="830"/>
- <position x="855" y="830"/>
+ <position x="265" y="1865"/>
+ <position x="242" y="1865"/>
+ <position x="242" y="1790"/>
+ <position x="125" y="1790"/>
</connection>
</connectionPointIn>
</variable>
@@ -803,53 +819,53 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="195" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <outVariable localId="40" height="30" width="80">
- <position x="1215" y="890"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
+ <relPosition x="195" y="31"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <outVariable localId="40" height="30" width="80" executionOrderId="0" negated="false">
+ <position x="580" y="1849"/>
+ <connectionPointIn>
+ <relPosition x="0" y="16"/>
<connection refLocalId="38" formalParameter="OUT">
- <position x="1215" y="905"/>
- <position x="1095" y="905"/>
+ <position x="580" y="1865"/>
+ <position x="460" y="1865"/>
</connection>
</connectionPointIn>
<expression>Test_Date</expression>
</outVariable>
- <outVariable localId="42" height="30" width="90">
- <position x="1100" y="985"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
+ <outVariable localId="42" height="30" width="90" executionOrderId="0" negated="false">
+ <position x="465" y="1944"/>
+ <connectionPointIn>
+ <relPosition x="0" y="16"/>
<connection refLocalId="46" formalParameter="OUT">
- <position x="1100" y="1000"/>
- <position x="1030" y="1000"/>
+ <position x="465" y="1960"/>
+ <position x="395" y="1960"/>
</connection>
</connectionPointIn>
<expression>Test_String</expression>
</outVariable>
- <outVariable localId="43" height="30" width="80">
- <position x="1100" y="1055"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
+ <outVariable localId="43" height="30" width="80" executionOrderId="0" negated="false">
+ <position x="465" y="2014"/>
+ <connectionPointIn>
+ <relPosition x="0" y="16"/>
<connection refLocalId="44" formalParameter="OUT">
- <position x="1100" y="1070"/>
- <position x="1035" y="1070"/>
+ <position x="465" y="2030"/>
+ <position x="400" y="2030"/>
</connection>
</connectionPointIn>
<expression>Test_Bool</expression>
</outVariable>
- <block localId="44" width="135" height="45" typeName="STRING_TO_BOOL">
- <position x="900" y="1040"/>
+ <block localId="44" width="135" height="45" typeName="STRING_TO_BOOL" executionOrderId="0">
+ <position x="265" y="1999"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="31"/>
<connection refLocalId="45">
- <position x="900" y="1070"/>
- <position x="850" y="1070"/>
+ <position x="265" y="2030"/>
+ <position x="115" y="2030"/>
</connection>
</connectionPointIn>
</variable>
@@ -858,27 +874,27 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="135" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="45" height="30" width="55">
- <position x="795" y="1055"/>
- <connectionPointOut>
- <relPosition x="55" y="15"/>
+ <relPosition x="135" y="31"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="45" height="30" width="55" executionOrderId="0" negated="false">
+ <position x="60" y="2014"/>
+ <connectionPointOut>
+ <relPosition x="55" y="16"/>
</connectionPointOut>
<expression>'True'</expression>
</inVariable>
- <block localId="46" width="130" height="45" typeName="INT_TO_STRING">
- <position x="900" y="970"/>
+ <block localId="46" width="130" height="45" typeName="INT_TO_STRING" executionOrderId="0">
+ <position x="265" y="1929"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="31"/>
<connection refLocalId="58">
- <position x="900" y="1000"/>
- <position x="840" y="1000"/>
+ <position x="265" y="1960"/>
+ <position x="205" y="1960"/>
</connection>
</connectionPointIn>
</variable>
@@ -887,27 +903,27 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="130" y="30"/>
+ <relPosition x="130" y="31"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="50" height="30" width="105" executionOrderId="0" negated="false">
- <position x="200" y="1085"/>
+ <position x="75" y="2275"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
<expression>Global_RS.Q1</expression>
</inVariable>
<block localId="51" width="70" height="85" typeName="AND" executionOrderId="0">
- <position x="365" y="1065"/>
+ <position x="240" y="2255"/>
<inputVariables>
<variable formalParameter="IN1" negated="true">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="50">
- <position x="365" y="1100"/>
- <position x="305" y="1100"/>
+ <position x="240" y="2290"/>
+ <position x="180" y="2290"/>
</connection>
</connectionPointIn>
</variable>
@@ -915,8 +931,8 @@
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="52">
- <position x="365" y="1135"/>
- <position x="305" y="1135"/>
+ <position x="240" y="2325"/>
+ <position x="180" y="2325"/>
</connection>
</connectionPointIn>
</variable>
@@ -930,51 +946,51 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="52" height="30" width="95">
- <position x="210" y="1120"/>
- <connectionPointOut>
- <relPosition x="95" y="15"/>
+ <inVariable localId="52" height="30" width="105" executionOrderId="0" negated="false">
+ <position x="75" y="2310"/>
+ <connectionPointOut>
+ <relPosition x="105" y="15"/>
</connectionPointOut>
<expression>BOOL#TRUE</expression>
</inVariable>
<outVariable localId="13" height="30" width="105" executionOrderId="0" negated="false">
- <position x="510" y="1085"/>
+ <position x="385" y="2275"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="51" formalParameter="OUT">
- <position x="510" y="1100"/>
- <position x="435" y="1100"/>
+ <position x="385" y="2290"/>
+ <position x="310" y="2290"/>
</connection>
</connectionPointIn>
<expression>Global_RS.S</expression>
</outVariable>
<outVariable localId="20" height="30" width="105" executionOrderId="0" negated="false">
- <position x="510" y="1200"/>
+ <position x="385" y="2390"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="41" formalParameter="OUT">
- <position x="510" y="1215"/>
- <position x="435" y="1215"/>
+ <position x="385" y="2405"/>
+ <position x="310" y="2405"/>
</connection>
</connectionPointIn>
<expression>Global_RS.R1</expression>
</outVariable>
<inVariable localId="24" height="30" width="105" executionOrderId="0" negated="false">
- <position x="200" y="1200"/>
+ <position x="75" y="2390"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
<expression>Global_RS.Q1</expression>
</inVariable>
<block localId="41" width="70" height="85" typeName="OR" executionOrderId="0">
- <position x="365" y="1180"/>
+ <position x="240" y="2370"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="24">
- <position x="365" y="1215"/>
- <position x="305" y="1215"/>
+ <position x="240" y="2405"/>
+ <position x="180" y="2405"/>
</connection>
</connectionPointIn>
</variable>
@@ -982,8 +998,8 @@
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="48">
- <position x="365" y="1250"/>
- <position x="305" y="1250"/>
+ <position x="240" y="2440"/>
+ <position x="180" y="2440"/>
</connection>
</connectionPointIn>
</variable>
@@ -997,46 +1013,33 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="48" height="30" width="100">
- <position x="205" y="1235"/>
- <connectionPointOut>
- <relPosition x="100" y="15"/>
+ <inVariable localId="48" height="30" width="105" executionOrderId="0" negated="false">
+ <position x="75" y="2425"/>
+ <connectionPointOut>
+ <relPosition x="105" y="15"/>
</connectionPointOut>
<expression>BOOL#FALSE</expression>
</inVariable>
- <outVariable localId="53" height="30" width="115">
- <position x="1060" y="700"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
- <connection refLocalId="35" formalParameter="ENO">
- <position x="1060" y="715"/>
- <position x="1032" y="715"/>
- <position x="1032" y="735"/>
- <position x="1005" y="735"/>
- </connection>
- </connectionPointIn>
- <expression>Test_BCD_ENO</expression>
- </outVariable>
- <outVariable localId="54" height="30" width="135">
- <position x="1565" y="815"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
+ <outVariable localId="54" height="30" width="135" executionOrderId="0" negated="false">
+ <position x="930" y="1774"/>
+ <connectionPointIn>
+ <relPosition x="0" y="16"/>
<connection refLocalId="55" formalParameter="OUT">
- <position x="1565" y="830"/>
- <position x="1490" y="830"/>
+ <position x="930" y="1790"/>
+ <position x="855" y="1790"/>
</connection>
</connectionPointIn>
<expression>Test_TOD_STRING</expression>
</outVariable>
- <block localId="55" width="125" height="45" typeName="TOD_TO_STRING">
- <position x="1365" y="800"/>
+ <block localId="55" width="125" height="45" typeName="TOD_TO_STRING" executionOrderId="0">
+ <position x="730" y="1759"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="31"/>
<connection refLocalId="39">
- <position x="1365" y="830"/>
- <position x="1290" y="830"/>
+ <position x="730" y="1790"/>
+ <position x="655" y="1790"/>
</connection>
</connectionPointIn>
</variable>
@@ -1045,90 +1048,90 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="125" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inOutVariable localId="39" height="30" width="75">
- <position x="1215" y="815"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
+ <relPosition x="125" y="31"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inOutVariable localId="39" height="30" width="75" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="580" y="1774"/>
+ <connectionPointIn>
+ <relPosition x="0" y="16"/>
<connection refLocalId="37" formalParameter="OUT">
- <position x="1215" y="830"/>
- <position x="1155" y="830"/>
- </connection>
- </connectionPointIn>
- <connectionPointOut>
- <relPosition x="75" y="15"/>
+ <position x="580" y="1790"/>
+ <position x="520" y="1790"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="75" y="16"/>
</connectionPointOut>
<expression>Test_TOD</expression>
</inOutVariable>
- <inVariable localId="49" height="30" width="30">
- <position x="765" y="1200"/>
+ <inVariable localId="49" height="30" width="30" executionOrderId="0" negated="false">
+ <position x="160" y="2510"/>
<connectionPointOut>
<relPosition x="30" y="15"/>
</connectionPointOut>
<expression>42</expression>
</inVariable>
- <outVariable localId="57" height="30" width="50">
- <position x="845" y="1200"/>
+ <outVariable localId="57" height="30" width="50" executionOrderId="0" negated="false">
+ <position x="240" y="2510"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="49">
- <position x="845" y="1215"/>
- <position x="795" y="1215"/>
+ <position x="240" y="2525"/>
+ <position x="190" y="2525"/>
</connection>
</connectionPointIn>
<expression>TOTO</expression>
</outVariable>
- <outVariable localId="56" height="30" width="50">
- <position x="845" y="1240"/>
+ <outVariable localId="56" height="30" width="50" executionOrderId="0" negated="false">
+ <position x="240" y="2550"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="49">
- <position x="845" y="1255"/>
- <position x="820" y="1255"/>
- <position x="820" y="1215"/>
- <position x="795" y="1215"/>
+ <position x="240" y="2565"/>
+ <position x="215" y="2565"/>
+ <position x="215" y="2525"/>
+ <position x="190" y="2525"/>
</connection>
</connectionPointIn>
<expression>TUTU</expression>
</outVariable>
- <inVariable localId="58" height="30" width="145">
- <position x="715" y="985"/>
- <connectionPointOut>
- <relPosition x="145" y="15"/>
+ <inVariable localId="58" height="30" width="145" executionOrderId="0" negated="false">
+ <position x="60" y="1944"/>
+ <connectionPointOut>
+ <relPosition x="145" y="16"/>
</connectionPointOut>
<expression>Second_Python_Var</expression>
</inVariable>
- <outVariable localId="47" height="30" width="125">
- <position x="400" y="975"/>
+ <outVariable localId="47" height="30" width="125" executionOrderId="0" negated="false">
+ <position x="200" y="1385"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="59">
- <position x="400" y="990"/>
- <position x="330" y="990"/>
+ <position x="200" y="1400"/>
+ <position x="130" y="1400"/>
</connection>
</connectionPointIn>
<expression>Test_Python_Var</expression>
</outVariable>
- <inVariable localId="59" height="30" width="30">
- <position x="300" y="975"/>
+ <inVariable localId="59" height="30" width="30" executionOrderId="0" negated="false">
+ <position x="100" y="1385"/>
<connectionPointOut>
<relPosition x="30" y="15"/>
</connectionPointOut>
<expression>23</expression>
</inVariable>
<block localId="61" typeName="function0" executionOrderId="0" height="45" width="110">
- <position x="1680" y="255"/>
+ <position x="760" y="1170"/>
<inputVariables>
<variable formalParameter="LocalVar0">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="62">
- <position x="1680" y="285"/>
- <position x="1640" y="285"/>
+ <position x="760" y="1200"/>
+ <position x="720" y="1200"/>
</connection>
</connectionPointIn>
</variable>
@@ -1143,23 +1146,147 @@
</outputVariables>
</block>
<inVariable localId="62" executionOrderId="0" height="30" width="55" negated="false">
- <position x="1585" y="270"/>
+ <position x="665" y="1185"/>
<connectionPointOut>
<relPosition x="55" y="15"/>
</connectionPointOut>
<expression>fefvsd</expression>
</inVariable>
<outVariable localId="63" executionOrderId="0" height="30" width="55" negated="false">
- <position x="1825" y="270"/>
+ <position x="905" y="1185"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="61" formalParameter="OUT">
- <position x="1825" y="285"/>
- <position x="1790" y="285"/>
+ <position x="905" y="1200"/>
+ <position x="870" y="1200"/>
</connection>
</connectionPointIn>
<expression>fefvsd</expression>
</outVariable>
+ <comment localId="53" height="65" width="420">
+ <position x="75" y="2160"/>
+ <content>
+ <xhtml:p><![CDATA[Shows global variables access from resource configuration (res_pytest) and from project's configuration.]]></xhtml:p>
+ </content>
+ </comment>
+ <inVariable localId="18" height="30" width="65" executionOrderId="0" negated="false">
+ <position x="950" y="720"/>
+ <connectionPointOut>
+ <relPosition x="65" y="15"/>
+ </connectionPointOut>
+ <expression>mux2_sel</expression>
+ </inVariable>
+ <comment localId="60" height="45" width="930">
+ <position x="60" y="1480"/>
+ <content>
+ <xhtml:p><![CDATA[Here is shown how to convert values between different types (BCD, DT, TOD, STRING and others) using standard functions.]]></xhtml:p>
+ </content>
+ </comment>
+ <comment localId="64" height="55" width="300">
+ <position x="665" y="1095"/>
+ <content>
+ <xhtml:p><![CDATA[Example of usage of user-defined function.]]></xhtml:p>
+ </content>
+ </comment>
+ <comment localId="65" height="45" width="410">
+ <position x="55" y="1315"/>
+ <content>
+ <xhtml:p><![CDATA[Shows access variable defined in python extension. ]]></xhtml:p>
+ </content>
+ </comment>
+ <inVariable localId="66" height="30" width="130" executionOrderId="0" negated="false">
+ <position x="60" y="1685"/>
+ <connectionPointOut>
+ <relPosition x="130" y="15"/>
+ </connectionPointOut>
+ <expression>Test_BCD_WRONG</expression>
+ </inVariable>
+ <block localId="67" width="105" height="100" typeName="BCD_TO_UINT" executionOrderId="0">
+ <position x="265" y="1620"/>
+ <inputVariables>
+ <variable formalParameter="EN">
+ <connectionPointIn>
+ <relPosition x="0" y="40"/>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN">
+ <connectionPointIn>
+ <relPosition x="0" y="80"/>
+ <connection refLocalId="66">
+ <position x="265" y="1700"/>
+ <position x="255" y="1700"/>
+ <position x="255" y="1700"/>
+ <position x="345" y="1700"/>
+ <position x="345" y="1700"/>
+ <position x="190" y="1700"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="ENO">
+ <connectionPointOut>
+ <relPosition x="105" y="40"/>
+ </connectionPointOut>
+ </variable>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="105" y="80"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <outVariable localId="68" height="30" width="185" executionOrderId="0" negated="false">
+ <position x="580" y="1685"/>
+ <connectionPointIn>
+ <relPosition x="0" y="15"/>
+ <connection refLocalId="67" formalParameter="OUT">
+ <position x="580" y="1700"/>
+ <position x="370" y="1700"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Test_BCD_WRONG_RESULT</expression>
+ </outVariable>
+ <comment localId="69" height="135" width="375">
+ <position x="795" y="1590"/>
+ <content>
+ <xhtml:p><![CDATA[Incorrect BCD number is not converted to UINT.
+
+151 (16#97) is good BCD number , but
+154 (16#9A) is not.
+
+Try this out and look at value of Test_BCD_CONVERTED variable.
+
+
+]]></xhtml:p>
+ </content>
+ </comment>
+ <outVariable localId="70" height="30" width="185" executionOrderId="0" negated="false">
+ <position x="580" y="1645"/>
+ <connectionPointIn>
+ <relPosition x="0" y="15"/>
+ <connection refLocalId="67" formalParameter="ENO">
+ <position x="580" y="1660"/>
+ <position x="370" y="1660"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Test_BCD_CONVERTED</expression>
+ </outVariable>
+ <comment localId="71" height="170" width="680">
+ <position x="35" y="30"/>
+ <content>
+ <xhtml:p><![CDATA[This example shows many features in Beremiz:
+
+ 1. How to implement python extensions.
+ 2. How to implement basic C extension.
+ 3. How to use C code in IEC POUs.
+ 4. How to call C functions from python code.
+ 5. How to avoid race conditions between IEC, C and python code.
+ 6. How to convert betweet different IEC types.
+]]></xhtml:p>
+ </content>
+ </comment>
</FBD>
</body>
</pou>
@@ -1243,7 +1370,7 @@
SetFbVar(COORDS, somebyte, .table[4]);
}
}}
-(* If you do not use __GET_VAR and _SET_VAR macro, expect unexpected *)
+(* If you do not use GetFbVar and SetFbVar macros, expect unexpected behaviour*)
Global_RS();
]]></xhtml:p>
</ST>
diff -r 6431f26aa501 -r 3291024e00da tests/svgui/plc.xml
--- a/tests/svgui/plc.xml Thu Feb 16 14:34:40 2017 +0500
+++ b/tests/svgui/plc.xml Thu Feb 16 14:35:12 2017 +0500
@@ -1,14 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.plcopen.org/xml/tc6.xsd"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
- <fileHeader companyName="beremiz"
- productName="Beremiz"
- productVersion="0.0"
- creationDateTime="2008-12-14T16:21:19"/>
- <contentHeader name="Beremiz Python Support Tests"
- modificationDateTime="2009-09-26T18:14:56">
+<?xml version='1.0' encoding='utf-8'?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201">
+ <fileHeader companyName="beremiz" productName="Beremiz" productVersion="0.0" creationDateTime="2008-12-14T16:21:19"/>
+ <contentHeader name="Beremiz SVGUI Test" modificationDateTime="2016-10-20T12:38:31">
<coordinateInfo>
<pageSize x="1024" y="1024"/>
<fbd>
@@ -33,57 +26,17 @@
<INT/>
</type>
</variable>
- <variable name="DigitalBit0">
- <type>
- <BOOL/>
- </type>
- </variable>
- <variable name="DigitalBit1">
- <type>
- <BOOL/>
- </type>
- </variable>
- <variable name="DigitalBit2">
- <type>
- <BOOL/>
- </type>
- </variable>
- <variable name="DigitalBit3">
- <type>
- <BOOL/>
- </type>
- </variable>
- <variable name="DigitalBit4">
- <type>
- <BOOL/>
- </type>
- </variable>
- <variable name="DigitalBit5">
- <type>
- <BOOL/>
- </type>
- </variable>
- <variable name="DigitalBit6">
- <type>
- <BOOL/>
- </type>
- </variable>
- <variable name="DigitalBit7">
- <type>
- <BOOL/>
- </type>
- </variable>
<variable name="Start_Stop">
<type>
<derived name="Button"/>
</type>
</variable>
- <variable name="Compteur">
+ <variable name="Counter_TextCtrl">
<type>
<derived name="TextCtrl"/>
</type>
</variable>
- <variable name="Temoin">
+ <variable name="State_LedCtrl">
<type>
<derived name="Led"/>
</type>
@@ -92,15 +45,15 @@
</interface>
<body>
<FBD>
- <block localId="32" width="80" height="110" typeName="ADD">
- <position x="665" y="420"/>
+ <block localId="32" width="80" height="110" typeName="ADD" executionOrderId="0">
+ <position x="649" y="241"/>
<inputVariables>
<variable formalParameter="EN">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="5">
- <position x="665" y="455"/>
- <position x="610" y="455"/>
+ <position x="649" y="276"/>
+ <position x="594" y="276"/>
</connection>
</connectionPointIn>
</variable>
@@ -108,8 +61,8 @@
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="100" formalParameter="OUT">
- <position x="665" y="485"/>
- <position x="490" y="485"/>
+ <position x="649" y="306"/>
+ <position x="474" y="306"/>
</connection>
</connectionPointIn>
</variable>
@@ -117,12 +70,12 @@
<connectionPointIn>
<relPosition x="0" y="95"/>
<connection refLocalId="33">
- <position x="665" y="515"/>
- <position x="645" y="515"/>
- <position x="645" y="555"/>
- <position x="870" y="555"/>
- <position x="870" y="485"/>
- <position x="855" y="485"/>
+ <position x="649" y="336"/>
+ <position x="629" y="336"/>
+ <position x="629" y="374"/>
+ <position x="854" y="374"/>
+ <position x="854" y="306"/>
+ <position x="839" y="306"/>
</connection>
</connectionPointIn>
</variable>
@@ -141,71 +94,71 @@
</variable>
</outputVariables>
</block>
- <inOutVariable localId="33" height="35" width="85">
- <position x="770" y="470"/>
+ <inOutVariable localId="33" height="35" width="85" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="754" y="289"/>
<connectionPointIn>
- <relPosition x="0" y="15"/>
+ <relPosition x="0" y="17"/>
<connection refLocalId="32" formalParameter="OUT">
- <position x="770" y="485"/>
- <position x="745" y="485"/>
+ <position x="754" y="306"/>
+ <position x="729" y="306"/>
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="85" y="15"/>
+ <relPosition x="85" y="17"/>
</connectionPointOut>
<expression>counter</expression>
</inOutVariable>
- <inVariable localId="39" height="35" width="70">
- <position x="90" y="470"/>
- <connectionPointOut>
- <relPosition x="70" y="15"/>
+ <inVariable localId="39" height="35" width="89" executionOrderId="0" negated="false">
+ <position x="55" y="289"/>
+ <connectionPointOut>
+ <relPosition x="89" y="17"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
- <inVariable localId="41" height="30" width="120">
- <position x="45" y="180"/>
+ <inVariable localId="41" height="30" width="120" executionOrderId="0" negated="false">
+ <position x="21" y="575"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'stop_back'</expression>
</inVariable>
- <inVariable localId="42" height="30" width="120">
- <position x="45" y="225"/>
+ <inVariable localId="42" height="30" width="120" executionOrderId="0" negated="false">
+ <position x="21" y="617"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'stop_sele'</expression>
</inVariable>
- <inVariable localId="46" height="30" width="180">
- <position x="675" y="265"/>
- <connectionPointOut>
- <relPosition x="180" y="15"/>
- </connectionPointOut>
- <expression>'text_compteur'</expression>
- </inVariable>
- <inVariable localId="51" height="30" width="110">
- <position x="725" y="80"/>
- <connectionPointOut>
- <relPosition x="110" y="15"/>
+ <inVariable localId="46" height="30" width="121" executionOrderId="0" negated="false">
+ <position x="694" y="755"/>
+ <connectionPointOut>
+ <relPosition x="121" y="15"/>
+ </connectionPointOut>
+ <expression>'text_counter'</expression>
+ </inVariable>
+ <inVariable localId="51" height="30" width="119" executionOrderId="0" negated="false">
+ <position x="692" y="568"/>
+ <connectionPointOut>
+ <relPosition x="119" y="15"/>
</connectionPointOut>
<expression>'led_stop'</expression>
</inVariable>
- <inVariable localId="52" height="30" width="120">
- <position x="715" y="115"/>
+ <inVariable localId="52" height="30" width="120" executionOrderId="0" negated="false">
+ <position x="691" y="604"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'led_start'</expression>
</inVariable>
- <block localId="83" width="145" height="60" typeName="INT_TO_STRING">
- <position x="600" y="320"/>
+ <block localId="83" width="145" height="60" typeName="INT_TO_STRING" executionOrderId="0">
+ <position x="537" y="812"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="40"/>
<connection refLocalId="4">
- <position x="600" y="360"/>
- <position x="555" y="360"/>
+ <position x="537" y="852"/>
+ <position x="504" y="852"/>
</connection>
</connectionPointIn>
</variable>
@@ -219,24 +172,24 @@
</variable>
</outputVariables>
</block>
- <block localId="92" width="200" height="230" typeName="Button" instanceName="Start_Stop">
- <position x="225" y="155"/>
+ <block localId="92" width="187" height="230" typeName="Button" instanceName="Start_Stop" executionOrderId="0">
+ <position x="201" y="549"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
- <relPosition x="0" y="40"/>
+ <relPosition x="0" y="41"/>
<connection refLocalId="41">
- <position x="225" y="195"/>
- <position x="165" y="195"/>
+ <position x="201" y="590"/>
+ <position x="141" y="590"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="sele_id">
<connectionPointIn>
- <relPosition x="0" y="85"/>
+ <relPosition x="0" y="83"/>
<connection refLocalId="42">
- <position x="225" y="240"/>
- <position x="165" y="240"/>
+ <position x="201" y="632"/>
+ <position x="141" y="632"/>
</connection>
</connectionPointIn>
</variable>
@@ -244,19 +197,19 @@
<connectionPointIn>
<relPosition x="0" y="125"/>
<connection refLocalId="93">
- <position x="225" y="280"/>
- <position x="165" y="280"/>
+ <position x="201" y="674"/>
+ <position x="141" y="674"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="set_state">
<connectionPointIn>
- <relPosition x="0" y="165"/>
+ <relPosition x="0" y="167"/>
</connectionPointIn>
</variable>
<variable formalParameter="state_in">
<connectionPointIn>
- <relPosition x="0" y="210"/>
+ <relPosition x="0" y="209"/>
</connectionPointIn>
</variable>
</inputVariables>
@@ -264,45 +217,45 @@
<outputVariables>
<variable formalParameter="state_out">
<connectionPointOut>
- <relPosition x="200" y="40"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="93" height="30" width="70">
- <position x="95" y="265"/>
- <connectionPointOut>
- <relPosition x="70" y="15"/>
+ <relPosition x="187" y="41"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="93" height="30" width="120" executionOrderId="0" negated="false">
+ <position x="21" y="659"/>
+ <connectionPointOut>
+ <relPosition x="120" y="15"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
- <block localId="94" width="100" height="145" typeName="TextCtrl" instanceName="Compteur">
- <position x="900" y="240"/>
+ <block localId="94" width="100" height="145" typeName="TextCtrl" instanceName="Counter_TextCtrl" executionOrderId="0">
+ <position x="876" y="730"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="40"/>
<connection refLocalId="46">
- <position x="900" y="280"/>
- <position x="855" y="280"/>
+ <position x="876" y="770"/>
+ <position x="815" y="770"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="set_text">
<connectionPointIn>
- <relPosition x="0" y="80"/>
+ <relPosition x="0" y="81"/>
<connection refLocalId="3">
- <position x="900" y="320"/>
- <position x="855" y="320"/>
+ <position x="876" y="811"/>
+ <position x="815" y="811"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="text">
<connectionPointIn>
- <relPosition x="0" y="120"/>
+ <relPosition x="0" y="122"/>
<connection refLocalId="83" formalParameter="OUT">
- <position x="900" y="360"/>
- <position x="745" y="360"/>
+ <position x="876" y="852"/>
+ <position x="682" y="852"/>
</connection>
</connectionPointIn>
</variable>
@@ -310,31 +263,31 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="1" height="30" width="70">
- <position x="80" y="85"/>
- <connectionPointOut>
- <relPosition x="70" y="15"/>
+ <inVariable localId="1" height="30" width="88" executionOrderId="0" negated="false">
+ <position x="59" y="220"/>
+ <connectionPointOut>
+ <relPosition x="88" y="15"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
- <block localId="95" width="100" height="130" typeName="Led" instanceName="Temoin">
- <position x="900" y="55"/>
+ <block localId="95" width="100" height="130" typeName="Led" instanceName="State_LedCtrl" executionOrderId="0">
+ <position x="876" y="545"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
- <relPosition x="0" y="40"/>
+ <relPosition x="0" y="38"/>
<connection refLocalId="51">
- <position x="900" y="95"/>
- <position x="835" y="95"/>
+ <position x="876" y="583"/>
+ <position x="811" y="583"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="sele_id">
<connectionPointIn>
- <relPosition x="0" y="75"/>
+ <relPosition x="0" y="74"/>
<connection refLocalId="52">
- <position x="900" y="130"/>
- <position x="835" y="130"/>
+ <position x="876" y="619"/>
+ <position x="811" y="619"/>
</connection>
</connectionPointIn>
</variable>
@@ -342,8 +295,8 @@
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="2">
- <position x="900" y="165"/>
- <position x="835" y="165"/>
+ <position x="876" y="655"/>
+ <position x="811" y="655"/>
</connection>
</connectionPointIn>
</variable>
@@ -351,28 +304,28 @@
<inOutVariables/>
<outputVariables/>
</block>
- <block localId="96" width="80" height="65" typeName="AND">
- <position x="200" y="45"/>
+ <block localId="96" width="80" height="65" typeName="AND" executionOrderId="0">
+ <position x="200" y="182"/>
<inputVariables>
<variable formalParameter="IN1" negated="true">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="31"/>
<connection refLocalId="96" formalParameter="OUT">
- <position x="200" y="75"/>
- <position x="175" y="75"/>
- <position x="175" y="30"/>
- <position x="305" y="30"/>
- <position x="305" y="75"/>
- <position x="280" y="75"/>
+ <position x="200" y="213"/>
+ <position x="175" y="213"/>
+ <position x="175" y="167"/>
+ <position x="305" y="167"/>
+ <position x="305" y="213"/>
+ <position x="280" y="213"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN2">
<connectionPointIn>
- <relPosition x="0" y="55"/>
+ <relPosition x="0" y="53"/>
<connection refLocalId="1">
- <position x="200" y="100"/>
- <position x="150" y="100"/>
+ <position x="200" y="235"/>
+ <position x="147" y="235"/>
</connection>
</connectionPointIn>
</variable>
@@ -381,68 +334,96 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="80" y="30"/>
+ <relPosition x="80" y="31"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<connector name="CLOCK" localId="97" height="30" width="90">
- <position x="345" y="60"/>
+ <position x="345" y="198"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="96" formalParameter="OUT">
- <position x="345" y="75"/>
- <position x="280" y="75"/>
+ <position x="345" y="213"/>
+ <position x="280" y="213"/>
</connection>
</connectionPointIn>
</connector>
<connector name="COUNT" localId="98" height="30" width="90">
- <position x="485" y="180"/>
+ <position x="461" y="575"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="92" formalParameter="state_out">
- <position x="485" y="195"/>
- <position x="425" y="195"/>
+ <position x="461" y="590"/>
+ <position x="388" y="590"/>
</connection>
</connectionPointIn>
</connector>
- <continuation name="COUNT" localId="2" height="30" width="90">
- <position x="745" y="150"/>
+ <continuation name="COUNT" localId="2" height="30" width="120">
+ <position x="691" y="640"/>
+ <connectionPointOut>
+ <relPosition x="120" y="15"/>
+ </connectionPointOut>
+ </continuation>
+ <inVariable localId="4" height="35" width="85" executionOrderId="0" negated="false">
+ <position x="419" y="835"/>
+ <connectionPointOut>
+ <relPosition x="85" y="17"/>
+ </connectionPointOut>
+ <expression>counter</expression>
+ </inVariable>
+ <continuation name="COUNT" localId="5" height="30" width="90">
+ <position x="504" y="261"/>
<connectionPointOut>
<relPosition x="90" y="15"/>
</connectionPointOut>
</continuation>
- <inVariable localId="4" height="35" width="85">
- <position x="470" y="345"/>
- <connectionPointOut>
- <relPosition x="85" y="15"/>
- </connectionPointOut>
- <expression>counter</expression>
- </inVariable>
- <continuation name="COUNT" localId="5" height="30" width="90">
- <position x="520" y="440"/>
+ <block localId="99" width="80" height="110" typeName="AND" executionOrderId="0">
+ <position x="199" y="264"/>
+ <inputVariables>
+ <variable formalParameter="IN1">
+ <connectionPointIn>
+ <relPosition x="0" y="42"/>
+ <connection refLocalId="39">
+ <position x="199" y="306"/>
+ <position x="144" y="306"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ <variable formalParameter="IN2">
+ <connectionPointIn>
+ <relPosition x="0" y="87"/>
+ <connection refLocalId="6">
+ <position x="199" y="351"/>
+ <position x="144" y="351"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="80" y="42"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <continuation name="CLOCK" localId="6" height="30" width="90">
+ <position x="54" y="336"/>
<connectionPointOut>
<relPosition x="90" y="15"/>
</connectionPointOut>
</continuation>
- <block localId="99" width="80" height="110" typeName="AND">
- <position x="215" y="445"/>
- <inputVariables>
- <variable formalParameter="IN1">
- <connectionPointIn>
- <relPosition x="0" y="40"/>
- <connection refLocalId="39">
- <position x="215" y="485"/>
- <position x="160" y="485"/>
- </connection>
- </connectionPointIn>
- </variable>
- <variable formalParameter="IN2">
- <connectionPointIn>
- <relPosition x="0" y="85"/>
- <connection refLocalId="6">
- <position x="215" y="530"/>
- <position x="160" y="530"/>
+ <block localId="100" width="125" height="45" typeName="BOOL_TO_INT" executionOrderId="0">
+ <position x="349" y="274"/>
+ <inputVariables>
+ <variable formalParameter="IN">
+ <connectionPointIn>
+ <relPosition x="0" y="32"/>
+ <connection refLocalId="99" formalParameter="OUT">
+ <position x="349" y="306"/>
+ <position x="279" y="306"/>
</connection>
</connectionPointIn>
</variable>
@@ -451,45 +432,41 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="80" y="40"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <continuation name="CLOCK" localId="6" height="30" width="90">
- <position x="70" y="515"/>
- <connectionPointOut>
- <relPosition x="90" y="15"/>
+ <relPosition x="125" y="32"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <continuation name="CLOCK" localId="3" height="30" width="122">
+ <position x="693" y="796"/>
+ <connectionPointOut>
+ <relPosition x="122" y="15"/>
</connectionPointOut>
</continuation>
- <block localId="100" width="125" height="45" typeName="BOOL_TO_INT">
- <position x="365" y="455"/>
- <inputVariables>
- <variable formalParameter="IN">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- <connection refLocalId="99" formalParameter="OUT">
- <position x="365" y="485"/>
- <position x="295" y="485"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="125" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <continuation name="CLOCK" localId="3" height="30" width="90">
- <position x="765" y="305"/>
- <connectionPointOut>
- <relPosition x="90" y="15"/>
- </connectionPointOut>
- </continuation>
+ <comment localId="101" height="152" width="816">
+ <position x="27" y="8"/>
+ <content>
+ <xhtml:p><![CDATA[This example shows how IEC program in PLC can interact with web interface.
+
+svgui is extensions to build web interface to PLC. It has *integrated* web-server. So it's NOT necessary to install Apache, lighttpd or nginx for that!!!
+
+As the program is running in PLC, web UI will be available at http://localhost:8009/.
+
+
+Web interface is build as SVG file in Inkscape. To edit SVG file click 'Inkscape' button in 0x: svgui extension.
+Inkscape is a free and open-source vector graphics editor. It's not part of Beremiz and needs to be installed separately.
+]]></xhtml:p>
+ </content>
+ </comment>
+ <comment localId="102" height="101" width="544">
+ <position x="17" y="409"/>
+ <content>
+ <xhtml:p><![CDATA[In this example basic elements like 'Button', 'Led' and 'Text' are used.
+Back_id and sele_id inputs of these blocks are IDs of graphic primitives in SVG file.
+This is the way how elements in SVG are bound to elements in PLC program.
+You can find out or edit these IDs in Inkscape.]]></xhtml:p>
+ </content>
+ </comment>
</FBD>
</body>
</pou>
diff -r 6431f26aa501 -r 3291024e00da tests/svgui/svgui@svgui/py_ext.xml
--- a/tests/svgui/svgui@svgui/py_ext.xml Thu Feb 16 14:34:40 2017 +0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Python xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="python_xsd.xsd">
-<![CDATA[]]>
-</Python>
diff -r 6431f26aa501 -r 3291024e00da tests/svgui/svgui@svgui/pyfile.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/svgui/svgui@svgui/pyfile.xml Thu Feb 16 14:35:12 2017 +0500
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='utf-8'?>
+<PyFile xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <variables/>
+ <globals>
+ <xhtml:p><![CDATA[
+
+/*
+ Web interface is build as SVG file in Inkscape.
+ To edit SVG file click 'Inkscape' button on the toolbar above.
+
+ Inkscape is a free and open-source vector graphics editor.
+ It's not part of Beremiz and needs to be installed separately.
+*/
+
+]]></xhtml:p>
+ </globals>
+ <init>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
+ </init>
+ <cleanup>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
+ </cleanup>
+ <start>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
+ </start>
+ <stop>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
+ </stop>
+</PyFile>
diff -r 6431f26aa501 -r 3291024e00da tests/traffic_lights/plc.xml
--- a/tests/traffic_lights/plc.xml Thu Feb 16 14:34:40 2017 +0500
+++ b/tests/traffic_lights/plc.xml Thu Feb 16 14:35:12 2017 +0500
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201">
- <fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2012-09-04T16:16:33"/>
- <contentHeader name="traffic_lights" modificationDateTime="2013-12-06T12:19:16">
+ <fileHeader companyName="Beremiz" productName="Unnamed" productVersion="1" creationDateTime="2012-09-04T16:16:33"/>
+ <contentHeader name="traffic_lights" modificationDateTime="2016-10-20T13:08:53">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -405,8 +405,8 @@
<connection refLocalId="39">
<position x="569" y="31"/>
<position x="569" y="11"/>
- <position x="1016" y="11"/>
- <position x="1016" y="1151"/>
+ <position x="980" y="11"/>
+ <position x="980" y="1151"/>
<position x="776" y="1151"/>
<position x="776" y="1097"/>
</connection>
@@ -512,7 +512,7 @@
<reference name="GREEN_LIGHT"/>
</action>
</actionBlock>
- <actionBlock localId="9" width="219" height="125">
+ <actionBlock localId="9" width="232" height="125">
<position x="711" y="250"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -554,7 +554,7 @@
<relPosition x="37" y="17"/>
</connectionPointOutAction>
</step>
- <actionBlock localId="11" width="203" height="103">
+ <actionBlock localId="11" width="235" height="103">
<position x="710" y="413"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -696,7 +696,7 @@
<relPosition x="148" y="13"/>
</connectionPointOutAction>
</step>
- <actionBlock localId="19" width="246" height="110">
+ <actionBlock localId="19" width="236" height="110">
<position x="708" y="573"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -731,7 +731,11 @@
<relPosition x="10" y="2"/>
</connectionPointOut>
<condition>
- <reference name="STOP"/>
+ <inline name="">
+ <ST>
+ <xhtml:p><![CDATA[NOT SWITCH_BUTTON]]></xhtml:p>
+ </ST>
+ </inline>
</condition>
</transition>
<jumpStep localId="21" height="13" width="12" targetName="Standstill">
@@ -796,7 +800,7 @@
<relPosition x="148" y="13"/>
</connectionPointOutAction>
</step>
- <actionBlock localId="25" width="238" height="110">
+ <actionBlock localId="25" width="233" height="110">
<position x="708" y="748"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -831,7 +835,12 @@
<relPosition x="10" y="2"/>
</connectionPointOut>
<condition>
- <reference name="STOP"/>
+ <connectionPointIn>
+ <connection refLocalId="48">
+ <position x="400" y="858"/>
+ <position x="290" y="858"/>
+ </connection>
+ </connectionPointIn>
</condition>
</transition>
<jumpStep localId="27" height="13" width="12" targetName="Standstill">
@@ -896,7 +905,7 @@
<relPosition x="56" y="13"/>
</connectionPointOutAction>
</step>
- <actionBlock localId="31" width="154" height="110">
+ <actionBlock localId="31" width="227" height="110">
<position x="709" y="931"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -1112,6 +1121,92 @@
</variable>
</outputVariables>
</block>
+ <comment localId="45" height="681" width="645">
+ <position x="1021" y="21"/>
+ <content>
+ <xhtml:p><![CDATA[*** Description of SFC action qualifiers ***
+
+N : non-stored - The action code body is executed or the Boolean variable is set as
+long as the step is active.
+
+R : overriding reset – When the step has previously been executed with the S
+(including DS, DS, and SL) qualifier, the R qualifier will stop the execution of the
+code or reset the Boolean variable.
+
+S : set (stored) - The action code body is executed or the Boolean variable is set.
+This state is stored as soon as the step becomes active. It can only be reset
+explicitly by associating the same action to a different step using the qualifier 'R'.
+
+L : time limited - The action code body is executed or the Boolean variable is set as
+long as the step is active but maximal for the fixed time interval.
+
+D : time delayed - The action code body is executed or the Boolean variable is set
+after the fixed delay time has elapsed. The action remains active as long as the step
+is active. If the step is active shorter than the fixed delay time the action does not
+become active.
+
+P : pulse - As soon as the step is active the action code body is executed or the
+Boolean variable is set for one operating cycle. (Note: The code body will then
+execute for one additional operating cycle with the Step.X variable FALSE.)
+
+SD : stored and time delayed - the action code body is executed or the Boolean
+variable is stored and set when the fixed delay time has elapsed after the step
+activation, even if the step becomes inactive. The action remains active until it is
+reset. If the step is active shorter than the fixed delay time the action becomes active
+anyway.
+
+DS : delayed and stored - The action code body is executed or the Boolean variable
+is set when the fixed delay time has elapsed after the step activation. The action
+remains active until it is reset. If the step is active shorter than the fixed delay time
+the action does not become active.
+
+SL : stored and time limited - The action code body is executed or the Boolean
+variable is set and stored for a fixed time interval as soon as the step is active. If the
+step is active shorter than the time interval the action is active for the whole time
+interval anyway. If the action is reset during the time interval the action becomes
+inactive as soon as the action is reset.
+]]></xhtml:p>
+ </content>
+ </comment>
+ <comment localId="46" height="160" width="375">
+ <position x="8" y="326"/>
+ <content>
+ <xhtml:p><![CDATA[Conditions can be written in any IEC 61131-3 language.
+They can be implemented in defferent ways:
+- reference to external implementation;
+- inline implementation;
+- written in FBD or LD on SFC diagram and connected to the condition.
+
+See below examples of all these types.]]></xhtml:p>
+ </content>
+ </comment>
+ <leftPowerRail localId="47" height="40" width="3">
+ <position x="189" y="838"/>
+ <connectionPointOut formalParameter="">
+ <relPosition x="3" y="20"/>
+ </connectionPointOut>
+ </leftPowerRail>
+ <contact localId="48" height="15" width="21" negated="true">
+ <position x="269" y="850"/>
+ <connectionPointIn>
+ <relPosition x="0" y="8"/>
+ <connection refLocalId="47">
+ <position x="269" y="858"/>
+ <position x="192" y="858"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="21" y="8"/>
+ </connectionPointOut>
+ <variable>SWITCH_BUTTON</variable>
+ </contact>
+ <comment localId="13" height="66" width="375">
+ <position x="9" y="28"/>
+ <content>
+ <xhtml:p><![CDATA[
+Sequential function chart (SFC) is commonly used to describe state machines.]]></xhtml:p>
+ </content>
+ </comment>
</SFC>
</body>
</pou>
@@ -1158,57 +1253,19 @@
<derived name="Led"/>
</type>
</variable>
- <variable name="TEST_DATE">
- <type>
- <DATE/>
- </type>
- <initialValue>
- <simpleValue value="D#2012-12-03"/>
- </initialValue>
- </variable>
- <variable name="RESULT_STRING">
- <type>
- <string/>
- </type>
- </variable>
- <variable name="TEST_STRING">
- <type>
- <string/>
- </type>
- <initialValue>
- <simpleValue value="TOTO"/>
- </initialValue>
- </variable>
- <variable name="TEST_ULINT">
- <type>
- <ULINT/>
- </type>
- </variable>
- <variable name="RESULT_INT">
- <type>
- <INT/>
- </type>
- </variable>
- <variable name="RESULT_BYTE">
- <type>
- <BYTE/>
- </type>
- </variable>
</localVars>
</interface>
<body>
<FBD>
- <block localId="1" width="349" height="836" typeName="traffic_light_sequence" instanceName="trafic_light_sequence0">
- <position x="470" y="127"/>
+ <block localId="1" width="349" height="836" typeName="traffic_light_sequence" instanceName="trafic_light_sequence0" executionOrderId="0">
+ <position x="470" y="406"/>
<inputVariables>
<variable formalParameter="SWITCH_BUTTON">
<connectionPointIn>
<relPosition x="0" y="101"/>
<connection refLocalId="2" formalParameter="state_out">
- <position x="470" y="228"/>
- <position x="401" y="228"/>
- <position x="401" y="177"/>
- <position x="333" y="177"/>
+ <position x="470" y="507"/>
+ <position x="333" y="507"/>
</connection>
</connectionPointIn>
</variable>
@@ -1216,8 +1273,10 @@
<connectionPointIn>
<relPosition x="0" y="264"/>
<connection refLocalId="3" formalParameter="state_out">
- <position x="470" y="391"/>
- <position x="335" y="391"/>
+ <position x="470" y="670"/>
+ <position x="402" y="670"/>
+ <position x="402" y="721"/>
+ <position x="335" y="721"/>
</connection>
</connectionPointIn>
</variable>
@@ -1251,15 +1310,15 @@
</variable>
</outputVariables>
</block>
- <block localId="2" width="143" height="183" typeName="Button" instanceName="SwitchButton">
- <position x="190" y="141"/>
+ <block localId="2" width="143" height="183" typeName="Button" instanceName="SwitchButton" executionOrderId="0">
+ <position x="190" y="471"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="36"/>
<connection refLocalId="5">
- <position x="190" y="177"/>
- <position x="136" y="177"/>
+ <position x="190" y="507"/>
+ <position x="136" y="507"/>
</connection>
</connectionPointIn>
</variable>
@@ -1267,8 +1326,8 @@
<connectionPointIn>
<relPosition x="0" y="68"/>
<connection refLocalId="6">
- <position x="190" y="209"/>
- <position x="136" y="209"/>
+ <position x="190" y="539"/>
+ <position x="136" y="539"/>
</connection>
</connectionPointIn>
</variable>
@@ -1276,8 +1335,8 @@
<connectionPointIn>
<relPosition x="0" y="100"/>
<connection refLocalId="4">
- <position x="190" y="241"/>
- <position x="136" y="241"/>
+ <position x="190" y="571"/>
+ <position x="136" y="571"/>
</connection>
</connectionPointIn>
</variable>
@@ -1301,15 +1360,15 @@
</variable>
</outputVariables>
</block>
- <block localId="3" width="143" height="198" typeName="Button" instanceName="PedestrianButton">
- <position x="192" y="354"/>
+ <block localId="3" width="143" height="198" typeName="Button" instanceName="PedestrianButton" executionOrderId="0">
+ <position x="192" y="684"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="37"/>
<connection refLocalId="7">
- <position x="192" y="391"/>
- <position x="159" y="391"/>
+ <position x="192" y="721"/>
+ <position x="159" y="721"/>
</connection>
</connectionPointIn>
</variable>
@@ -1317,8 +1376,8 @@
<connectionPointIn>
<relPosition x="0" y="72"/>
<connection refLocalId="8">
- <position x="192" y="426"/>
- <position x="159" y="426"/>
+ <position x="192" y="756"/>
+ <position x="159" y="756"/>
</connection>
</connectionPointIn>
</variable>
@@ -1347,50 +1406,50 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="4" height="27" width="18">
- <position x="118" y="228"/>
+ <inVariable localId="4" height="27" width="18" executionOrderId="0" negated="false">
+ <position x="118" y="558"/>
<connectionPointOut>
<relPosition x="18" y="13"/>
</connectionPointOut>
<expression>1</expression>
</inVariable>
- <inVariable localId="5" height="27" width="105">
- <position x="31" y="164"/>
+ <inVariable localId="5" height="27" width="105" executionOrderId="0" negated="false">
+ <position x="31" y="494"/>
<connectionPointOut>
<relPosition x="105" y="13"/>
</connectionPointOut>
<expression>'SWITCH_OFF'</expression>
</inVariable>
- <inVariable localId="6" height="27" width="105">
- <position x="31" y="196"/>
+ <inVariable localId="6" height="27" width="105" executionOrderId="0" negated="false">
+ <position x="31" y="526"/>
<connectionPointOut>
<relPosition x="105" y="13"/>
</connectionPointOut>
<expression>'SWITCH_ON'</expression>
</inVariable>
- <inVariable localId="7" height="27" width="137">
- <position x="22" y="378"/>
+ <inVariable localId="7" height="27" width="137" executionOrderId="0" negated="false">
+ <position x="22" y="708"/>
<connectionPointOut>
<relPosition x="137" y="13"/>
</connectionPointOut>
<expression>'PEDESTRIAN_OFF'</expression>
</inVariable>
- <inVariable localId="8" height="27" width="137">
- <position x="22" y="413"/>
+ <inVariable localId="8" height="27" width="137" executionOrderId="0" negated="false">
+ <position x="22" y="743"/>
<connectionPointOut>
<relPosition x="137" y="13"/>
</connectionPointOut>
<expression>'PEDESTRIAN_ON'</expression>
</inVariable>
- <block localId="9" width="115" height="133" typeName="Led" instanceName="RedLight">
- <position x="1057" y="116"/>
+ <block localId="9" width="115" height="133" typeName="Led" instanceName="RedLight" executionOrderId="0">
+ <position x="1057" y="395"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="10">
- <position x="1057" y="154"/>
- <position x="1010" y="154"/>
+ <position x="1057" y="433"/>
+ <position x="1010" y="433"/>
</connection>
</connectionPointIn>
</variable>
@@ -1398,8 +1457,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="11">
- <position x="1057" y="191"/>
- <position x="1010" y="191"/>
+ <position x="1057" y="470"/>
+ <position x="1010" y="470"/>
</connection>
</connectionPointIn>
</variable>
@@ -1407,8 +1466,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="RED_LIGHT">
- <position x="1057" y="228"/>
- <position x="819" y="228"/>
+ <position x="1057" y="507"/>
+ <position x="819" y="507"/>
</connection>
</connectionPointIn>
</variable>
@@ -1416,29 +1475,29 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="10" height="27" width="79">
- <position x="931" y="141"/>
+ <inVariable localId="10" height="27" width="79" executionOrderId="0" negated="false">
+ <position x="931" y="420"/>
<connectionPointOut>
<relPosition x="79" y="13"/>
</connectionPointOut>
<expression>'RED_OFF'</expression>
</inVariable>
- <inVariable localId="11" height="27" width="79">
- <position x="931" y="178"/>
+ <inVariable localId="11" height="27" width="79" executionOrderId="0" negated="false">
+ <position x="931" y="457"/>
<connectionPointOut>
<relPosition x="79" y="13"/>
</connectionPointOut>
<expression>'RED_ON'</expression>
</inVariable>
- <block localId="12" width="115" height="133" typeName="Led" instanceName="OrangeLight">
- <position x="1058" y="279"/>
+ <block localId="12" width="115" height="133" typeName="Led" instanceName="OrangeLight" executionOrderId="0">
+ <position x="1058" y="558"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="13">
- <position x="1058" y="317"/>
- <position x="1010" y="317"/>
+ <position x="1058" y="596"/>
+ <position x="1010" y="596"/>
</connection>
</connectionPointIn>
</variable>
@@ -1446,8 +1505,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="14">
- <position x="1058" y="354"/>
- <position x="1010" y="354"/>
+ <position x="1058" y="633"/>
+ <position x="1010" y="633"/>
</connection>
</connectionPointIn>
</variable>
@@ -1455,8 +1514,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="ORANGE_LIGHT">
- <position x="1058" y="391"/>
- <position x="819" y="391"/>
+ <position x="1058" y="670"/>
+ <position x="819" y="670"/>
</connection>
</connectionPointIn>
</variable>
@@ -1464,29 +1523,29 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="13" height="27" width="111">
- <position x="899" y="304"/>
+ <inVariable localId="13" height="27" width="111" executionOrderId="0" negated="false">
+ <position x="899" y="583"/>
<connectionPointOut>
<relPosition x="111" y="13"/>
</connectionPointOut>
<expression>'ORANGE_OFF'</expression>
</inVariable>
- <inVariable localId="14" height="27" width="106">
- <position x="904" y="341"/>
+ <inVariable localId="14" height="27" width="106" executionOrderId="0" negated="false">
+ <position x="904" y="620"/>
<connectionPointOut>
<relPosition x="106" y="13"/>
</connectionPointOut>
<expression>'ORANGE_ON'</expression>
</inVariable>
- <block localId="15" width="115" height="133" typeName="Led" instanceName="GreenLight">
- <position x="1058" y="442"/>
+ <block localId="15" width="115" height="133" typeName="Led" instanceName="GreenLight" executionOrderId="0">
+ <position x="1058" y="721"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="16">
- <position x="1058" y="480"/>
- <position x="1010" y="480"/>
+ <position x="1058" y="759"/>
+ <position x="1010" y="759"/>
</connection>
</connectionPointIn>
</variable>
@@ -1494,8 +1553,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="17">
- <position x="1058" y="517"/>
- <position x="1010" y="517"/>
+ <position x="1058" y="796"/>
+ <position x="1010" y="796"/>
</connection>
</connectionPointIn>
</variable>
@@ -1503,8 +1562,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="GREEN_LIGHT">
- <position x="1058" y="554"/>
- <position x="819" y="554"/>
+ <position x="1058" y="833"/>
+ <position x="819" y="833"/>
</connection>
</connectionPointIn>
</variable>
@@ -1512,29 +1571,29 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="16" height="27" width="111">
- <position x="899" y="467"/>
+ <inVariable localId="16" height="27" width="111" executionOrderId="0" negated="false">
+ <position x="899" y="746"/>
<connectionPointOut>
<relPosition x="111" y="13"/>
</connectionPointOut>
<expression>'GREEN_OFF'</expression>
</inVariable>
- <inVariable localId="17" height="27" width="106">
- <position x="904" y="504"/>
+ <inVariable localId="17" height="27" width="106" executionOrderId="0" negated="false">
+ <position x="904" y="783"/>
<connectionPointOut>
<relPosition x="106" y="13"/>
</connectionPointOut>
<expression>'GREEN_ON'</expression>
</inVariable>
- <block localId="18" width="115" height="133" typeName="Led" instanceName="PedestrianRedLight">
- <position x="1059" y="605"/>
+ <block localId="18" width="115" height="133" typeName="Led" instanceName="PedestrianRedLight" executionOrderId="0">
+ <position x="1059" y="884"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="19">
- <position x="1059" y="643"/>
- <position x="1020" y="643"/>
+ <position x="1059" y="922"/>
+ <position x="1020" y="922"/>
</connection>
</connectionPointIn>
</variable>
@@ -1542,8 +1601,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="20">
- <position x="1059" y="680"/>
- <position x="1020" y="680"/>
+ <position x="1059" y="959"/>
+ <position x="1020" y="959"/>
</connection>
</connectionPointIn>
</variable>
@@ -1551,8 +1610,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="PEDESTRIAN_RED_LIGHT">
- <position x="1059" y="717"/>
- <position x="819" y="717"/>
+ <position x="1059" y="996"/>
+ <position x="819" y="996"/>
</connection>
</connectionPointIn>
</variable>
@@ -1560,29 +1619,29 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="19" height="27" width="171">
- <position x="849" y="630"/>
+ <inVariable localId="19" height="27" width="171" executionOrderId="0" negated="false">
+ <position x="849" y="909"/>
<connectionPointOut>
<relPosition x="171" y="13"/>
</connectionPointOut>
<expression>'PEDESTRIAN_RED_OFF'</expression>
</inVariable>
- <inVariable localId="20" height="27" width="166">
- <position x="854" y="667"/>
+ <inVariable localId="20" height="27" width="166" executionOrderId="0" negated="false">
+ <position x="854" y="946"/>
<connectionPointOut>
<relPosition x="166" y="13"/>
</connectionPointOut>
<expression>'PEDESTRIAN_RED_ON'</expression>
</inVariable>
- <block localId="21" width="115" height="133" typeName="Led" instanceName="PedestrianGreenLight">
- <position x="1059" y="768"/>
+ <block localId="21" width="115" height="133" typeName="Led" instanceName="PedestrianGreenLight" executionOrderId="0">
+ <position x="1059" y="1047"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="22">
- <position x="1059" y="806"/>
- <position x="1035" y="806"/>
+ <position x="1059" y="1085"/>
+ <position x="1035" y="1085"/>
</connection>
</connectionPointIn>
</variable>
@@ -1590,8 +1649,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="23">
- <position x="1059" y="843"/>
- <position x="1035" y="843"/>
+ <position x="1059" y="1122"/>
+ <position x="1035" y="1122"/>
</connection>
</connectionPointIn>
</variable>
@@ -1599,8 +1658,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="PEDESTRIAN_GREEN_LIGHT">
- <position x="1059" y="880"/>
- <position x="819" y="880"/>
+ <position x="1059" y="1159"/>
+ <position x="819" y="1159"/>
</connection>
</connectionPointIn>
</variable>
@@ -1608,236 +1667,52 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="22" height="27" width="190">
- <position x="845" y="793"/>
+ <inVariable localId="22" height="27" width="190" executionOrderId="0" negated="false">
+ <position x="845" y="1072"/>
<connectionPointOut>
<relPosition x="190" y="13"/>
</connectionPointOut>
<expression>'PEDESTRIAN_GREEN_OFF'</expression>
</inVariable>
- <inVariable localId="23" height="27" width="185">
- <position x="850" y="830"/>
+ <inVariable localId="23" height="27" width="185" executionOrderId="0" negated="false">
+ <position x="850" y="1109"/>
<connectionPointOut>
<relPosition x="185" y="13"/>
</connectionPointOut>
<expression>'PEDESTRIAN_GREEN_ON'</expression>
</inVariable>
- <inVariable localId="24" height="27" width="84">
- <position x="289" y="1141"/>
- <connectionPointOut>
- <relPosition x="84" y="13"/>
- </connectionPointOut>
- <expression>TEST_DATE</expression>
- </inVariable>
- <block localId="25" width="128" height="40" typeName="DATE_TO_STRING">
- <position x="426" y="1124"/>
- <inputVariables>
- <variable formalParameter="IN">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- <connection refLocalId="24">
- <position x="426" y="1154"/>
- <position x="373" y="1154"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="128" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <outVariable localId="26" height="27" width="116">
- <position x="640" y="1141"/>
- <connectionPointIn>
- <relPosition x="0" y="13"/>
- <connection refLocalId="25" formalParameter="OUT">
- <position x="640" y="1154"/>
- <position x="554" y="1154"/>
- </connection>
- </connectionPointIn>
- <expression>RESULT_STRING</expression>
- </outVariable>
- <inVariable localId="27" height="27" width="90">
- <position x="294" y="1271"/>
- <connectionPointOut>
- <relPosition x="90" y="13"/>
- </connectionPointOut>
- <expression>TEST_ULINT</expression>
- </inVariable>
- <outVariable localId="28" height="27" width="89">
- <position x="630" y="1271"/>
- <connectionPointIn>
- <relPosition x="0" y="13"/>
- <connection refLocalId="29" formalParameter="OUT">
- <position x="630" y="1284"/>
- <position x="551" y="1284"/>
- </connection>
- </connectionPointIn>
- <expression>RESULT_INT</expression>
- </outVariable>
- <block localId="29" width="107" height="40" typeName="ULINT_TO_INT">
- <position x="444" y="1254"/>
- <inputVariables>
- <variable formalParameter="IN">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- <connection refLocalId="27">
- <position x="444" y="1284"/>
- <position x="384" y="1284"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="107" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="30" height="27" width="89">
- <position x="139" y="1032"/>
- <connectionPointOut>
- <relPosition x="89" y="13"/>
- </connectionPointOut>
- <expression>RESULT_INT</expression>
- </inVariable>
- <block localId="31" width="68" height="85" typeName="LIMIT">
- <position x="419" y="994"/>
- <inputVariables>
- <variable formalParameter="MN">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- <connection refLocalId="33">
- <position x="419" y="1024"/>
- <position x="390" y="1024"/>
- </connection>
- </connectionPointIn>
- </variable>
- <variable formalParameter="IN">
- <connectionPointIn>
- <relPosition x="0" y="51"/>
- <connection refLocalId="38" formalParameter="OUT">
- <position x="419" y="1045"/>
- <position x="335" y="1045"/>
- </connection>
- </connectionPointIn>
- </variable>
- <variable formalParameter="MX">
- <connectionPointIn>
- <relPosition x="0" y="72"/>
- <connection refLocalId="34">
- <position x="419" y="1066"/>
- <position x="404" y="1066"/>
- <position x="404" y="1067"/>
- <position x="389" y="1067"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="68" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="33" height="27" width="20">
- <position x="370" y="1011"/>
- <connectionPointOut>
- <relPosition x="20" y="13"/>
- </connectionPointOut>
- <expression>0</expression>
- </inVariable>
- <inVariable localId="34" height="27" width="26">
- <position x="363" y="1054"/>
- <connectionPointOut>
- <relPosition x="26" y="13"/>
- </connectionPointOut>
- <expression>31</expression>
- </inVariable>
- <block localId="35" width="100" height="45" typeName="INT_TO_BYTE">
- <position x="529" y="992"/>
- <inputVariables>
- <variable formalParameter="IN">
- <connectionPointIn>
- <relPosition x="0" y="32"/>
- <connection refLocalId="31" formalParameter="OUT">
- <position x="529" y="1024"/>
- <position x="487" y="1024"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="100" y="32"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <outVariable localId="37" height="27" width="100">
- <position x="681" y="1011"/>
- <connectionPointIn>
- <relPosition x="0" y="13"/>
- <connection refLocalId="35" formalParameter="OUT">
- <position x="681" y="1024"/>
- <position x="629" y="1024"/>
- </connection>
- </connectionPointIn>
- <expression>RESULT_BYTE</expression>
- </outVariable>
- <block localId="38" width="67" height="60" typeName="MUL">
- <position x="268" y="1015"/>
- <inputVariables>
- <variable formalParameter="IN1">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- <connection refLocalId="30">
- <position x="268" y="1045"/>
- <position x="228" y="1045"/>
- </connection>
- </connectionPointIn>
- </variable>
- <variable formalParameter="IN2">
- <connectionPointIn>
- <relPosition x="0" y="50"/>
- <connection refLocalId="39">
- <position x="268" y="1065"/>
- <position x="248" y="1065"/>
- <position x="248" y="1084"/>
- <position x="229" y="1084"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="67" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="39" height="27" width="18">
- <position x="211" y="1071"/>
- <connectionPointOut>
- <relPosition x="18" y="13"/>
- </connectionPointOut>
- <expression>1</expression>
- </inVariable>
+ <comment localId="24" height="262" width="804">
+ <position x="22" y="13"/>
+ <content>
+ <xhtml:p><![CDATA[This example implements control of traffic lights.
+
+Basically it shows following features of Beremiz:
+- web interface (SCADA) using integrated web server in svgui extension;
+- interaction with web UI;
+- functional blocks in SFC language.
+
+
+
+
+SVGUI is extensions to build web interface to PLC. It has *integrated* web-server. So it's NOT necessary to install Apache, lighttpd or nginx for that!!!
+
+As the program is running in PLC, web UI will be available at http://localhost:8009/.
+
+Web interface is build as SVG file in Inkscape. To edit SVG file click 'Inkscape' button in 0x: svgui extension.
+Inkscape is a free and open-source vector graphics editor. It's not part of Beremiz and needs to be installed separately.
+]]></xhtml:p>
+ </content>
+ </comment>
+ <comment localId="102" height="126" width="411">
+ <position x="20" y="319"/>
+ <content>
+ <xhtml:p><![CDATA[In this example FB like 'Button', 'Led' and 'Text' are used.
+Back_id and sele_id inputs of these blocks are IDs of
+graphic primitives in SVG file.
+This is the way how elements in SVG are bound to elements
+in PLC program. You can find out or edit these IDs in Inkscape.]]></xhtml:p>
+ </content>
+ </comment>
</FBD>
</body>
</pou>
diff -r 6431f26aa501 -r 3291024e00da tests/traffic_lights/svgui-0@svgui/pyfile.xml
--- a/tests/traffic_lights/svgui-0@svgui/pyfile.xml Thu Feb 16 14:34:40 2017 +0500
+++ b/tests/traffic_lights/svgui-0@svgui/pyfile.xml Thu Feb 16 14:35:12 2017 +0500
@@ -2,18 +2,31 @@
<PyFile xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables/>
<globals>
- <xhtml:p><![CDATA[]]></xhtml:p>
+ <xhtml:p><![CDATA[
+/*
+ Web interface is build as SVG file in Inkscape.
+ To edit SVG file click 'Inkscape' button on the toolbar above.
+
+ Inkscape is a free and open-source vector graphics editor.
+ It's not part of Beremiz and needs to be installed separately.
+*/
+
+]]></xhtml:p>
</globals>
<init>
- <xhtml:p><![CDATA[]]></xhtml:p>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
</init>
<cleanup>
- <xhtml:p><![CDATA[]]></xhtml:p>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
</cleanup>
<start>
- <xhtml:p><![CDATA[]]></xhtml:p>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
</start>
<stop>
- <xhtml:p><![CDATA[]]></xhtml:p>
+ <xhtml:p><![CDATA[
+]]></xhtml:p>
</stop>
</PyFile>
diff -r 6431f26aa501 -r 3291024e00da util/BitmapLibrary.py
--- a/util/BitmapLibrary.py Thu Feb 16 14:34:40 2017 +0500
+++ b/util/BitmapLibrary.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os
diff -r 6431f26aa501 -r 3291024e00da util/ProcessLogger.py
--- a/util/ProcessLogger.py Thu Feb 16 14:34:40 2017 +0500
+++ b/util/ProcessLogger.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,27 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of Beremiz, a Integrated Development Environment for
-#programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
-#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
-#
-#See COPYING file for copyrights details.
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
-#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import time
import wx
@@ -109,6 +108,7 @@
self.errdata = []
self.keyword = keyword
self.kill_it = kill_it
+ self.startsem = Semaphore(0)
self.finishsem = Semaphore(0)
self.endlock = Lock()
@@ -145,6 +145,7 @@
self.Proc.stderr,
self.errors)
self.errt.start()
+ self.startsem.release()
def output(self,v):
@@ -165,9 +166,11 @@
def log_the_end(self,ecode,pid):
self.logger.write(self.Command_str + "\n")
- self.logger.write_warning(_("exited with status %s (pid %s)\n")%(str(ecode),str(pid)))
+ self.logger.write_warning(_("exited with status {a1} (pid {a2})\n").format(a1 = str(ecode), a2 = str(pid)))
def finish(self, pid,ecode):
+ # avoid running function before start is finished
+ self.startsem.acquire()
if self.timeout:
self.timeout.cancel()
self.exitcode = ecode
@@ -179,6 +182,10 @@
self.finishsem.release()
def kill(self,gently=True):
+ # avoid running kill before start is finished
+ self.startsem.acquire()
+ self.startsem.release()
+
self.outt.killed = True
self.errt.killed = True
if wx.Platform == '__WXMSW__':
diff -r 6431f26aa501 -r 3291024e00da version.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/version.py Thu Feb 16 14:35:12 2017 +0500
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
+#
+# Copyright (C) 2016: Andrey Skvortsov
+#
+# See COPYING file for copyrights details.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+import subprocess, os
+
+def GetAppRevision():
+ rev = None
+ app_dir=os.path.dirname(os.path.realpath(__file__))
+ try:
+ pipe = subprocess.Popen(
+ ["hg", "id", "-i"],
+ stdout = subprocess.PIPE,
+ cwd = app_dir
+ )
+ rev = pipe.communicate()[0]
+ if pipe.returncode != 0:
+ rev = None
+ except:
+ pass
+
+ # if this is not mercurial repository
+ # try to read revision from file
+ if rev is None:
+ try:
+ f = open(os.path.join(app_dir,"revision"))
+ rev = f.readline()
+ except:
+ pass
+ return rev
+
+def GetAboutDialogInfo():
+ import wx
+ info = wx.AboutDialogInfo()
+
+ info.Name = "Beremiz"
+ info.Version = app_version
+
+ info.Copyright = "(C) 2016 Andrey Skvortsov\n"
+ info.Copyright += "(C) 2008-2015 Eduard Tisserant\n"
+ info.Copyright += "(C) 2008-2015 Laurent Bessard"
+
+ info.WebSite = ("http://beremiz.org", "beremiz.org")
+
+ info.Description = _("Open Source framework for automation, "
+ "implemented IEC 61131 IDE with constantly growing set of extensions "
+ "and flexible PLC runtime.")
+
+ info.Developers = ("Andrey Skvortsov <andrej.skvortzov@gmail.com>",
+ "Sergey Surkov <surkov.sv@summatechnology.ru>",
+ "Edouard Tisserant <edouard.tisserant@gmail.com>",
+ "Laurent Bessard <laurent.bessard@gmail.com>")
+
+
+ info.License = ('\n This program is free software; you can redistribute it and/or\n'
+ ' modify it under the terms of the GNU General Public License\n'
+ ' as published by the Free Software Foundation; either version 2\n'
+ ' of the License, or (at your option) any later version.\n'
+ '\n'
+ ' This program is distributed in the hope that it will be useful,\n'
+ ' but WITHOUT ANY WARRANTY; without even the implied warranty of\n'
+ ' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n'
+ ' GNU General Public License below for more details.\n'
+ '\n'
+ '\n'
+ '\n'
+ '')
+
+ # read license file
+ path=os.path.join(os.path.dirname(os.path.abspath(__file__)))
+ license_path = os.path.join(path, u"COPYING")
+ license=''
+ if os.path.exists(license_path):
+ with open(license_path) as f:
+ info.License += f.read()
+
+ info.Icon = wx.Icon(os.path.join(path, "images", "about_brz_logo.png"), wx.BITMAP_TYPE_PNG)
+
+ info.Translators = ("Russian\t- Andrey Skvortsov <andrej.skvortzov@gmail.com>",
+ "Korean\t- Reinhard Lee <lij3105@gmail.com>",
+ "German\t- Mark Muzenhardt <mark.muzenhardt@gmail.com>",
+ "French\t- Laurent Bessard <laurent.bessard@gmail.com>")
+ return info
+
+app_version = "1.2"
+rev = GetAppRevision()
+if rev is not None:
+ app_version = app_version + "-" + rev.rstrip()
+
+
+
diff -r 6431f26aa501 -r 3291024e00da xmlclass/__init__.py
--- a/xmlclass/__init__.py Thu Feb 16 14:34:40 2017 +0500
+++ b/xmlclass/__init__.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Package initialisation
diff -r 6431f26aa501 -r 3291024e00da xmlclass/xmlclass.py
--- a/xmlclass/xmlclass.py Thu Feb 16 14:34:40 2017 +0500
+++ b/xmlclass/xmlclass.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os, sys
import re
@@ -1754,7 +1754,7 @@
return tree, None
def Dumps(self, xml_obj):
- return etree.tostring(xml_obj)
+ return etree.tostring(xml_obj, encoding='utf-8')
def Loads(self, xml_string):
return etree.fromstring(xml_string, self)
diff -r 6431f26aa501 -r 3291024e00da xmlclass/xsdschema.py
--- a/xmlclass/xsdschema.py Thu Feb 16 14:34:40 2017 +0500
+++ b/xmlclass/xsdschema.py Thu Feb 16 14:35:12 2017 +0500
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
-#based on the plcopen standard.
+# This file is part of Beremiz, a Integrated Development Environment for
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#You should have received a copy of the GNU General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os, re
import datetime