beremiz: comparison etherlab/EtherCATManagementEditor.py

equal deleted inserted replaced

-:c89fc366bebd
+:0ffb41625592
 import string
 from xml.dom import minidom
 import wx
 import wx.grid
-import wx.gizmos
+import wx.adv
 import wx.lib.buttons
 # --------------------------------------------------------------------
 from controls import CustomGrid, CustomTable
 from runtime import PlcStatus
 self.StaticTextDic[statictext_name] = wx.StaticText(self, label=_(statictext_label))
 self.TextCtrlDic[textctrl_name] = wx.TextCtrl(self, size=wx.Size(130, 24), style=wx.TE_READONLY)
 self.SizerDic["SlaveInfosDetailsInnerSizer"].AddMany([self.StaticTextDic[statictext_name],
 self.TextCtrlDic[textctrl_name]])
-self.SizerDic["SlaveInfosDetailsBox"].AddSizer(self.SizerDic["SlaveInfosDetailsInnerSizer"])
+self.SizerDic["SlaveInfosDetailsBox"].Add(self.SizerDic["SlaveInfosDetailsInnerSizer"])
 self.SyncManagersGrid = CustomGrid(self, size=wx.Size(605, 155), style=wx.VSCROLL)
 self.SizerDic["SyncManagerInnerSizer"].Add(self.SyncManagersGrid)
 self.SizerDic["SyncManagerBox"].Add(self.SizerDic["SyncManagerInnerSizer"])
 ("CurrentStateLabel", "Current State:", "CurrentState")])
 ]
 for button_name, button_id, button_label, button_tooltipstring, event_method, sub_item in buttons:
 self.ButtonDic[button_name] = wx.Button(self, id=button_id, label=_(button_label))
 self.ButtonDic[button_name].Bind(wx.EVT_BUTTON, event_method)
