beremiz: comparison Beremiz.py

equal deleted inserted replaced

-:6e205c1f05a0
+:eee7625de1f7
 updateinfoThread.start()
 updateinfoThread.join(2)
 splash.SetText(text=updateinfo)
 wx.Yield()
-# Import module for internationalization
+from util.TranslationCatalogs import AddCatalog
-import gettext
+from util.BitmapLibrary import AddBitmapFolder, GetBitmap
-# Get folder containing translation files
+AddCatalog(os.path.join(CWD, "locale"))
-localedir = os.path.join(CWD,"locale")
+AddBitmapFolder(os.path.join(CWD, "images"))
-# 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:
-test_loc = wx.Locale(langid)
-test_loc.AddCatalogLookupPathPrefix(localedir)
-if test_loc.AddCatalog(domain):
-loc = wx.Locale(langid)
-else:
-loc = wx.Locale(wx.LANGUAGE_ENGLISH)
-__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
+# Import module for internationalization
+import gettext
-base_folder = os.path.split(sys.path[0])[0]
-sys.path.append(base_folder)
+__builtin__.__dict__['_'] = wx.GetTranslation
-sys.path.append(os.path.join(base_folder, "plcopeneditor"))
-from utils.BitmapLibrary import AddBitmapFolder, GetBitmap
-AddBitmapFolder(os.path.join(CWD, "images"))
-if __name__ == '__main__':
 # Load extensions
 for extfilename in extensions:
 extension_folder = os.path.split(os.path.realpath(extfilename))[0]
 sys.path.append(extension_folder)
+AddCatalog(os.path.join(extension_folder, "locale"))
 AddBitmapFolder(os.path.join(extension_folder, "images"))
 execfile(extfilename, locals())
 import wx.lib.buttons, wx.lib.statbmp
 import cPickle
 import types, time, re, platform, time, traceback, commands
 from docutil import OpenHtmlFrame
-from PLCOpenEditor import IDEFrame, AppendMenu, TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES
+from IDEFrame import IDEFrame, AppendMenu
-from PLCOpenEditor import EditorPanel, Viewer, TextViewer, GraphicViewer, ResourceEditor, ConfigurationEditor, DataTypeEditor
+from IDEFrame import TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES
-from PLCOpenEditor import EncodeFileSystemPath, DecodeFileSystemPath
+from IDEFrame import EncodeFileSystemPath, DecodeFileSystemPath
-from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY, ITEM_PROJECT, ITEM_RESOURCE
+from editors.EditorPanel import EditorPanel
+from editors.Viewer import Viewer
-from util.TextCtrlAutoComplete import TextCtrlAutoComplete
+from editors.TextViewer import TextViewer
-from util.BrowseValuesLibraryDialog import BrowseValuesLibraryDialog
+from editors.GraphicViewer import GraphicViewer
+from editors.ResourceEditor import ConfigurationEditor, ResourceEditor
+from editors.DataTypeEditor import DataTypeEditor
 from util.MiniTextControler import MiniTextControler
 from util.ProcessLogger import ProcessLogger
