diff -r 8d9e7edc0195 -r 897ba122460e PLCOpenEditor.py --- a/PLCOpenEditor.py Wed Sep 02 08:30:34 2009 -0600 +++ b/PLCOpenEditor.py Wed Sep 02 08:39:18 2009 -0600 @@ -572,7 +572,7 @@ self.OnPageDragged) self.AUIManager.AddPane(self.TabsOpened, wx.aui.AuiPaneInfo().CentrePane()) - self.DebugVariablePanel = DebugVariablePanel(self, self.Controler) + self.DebugVariablePanel = DebugVariablePanel(self, self.Controler.DataProducer) self.AUIManager.AddPane(self.DebugVariablePanel, wx.aui.AuiPaneInfo().Caption(_("Variables")).Right().Layer(0).BestSize(wx.Size(250, 600)).CloseButton(False)) else: self.SecondSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORSECONDSPLITTER, @@ -592,7 +592,7 @@ wx.EVT_NOTEBOOK_PAGE_CHANGED(self.TabsOpened, ID_PLCOPENEDITORTABSOPENED, self.OnPouSelectedChanged) - self.DebugVariablePanel = DebugVariablePanel(self.SecondSplitter, self.Controler) + self.DebugVariablePanel = DebugVariablePanel(self.SecondSplitter, self.Controler.DataProducer) self.SecondSplitter.SplitVertically(self.TabsOpened, self.DebugVariablePanel, -250) else: @@ -2008,7 +2008,7 @@ event.Skip() def OpenGraphicViewer(self, var_path): - new_window = GraphicViewer(self.TabsOpened, self, self.Controler, var_path) + new_window = GraphicViewer(self.TabsOpened, self, self.Controler.DataProducer, var_path) self.AddPage(new_window, "") new_window.SetFocus() self.RefreshPageTitles() @@ -4874,10 +4874,9 @@ self._init_sizers() - def __init__(self, parent, controler): + def __init__(self, parent, producer): self._init_ctrls(parent) - DebugViewer.__init__(self, controler, True) - self.Controler = controler + DebugViewer.__init__(self, producer, True) self.HasNewData = False self.Table = DebugVariableTable(self, [], GetDebugVariablesTableColnames())