-self.ButtonDic[button_name].SetToolTipString(button_tooltipstring)
+self.ButtonDic[button_name].SetToolTip(button_tooltipstring)
 self.SizerDic["SlaveState_up_sizer"].Add(self.ButtonDic[button_name])
 for statictext_name, statictext_label, textctrl_name in sub_item:
 self.StaticTextDic[statictext_name] = wx.StaticText(self, label=_(statictext_label))
 self.TextCtrlDic[textctrl_name] = wx.TextCtrl(self, size=wx.DefaultSize, style=wx.TE_READONLY)
 self.SizerDic["SlaveState_up_sizer"].AddMany([self.StaticTextDic[statictext_name],
 for button_name, button_label, button_tooltipstring, event_method in [
 ("StartTimerButton", "Start State Monitoring", "Slave State Update Restart", self.StartTimer),
 ("StopTimerButton", "Stop State Monitoring", "Slave State Update Stop", self.CurrentStateThreadStop)]:
 self.ButtonDic[button_name] = wx.Button(self, label=_(button_label))
 self.ButtonDic[button_name].Bind(wx.EVT_BUTTON, event_method)
-self.ButtonDic[button_name].SetToolTipString(button_tooltipstring)
+self.ButtonDic[button_name].SetToolTip(button_tooltipstring)
 self.SizerDic["SlaveState_down_sizer"].Add(self.ButtonDic[button_name])
 self.SizerDic["SlaveState_sizer"].AddMany([self.SizerDic["SlaveState_up_sizer"],
 self.SizerDic["SlaveState_down_sizer"]])
 @param controler: _EthercatSlaveCTN class in EthercatSlave.py
 """
 wx.Panel.__init__(self, parent, -1, size=(350, 500))
-self.Tree = wx.gizmos.TreeListCtrl(self, -1, size=(350, 500),
+self.Tree = wx.adv.TreeListCtrl(self, -1, size=(350, 500),
 style=(wx.TR_DEFAULT_STYLE |
 wx.TR_FULL_ROW_HIGHLIGHT |
 wx.TR_HIDE_ROOT |
 wx.TR_COLUMN_LINES |
 wx.TR_ROW_LINES))
 ('Slaves', 'Slave Count:')]:
 self.StaticText[key] = wx.StaticText(self, label=_(label))
 self.TextCtrl[key] = wx.TextCtrl(self, size=wx.Size(130, 24), style=wx.TE_READONLY)
 self.MasterStateSizer['innerMasterState'].AddMany([self.StaticText[key], self.TextCtrl[key]])
-self.MasterStateSizer['masterState'].AddSizer(self.MasterStateSizer['innerMasterState'])
+self.MasterStateSizer['masterState'].Add(self.MasterStateSizer['innerMasterState'])
 # ----------------------- Ethernet Network Card Information ---------------------------------------
 for key, label in [
 ('Main', 'MAC Address:'),
 ('Link', 'Link State:'),
 ('Lost frames', 'Lost Frames:')]:
 self.StaticText[key] = wx.StaticText(self, label=_(label))
 self.TextCtrl[key] = wx.TextCtrl(self, size=wx.Size(130, 24), style=wx.TE_READONLY)
 self.MasterStateSizer['innerDeviceInfo'].AddMany([self.StaticText[key], self.TextCtrl[key]])
-self.MasterStateSizer['deviceInfo'].AddSizer(self.MasterStateSizer['innerDeviceInfo'])
+self.MasterStateSizer['deviceInfo'].Add(self.MasterStateSizer['innerDeviceInfo'])
 # ----------------------- Network Frame Information -----------------------------------------------
 for key, label in [
 ("Tx frame rate [1/s]", "Tx Frame Rate [1/s]:"),
 ("Tx rate [KByte/s]", "Tx Rate [KByte/s]:"),
 self.TextCtrl[key] = {}
 for index in ['0', '1', '2']:
 self.TextCtrl[key][index] = wx.TextCtrl(self, size=wx.Size(130, 24), style=wx.TE_READONLY)
 self.MasterStateSizer['innerFrameInfo'].Add(self.TextCtrl[key][index])
-self.MasterStateSizer['frameInfo'].AddSizer(self.MasterStateSizer['innerFrameInfo'])
+self.MasterStateSizer['frameInfo'].Add(self.MasterStateSizer['innerFrameInfo'])
 # ------------------------------- Slave Information  -----------------------------------------------
 self.SITreeListCtrl = SITreeListCtrl(self, self.Controler)
 self.MasterStateSizer["innerSlaveInfo"].AddMany([self.SIUpdateButton,
 self.SITreeListCtrl])
-self.MasterStateSizer["slaveInfo"].AddSizer(
+self.MasterStateSizer["slaveInfo"].Add(
 self.MasterStateSizer["innerSlaveInfo"])
 # --------------------------------- Main Sizer ----------------------------------------------------
 self.MasterStateSizer["main"].Add(self.MSUpdateButton)
 for key, sub, in [
 ("innerBottom", [
 "slaveInfo"]),
 ("main", [
 "innerTop", "innerMiddle", "innerBottom"])]:
 for key2 in sub:
-self.MasterStateSizer[key].AddSizer(self.MasterStateSizer[key2])
+self.MasterStateSizer[key].Add(self.MasterStateSizer[key2])
 self.SetSizer(self.MasterStateSizer["main"])
 def OnMSUpdateButtonClick(self, event):
 """
 wx.Panel.__init__(self, parent, -1, size=wx.Size(750, 350))
 self.Controler=controler
-self.Tree = wx.gizmos.TreeListCtrl(self, -1, size=wx.Size(750,350),
+self.Tree = wx.adv.TreeListCtrl(self, -1, size=wx.Size(750,350),
 style=wx.TR_HAS_BUTTONS
 |wx.TR_HIDE_ROOT
 |wx.TR_ROW_LINES
 |wx.TR_COLUMN_LINES
 |wx.TR_FULL_ROW_HIGHLIGHT)

branch	wxPython4
changeset 3303	0ffb41625592
parent 2643	b98d9e08231f
child 3572	b46af5b80c7d