+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, MATIEC_ERROR_MODEL, ITEM_CONFNODE
 MAX_RECENT_PROJECTS = 10
 class GenStaticBitmap(wx.lib.statbmp.GenStaticBitmap):
 """ Customized GenStaticBitmap, fix transparency redraw bug on wx2.8/win32,
 # to prevent rapid fire on rising log panel
 self.rising_timer = 0
 self.lock = Lock()
 self.YieldLock = Lock()
 self.RefreshLock = Lock()
+self.TimerAccessLock = Lock()
 self.stack = []
 self.LastRefreshTime = gettime()
 self.LastRefreshTimer = None
 def write(self, s, style = None):
 if self.lock.acquire():
 self.stack.append((s,style))
 self.lock.release()
 current_time = gettime()
+self.TimerAccessLock.acquire()
 if self.LastRefreshTimer:
 self.LastRefreshTimer.cancel()
 self.LastRefreshTimer=None
+self.TimerAccessLock.release()
 if current_time - self.LastRefreshTime > REFRESH_PERIOD and self.RefreshLock.acquire(False):
 self._should_write()
 else:
-self.LastRefreshTimer = Timer(REFRESH_PERIOD, self._should_write)
+self.TimerAccessLock.acquire()
+self.LastRefreshTimer = Timer(REFRESH_PERIOD, self._timer_expired)
 self.LastRefreshTimer.start()
+self.TimerAccessLock.release()
+def _timer_expired(self):
+if self.RefreshLock.acquire(False):
+self._should_write()
+else:
+self.TimerAccessLock.acquire()
+self.LastRefreshTimer = Timer(REFRESH_PERIOD, self._timer_expired)
+self.LastRefreshTimer.start()
+self.TimerAccessLock.release()
 def _should_write(self):
 wx.CallAfter(self._write)
 if MainThread == currentThread().ident:
 app = wx.GetApp()
 app.Yield()
 self.YieldLock.release()
 def _write(self):
 if self.output :
-self.output.Freeze();
+self.output.Freeze()
 self.lock.acquire()
 for s, style in self.stack:
 if style is None : style=self.black_white
 if self.default_style != style:
 self.output.SetDefaultStyle(style)
 pass
 newtime = time.time()
 if newtime - self.rising_timer > 1:
 self.risecall()
 self.rising_timer = newtime
 def write_warning(self, s):
 self.write(s,self.red_white)
 def write_error(self, s):
 self.write(s,self.red_yellow)
 IDEFrame._init_utils(self)
 def _init_coll_FileMenu_Items(self, parent):
 AppendMenu(parent, help='', id=wx.ID_NEW,
-kind=wx.ITEM_NORMAL, text=_(u'New\tCTRL+N'))
+kind=wx.ITEM_NORMAL, text=_(u'New') + '\tCTRL+N')
 AppendMenu(parent, help='', id=wx.ID_OPEN,
-kind=wx.ITEM_NORMAL, text=_(u'Open\tCTRL+O'))
+kind=wx.ITEM_NORMAL, text=_(u'Open') + '\tCTRL+O')
 parent.AppendMenu(ID_FILEMENURECENTPROJECTS, _("&Recent Projects"), self.RecentProjectsMenu)
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_SAVE,
-kind=wx.ITEM_NORMAL, text=_(u'Save\tCTRL+S'))
+kind=wx.ITEM_NORMAL, text=_(u'Save') + '\tCTRL+S')
 AppendMenu(parent, help='', id=wx.ID_SAVEAS,
-kind=wx.ITEM_NORMAL, text=_(u'Save as\tCTRL+SHIFT+S'))
+kind=wx.ITEM_NORMAL, text=_(u'Save as') + '\tCTRL+SHIFT+S')
 AppendMenu(parent, help='', id=wx.ID_CLOSE,
-kind=wx.ITEM_NORMAL, text=_(u'Close Tab\tCTRL+W'))
+kind=wx.ITEM_NORMAL, text=_(u'Close Tab') + '\tCTRL+W')
 AppendMenu(parent, help='', id=wx.ID_CLOSE_ALL,
-kind=wx.ITEM_NORMAL, text=_(u'Close Project\tCTRL+SHIFT+W'))
+kind=wx.ITEM_NORMAL, text=_(u'Close Project') + '\tCTRL+SHIFT+W')
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_PAGE_SETUP,
-kind=wx.ITEM_NORMAL, text=_(u'Page Setup\tCTRL+ALT+P'))
+kind=wx.ITEM_NORMAL, text=_(u'Page Setup') + '\tCTRL+ALT+P')
 AppendMenu(parent, help='', id=wx.ID_PREVIEW,
-kind=wx.ITEM_NORMAL, text=_(u'Preview\tCTRL+SHIFT+P'))
+kind=wx.ITEM_NORMAL, text=_(u'Preview') + '\tCTRL+SHIFT+P')
 AppendMenu(parent, help='', id=wx.ID_PRINT,
-kind=wx.ITEM_NORMAL, text=_(u'Print\tCTRL+P'))
+kind=wx.ITEM_NORMAL, text=_(u'Print') + '\tCTRL+P')
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_EXIT,
-kind=wx.ITEM_NORMAL, text=_(u'Quit\tCTRL+Q'))
+kind=wx.ITEM_NORMAL, text=_(u'Quit') + '\tCTRL+Q')
 self.Bind(wx.EVT_MENU, self.OnNewProjectMenu, id=wx.ID_NEW)
 self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu, id=wx.ID_OPEN)
 self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE)
 self.Bind(wx.EVT_MENU, self.OnSaveProjectAsMenu, id=wx.ID_SAVEAS)
 self.local_runtime_tmpdir = tempfile.mkdtemp()
 # choose an arbitrary random port for runtime
 self.runtime_port = int(random.random() * 1000) + 61131
 # launch local runtime
 self.local_runtime = ProcessLogger(self.Log,
-"\"%s\" \"%s\" -p %s -i localhost %s %s"%(sys.executable,
+"\"%s\" \"%s\" -p %s -i localhost %s %s"%(
-Bpath("Beremiz_service.py"),
+sys.executable,
-self.runtime_port,
+Bpath("Beremiz_service.py"),
-{False : "-x 0", True :"-x 1"}[taskbaricon],
+self.runtime_port,
-self.local_runtime_tmpdir),
+{False : "-x 0", True :"-x 1"}[taskbaricon],
-no_gui=False,
+self.local_runtime_tmpdir),
-timeout=500, keyword = "working")
+no_gui=False,
+timeout=500, keyword = "working",
+cwd = self.local_runtime_tmpdir)
 self.local_runtime.spin()
 return self.runtime_port
 def KillLocalRuntime(self):
 if self.local_runtime is not None:
 event.GetEventObject().Disable()
 # Call
 getattr(self.CTR, method)()
 # Re-enable button
 event.GetEventObject().Enable()
-# Trigger refresh on Idle
-wx.CallAfter(self.RefreshStatusToolBar)
 return OnMenu
 def GetConfigEntry(self, entry_name, default):
 return cPickle.loads(str(self.Config.Read(entry_name, cPickle.dumps(default))))
 try:
 defaultpath = DecodeFileSystemPath(self.Config.Read("lastopenedfolder"))
 except:
 defaultpath = os.path.expanduser("~")
-dialog = wx.DirDialog(self , _("Choose a project"), defaultpath, wx.DD_NEW_DIR_BUTTON)
+dialog = wx.DirDialog(self , _("Choose a project"), defaultpath)
 if dialog.ShowModal() == wx.ID_OK:
 projectpath = dialog.GetPath()
 self.Config.Write("lastopenedfolder",
 EncodeFileSystemPath(os.path.dirname(projectpath)))
 self.Config.Flush()
 try:
 defaultpath = DecodeFileSystemPath(self.Config.Read("lastopenedfolder"))
 except:
 defaultpath = os.path.expanduser("~")
-dialog = wx.DirDialog(self , _("Choose a project"), defaultpath, wx.DD_NEW_DIR_BUTTON)
+dialog = wx.DirDialog(self , _("Choose a project"), defaultpath, style=wx.DEFAULT_DIALOG_STYLE|
+wx.RESIZE_BORDER)
 if dialog.ShowModal() == wx.ID_OK:
 self.OpenProject(dialog.GetPath())
 dialog.Destroy()
 def OpenProject(self, projectpath):
 def OnQuitMenu(self, event):
 self.Close()
 def OnAboutMenu(self, event):
-OpenHtmlFrame(self,_("About Beremiz"), Bpath("doc","about.html"), wx.Size(550, 500))
+OpenHtmlFrame(self,_("About Beremiz"), Bpath("doc", "about.html"), wx.Size(550, 500))
 def OnProjectTreeItemBeginEdit(self, event):
 selected = event.GetItem()
 if self.ProjectTree.GetPyData(selected)["type"] == ITEM_CONFNODE:
 event.Veto()
 if item_infos["type"] == ITEM_CONFNODE:
 confnode_menu = wx.Menu(title='')
 confnode = item_infos["confnode"]
-if confnode is not None and len(confnode.CTNChildrenTypes) > 0:
+if confnode is not None:
-for name, XSDClass, help in confnode.CTNChildrenTypes:
+menu_items = confnode.GetContextualMenuItems()
-new_id = wx.NewId()
+if menu_items is not None:
-confnode_menu.Append(help=help, id=new_id, kind=wx.ITEM_NORMAL, text=name)
+for text, help, callback in menu_items:
-self.Bind(wx.EVT_MENU, self.GetAddConfNodeFunction(name, confnode), id=new_id)
+new_id = wx.NewId()
+confnode_menu.Append(help=help, id=new_id, kind=wx.ITEM_NORMAL, text=text)
+self.Bind(wx.EVT_MENU, callback, id=new_id)
+else:
+for name, XSDClass, help in confnode.CTNChildrenTypes:
+new_id = wx.NewId()
+confnode_menu.Append(help=help, id=new_id, kind=wx.ITEM_NORMAL, text=_("Add") + " " + name)
+self.Bind(wx.EVT_MENU, self.GetAddConfNodeFunction(name, confnode), id=new_id)
 new_id = wx.NewId()
 AppendMenu(confnode_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Delete"))
 self.Bind(wx.EVT_MENU, self.GetDeleteMenuFunction(confnode), id=new_id)
 self._Refresh(TITLE, FILEMENU, EDITMENU, PROJECTTREE, POUINSTANCEVARIABLESPANEL)
 self.EditProjectElement(ITEM_RESOURCE, tagname)
 def AddConfNode(self, ConfNodeType, confnode=None):
 if self.CTR.CheckProjectPathPerm():
-ConfNodeName = "%s-0" % ConfNodeType
+ConfNodeName = "%s_0" % ConfNodeType
 if confnode is not None:
 confnode.CTNAddChild(ConfNodeName, ConfNodeType)
 else:
 self.CTR.CTNAddChild(ConfNodeName, ConfNodeType)
 self._Refresh(TITLE, FILEMENU, PROJECTTREE)
 if dialog.ShowModal() == wx.ID_YES:
 confnode.CTNRemove()
 del confnode
 self._Refresh(TITLE, FILEMENU, PROJECTTREE)
 dialog.Destroy()
+#-------------------------------------------------------------------------------
+#                        Highlights showing functions
+#-------------------------------------------------------------------------------
+def ShowHighlight(self, infos, start, end, highlight_type):
+config_name = self.Controler.GetProjectMainConfigurationName()
+if config_name is not None and infos[0] == self.Controler.ComputeConfigurationName(config_name):
+self.CTR._OpenView()
+selected = self.TabsOpened.GetSelection()
+if selected != -1:
+viewer = self.TabsOpened.GetPage(selected)
+viewer.AddHighlight(infos[1:], start, end, highlight_type)
+else:
+IDEFrame.ShowHighlight(self, infos, start, end, highlight_type)
 #-------------------------------------------------------------------------------
 #                               Exception Handler
 #-------------------------------------------------------------------------------
 Max_Traceback_List_Size = 20

branch	1.1 Korean release
changeset 968	eee7625de1f7
parent 967	8a339cd61cb4
child 970	0dd89c8eeef5