144 from editors.GraphicViewer import GraphicViewer |
144 from editors.GraphicViewer import GraphicViewer |
145 from editors.ResourceEditor import ConfigurationEditor, ResourceEditor |
145 from editors.ResourceEditor import ConfigurationEditor, ResourceEditor |
146 from editors.DataTypeEditor import DataTypeEditor |
146 from editors.DataTypeEditor import DataTypeEditor |
147 from util.MiniTextControler import MiniTextControler |
147 from util.MiniTextControler import MiniTextControler |
148 from util.ProcessLogger import ProcessLogger |
148 from util.ProcessLogger import ProcessLogger |
|
149 from controls.LogViewer import LogViewer |
149 |
150 |
150 from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY, ITEM_PROJECT, ITEM_RESOURCE |
151 from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY, ITEM_PROJECT, ITEM_RESOURCE |
151 from ProjectController import ProjectController, MATIEC_ERROR_MODEL, ITEM_CONFNODE |
152 from ProjectController import ProjectController, MATIEC_ERROR_MODEL, ITEM_CONFNODE |
152 |
153 |
153 |
154 |
285 ] = [wx.NewId() for _init_ctrls in range(1)] |
286 ] = [wx.NewId() for _init_ctrls in range(1)] |
286 |
287 |
287 CONFNODEMENU_POSITION = 3 |
288 CONFNODEMENU_POSITION = 3 |
288 |
289 |
289 class Beremiz(IDEFrame): |
290 class Beremiz(IDEFrame): |
290 |
291 |
291 def _init_utils(self): |
292 def _init_utils(self): |
292 self.ConfNodeMenu = wx.Menu(title='') |
293 self.ConfNodeMenu = wx.Menu(title='') |
293 self.RecentProjectsMenu = wx.Menu(title='') |
294 self.RecentProjectsMenu = wx.Menu(title='') |
294 |
295 |
295 IDEFrame._init_utils(self) |
296 IDEFrame._init_utils(self) |
383 size=wx.Size(0, 0), style=wx.TE_MULTILINE|wx.TE_RICH2) |
384 size=wx.Size(0, 0), style=wx.TE_MULTILINE|wx.TE_RICH2) |
384 self.LogConsole.Bind(wx.EVT_LEFT_DCLICK, self.OnLogConsoleDClick) |
385 self.LogConsole.Bind(wx.EVT_LEFT_DCLICK, self.OnLogConsoleDClick) |
385 self.MainTabs["LogConsole"] = (self.LogConsole, _("Log Console")) |
386 self.MainTabs["LogConsole"] = (self.LogConsole, _("Log Console")) |
386 self.BottomNoteBook.AddPage(*self.MainTabs["LogConsole"]) |
387 self.BottomNoteBook.AddPage(*self.MainTabs["LogConsole"]) |
387 #self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogConsole), wx.RIGHT) |
388 #self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogConsole), wx.RIGHT) |
388 |
389 |
|
390 self.LogViewer = LogViewer(self.BottomNoteBook, self) |
|
391 self.MainTabs["LogViewer"] = (self.LogViewer, _("Log Viewer")) |
|
392 self.BottomNoteBook.AddPage(*self.MainTabs["LogViewer"]) |
|
393 self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogViewer), wx.RIGHT) |
|
394 |
389 StatusToolBar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, |
395 StatusToolBar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, |
390 wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER) |
396 wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER) |
391 StatusToolBar.SetToolBitmapSize(wx.Size(25, 25)) |
397 StatusToolBar.SetToolBitmapSize(wx.Size(25, 25)) |
392 StatusToolBar.Realize() |
398 StatusToolBar.Realize() |
393 self.Panes["StatusToolBar"] = StatusToolBar |
399 self.Panes["StatusToolBar"] = StatusToolBar |
539 if result is not None: |
545 if result is not None: |
540 first_line, first_column, last_line, last_column, error = result.groups() |
546 first_line, first_column, last_line, last_column, error = result.groups() |
541 infos = self.CTR.ShowError(self.Log, |
547 infos = self.CTR.ShowError(self.Log, |
542 (int(first_line), int(first_column)), |
548 (int(first_line), int(first_column)), |
543 (int(last_line), int(last_column))) |
549 (int(last_line), int(last_column))) |
544 |
550 |
545 ## Function displaying an Error dialog in PLCOpenEditor. |
551 ## Function displaying an Error dialog in PLCOpenEditor. |
546 # @return False if closing cancelled. |
552 # @return False if closing cancelled. |
547 def CheckSaveBeforeClosing(self, title=_("Close Project")): |
553 def CheckSaveBeforeClosing(self, title=_("Close Project")): |
548 if self.CTR.ProjectTestModified(): |
554 if self.CTR.ProjectTestModified(): |
549 dialog = wx.MessageDialog(self, |
555 dialog = wx.MessageDialog(self, |