--- a/objdictgen/commondialogs.py Wed Aug 08 08:51:09 2007 +0200
+++ b/objdictgen/commondialogs.py Wed Aug 08 14:55:15 2007 +0200
@@ -21,8 +21,6 @@
#License along with this library; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from wxPython.wx import *
-from wxPython.grid import *
import wx
import os
@@ -32,81 +30,125 @@
#-------------------------------------------------------------------------------
-[wxID_COMMUNICATIONDIALOG, wxID_COMMUNICATIONDIALOGMAINPANEL,
- wxID_COMMUNICATIONDIALOGPOSSIBLEINDEXES, wxID_COMMUNICATIONDIALOGCURRENTINDEXES,
- wxID_COMMUNICATIONDIALOGSELECT, wxID_COMMUNICATIONDIALOGUNSELECT,
- wxID_COMMUNICATIONDIALOGSTATICTEXT1, wxID_COMMUNICATIONDIALOGSTATICTEXT2
-] = [wx.NewId() for _init_ctrls in range(8)]
+[ID_COMMUNICATIONDIALOG, ID_COMMUNICATIONDIALOGPOSSIBLEINDEXES,
+ ID_COMMUNICATIONDIALOGCURRENTINDEXES, ID_COMMUNICATIONDIALOGSELECT,
+ ID_COMMUNICATIONDIALOGUNSELECT, ID_COMMUNICATIONDIALOGSTATICTEXT1,
+ ID_COMMUNICATIONDIALOGSTATICTEXT2
+] = [wx.NewId() for _init_ctrls in range(7)]
class CommunicationDialog(wx.Dialog):
def _init_coll_flexGridSizer1_Items(self, parent):
- # generated method, don't edit
-
- parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+ parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+ parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ def _init_coll_flexGridSizer1_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
+
+ def _init_coll_MainSizer_Items(self, parent):
+ parent.AddSizer(self.LeftGridSizer, 0, border=0, flag=wx.GROW)
+ parent.AddSizer(self.MiddleGridSizer, 0, border=0, flag=wx.GROW)
+ parent.AddSizer(self.RightGridSizer, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_MainSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableCol(2)
+ parent.AddGrowableRow(0)
+
+ def _init_coll_LeftGridSizer_Items(self, parent):
+ parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.PossibleIndexes, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_LeftGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(1)
+
+ def _init_coll_MiddleGridSizer_Items(self, parent):
+ parent.AddWindow(self.Select, 0, border=0, flag=wx.ALIGN_BOTTOM)
+ parent.AddWindow(self.Unselect, 0, border=0, flag=wx.ALIGN_TOP)
+
+ def _init_coll_MiddleGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
+ parent.AddGrowableRow(1)
+
+ def _init_coll_RightGridSizer_Items(self, parent):
+ parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.CurrentIndexes, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_RightGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(1)
def _init_sizers(self):
- # generated method, don't edit
- self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+ self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+ self.MainSizer = wx.FlexGridSizer(cols=3, hgap=15, rows=1, vgap=0)
+ self.LeftGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
+ self.MiddleGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=40)
+ self.RightGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
+
self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+ self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+ self._init_coll_MainSizer_Items(self.MainSizer)
+ self._init_coll_MainSizer_Growables(self.MainSizer)
+ self._init_coll_LeftGridSizer_Items(self.LeftGridSizer)
+ self._init_coll_LeftGridSizer_Growables(self.LeftGridSizer)
+ self._init_coll_MiddleGridSizer_Items(self.MiddleGridSizer)
+ self._init_coll_MiddleGridSizer_Growables(self.MiddleGridSizer)
+ self._init_coll_RightGridSizer_Items(self.RightGridSizer)
+ self._init_coll_RightGridSizer_Growables(self.RightGridSizer)
+
self.SetSizer(self.flexGridSizer1)
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Dialog.__init__(self, id=wxID_COMMUNICATIONDIALOG,
+ wx.Dialog.__init__(self, id=ID_COMMUNICATIONDIALOG,
name='CommunicationDialog', parent=prnt, pos=wx.Point(234, 216),
- size=wx.Size(726, 437), style=wx.DEFAULT_DIALOG_STYLE,
+ size=wx.Size(726, 437), style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER,
title='Edit Communication Profile')
self.SetClientSize(wx.Size(726, 437))
- self.MainPanel = wx.Panel(id=wxID_COMMUNICATIONDIALOGMAINPANEL,
- name='MainPanel', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(688, 382), style=wx.TAB_TRAVERSAL)
- self.MainPanel.SetAutoLayout(True)
+ self.staticText1 = wx.StaticText(id=ID_COMMUNICATIONDIALOGSTATICTEXT1,
+ label='Possible Profile Indexes:', name='staticText1',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0,
+ 17), style=0)
self.PossibleIndexes = wx.ListBox(choices=[],
- id=wxID_COMMUNICATIONDIALOGPOSSIBLEINDEXES,
- name='PossibleIndexes', parent=self.MainPanel, pos=wx.Point(40,
- 48), size=wx.Size(280, 320), style=wxLB_EXTENDED)
+ id=ID_COMMUNICATIONDIALOGPOSSIBLEINDEXES,
+ name='PossibleIndexes', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 0), style=wx.LB_EXTENDED)
self.PossibleIndexes.Bind(wx.EVT_LEFT_DCLICK, self.OnPossibleIndexesDClick,
- id=wxID_COMMUNICATIONDIALOGPOSSIBLEINDEXES)
-
- self.CurrentIndexes = wx.ListBox(choices=[],
- id=wxID_COMMUNICATIONDIALOGCURRENTINDEXES, name='CurrentIndexes',
- parent=self.MainPanel, pos=wx.Point(400, 48), size=wx.Size(280,
- 320), style=wxLB_EXTENDED)
- self.CurrentIndexes.Bind(wx.EVT_LEFT_DCLICK, self.OnCurrentIndexesDClick,
- id=wxID_COMMUNICATIONDIALOGCURRENTINDEXES)
-
- self.Select = wx.Button(id=wxID_COMMUNICATIONDIALOGSELECT, label='>>',
- name='Select', parent=self.MainPanel, pos=wx.Point(345, 136),
+ id=ID_COMMUNICATIONDIALOGPOSSIBLEINDEXES)
+
+ self.Select = wx.Button(id=ID_COMMUNICATIONDIALOGSELECT, label='>>',
+ name='Select', parent=self, pos=wx.Point(0, 0),
size=wx.Size(32, 32), style=0)
self.Select.Bind(wx.EVT_BUTTON, self.OnSelectButton,
- id=wxID_COMMUNICATIONDIALOGSELECT)
-
- self.Unselect = wx.Button(id=wxID_COMMUNICATIONDIALOGUNSELECT,
- label='<<', name='Unselect', parent=self.MainPanel,
- pos=wx.Point(345, 216), size=wx.Size(32, 30), style=0)
+ id=ID_COMMUNICATIONDIALOGSELECT)
+
+ self.Unselect = wx.Button(id=ID_COMMUNICATIONDIALOGUNSELECT,
+ label='<<', name='Unselect', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(32, 32), style=0)
self.Unselect.Bind(wx.EVT_BUTTON, self.OnUnselectButton,
- id=wxID_COMMUNICATIONDIALOGUNSELECT)
-
- self.staticText1 = wx.StaticText(id=wxID_COMMUNICATIONDIALOGSTATICTEXT1,
- label='Possible Profile Indexes:', name='staticText1',
- parent=self.MainPanel, pos=wx.Point(40, 24), size=wx.Size(156,
+ id=ID_COMMUNICATIONDIALOGUNSELECT)
+
+ self.staticText2 = wx.StaticText(id=ID_COMMUNICATIONDIALOGSTATICTEXT2,
+ label='Current Profile Indexes:', name='staticText2',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0,
17), style=0)
- self.staticText2 = wx.StaticText(id=wxID_COMMUNICATIONDIALOGSTATICTEXT2,
- label='Current Profile Indexes:', name='staticText2',
- parent=self.MainPanel, pos=wx.Point(400, 24), size=wx.Size(152,
- 17), style=0)
-
+ self.CurrentIndexes = wx.ListBox(choices=[],
+ id=ID_COMMUNICATIONDIALOGCURRENTINDEXES, name='CurrentIndexes',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 0),
+ style=wx.LB_EXTENDED)
+ self.CurrentIndexes.Bind(wx.EVT_LEFT_DCLICK, self.OnCurrentIndexesDClick,
+ id=ID_COMMUNICATIONDIALOGCURRENTINDEXES)
+
+ self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+
self._init_sizers()
def __init__(self, parent):
self._init_ctrls(parent)
- self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
- self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
self.AllList = []
self.CurrentList = []
self.IndexDictionary = {}
@@ -174,101 +216,122 @@
#-------------------------------------------------------------------------------
-[wxID_MAPVARIABLEDIALOG, wxID_MAPVARIABLEDIALOGINDEX,
- wxID_MAPVARIABLEDIALOGINDEXNAME, wxID_MAPVARIABLEDIALOGMAINPANEL,
- wxID_MAPVARIABLEDIALOGNUMBER, wxID_MAPVARIABLEDIALOGRADIOBUTTON1,
- wxID_MAPVARIABLEDIALOGRADIOBUTTON2, wxID_MAPVARIABLEDIALOGRADIOBUTTON3,
- wxID_MAPVARIABLEDIALOGSTATICTEXT1, wxID_MAPVARIABLEDIALOGSTATICTEXT2,
- wxID_MAPVARIABLEDIALOGSTATICTEXT3, wxID_MAPVARIABLEDIALOGSTATICTEXT4,
+[ID_MAPVARIABLEDIALOG, ID_MAPVARIABLEDIALOGINDEX,
+ ID_MAPVARIABLEDIALOGINDEXNAME, ID_MAPVARIABLEDIALOGSPACER,
+ ID_MAPVARIABLEDIALOGNUMBER, ID_MAPVARIABLEDIALOGRADIOBUTTON1,
+ ID_MAPVARIABLEDIALOGRADIOBUTTON2, ID_MAPVARIABLEDIALOGRADIOBUTTON3,
+ ID_MAPVARIABLEDIALOGSTATICTEXT1, ID_MAPVARIABLEDIALOGSTATICTEXT2,
+ ID_MAPVARIABLEDIALOGSTATICTEXT3, ID_MAPVARIABLEDIALOGSTATICTEXT4,
] = [wx.NewId() for _init_ctrls in range(12)]
class MapVariableDialog(wx.Dialog):
def _init_coll_flexGridSizer1_Items(self, parent):
- # generated method, don't edit
-
- parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+ parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+ parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ def _init_coll_flexGridSizer1_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
+
+ def _init_coll_MainSizer_Items(self, parent):
+ parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Index, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.radioButton1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.radioButton2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText4, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.IndexName, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.radioButton3, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Number, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_MainSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableCol(2)
def _init_sizers(self):
- # generated method, don't edit
- self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+ self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+ self.MainSizer = wx.FlexGridSizer(cols=3, hgap=30, rows=4, vgap=5)
+
self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+ self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+ self._init_coll_MainSizer_Items(self.MainSizer)
+ self._init_coll_MainSizer_Growables(self.MainSizer)
+
self.SetSizer(self.flexGridSizer1)
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Dialog.__init__(self, id=wxID_MAPVARIABLEDIALOG,
+ wx.Dialog.__init__(self, id=ID_MAPVARIABLEDIALOG,
name='CommunicationDialog', parent=prnt, pos=wx.Point(376, 223),
size=wx.Size(444, 186), style=wx.DEFAULT_DIALOG_STYLE,
title='Add Map Variable')
self.SetClientSize(wx.Size(444, 186))
- self.MainPanel = wx.Panel(id=wxID_MAPVARIABLEDIALOGMAINPANEL,
- name='MainPanel', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(431, 142), style=wx.TAB_TRAVERSAL)
- self.MainPanel.SetAutoLayout(True)
-
- self.staticText1 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT1,
- label='Index:', name='staticText1', parent=self.MainPanel,
- pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
-
- self.Index = wx.TextCtrl(id=wxID_MAPVARIABLEDIALOGINDEX, name='Index',
- parent=self.MainPanel, pos=wx.Point(24, 48), size=wx.Size(152,
- 25), style=0, value='0x2000')
-
- self.staticText3 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT3,
- label='Name:', name='staticText3', parent=self.MainPanel,
- pos=wx.Point(24, 80), size=wx.Size(47, 17), style=0)
-
- self.IndexName = wx.TextCtrl(id=wxID_MAPVARIABLEDIALOGINDEXNAME,
- name='IndexName', parent=self.MainPanel, pos=wx.Point(24, 104),
- size=wx.Size(152, 24), style=0, value='Undefined')
-
- self.staticText2 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT2,
- label='Type:', name='staticText2', parent=self.MainPanel,
- pos=wx.Point(208, 24), size=wx.Size(38, 17), style=0)
-
- self.radioButton1 = wx.RadioButton(id=wxID_MAPVARIABLEDIALOGRADIOBUTTON1,
- label='VAR', name='radioButton1', parent=self.MainPanel,
- pos=wx.Point(208, 48), size=wx.Size(72, 24), style=wxRB_GROUP)
+ self.staticText1 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT1,
+ label='Index:', name='staticText1', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.staticText2 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT2,
+ label='Type:', name='staticText2', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.staticText3 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT3,
+ label='Name:', name='staticText3', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.staticText4 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT4,
+ label='Number:', name='staticText4', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 16), style=0)
+
+ self.radioButton1 = wx.RadioButton(id=ID_MAPVARIABLEDIALOGRADIOBUTTON1,
+ label='VAR', name='radioButton1', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(80, 24), style=wx.RB_GROUP)
self.radioButton1.SetValue(True)
self.radioButton1.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton1Click,
- id=wxID_MAPVARIABLEDIALOGRADIOBUTTON1)
-
- self.radioButton2 = wx.RadioButton(id=wxID_MAPVARIABLEDIALOGRADIOBUTTON2,
- label='ARRAY', name='radioButton2', parent=self.MainPanel,
- pos=wx.Point(208, 72), size=wx.Size(80, 24), style=wxRB_SINGLE)
+ id=ID_MAPVARIABLEDIALOGRADIOBUTTON1)
+
+ self.radioButton2 = wx.RadioButton(id=ID_MAPVARIABLEDIALOGRADIOBUTTON2,
+ label='ARRAY', name='radioButton2', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(80, 24), style=wx.RB_SINGLE)
self.radioButton2.SetValue(False)
self.radioButton2.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton2Click,
- id=wxID_MAPVARIABLEDIALOGRADIOBUTTON2)
-
- self.radioButton3 = wx.RadioButton(id=wxID_MAPVARIABLEDIALOGRADIOBUTTON3,
- label='REC', name='radioButton3', parent=self.MainPanel,
- pos=wx.Point(208, 96), size=wx.Size(96, 24), style=wxRB_SINGLE)
+ id=ID_MAPVARIABLEDIALOGRADIOBUTTON2)
+
+ self.radioButton3 = wx.RadioButton(id=ID_MAPVARIABLEDIALOGRADIOBUTTON3,
+ label='REC', name='radioButton3', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(80, 24), style=wx.RB_SINGLE)
self.radioButton3.SetValue(False)
self.radioButton3.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton3Click,
- id=wxID_MAPVARIABLEDIALOGRADIOBUTTON3)
-
- self.staticText4 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT4,
- label='Number:', name='staticText4', parent=self.MainPanel,
- pos=wx.Point(312, 80), size=wx.Size(88, 16), style=0)
-
- self.Number = wx.TextCtrl(id=wxID_MAPVARIABLEDIALOGNUMBER,
- name='Number', parent=self.MainPanel, pos=wx.Point(312, 104),
- size=wx.Size(112, 24), style=wx.TE_RIGHT, value='0')
-
+ id=ID_MAPVARIABLEDIALOGRADIOBUTTON3)
+
+ self.Index = wx.TextCtrl(id=ID_MAPVARIABLEDIALOGINDEX, name='Index',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 25),
+ style=0, value='0x2000')
+
+ self.IndexName = wx.TextCtrl(id=ID_MAPVARIABLEDIALOGINDEXNAME,
+ name='IndexName', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=0, value='Undefined')
+
+ self.Number = wx.TextCtrl(id=ID_MAPVARIABLEDIALOGNUMBER,
+ name='Number', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=wx.TE_RIGHT, value='0')
+
+ self.Spacer = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER,
+ name='Spacer', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+
+ self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+ self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+
self._init_sizers()
def __init__(self, parent):
self._init_ctrls(parent)
- self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
- self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
self.staticText4.Enable(False)
self.Number.Enable(False)
- EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
def SetIndex(self, index):
self.Index.SetValue("0x%04X"%index)
@@ -296,11 +359,11 @@
text += " and %s"%item
else:
text += ", %s"%item
- message = wxMessageDialog(self, "Form isn't valid. %s must be integer%s!"%(text,suffix), "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "Form isn't valid. %s must be integer%s!"%(text,suffix), "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
- self.EndModal(wxID_OK)
+ self.EndModal(wx.ID_OK)
def GetValues(self):
name = self.IndexName.GetValue()
@@ -338,87 +401,126 @@
#-------------------------------------------------------------------------------
-[wxID_USERTYPEDIALOG, wxID_USERTYPEDIALOGLENGTH, wxID_USERTYPEDIALOGMAINPANEL,
- wxID_USERTYPEDIALOGMAX, wxID_USERTYPEDIALOGMIN,
- wxID_USERTYPEDIALOGSTATICBOX1, wxID_USERTYPEDIALOGSTATICTEXT1,
- wxID_USERTYPEDIALOGSTATICTEXT2, wxID_USERTYPEDIALOGSTATICTEXT3,
- wxID_USERTYPEDIALOGSTATICTEXT4, wxID_USERTYPEDIALOGTYPE,
+[ID_USERTYPEDIALOG, ID_USERTYPEDIALOGSPACER,
+ ID_USERTYPEDIALOGTYPE, ID_USERTYPEDIALOGMAX,
+ ID_USERTYPEDIALOGMIN, ID_USERTYPEDIALOGLENGTH,
+ ID_USERTYPEDIALOGSTATICBOX1, ID_USERTYPEDIALOGSTATICTEXT1,
+ ID_USERTYPEDIALOGSTATICTEXT2, ID_USERTYPEDIALOGSTATICTEXT3,
+ ID_USERTYPEDIALOGSTATICTEXT4,
] = [wx.NewId() for _init_ctrls in range(11)]
class UserTypeDialog(wx.Dialog):
def _init_coll_flexGridSizer1_Items(self, parent):
- # generated method, don't edit
-
- parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
-
+ parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+ parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ def _init_coll_flexGridSizer1_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
+
+ def _init_coll_MainSizer_Items(self, parent):
+ parent.AddSizer(self.LeftGridSizer, 2, border=5, flag=wx.GROW|wx.RIGHT)
+ parent.AddSizer(self.RightBoxSizer, 3, border=5, flag=wx.GROW|wx.LEFT)
+
+ def _init_coll_LeftGridSizer_Items(self, parent):
+ parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Type, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_LeftGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(2)
+
+ def _init_coll_RightBoxSizer_Items(self, parent):
+ parent.AddSizer(self.RightBoxGridSizer, 0, border=10, flag=wx.GROW|wx.ALL)
+
+ def _init_coll_RightBoxGridSizer_Items(self, parent):
+ parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Min, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Max, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText4, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Length, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_RightBoxGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(1)
+
def _init_sizers(self):
- # generated method, don't edit
- self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+ self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+ self.MainSizer = wx.BoxSizer(wx.HORIZONTAL)
+ self.LeftGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=5)
+ self.RightBoxSizer = wx.StaticBoxSizer(self.staticBox1, wx.VERTICAL)
+ self.RightBoxGridSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=3, vgap=10)
+
self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+ self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+ self._init_coll_MainSizer_Items(self.MainSizer)
+ self._init_coll_LeftGridSizer_Items(self.LeftGridSizer)
+ self._init_coll_LeftGridSizer_Growables(self.LeftGridSizer)
+ self._init_coll_RightBoxSizer_Items(self.RightBoxSizer)
+ self._init_coll_RightBoxGridSizer_Items(self.RightBoxGridSizer)
+ self._init_coll_RightBoxGridSizer_Growables(self.RightBoxGridSizer)
+
self.SetSizer(self.flexGridSizer1)
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Dialog.__init__(self, id=wxID_USERTYPEDIALOG, name='UserTypeDialog',
- parent=prnt, pos=wx.Point(376, 223), size=wx.Size(444, 228),
+ wx.Dialog.__init__(self, id=ID_USERTYPEDIALOG, name='UserTypeDialog',
+ parent=prnt, pos=wx.Point(376, 223), size=wx.Size(444, 210),
style=wx.DEFAULT_DIALOG_STYLE, title='Add User Type')
- self.SetClientSize(wx.Size(444, 228))
-
- self.MainPanel = wx.Panel(id=wxID_USERTYPEDIALOGMAINPANEL,
- name='MainPanel', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(431, 182), style=wx.TAB_TRAVERSAL)
- self.MainPanel.SetAutoLayout(True)
-
- self.staticText1 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT1,
- label='Type:', name='staticText1', parent=self.MainPanel,
- pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
-
- self.Type = wx.Choice(choices=[], id=wxID_USERTYPEDIALOGTYPE,
- name='Type', parent=self.MainPanel, pos=wx.Point(24, 48),
- size=wx.Size(160, 24), style=0)
+ self.SetClientSize(wx.Size(444, 210))
+
+ self.staticText1 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT1,
+ label='Type:', name='staticText1', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.Type = wx.Choice(choices=[], id=ID_USERTYPEDIALOGTYPE,
+ name='Type', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=0)
self.Type.Bind(wx.EVT_CHOICE, self.OnTypeChoice,
- id=wxID_USERTYPEDIALOGTYPE)
-
- self.staticBox1 = wx.StaticBox(id=wxID_USERTYPEDIALOGSTATICBOX1,
- label='Values', name='staticBox1', parent=self.MainPanel,
- pos=wx.Point(200, 24), size=wx.Size(224, 144), style=0)
-
- self.staticText2 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT2,
- label='Minimum:', name='staticText2', parent=self.MainPanel,
- pos=wx.Point(216, 48), size=wx.Size(67, 17), style=0)
-
- self.Min = wx.TextCtrl(id=wxID_USERTYPEDIALOGMIN, name='Min',
- parent=self.MainPanel, pos=wx.Point(296, 48), size=wx.Size(112,
- 24), style=wx.TE_RIGHT, value='0')
-
- self.staticText3 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT3,
- label='Maximum:', name='staticText3', parent=self.MainPanel,
- pos=wx.Point(216, 88), size=wx.Size(71, 17), style=0)
-
- self.Max = wx.TextCtrl(id=wxID_USERTYPEDIALOGMAX, name='Max',
- parent=self.MainPanel, pos=wx.Point(296, 88), size=wx.Size(112,
- 25), style=wx.TE_RIGHT, value='0')
-
- self.staticText4 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT4,
- label='Length:', name='staticText4', parent=self.MainPanel,
- pos=wx.Point(216, 128), size=wx.Size(52, 17), style=0)
-
- self.Length = wx.TextCtrl(id=wxID_USERTYPEDIALOGLENGTH, name='Length',
- parent=self.MainPanel, pos=wx.Point(296, 128), size=wx.Size(112,
- 25), style=wx.TE_RIGHT, value='0')
-
+ id=ID_USERTYPEDIALOGTYPE)
+
+ self.Spacer = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER,
+ name='Spacer', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+
+ self.staticBox1 = wx.StaticBox(id=ID_USERTYPEDIALOGSTATICBOX1,
+ label='Values', name='staticBox1', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 0), style=0)
+
+ self.staticText2 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT2,
+ label='Minimum:', name='staticText2', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(80, 17), style=0)
+
+ self.Min = wx.TextCtrl(id=ID_USERTYPEDIALOGMIN, name='Min',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24),
+ style=wx.TE_RIGHT, value='0')
+
+ self.staticText3 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT3,
+ label='Maximum:', name='staticText3', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(80, 17), style=0)
+
+ self.Max = wx.TextCtrl(id=ID_USERTYPEDIALOGMAX, name='Max',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24),
+ style=wx.TE_RIGHT, value='0')
+
+ self.staticText4 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT4,
+ label='Length:', name='staticText4', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(80, 17), style=0)
+
+ self.Length = wx.TextCtrl(id=ID_USERTYPEDIALOGLENGTH, name='Length',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24),
+ style=wx.TE_RIGHT, value='0')
+
+ self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+ self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+
self._init_sizers()
def __init__(self, parent):
self._init_ctrls(parent)
- self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
- self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
+
self.TypeDictionary = {}
- EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
def OnOK(self, event):
error = []
good = True
@@ -460,12 +562,12 @@
firstmessage = ". A type must be selected"
good = False
if not good:
- message = wxMessageDialog(self, "Form isn't valid%s%s%s!"%(firstmessage,secondmessage), "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "Form isn't valid%s%s%s!"%(firstmessage,secondmessage), "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
self.Name.SetFocus()
else:
- self.EndModal(wxID_OK)
+ self.EndModal(wx.ID_OK)
def SetValues(self, min = None, max = None, length = None):
if min != None:
@@ -533,84 +635,100 @@
#-------------------------------------------------------------------------------
-[wxID_NODEINFOSDIALOG, wxID_NODEINFOSDIALOGMAINPANEL,
- wxID_NODEINFOSDIALOGNAME, wxID_NODEINFOSDIALOGNODEID,
- wxID_NODEINFOSDIALOGDESCRIPTION, wxID_NODEINFOSDIALOGSTATICTEXT1,
- wxID_NODEINFOSDIALOGSTATICTEXT2, wxID_NODEINFOSDIALOGSTATICTEXT3,
- wxID_NODEINFOSDIALOGSTATICTEXT4, wxID_NODEINFOSDIALOGTYPE,
-] = [wx.NewId() for _init_ctrls in range(10)]
+[ID_NODEINFOSDIALOG, ID_NODEINFOSDIALOGNAME,
+ ID_NODEINFOSDIALOGNODEID, ID_NODEINFOSDIALOGDESCRIPTION,
+ ID_NODEINFOSDIALOGTYPE, ID_NODEINFOSDIALOGSTATICTEXT1,
+ ID_NODEINFOSDIALOGSTATICTEXT2, ID_NODEINFOSDIALOGSTATICTEXT3,
+ ID_NODEINFOSDIALOGSTATICTEXT4,
+] = [wx.NewId() for _init_ctrls in range(9)]
class NodeInfosDialog(wx.Dialog):
def _init_coll_flexGridSizer1_Items(self, parent):
- # generated method, don't edit
-
- parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+ parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+ parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ def _init_coll_flexGridSizer1_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
+
+ def _init_coll_MainSizer_Items(self, parent):
+ parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Name, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.NodeID, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Type, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText4, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Description, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_MainSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
def _init_sizers(self):
- # generated method, don't edit
- self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+ self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+ self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=8, vgap=5)
+
self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+ self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+ self._init_coll_MainSizer_Items(self.MainSizer)
+ self._init_coll_MainSizer_Growables(self.MainSizer)
+
self.SetSizer(self.flexGridSizer1)
-
+
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Dialog.__init__(self, id=wxID_NODEINFOSDIALOG,
+ wx.Dialog.__init__(self, id=ID_NODEINFOSDIALOG,
name='NodeInfosDialog', parent=prnt, pos=wx.Point(376, 223),
- size=wx.Size(300, 300), style=wx.DEFAULT_DIALOG_STYLE,
+ size=wx.Size(300, 280), style=wx.DEFAULT_DIALOG_STYLE,
title='Node Infos')
- self.SetClientSize(wx.Size(300, 300))
-
- self.MainPanel = wx.Panel(id=wxID_NODEINFOSDIALOGMAINPANEL,
- name='MainPanel', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(280, 264), style=wx.TAB_TRAVERSAL)
- self.MainPanel.SetAutoLayout(True)
-
- self.staticText1 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT1,
- label='Name:',
- name='staticText1', parent=self.MainPanel,
- pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
-
- self.Name = wx.TextCtrl(id=wxID_NODEINFOSDIALOGNAME, name='Name',
- parent=self.MainPanel, pos=wx.Point(24, 48), size=wx.Size(250,
- 25), style=0, value='')
-
- self.staticText2 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT2,
- label='Node ID:', name='staticText2', parent=self.MainPanel,
- pos=wx.Point(24, 80), size=wx.Size(67, 17), style=0)
-
- self.NodeID = wx.TextCtrl(id=wxID_NODEINFOSDIALOGNODEID, name='NodeID',
- parent=self.MainPanel, pos=wx.Point(24, 104), size=wx.Size(250,
- 25), style=wx.TE_RIGHT, value='')
-
- self.staticText3 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT3,
- label='Type:', name='staticText3', parent=self.MainPanel,
- pos=wx.Point(24, 136), size=wx.Size(71, 17), style=0)
-
- self.Type = wx.Choice(choices=[], id=wxID_NODEINFOSDIALOGTYPE,
- name='Type', parent=self.MainPanel, pos=wx.Point(24, 160),
- size=wx.Size(250, 25), style=0)
-
- self.staticText4 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT4,
- label='Description:', name='staticText4', parent=self.MainPanel,
- pos=wx.Point(24, 192), size=wx.Size(71, 17), style=0)
-
- self.Description = wx.TextCtrl(id=wxID_NODEINFOSDIALOGDESCRIPTION,
- name='Description', parent=self.MainPanel, pos=wx.Point(24, 216),
- size=wx.Size(250, 25), style=0, value='')
-
+ self.SetClientSize(wx.Size(300, 280))
+
+ self.staticText1 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT1,
+ label='Name:', name='staticText1', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.Name = wx.TextCtrl(id=ID_NODEINFOSDIALOGNAME, name='Name',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24),
+ style=0, value='')
+
+ self.staticText2 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT2,
+ label='Node ID:', name='staticText2', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.NodeID = wx.TextCtrl(id=ID_NODEINFOSDIALOGNODEID, name='NodeID',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 25),
+ style=wx.TE_RIGHT, value='')
+
+ self.staticText3 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT3,
+ label='Type:', name='staticText3', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.Type = wx.Choice(choices=[], id=ID_NODEINFOSDIALOGTYPE,
+ name='Type', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 25), style=0)
+
+ self.staticText4 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT4,
+ label='Description:', name='staticText4', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.Description = wx.TextCtrl(id=ID_NODEINFOSDIALOGDESCRIPTION,
+ name='Description', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=0, value='')
+
+ self.Spacer = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER,
+ name='Spacer', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+
+ self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+ self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+
self._init_sizers()
def __init__(self, parent):
self._init_ctrls(parent)
- self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
- self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
+
self.Type.Append("master")
self.Type.Append("slave")
- EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
def OnOK(self, event):
name = self.Name.GetValue()
message = ""
@@ -626,12 +744,12 @@
except:
message = "Node ID must be integer!"
if message != "":
- message = wxMessageDialog(self, message, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, message, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
self.Name.SetFocus()
else:
- self.EndModal(wxID_OK)
+ self.EndModal(wx.ID_OK)
def SetValues(self, name, id, type, description):
self.Name.SetValue(name)
@@ -653,149 +771,217 @@
#-------------------------------------------------------------------------------
-[wxID_CREATENODEDIALOG, wxID_CREATENODEDIALOGEMERGENCY,
- wxID_CREATENODEDIALOGGENSYNC, wxID_CREATENODEDIALOGMAINPANEL,
- wxID_CREATENODEDIALOGNAME, wxID_CREATENODEDIALOGNMT_HEARTBEAT,
- wxID_CREATENODEDIALOGNMT_NODEGUARDING, wxID_CREATENODEDIALOGNMT_NONE,
- wxID_CREATENODEDIALOGNODEID, wxID_CREATENODEDIALOGPROFILE,
- wxID_CREATENODEDIALOGSAVECONFIG, wxID_CREATENODEDIALOGSTATICTEXT1,
- wxID_CREATENODEDIALOGSTATICTEXT2, wxID_CREATENODEDIALOGSTATICTEXT3,
- wxID_CREATENODEDIALOGSTATICTEXT4, wxID_CREATENODEDIALOGSTATICTEXT5,
- wxID_CREATENODEDIALOGSTATICTEXT6, wxID_CREATENODEDIALOGSTATICTEXT7,
- wxID_CREATENODEDIALOGSTOREEDS, wxID_CREATENODEDIALOGDESCRIPTION,
- wxID_CREATENODEDIALOGTYPE,
+[ID_CREATENODEDIALOG, ID_CREATENODEDIALOGEMERGENCY,
+ ID_CREATENODEDIALOGGENSYNC, ID_CREATENODEDIALOGSPACER,
+ ID_CREATENODEDIALOGNAME, ID_CREATENODEDIALOGNMT_HEARTBEAT,
+ ID_CREATENODEDIALOGNMT_NODEGUARDING, ID_CREATENODEDIALOGNMT_NONE,
+ ID_CREATENODEDIALOGNODEID, ID_CREATENODEDIALOGPROFILE,
+ ID_CREATENODEDIALOGSAVECONFIG, ID_CREATENODEDIALOGSTATICTEXT1,
+ ID_CREATENODEDIALOGSTATICTEXT2, ID_CREATENODEDIALOGSTATICTEXT3,
+ ID_CREATENODEDIALOGSTATICTEXT4, ID_CREATENODEDIALOGSTATICTEXT5,
+ ID_CREATENODEDIALOGSTATICTEXT6, ID_CREATENODEDIALOGSTATICTEXT7,
+ ID_CREATENODEDIALOGSTOREEDS, ID_CREATENODEDIALOGDESCRIPTION,
+ ID_CREATENODEDIALOGTYPE,
] = [wx.NewId() for _init_ctrls in range(21)]
class CreateNodeDialog(wx.Dialog):
def _init_coll_flexGridSizer1_Items(self, parent):
- # generated method, don't edit
-
- parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+ parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+ parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ def _init_coll_flexGridSizer1_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
+
+ def _init_coll_MainSizer_Items(self, parent):
+ parent.AddSizer(self.TopBoxSizer, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText7, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Description, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_MainSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableCol(0)
+
+ def _init_coll_TopBoxSizer_Items(self, parent):
+ parent.AddSizer(self.LeftBoxSizer, 1, border=10, flag=wx.GROW|wx.RIGHT)
+ parent.AddSizer(self.RightGridSizer, 1, border=10, flag=wx.GROW|wx.LEFT)
+
+ def _init_coll_LeftBoxSizer_Items(self, parent):
+ parent.AddWindow(self.staticText1, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.Type, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.staticText2, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.Name, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.staticText3, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.NodeID, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.staticText4, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.Profile, 0, border=20, flag=wx.GROW|wx.BOTTOM)
+
+ def _init_coll_RightGridSizer_Items(self, parent):
+ parent.AddSizer(self.RightTopGridSizer, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+ parent.AddSizer(self.RightBottomGridSizer, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_RightGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(1)
+
+ def _init_coll_RightTopGridSizer_Items(self, parent):
+ parent.AddWindow(self.staticText5, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.NMT_None, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.NMT_NodeGuarding, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.NMT_Heartbeat, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_RightTopGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+
+ def _init_coll_RightBottomGridSizer_Items(self, parent):
+ parent.AddWindow(self.staticText6, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.DS302, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.GenSYNC, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.Emergency, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.SaveConfig, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.StoreEDS, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_RightBottomGridSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
def _init_sizers(self):
- # generated method, don't edit
- self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+ self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+ self.MainSizer = wx.FlexGridSizer(cols=1, hgap=5, rows=3, vgap=0)
+ self.TopBoxSizer = wx.BoxSizer(wx.HORIZONTAL)
+ self.LeftBoxSizer = wx.BoxSizer(wx.VERTICAL)
+ self.RightGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=5)
+ self.RightTopGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=4, vgap=0)
+ self.RightBottomGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=6, vgap=0)
+
self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+ self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+ self._init_coll_MainSizer_Items(self.MainSizer)
+ self._init_coll_MainSizer_Growables(self.MainSizer)
+ self._init_coll_TopBoxSizer_Items(self.TopBoxSizer)
+ self._init_coll_LeftBoxSizer_Items(self.LeftBoxSizer)
+ self._init_coll_RightGridSizer_Items(self.RightGridSizer)
+ self._init_coll_RightGridSizer_Growables(self.RightGridSizer)
+ self._init_coll_RightTopGridSizer_Items(self.RightTopGridSizer)
+ self._init_coll_RightTopGridSizer_Growables(self.RightTopGridSizer)
+ self._init_coll_RightBottomGridSizer_Items(self.RightBottomGridSizer)
+ self._init_coll_RightBottomGridSizer_Growables(self.RightBottomGridSizer)
+
self.SetSizer(self.flexGridSizer1)
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Dialog.__init__(self, id=wxID_CREATENODEDIALOG,
+ wx.Dialog.__init__(self, id=ID_CREATENODEDIALOG,
name='CreateNodeDialog', parent=prnt, pos=wx.Point(376, 223),
- size=wx.Size(451, 376), style=wx.DEFAULT_DIALOG_STYLE,
+ size=wx.Size(450, 350), style=wx.DEFAULT_DIALOG_STYLE,
title='Create a new Node')
- self.SetClientSize(wx.Size(451, 376))
-
- self.MainPanel = wx.Panel(id=wxID_CREATENODEDIALOGMAINPANEL,
- name='MainPanel', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(440, 278), style=wx.TAB_TRAVERSAL)
- self.MainPanel.SetAutoLayout(True)
-
- self.staticText1 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT1,
- label='Name:', name='staticText1', parent=self.MainPanel,
- pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
-
- self.staticText2 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT2,
- label='Node ID:', name='staticText2', parent=self.MainPanel,
- pos=wx.Point(24, 80), size=wx.Size(67, 17), style=0)
-
- self.staticText3 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT3,
- label='Type:', name='staticText3', parent=self.MainPanel,
- pos=wx.Point(24, 136), size=wx.Size(71, 17), style=0)
-
- self.Type = wx.Choice(choices=[], id=wxID_CREATENODEDIALOGTYPE,
- name='Type', parent=self.MainPanel, pos=wx.Point(24, 160),
- size=wx.Size(200, 24), style=0)
-
- self.Name = wx.TextCtrl(id=wxID_CREATENODEDIALOGNAME, name='Name',
- parent=self.MainPanel, pos=wx.Point(24, 48), size=wx.Size(200,
- 25), style=0, value='')
-
- self.NodeID = wx.TextCtrl(id=wxID_CREATENODEDIALOGNODEID, name='NodeID',
- parent=self.MainPanel, pos=wx.Point(24, 104), size=wx.Size(200,
- 25), style=wx.TE_RIGHT, value='')
-
- self.staticText4 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT4,
- label='Profile:', name='staticText4', parent=self.MainPanel,
- pos=wx.Point(24, 192), size=wx.Size(47, 17), style=0)
-
- self.Profile = wx.Choice(choices=[], id=wxID_CREATENODEDIALOGPROFILE,
- name='Profile', parent=self.MainPanel, pos=wx.Point(24, 216),
- size=wx.Size(200, 24), style=0)
+ self.SetClientSize(wx.Size(450, 350))
+
+ self.staticText1 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT1,
+ label='Name:', name='staticText1', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.staticText2 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT2,
+ label='Node ID:', name='staticText2', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.staticText3 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT3,
+ label='Type:', name='staticText3', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.staticText4 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT4,
+ label='Profile:', name='staticText4', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.Type = wx.Choice(choices=[], id=ID_CREATENODEDIALOGTYPE,
+ name='Type', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 25), style=0)
+
+ self.Name = wx.TextCtrl(id=ID_CREATENODEDIALOGNAME, name='Name',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24),
+ style=0, value='')
+
+ self.NodeID = wx.TextCtrl(id=ID_CREATENODEDIALOGNODEID, name='NodeID',
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24),
+ style=wx.TE_RIGHT, value='')
+
+ self.Profile = wx.Choice(choices=[], id=ID_CREATENODEDIALOGPROFILE,
+ name='Profile', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=0)
self.Profile.Bind(wx.EVT_CHOICE, self.OnProfileChoice,
- id=wxID_CREATENODEDIALOGPROFILE)
-
- self.staticText5 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT5,
+ id=ID_CREATENODEDIALOGPROFILE)
+
+ self.staticText5 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT5,
label='Network Management:', name='staticText5',
- parent=self.MainPanel, pos=wx.Point(256, 24), size=wx.Size(152,
- 16), style=0)
-
- self.NMT_None = wx.RadioButton(id=wxID_CREATENODEDIALOGNMT_NONE,
- label='None', name='NMT_None', parent=self.MainPanel,
- pos=wx.Point(256, 40), size=wx.Size(114, 24), style=0)
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.NMT_None = wx.RadioButton(id=ID_CREATENODEDIALOGNMT_NONE,
+ label='None', name='NMT_None', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
self.NMT_None.SetValue(True)
- self.NMT_NodeGuarding = wx.RadioButton(id=wxID_CREATENODEDIALOGNMT_NODEGUARDING,
- label='Node Guarding', name='NMT_NodeGuarding',
- parent=self.MainPanel, pos=wx.Point(256, 64), size=wx.Size(128,
- 24), style=0)
+ self.NMT_NodeGuarding = wx.RadioButton(id=ID_CREATENODEDIALOGNMT_NODEGUARDING,
+ label='Node Guarding', name='NMT_NodeGuarding', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
self.NMT_NodeGuarding.SetValue(False)
- self.NMT_Heartbeat = wx.RadioButton(id=wxID_CREATENODEDIALOGNMT_HEARTBEAT,
- label='Heartbeat', name='NMT_Heartbeat', parent=self.MainPanel,
- pos=wx.Point(256, 88), size=wx.Size(114, 24), style=0)
+ self.NMT_Heartbeat = wx.RadioButton(id=ID_CREATENODEDIALOGNMT_HEARTBEAT,
+ label='Heartbeat', name='NMT_Heartbeat', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
self.NMT_Heartbeat.SetValue(False)
- self.staticText6 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT6,
- label='Options:', name='staticText6', parent=self.MainPanel,
- pos=wx.Point(256, 128), size=wx.Size(72, 17), style=0)
-
- self.DS302 = wx.CheckBox(id=wxID_CREATENODEDIALOGGENSYNC,
- label='DS-302 Profile', name='DS302', parent=self.MainPanel,
- pos=wx.Point(256, 144), size=wx.Size(128, 24), style=0)
+ self.staticText6 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT6,
+ label='Options:', name='staticText6', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.DS302 = wx.CheckBox(id=ID_CREATENODEDIALOGGENSYNC,
+ label='DS-302 Profile', name='DS302', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
self.DS302.SetValue(False)
#self.DS302.Enable(False)
- self.GenSYNC = wx.CheckBox(id=wxID_CREATENODEDIALOGGENSYNC,
- label='Generate SYNC', name='GenSYNC', parent=self.MainPanel,
- pos=wx.Point(256, 168), size=wx.Size(128, 24), style=0)
+ self.GenSYNC = wx.CheckBox(id=ID_CREATENODEDIALOGGENSYNC,
+ label='Generate SYNC', name='GenSYNC', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
self.GenSYNC.SetValue(False)
- self.Emergency = wx.CheckBox(id=wxID_CREATENODEDIALOGEMERGENCY,
+ self.Emergency = wx.CheckBox(id=ID_CREATENODEDIALOGEMERGENCY,
label='Emergency support', name='Emergency',
- parent=self.MainPanel, pos=wx.Point(256, 192), size=wx.Size(152,
- 24), style=0)
+ parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
self.Emergency.SetValue(False)
self.Emergency.Enable(False)
- self.SaveConfig = wx.CheckBox(id=wxID_CREATENODEDIALOGSAVECONFIG,
- label='Save Configuration', name='SaveConfig',
- parent=self.MainPanel, pos=wx.Point(256, 216), size=wx.Size(152,
- 24), style=0)
+ self.SaveConfig = wx.CheckBox(id=ID_CREATENODEDIALOGSAVECONFIG,
+ label='Save Configuration', name='SaveConfig', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
self.SaveConfig.SetValue(False)
self.SaveConfig.Enable(False)
-# self.StoreEDS = wx.CheckBox(id=wxID_CREATENODEDIALOGSTOREEDS,
-# label='Store EDS', name='StoreEDS', parent=self.MainPanel,
-# pos=wx.Point(256, 240), size=wx.Size(144, 24), style=0)
-# self.StoreEDS.SetValue(False)
-
- self.staticText7 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT7,
- label='Description:', name='staticText7', parent=self.MainPanel,
- pos=wx.Point(24, 248), size=wx.Size(71, 17), style=0)
-
- self.Description = wx.TextCtrl(id=wxID_CREATENODEDIALOGDESCRIPTION,
- name='Description', parent=self.MainPanel, pos=wx.Point(24, 272),
- size=wx.Size(400, 25), style=0, value='')
-
+ self.StoreEDS = wx.CheckBox(id=ID_CREATENODEDIALOGSTOREEDS,
+ label='Store EDS', name='StoreEDS', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
+ self.StoreEDS.SetValue(False)
+ self.StoreEDS.Hide()
+
+ self.staticText7 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT7,
+ label='Description:', name='staticText7', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.Description = wx.TextCtrl(id=ID_CREATENODEDIALOGDESCRIPTION,
+ name='Description', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=0, value='')
+
+ self.Spacer = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER,
+ name='Spacer', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+
+ self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+ self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+
self._init_sizers()
def __init__(self, parent, cwd):
self._init_ctrls(parent)
- self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
- self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
+
self.NodeID.SetValue("0x00")
self.Type.Append("master")
self.Type.Append("slave")
@@ -815,8 +1001,6 @@
self.Profile.SetStringSelection("None")
self.Name.SetFocus()
- EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
def OnOK(self, event):
name = self.Name.GetValue()
message = ""
@@ -832,12 +1016,12 @@
except:
message = "Node ID must be an integer!"
if message != "":
- message = wxMessageDialog(self, message, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, message, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
self.Name.SetFocus()
else:
- self.EndModal(wxID_OK)
+ self.EndModal(wx.ID_OK)
def GetValues(self):
name = self.Name.GetValue()
@@ -871,13 +1055,13 @@
options.append("Emergency")
if self.SaveConfig.GetValue():
options.append("SaveConfig")
-# if self.StoreEDS.GetValue():
-# options.append("StoreEDS")
+ if self.StoreEDS.GetValue():
+ options.append("StoreEDS")
return options
def OnProfileChoice(self, event):
if self.Profile.GetStringSelection() == "Other":
- dialog = wxFileDialog(self, "Choose a file", self.Directory, "", "OD Profile files (*.prf)|*.prf|All files|*.*", wxOPEN|wxCHANGE_DIR)
+ dialog = wx.FileDialog(self, "Choose a file", self.Directory, "", "OD Profile files (*.prf)|*.prf|All files|*.*", wx.OPEN|wx.CHANGE_DIR)
dialog.ShowModal()
filepath = dialog.GetPath()
dialog.Destroy()
@@ -896,80 +1080,97 @@
# ADD Slave to NodeList Dialog
#-------------------------------------------------------------------------------
-[wxID_ADDSLAVEDIALOG, wxID_ADDSLAVEDIALOGMAINPANEL, wxID_ADDSLAVEDIALOGSLAVENAME,
- wxID_ADDSLAVEDIALOGSLAVENODEID, wxID_ADDSLAVEDIALOGEDSFILE,
- wxID_ADDSLAVEDIALOGIMPORTEDS, wxID_ADDSLAVEDIALOGSTATICTEXT1,
- wxID_ADDSLAVEDIALOGSTATICTEXT2, wxID_ADDSLAVEDIALOGSTATICTEXT3,
-] = [wx.NewId() for _init_ctrls in range(9)]
+[ID_ADDSLAVEDIALOG, ID_ADDSLAVEDIALOGSLAVENAME,
+ ID_ADDSLAVEDIALOGSLAVENODEID, ID_ADDSLAVEDIALOGEDSFILE,
+ ID_ADDSLAVEDIALOGIMPORTEDS, ID_ADDSLAVEDIALOGSTATICTEXT1,
+ ID_ADDSLAVEDIALOGSTATICTEXT2, ID_ADDSLAVEDIALOGSTATICTEXT3,
+] = [wx.NewId() for _init_ctrls in range(8)]
class AddSlaveDialog(wx.Dialog):
def _init_coll_flexGridSizer1_Items(self, parent):
- # generated method, don't edit
-
- parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+ parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+ parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ def _init_coll_flexGridSizer1_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
+
+ def _init_coll_MainSizer_Items(self, parent):
+ parent.AddWindow(self.staticText1, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.SlaveName, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.staticText2, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.SlaveNodeID, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+ parent.AddWindow(self.staticText3, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ parent.AddSizer(self.BottomSizer, 0, border=0, flag=wx.GROW)
+
+ def _init_coll_BottomSizer_Items(self, parent):
+ parent.AddWindow(self.EDSFile, 0, border=4, flag=wx.GROW|wx.TOP|wx.BOTTOM)
+ parent.AddWindow(self.ImportEDS, 0, border=0, flag=0)
+
+ def _init_coll_BottomSizer_Growables(self, parent):
+ parent.AddGrowableCol(0)
+ parent.AddGrowableRow(0)
def _init_sizers(self):
- # generated method, don't edit
- self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+ self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+ self.MainSizer = wx.BoxSizer(wx.VERTICAL)
+ self.BottomSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=1, vgap=0)
+
self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+ self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+ self._init_coll_MainSizer_Items(self.MainSizer)
+ self._init_coll_BottomSizer_Items(self.BottomSizer)
+ self._init_coll_BottomSizer_Growables(self.BottomSizer)
+
self.SetSizer(self.flexGridSizer1)
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Dialog.__init__(self, id=wxID_ADDSLAVEDIALOG,
+ wx.Dialog.__init__(self, id=ID_ADDSLAVEDIALOG,
name='AddSlaveDialog', parent=prnt, pos=wx.Point(376, 223),
- size=wx.Size(300, 250), style=wx.DEFAULT_DIALOG_STYLE,
+ size=wx.Size(300, 250), style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER,
title='Add a slave to nodelist')
self.SetClientSize(wx.Size(300, 250))
- self.MainPanel = wx.Panel(id=wxID_ADDSLAVEDIALOGMAINPANEL,
- name='MainPanel', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(350, 250), style=wx.TAB_TRAVERSAL)
- self.MainPanel.SetAutoLayout(True)
-
- self.staticText1 = wx.StaticText(id=wxID_ADDSLAVEDIALOGSTATICTEXT1,
- label='Slave Name:', name='staticText1', parent=self.MainPanel,
- pos=wx.Point(24, 24), size=wx.Size(150, 17), style=0)
-
- self.SlaveName = wx.TextCtrl(id=wxID_ADDSLAVEDIALOGSLAVENAME,
- name='SlaveName', parent=self.MainPanel, pos=wx.Point(24, 48),
- size=wx.Size(250, 24), style=0)
-
- self.staticText2 = wx.StaticText(id=wxID_ADDSLAVEDIALOGSTATICTEXT2,
- label='Slave Node ID:', name='staticText2', parent=self.MainPanel,
- pos=wx.Point(24, 80), size=wx.Size(150, 17), style=0)
-
- self.SlaveNodeID = wx.TextCtrl(id=wxID_ADDSLAVEDIALOGSLAVENODEID,
- name='SlaveName', parent=self.MainPanel, pos=wx.Point(24, 104),
- size=wx.Size(250, 24), style=wxALIGN_RIGHT)
-
- self.staticText3 = wx.StaticText(id=wxID_ADDSLAVEDIALOGSTATICTEXT3,
- label='EDS File:', name='staticText3', parent=self.MainPanel,
- pos=wx.Point(24, 136), size=wx.Size(155, 17), style=0)
-
- self.EDSFile = wx.Choice(id=wxID_ADDSLAVEDIALOGEDSFILE,
- name='EDSFile', parent=self.MainPanel, pos=wx.Point(24, 160),
- size=wx.Size(145, 24), style=0)
-
- self.ImportEDS = wxButton(id=wxID_ADDSLAVEDIALOGIMPORTEDS, label='Import EDS',
- name='ImportEDS', parent=self.MainPanel, pos=wx.Point(174, 160),
+ self.staticText1 = wx.StaticText(id=ID_ADDSLAVEDIALOGSTATICTEXT1,
+ label='Slave Name:', name='staticText1', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.SlaveName = wx.TextCtrl(id=ID_ADDSLAVEDIALOGSLAVENAME,
+ name='SlaveName', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=0)
+
+ self.staticText2 = wx.StaticText(id=ID_ADDSLAVEDIALOGSTATICTEXT2,
+ label='Slave Node ID:', name='staticText2', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.SlaveNodeID = wx.TextCtrl(id=ID_ADDSLAVEDIALOGSLAVENODEID,
+ name='SlaveName', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=wx.ALIGN_RIGHT)
+
+ self.staticText3 = wx.StaticText(id=ID_ADDSLAVEDIALOGSTATICTEXT3,
+ label='EDS File:', name='staticText3', parent=self,
+ pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
+
+ self.EDSFile = wx.Choice(id=ID_ADDSLAVEDIALOGEDSFILE,
+ name='EDSFile', parent=self, pos=wx.Point(0, 0),
+ size=wx.Size(0, 24), style=0)
+
+ self.ImportEDS = wx.Button(id=ID_ADDSLAVEDIALOGIMPORTEDS, label='Import EDS',
+ name='ImportEDS', parent=self, pos=wx.Point(0, 0),
size=wx.Size(100, 32), style=0)
self.ImportEDS.Bind(wx.EVT_BUTTON, self.OnImportEDSButton,
- id=wxID_ADDSLAVEDIALOGIMPORTEDS)
-
+ id=ID_ADDSLAVEDIALOGIMPORTEDS)
+
+ self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
+ self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+
self._init_sizers()
def __init__(self, parent):
self._init_ctrls(parent)
- self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL|wxCENTRE)
- self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_RIGHT)
self.SlaveNodeID.SetValue("0x00")
-
- EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
+
def OnOK(self, event):
error = []
if self.SlaveName.GetValue() == "":
@@ -987,7 +1188,7 @@
text += " and %s"%item
else:
text += ", %s"%item
- message = wxMessageDialog(self, "Form isn't complete. %s must be filled!"%text, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "Form isn't complete. %s must be filled!"%text, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
@@ -998,29 +1199,29 @@
else:
nodeid = int(nodeid)
except:
- message = wxMessageDialog(self, "Slave Node ID must be a value in decimal or hexadecimal!", "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "Slave Node ID must be a value in decimal or hexadecimal!", "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
return
if not 0 <= nodeid <= 127:
- message = wxMessageDialog(self, "Slave Node ID must be between 0 and 127!", "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "Slave Node ID must be between 0 and 127!", "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
elif nodeid == 0 or nodeid in self.NodeList.SlaveNodes.keys():
- message = wxMessageDialog(self, "A Node with this ID already exist in the network!", "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "A Node with this ID already exist in the network!", "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
- self.EndModal(wxID_OK)
+ self.EndModal(wx.ID_OK)
def OnImportEDSButton(self, event):
- dialog = wxFileDialog(self, "Choose an EDS file", os.getcwd(), "", "EDS files (*.eds)|*.eds|All files|*.*", wxOPEN|wxCHANGE_DIR)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.FileDialog(self, "Choose an EDS file", os.getcwd(), "", "EDS files (*.eds)|*.eds|All files|*.*", wx.OPEN|wx.CHANGE_DIR)
+ if dialog.ShowModal() == wx.ID_OK:
filepath = dialog.GetPath()
if os.path.isfile(filepath):
result = self.NodeList.ImportEDSFile(filepath)
if result:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -1032,7 +1233,7 @@
self.EDSFile.Clear()
for option in self.NodeList.EDSNodes.keys():
self.EDSFile.Append(option)
- if self.EDSFile.FindString(selection) != wxNOT_FOUND:
+ if self.EDSFile.FindString(selection) != wx.NOT_FOUND:
self.EDSFile.SetStringSelection(selection)
def SetNodeList(self, nodelist):
--- a/objdictgen/networkedit.py Wed Aug 08 08:51:09 2007 +0200
+++ b/objdictgen/networkedit.py Wed Aug 08 14:55:15 2007 +0200
@@ -21,10 +21,7 @@
#License along with this library; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from wxPython.wx import *
-from wxPython.grid import *
import wx
-from wx.lib.anchors import LayoutAnchors
import wx.grid
from types import *
@@ -70,45 +67,48 @@
ScriptDirectory = path
try:
- from wxPython.html import *
-
- wxEVT_HTML_URL_CLICK = wxNewId()
-
- def EVT_HTML_URL_CLICK(win, func):
- win.Connect(-1, -1, wxEVT_HTML_URL_CLICK, func)
-
- class wxHtmlWindowUrlClick(wxPyEvent):
+ import wx.html
+
+ EVT_HTML_URL_CLICK = wx.NewId()
+
+ class HtmlWindowUrlClick(wx.PyEvent):
def __init__(self, linkinfo):
- wxPyEvent.__init__(self)
- self.SetEventType(wxEVT_HTML_URL_CLICK)
+ wx.PyEvent.__init__(self)
+ self.SetEventType(EVT_HTML_URL_CLICK)
self.linkinfo = (linkinfo.GetHref(), linkinfo.GetTarget())
-
- class wxUrlClickHtmlWindow(wxHtmlWindow):
+
+ class UrlClickHtmlWindow(wx.html.HtmlWindow):
""" HTML window that generates and OnLinkClicked event.
Use this to avoid having to override HTMLWindow
"""
def OnLinkClicked(self, linkinfo):
- wxPostEvent(self, wxHtmlWindowUrlClick(linkinfo))
+ wx.PostEvent(self, HtmlWindowUrlClick(linkinfo))
+
+ def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY):
+ if event == HtmlWindowUrlClick:
+ self.Connect(-1, -1, EVT_HTML_URL_CLICK, handler)
+ else:
+ wx.html.HtmlWindow.Bind(event, handler, source=source, id=id, id2=id2)
#-------------------------------------------------------------------------------
# Html Frame
#-------------------------------------------------------------------------------
- [wxID_HTMLFRAME, wxID_HTMLFRAMEHTMLCONTENT] = [wx.NewId() for _init_ctrls in range(2)]
+ [ID_HTMLFRAME, ID_HTMLFRAMEHTMLCONTENT] = [wx.NewId() for _init_ctrls in range(2)]
class HtmlFrame(wx.Frame):
def _init_ctrls(self, prnt):
# generated method, don't edit
- wx.Frame.__init__(self, id=wxID_HTMLFRAME, name='HtmlFrame',
+ wx.Frame.__init__(self, id=ID_HTMLFRAME, name='HtmlFrame',
parent=prnt, pos=wx.Point(320, 231), size=wx.Size(853, 616),
style=wx.DEFAULT_FRAME_STYLE, title='')
- self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=wxID_HTMLFRAME)
+ self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=ID_HTMLFRAME)
- self.HtmlContent = wxUrlClickHtmlWindow(id=wxID_HTMLFRAMEHTMLCONTENT,
+ self.HtmlContent = UrlClickHtmlWindow(id=ID_HTMLFRAMEHTMLCONTENT,
name='HtmlContent', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(-1, -1), style=wxHW_SCROLLBAR_AUTO|wxHW_NO_SELECTION)
- EVT_HTML_URL_CLICK(self.HtmlContent, self.OnLinkClick)
+ size=wx.Size(-1, -1), style=wx.html.HW_SCROLLBAR_AUTO|wx.html.HW_NO_SELECTION)
+ self.HtmlContent.Bind(HtmlWindowUrlClick, self.OnLinkClick)
def __init__(self, parent, opened):
self._init_ctrls(parent)
@@ -129,7 +129,7 @@
try:
import webbrowser
except ImportError:
- wxMessageBox('Please point your browser at: %s' % url)
+ wx.MessageBox('Please point your browser at: %s' % url)
else:
webbrowser.open(url)
@@ -138,33 +138,33 @@
Html_Window = False
-[wxID_NETWORKEDIT, wxID_NETWORKEDITNETWORKNODES,
- wxID_NETWORKEDITHELPBAR,
+[ID_NETWORKEDIT, ID_NETWORKEDITNETWORKNODES,
+ ID_NETWORKEDITHELPBAR,
] = [wx.NewId() for _init_ctrls in range(3)]
-[wxID_NETWORKEDITADDMENUITEMS0, wxID_NETWORKEDITADDMENUITEMS1,
- wxID_NETWORKEDITADDMENUITEMS2, wxID_NETWORKEDITADDMENUITEMS3,
- wxID_NETWORKEDITADDMENUITEMS4, wxID_NETWORKEDITADDMENUITEMS5,
+[ID_NETWORKEDITADDMENUITEMS0, ID_NETWORKEDITADDMENUITEMS1,
+ ID_NETWORKEDITADDMENUITEMS2, ID_NETWORKEDITADDMENUITEMS3,
+ ID_NETWORKEDITADDMENUITEMS4, ID_NETWORKEDITADDMENUITEMS5,
] = [wx.NewId() for _init_coll_AddMenu_Items in range(6)]
-[wxID_NETWORKEDITFILEMENUITEMS0, wxID_NETWORKEDITFILEMENUITEMS1,
- wxID_NETWORKEDITFILEMENUITEMS2, wxID_NETWORKEDITFILEMENUITEMS4,
- wxID_NETWORKEDITFILEMENUITEMS5, wxID_NETWORKEDITFILEMENUITEMS6,
+[ID_NETWORKEDITFILEMENUITEMS0, ID_NETWORKEDITFILEMENUITEMS1,
+ ID_NETWORKEDITFILEMENUITEMS2, ID_NETWORKEDITFILEMENUITEMS4,
+ ID_NETWORKEDITFILEMENUITEMS5, ID_NETWORKEDITFILEMENUITEMS6,
] = [wx.NewId() for _init_coll_FileMenu_Items in range(6)]
-[wxID_NETWORKEDITNETWORKMENUITEMS0, wxID_NETWORKEDITNETWORKMENUITEMS1,
- wxID_NETWORKEDITNETWORKMENUITEMS3,
+[ID_NETWORKEDITNETWORKMENUITEMS0, ID_NETWORKEDITNETWORKMENUITEMS1,
+ ID_NETWORKEDITNETWORKMENUITEMS3,
] = [wx.NewId() for _init_coll_AddMenu_Items in range(3)]
-[wxID_NETWORKEDITEDITMENUITEMS0, wxID_NETWORKEDITEDITMENUITEMS1,
- wxID_NETWORKEDITEDITMENUITEMS2, wxID_NETWORKEDITEDITMENUITEMS4,
- wxID_NETWORKEDITEDITMENUITEMS6, wxID_NETWORKEDITEDITMENUITEMS7,
- wxID_NETWORKEDITEDITMENUITEMS8,
+[ID_NETWORKEDITEDITMENUITEMS0, ID_NETWORKEDITEDITMENUITEMS1,
+ ID_NETWORKEDITEDITMENUITEMS2, ID_NETWORKEDITEDITMENUITEMS4,
+ ID_NETWORKEDITEDITMENUITEMS6, ID_NETWORKEDITEDITMENUITEMS7,
+ ID_NETWORKEDITEDITMENUITEMS8,
] = [wx.NewId() for _init_coll_EditMenu_Items in range(7)]
-[wxID_NETWORKEDITHELPMENUITEMS0, wxID_NETWORKEDITHELPMENUITEMS1,
- wxID_NETWORKEDITHELPMENUITEMS2,
+[ID_NETWORKEDITHELPMENUITEMS0, ID_NETWORKEDITHELPMENUITEMS1,
+ ID_NETWORKEDITHELPMENUITEMS2,
] = [wx.NewId() for _init_coll_HelpMenu_Items in range(3)]
class networkedit(wx.Frame):
@@ -181,123 +181,123 @@
def _init_coll_EditMenu_Items(self, parent):
# generated method, don't edit
- parent.Append(help='', id=wxID_NETWORKEDITEDITMENUITEMS4,
+ parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS4,
kind=wx.ITEM_NORMAL, text='Refresh\tCTRL+R')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_NETWORKEDITEDITMENUITEMS1,
+ parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS1,
kind=wx.ITEM_NORMAL, text='Undo\tCTRL+Z')
- parent.Append(help='', id=wxID_NETWORKEDITEDITMENUITEMS0,
+ parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS0,
kind=wx.ITEM_NORMAL, text='Redo\tCTRL+Y')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_NETWORKEDITEDITMENUITEMS6,
+ parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS6,
kind=wx.ITEM_NORMAL, text='Node infos')
- parent.Append(help='', id=wxID_NETWORKEDITEDITMENUITEMS2,
+ parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS2,
kind=wx.ITEM_NORMAL, text='DS-301 Profile')
- parent.Append(help='', id=wxID_NETWORKEDITEDITMENUITEMS8,
+ parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS8,
kind=wx.ITEM_NORMAL, text='DS-302 Profile')
- parent.Append(help='', id=wxID_NETWORKEDITEDITMENUITEMS7,
+ parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS7,
kind=wx.ITEM_NORMAL, text='Other Profile')
self.Bind(wx.EVT_MENU, self.OnUndoMenu,
- id=wxID_NETWORKEDITEDITMENUITEMS1)
+ id=ID_NETWORKEDITEDITMENUITEMS1)
self.Bind(wx.EVT_MENU, self.OnRedoMenu,
- id=wxID_NETWORKEDITEDITMENUITEMS0)
+ id=ID_NETWORKEDITEDITMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnCommunicationMenu,
- id=wxID_NETWORKEDITEDITMENUITEMS2)
+ id=ID_NETWORKEDITEDITMENUITEMS2)
self.Bind(wx.EVT_MENU, self.OnRefreshMenu,
- id=wxID_NETWORKEDITEDITMENUITEMS4)
+ id=ID_NETWORKEDITEDITMENUITEMS4)
self.Bind(wx.EVT_MENU, self.OnNodeInfosMenu,
- id=wxID_NETWORKEDITEDITMENUITEMS6)
+ id=ID_NETWORKEDITEDITMENUITEMS6)
self.Bind(wx.EVT_MENU, self.OnEditProfileMenu,
- id=wxID_NETWORKEDITEDITMENUITEMS7)
+ id=ID_NETWORKEDITEDITMENUITEMS7)
self.Bind(wx.EVT_MENU, self.OnOtherCommunicationMenu,
- id=wxID_NETWORKEDITEDITMENUITEMS8)
+ id=ID_NETWORKEDITEDITMENUITEMS8)
def _init_coll_HelpMenu_Items(self, parent):
# generated method, don't edit
- parent.Append(help='', id=wxID_NETWORKEDITHELPMENUITEMS0,
+ parent.Append(help='', id=ID_NETWORKEDITHELPMENUITEMS0,
kind=wx.ITEM_NORMAL, text='DS-301 Standard\tF1')
self.Bind(wx.EVT_MENU, self.OnHelpDS301Menu,
- id=wxID_NETWORKEDITHELPMENUITEMS0)
- parent.Append(help='', id=wxID_NETWORKEDITHELPMENUITEMS1,
+ id=ID_NETWORKEDITHELPMENUITEMS0)
+ parent.Append(help='', id=ID_NETWORKEDITHELPMENUITEMS1,
kind=wx.ITEM_NORMAL, text='CAN Festival Docs\tF2')
self.Bind(wx.EVT_MENU, self.OnHelpCANFestivalMenu,
- id=wxID_NETWORKEDITHELPMENUITEMS1)
+ id=ID_NETWORKEDITHELPMENUITEMS1)
if Html_Window and self.ModeSolo:
- parent.Append(help='', id=wxID_NETWORKEDITHELPMENUITEMS2,
+ parent.Append(help='', id=ID_NETWORKEDITHELPMENUITEMS2,
kind=wx.ITEM_NORMAL, text='About')
self.Bind(wx.EVT_MENU, self.OnAboutMenu,
- id=wxID_NETWORKEDITHELPMENUITEMS2)
+ id=ID_NETWORKEDITHELPMENUITEMS2)
def _init_coll_FileMenu_Items(self, parent):
# generated method, don't edit
- parent.Append(help='', id=wxID_NETWORKEDITFILEMENUITEMS5,
+ parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS5,
kind=wx.ITEM_NORMAL, text='New\tCTRL+N')
- parent.Append(help='', id=wxID_NETWORKEDITFILEMENUITEMS0,
+ parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS0,
kind=wx.ITEM_NORMAL, text='Open\tCTRL+O')
- parent.Append(help='', id=wxID_NETWORKEDITFILEMENUITEMS1,
+ parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS1,
kind=wx.ITEM_NORMAL, text='Save\tCTRL+S')
- parent.Append(help='', id=wxID_NETWORKEDITFILEMENUITEMS2,
+ parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS2,
kind=wx.ITEM_NORMAL, text='Close\tCTRL+W')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_NETWORKEDITFILEMENUITEMS4,
+ parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS4,
kind=wx.ITEM_NORMAL, text='Exit')
self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu,
- id=wxID_NETWORKEDITFILEMENUITEMS0)
+ id=ID_NETWORKEDITFILEMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu,
- id=wxID_NETWORKEDITFILEMENUITEMS1)
+ id=ID_NETWORKEDITFILEMENUITEMS1)
self.Bind(wx.EVT_MENU, self.OnCloseProjectMenu,
- id=wxID_NETWORKEDITFILEMENUITEMS2)
+ id=ID_NETWORKEDITFILEMENUITEMS2)
self.Bind(wx.EVT_MENU, self.OnQuitMenu,
- id=wxID_NETWORKEDITFILEMENUITEMS4)
+ id=ID_NETWORKEDITFILEMENUITEMS4)
self.Bind(wx.EVT_MENU, self.OnNewProjectMenu,
- id=wxID_NETWORKEDITFILEMENUITEMS5)
+ id=ID_NETWORKEDITFILEMENUITEMS5)
def _init_coll_NetworkMenu_Items(self, parent):
# generated method, don't edit
- parent.Append(help='', id=wxID_NETWORKEDITNETWORKMENUITEMS0,
+ parent.Append(help='', id=ID_NETWORKEDITNETWORKMENUITEMS0,
kind=wx.ITEM_NORMAL, text='Add Slave Node')
- parent.Append(help='', id=wxID_NETWORKEDITNETWORKMENUITEMS1,
+ parent.Append(help='', id=ID_NETWORKEDITNETWORKMENUITEMS1,
kind=wx.ITEM_NORMAL, text='Remove Slave Node')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_NETWORKEDITNETWORKMENUITEMS3,
+ parent.Append(help='', id=ID_NETWORKEDITNETWORKMENUITEMS3,
kind=wx.ITEM_NORMAL, text='Build Master Dictionary')
self.Bind(wx.EVT_MENU, self.OnAddSlaveMenu,
- id=wxID_NETWORKEDITNETWORKMENUITEMS0)
+ id=ID_NETWORKEDITNETWORKMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnRemoveSlaveMenu,
- id=wxID_NETWORKEDITNETWORKMENUITEMS1)
+ id=ID_NETWORKEDITNETWORKMENUITEMS1)
## self.Bind(wx.EVT_MENU, self.OnBuildMasterMenu,
-## id=wxID_NETWORKEDITNETWORKMENUITEMS3)
+## id=ID_NETWORKEDITNETWORKMENUITEMS3)
def _init_coll_AddMenu_Items(self, parent):
# generated method, don't edit
- parent.Append(help='', id=wxID_NETWORKEDITADDMENUITEMS0,
+ parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS0,
kind=wx.ITEM_NORMAL, text='SDO Server')
- parent.Append(help='', id=wxID_NETWORKEDITADDMENUITEMS1,
+ parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS1,
kind=wx.ITEM_NORMAL, text='SDO Client')
- parent.Append(help='', id=wxID_NETWORKEDITADDMENUITEMS2,
+ parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS2,
kind=wx.ITEM_NORMAL, text='PDO Transmit')
- parent.Append(help='', id=wxID_NETWORKEDITADDMENUITEMS3,
+ parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS3,
kind=wx.ITEM_NORMAL, text='PDO Receive')
- parent.Append(help='', id=wxID_NETWORKEDITADDMENUITEMS4,
+ parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS4,
kind=wx.ITEM_NORMAL, text='Map Variable')
- parent.Append(help='', id=wxID_NETWORKEDITADDMENUITEMS5,
+ parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS5,
kind=wx.ITEM_NORMAL, text='User Type')
self.Bind(wx.EVT_MENU, self.OnAddSDOServerMenu,
- id=wxID_NETWORKEDITADDMENUITEMS0)
+ id=ID_NETWORKEDITADDMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnAddSDOClientMenu,
- id=wxID_NETWORKEDITADDMENUITEMS1)
+ id=ID_NETWORKEDITADDMENUITEMS1)
self.Bind(wx.EVT_MENU, self.OnAddPDOTransmitMenu,
- id=wxID_NETWORKEDITADDMENUITEMS2)
+ id=ID_NETWORKEDITADDMENUITEMS2)
self.Bind(wx.EVT_MENU, self.OnAddPDOReceiveMenu,
- id=wxID_NETWORKEDITADDMENUITEMS3)
+ id=ID_NETWORKEDITADDMENUITEMS3)
self.Bind(wx.EVT_MENU, self.OnAddMapVariableMenu,
- id=wxID_NETWORKEDITADDMENUITEMS4)
+ id=ID_NETWORKEDITADDMENUITEMS4)
self.Bind(wx.EVT_MENU, self.OnAddUserTypeMenu,
- id=wxID_NETWORKEDITADDMENUITEMS5)
+ id=ID_NETWORKEDITADDMENUITEMS5)
def _init_coll_HelpBar_Fields(self, parent):
# generated method, don't edit
@@ -316,13 +316,9 @@
if self.ModeSolo:
self.FileMenu = wx.Menu(title='')
-
self.NetworkMenu = wx.Menu(title='')
-
self.EditMenu = wx.Menu(title='')
-
self.AddMenu = wx.Menu(title='')
-
self.HelpMenu = wx.Menu(title='')
self._init_coll_menuBar1_Menus(self.menuBar1)
@@ -335,22 +331,22 @@
def _init_ctrls(self, prnt):
# generated method, don't edit
- wx.Frame.__init__(self, id=wxID_NETWORKEDIT, name='networkedit',
+ wx.Frame.__init__(self, id=ID_NETWORKEDIT, name='networkedit',
parent=prnt, pos=wx.Point(149, 178), size=wx.Size(1000, 700),
style=wx.DEFAULT_FRAME_STYLE, title='Networkedit')
self._init_utils()
self.SetClientSize(wx.Size(1000, 700))
self.SetMenuBar(self.menuBar1)
- self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=wxID_NETWORKEDIT)
-
- self.NetworkNodes = wx.Notebook(id=wxID_NETWORKEDITNETWORKNODES,
+ self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=ID_NETWORKEDIT)
+
+ self.NetworkNodes = wx.Notebook(id=ID_NETWORKEDITNETWORKNODES,
name='NetworkNodes', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(0, 0), style=wxNB_LEFT)
+ size=wx.Size(0, 0), style=wx.NB_LEFT)
self.NetworkNodes.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED,
- self.OnNodeSelectedChanged, id=wxID_NETWORKEDITNETWORKNODES)
-
- self.HelpBar = wx.StatusBar(id=wxID_NETWORKEDITHELPBAR, name='HelpBar',
- parent=self, style=wxST_SIZEGRIP)
+ self.OnNodeSelectedChanged, id=ID_NETWORKEDITNETWORKNODES)
+
+ self.HelpBar = wx.StatusBar(id=ID_NETWORKEDITHELPBAR, name='HelpBar',
+ parent=self, style=wx.ST_SIZEGRIP)
self._init_coll_HelpBar_Fields(self.HelpBar)
self.SetStatusBar(self.HelpBar)
@@ -459,8 +455,8 @@
defaultpath = os.path.dirname(self.NodeList.GetRoot())
else:
defaultpath = os.getcwd()
- dialog = wxDirDialog(self , "Choose a project", defaultpath, wxDD_NEW_DIR_BUTTON)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.DirDialog(self , "Choose a project", defaultpath, wx.DD_NEW_DIR_BUTTON)
+ if dialog.ShowModal() == wx.ID_OK:
projectpath = dialog.GetPath()
if os.path.isdir(projectpath) and len(os.listdir(projectpath)) == 0:
os.mkdir(os.path.join(projectpath, "eds"))
@@ -478,7 +474,7 @@
self.RefreshProfileMenu()
self.RefreshMainMenu()
else:
- message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
event.Skip()
@@ -488,8 +484,8 @@
defaultpath = os.path.dirname(self.NodeList.GetRoot())
else:
defaultpath = os.getcwd()
- dialog = wxDirDialog(self , "Choose a project", defaultpath, 0)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.DirDialog(self , "Choose a project", defaultpath, 0)
+ if dialog.ShowModal() == wx.ID_OK:
projectpath = dialog.GetPath()
if os.path.isdir(projectpath):
manager = NodeManager(ScriptDirectory)
@@ -506,7 +502,7 @@
self.RefreshProfileMenu()
self.RefreshMainMenu()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -515,7 +511,7 @@
def OnSaveProjectMenu(self, event):
result = self.NodeList.SaveProject()
if result:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
event.Skip()
@@ -523,16 +519,16 @@
def OnCloseProjectMenu(self, event):
if self.NodeList:
if self.NodeList.HasChanged():
- dialog = wxMessageDialog(self, "There are changes, do you want to save?", "Close Project", wxYES_NO|wxCANCEL|wxICON_QUESTION)
+ dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Project", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
answer = dialog.ShowModal()
dialog.Destroy()
- if answer == wxID_YES:
+ if answer == wx.ID_YES:
result = self.NodeList.SaveProject()
if result:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
- elif answer == wxID_NO:
+ elif answer == wx.ID_NO:
self.NodeList.ForceChanged(False)
if not self.NodeList.HasChanged():
self.Manager = None
@@ -549,7 +545,7 @@
def OnAddSlaveMenu(self, event):
dialog = AddSlaveDialog(self)
dialog.SetNodeList(self.NodeList)
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
values = dialog.GetValues()
result = self.NodeList.AddSlaveNode(values["slaveName"], values["slaveNodeID"], values["edsFile"])
if not result:
@@ -561,7 +557,7 @@
self.NetworkNodes.SetSelection(idx)
self.RefreshBufferState()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -570,8 +566,8 @@
def OnRemoveSlaveMenu(self, event):
slavenames = self.NodeList.GetSlaveNames()
slaveids = self.NodeList.GetSlaveIDs()
- dialog = wxSingleChoiceDialog(self, "Choose a slave to remove", "Remove slave", slavenames)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.SingleChoiceDialog(self, "Choose a slave to remove", "Remove slave", slavenames)
+ if dialog.ShowModal() == wx.ID_OK:
choice = dialog.GetSelection()
result = self.NodeList.RemoveSlaveNode(slaveids[choice])
if not result:
@@ -585,7 +581,7 @@
self.NodeList.SetCurrentSelected(slaveids[new_selection - 1])
self.RefreshBufferState()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
event.Skip()
@@ -657,15 +653,15 @@
def RefreshMainMenu(self):
if self.menuBar1:
- self.NetworkMenu.Enable(wxID_NETWORKEDITNETWORKMENUITEMS3, False)
+ self.NetworkMenu.Enable(ID_NETWORKEDITNETWORKMENUITEMS3, False)
if self.NodeList == None:
if self.ModeSolo:
self.menuBar1.EnableTop(1, False)
self.menuBar1.EnableTop(2, False)
self.menuBar1.EnableTop(3, False)
if self.FileMenu:
- self.FileMenu.Enable(wxID_NETWORKEDITFILEMENUITEMS1, False)
- self.FileMenu.Enable(wxID_NETWORKEDITFILEMENUITEMS2, False)
+ self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS1, False)
+ self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS2, False)
else:
self.menuBar1.EnableTop(0, False)
self.menuBar1.EnableTop(1, False)
@@ -674,8 +670,8 @@
if self.ModeSolo:
self.menuBar1.EnableTop(1, True)
if self.FileMenu:
- self.FileMenu.Enable(wxID_NETWORKEDITFILEMENUITEMS1, True)
- self.FileMenu.Enable(wxID_NETWORKEDITFILEMENUITEMS2, True)
+ self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS1, True)
+ self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS2, True)
if self.NetworkNodes.GetSelection() == 0:
self.menuBar1.EnableTop(2, True)
self.menuBar1.EnableTop(3, True)
@@ -694,7 +690,7 @@
def RefreshProfileMenu(self):
if self.EditMenu:
profile = self.Manager.GetCurrentProfileName()
- edititem = self.EditMenu.FindItemById(wxID_NETWORKEDITEDITMENUITEMS7)
+ edititem = self.EditMenu.FindItemById(ID_NETWORKEDITEDITMENUITEMS7)
if edititem:
length = self.AddMenu.GetMenuItemCount()
for i in xrange(length-6):
@@ -755,13 +751,13 @@
index, subIndex = result
result = OpenPDFDocIndex(index, ScriptDirectory)
if type(result) == StringType:
- message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
if not find_index:
result = OpenPDFDocIndex(None, ScriptDirectory)
if type(result) == StringType:
- message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
event.Skip()
@@ -810,7 +806,7 @@
dialog.SetIndexDictionary(dictionary)
dialog.SetCurrentList(current)
dialog.RefreshLists()
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
new_profile = dialog.GetCurrentList()
addinglist = []
removinglist = []
@@ -835,7 +831,7 @@
dialog = NodeInfosDialog(self)
name, id, type, description = self.Manager.GetCurrentNodeInfos()
dialog.SetValues(name, id, type, description)
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
name, id, type, description = dialog.GetValues()
self.Manager.SetCurrentNodeInfos(name, id, type, description)
self.RefreshBufferState()
@@ -856,33 +852,33 @@
if index:
dialog = MapVariableDialog(self)
dialog.SetIndex(index)
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
index, name, struct, number = dialog.GetValues()
result = self.Manager.AddMapVariableToCurrent(index, name, struct, number)
if type(result) != StringType:
self.RefreshBufferState()
self.RefreshCurrentIndexList()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
else:
- message = wxMessageDialog(self, result, "No map variable index left!", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "No map variable index left!", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
def AddUserType(self):
dialog = UserTypeDialog(self)
dialog.SetTypeList(self.Manager.GetCustomisableTypes())
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
type, min, max, length = dialog.GetValues()
result = self.Manager.AddUserTypeToCurrent(type, min, max, length)
if not IsOfType(result, StringType):
self.RefreshBufferState()
self.RefreshCurrentIndexList()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -933,7 +929,7 @@
return res
def Display_Error_Dialog(e_value):
- message = wxMessageDialog(None, str(e_value), "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(None, str(e_value), "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
@@ -949,7 +945,7 @@
ignored_exceptions = [] # a problem with a line in a module is only reported once per session
-def wxAddExceptHook(path, app_version='[No version]'):#, ignored_exceptions=[]):
+def AddExceptHook(path, app_version='[No version]'):#, ignored_exceptions=[]):
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
@@ -991,11 +987,11 @@
sys.excepthook = handle_exception
if __name__ == '__main__':
- app = wxPySimpleApp()
- wxInitAllImageHandlers()
+ app = wx.PySimpleApp()
+ wx.InitAllImageHandlers()
# Install a exception handle for bug reports
- wxAddExceptHook(os.getcwd(),__version__)
+ AddExceptHook(os.getcwd(),__version__)
frame = networkedit(None)
--- a/objdictgen/objdictedit.py Wed Aug 08 08:51:09 2007 +0200
+++ b/objdictgen/objdictedit.py Wed Aug 08 14:55:15 2007 +0200
@@ -21,10 +21,7 @@
#License along with this library; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from wxPython.wx import *
-from wxPython.grid import *
import wx
-import wx.grid
from types import *
import os, re, platform, sys, time, traceback, getopt
@@ -39,45 +36,47 @@
from doc_index.DS301_index import *
try:
- from wxPython.html import *
-
- wxEVT_HTML_URL_CLICK = wxNewId()
-
- def EVT_HTML_URL_CLICK(win, func):
- win.Connect(-1, -1, wxEVT_HTML_URL_CLICK, func)
-
- class wxHtmlWindowUrlClick(wxPyEvent):
+ import wx.html
+
+ EVT_HTML_URL_CLICK = wx.NewId()
+
+ class HtmlWindowUrlClick(wx.PyEvent):
def __init__(self, linkinfo):
- wxPyEvent.__init__(self)
- self.SetEventType(wxEVT_HTML_URL_CLICK)
+ wx.PyEvent.__init__(self)
+ self.SetEventType(EVT_HTML_URL_CLICK)
self.linkinfo = (linkinfo.GetHref(), linkinfo.GetTarget())
-
- class wxUrlClickHtmlWindow(wxHtmlWindow):
+
+ class UrlClickHtmlWindow(wx.html.HtmlWindow):
""" HTML window that generates and OnLinkClicked event.
Use this to avoid having to override HTMLWindow
"""
def OnLinkClicked(self, linkinfo):
- wxPostEvent(self, wxHtmlWindowUrlClick(linkinfo))
+ wx.PostEvent(self, HtmlWindowUrlClick(linkinfo))
+
+ def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY):
+ if event == HtmlWindowUrlClick:
+ self.Connect(-1, -1, EVT_HTML_URL_CLICK, handler)
+ else:
+ wx.html.HtmlWindow.Bind(event, handler, source=source, id=id, id2=id2)
#-------------------------------------------------------------------------------
# Html Frame
#-------------------------------------------------------------------------------
- [wxID_HTMLFRAME, wxID_HTMLFRAMEHTMLCONTENT] = [wx.NewId() for _init_ctrls in range(2)]
+ [ID_HTMLFRAME, ID_HTMLFRAMEHTMLCONTENT] = [wx.NewId() for _init_ctrls in range(2)]
class HtmlFrame(wx.Frame):
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Frame.__init__(self, id=wxID_HTMLFRAME, name='HtmlFrame',
+ wx.Frame.__init__(self, id=ID_HTMLFRAME, name='HtmlFrame',
parent=prnt, pos=wx.Point(320, 231), size=wx.Size(853, 616),
style=wx.DEFAULT_FRAME_STYLE, title='')
- self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=wxID_HTMLFRAME)
+ self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=ID_HTMLFRAME)
- self.HtmlContent = wxUrlClickHtmlWindow(id=wxID_HTMLFRAMEHTMLCONTENT,
+ self.HtmlContent = UrlClickHtmlWindow(id=ID_HTMLFRAMEHTMLCONTENT,
name='HtmlContent', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(-1, -1), style=wxHW_SCROLLBAR_AUTO|wxHW_NO_SELECTION)
- EVT_HTML_URL_CLICK(self.HtmlContent, self.OnLinkClick)
+ size=wx.Size(-1, -1), style=wx.html.HW_SCROLLBAR_AUTO|wx.html.HW_NO_SELECTION)
+ self.HtmlContent.Bind(HtmlWindowUrlClick, self.OnLinkClick)
def __init__(self, parent, opened):
self._init_ctrls(parent)
@@ -98,10 +97,10 @@
try:
import webbrowser
except ImportError:
- wxMessageBox('Please point your browser at: %s' % url)
+ wx.MessageBox('Please point your browser at: %s' % url)
else:
webbrowser.open(url)
-
+
Html_Window = True
except:
Html_Window = False
@@ -129,164 +128,153 @@
ScriptDirectory = sys.path[0]
-[wxID_OBJDICTEDIT, wxID_OBJDICTEDITFILEOPENED,
- wxID_OBJDICTEDITHELPBAR,
+[ID_OBJDICTEDIT, ID_OBJDICTEDITFILEOPENED,
+ ID_OBJDICTEDITHELPBAR,
] = [wx.NewId() for _init_ctrls in range(3)]
-[wxID_OBJDICTEDITADDMENUITEMS0, wxID_OBJDICTEDITADDMENUITEMS1,
- wxID_OBJDICTEDITADDMENUITEMS2, wxID_OBJDICTEDITADDMENUITEMS3,
- wxID_OBJDICTEDITADDMENUITEMS4, wxID_OBJDICTEDITADDMENUITEMS5,
+[ID_OBJDICTEDITADDMENUITEMS0, ID_OBJDICTEDITADDMENUITEMS1,
+ ID_OBJDICTEDITADDMENUITEMS2, ID_OBJDICTEDITADDMENUITEMS3,
+ ID_OBJDICTEDITADDMENUITEMS4, ID_OBJDICTEDITADDMENUITEMS5,
] = [wx.NewId() for _init_coll_AddMenu_Items in range(6)]
-[wxID_OBJDICTEDITFILEMENUITEMS0, wxID_OBJDICTEDITFILEMENUITEMS1,
- wxID_OBJDICTEDITFILEMENUITEMS2, wxID_OBJDICTEDITFILEMENUITEMS4,
- wxID_OBJDICTEDITFILEMENUITEMS5, wxID_OBJDICTEDITFILEMENUITEMS6,
- wxID_OBJDICTEDITFILEMENUITEMS7, wxID_OBJDICTEDITFILEMENUITEMS8,
- wxID_OBJDICTEDITFILEMENUITEMS9,
+[ID_OBJDICTEDITFILEMENUITEMS0, ID_OBJDICTEDITFILEMENUITEMS1,
+ ID_OBJDICTEDITFILEMENUITEMS2, ID_OBJDICTEDITFILEMENUITEMS4,
+ ID_OBJDICTEDITFILEMENUITEMS5, ID_OBJDICTEDITFILEMENUITEMS6,
+ ID_OBJDICTEDITFILEMENUITEMS7, ID_OBJDICTEDITFILEMENUITEMS8,
+ ID_OBJDICTEDITFILEMENUITEMS9,
] = [wx.NewId() for _init_coll_FileMenu_Items in range(9)]
-[wxID_OBJDICTEDITEDITMENUITEMS0, wxID_OBJDICTEDITEDITMENUITEMS1,
- wxID_OBJDICTEDITEDITMENUITEMS2, wxID_OBJDICTEDITEDITMENUITEMS4,
- wxID_OBJDICTEDITEDITMENUITEMS6, wxID_OBJDICTEDITEDITMENUITEMS7,
- wxID_OBJDICTEDITEDITMENUITEMS8,
+[ID_OBJDICTEDITEDITMENUITEMS0, ID_OBJDICTEDITEDITMENUITEMS1,
+ ID_OBJDICTEDITEDITMENUITEMS2, ID_OBJDICTEDITEDITMENUITEMS4,
+ ID_OBJDICTEDITEDITMENUITEMS6, ID_OBJDICTEDITEDITMENUITEMS7,
+ ID_OBJDICTEDITEDITMENUITEMS8,
] = [wx.NewId() for _init_coll_EditMenu_Items in range(7)]
-[wxID_OBJDICTEDITHELPMENUITEMS0, wxID_OBJDICTEDITHELPMENUITEMS1,
- wxID_OBJDICTEDITHELPMENUITEMS2,
+[ID_OBJDICTEDITHELPMENUITEMS0, ID_OBJDICTEDITHELPMENUITEMS1,
+ ID_OBJDICTEDITHELPMENUITEMS2,
] = [wx.NewId() for _init_coll_HelpMenu_Items in range(3)]
class objdictedit(wx.Frame):
def _init_coll_menuBar1_Menus(self, parent):
- # generated method, don't edit
-
parent.Append(menu=self.FileMenu, title='File')
parent.Append(menu=self.EditMenu, title='Edit')
parent.Append(menu=self.AddMenu, title='Add')
parent.Append(menu=self.HelpMenu, title='Help')
def _init_coll_EditMenu_Items(self, parent):
- # generated method, don't edit
-
- parent.Append(help='', id=wxID_OBJDICTEDITEDITMENUITEMS4,
+ parent.Append(help='', id=ID_OBJDICTEDITEDITMENUITEMS4,
kind=wx.ITEM_NORMAL, text='Refresh\tCTRL+R')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_OBJDICTEDITEDITMENUITEMS1,
+ parent.Append(help='', id=ID_OBJDICTEDITEDITMENUITEMS1,
kind=wx.ITEM_NORMAL, text='Undo\tCTRL+Z')
- parent.Append(help='', id=wxID_OBJDICTEDITEDITMENUITEMS0,
+ parent.Append(help='', id=ID_OBJDICTEDITEDITMENUITEMS0,
kind=wx.ITEM_NORMAL, text='Redo\tCTRL+Y')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_OBJDICTEDITEDITMENUITEMS6,
+ parent.Append(help='', id=ID_OBJDICTEDITEDITMENUITEMS6,
kind=wx.ITEM_NORMAL, text='Node infos')
- parent.Append(help='', id=wxID_OBJDICTEDITEDITMENUITEMS2,
+ parent.Append(help='', id=ID_OBJDICTEDITEDITMENUITEMS2,
kind=wx.ITEM_NORMAL, text='DS-301 Profile')
- parent.Append(help='', id=wxID_OBJDICTEDITEDITMENUITEMS8,
+ parent.Append(help='', id=ID_OBJDICTEDITEDITMENUITEMS8,
kind=wx.ITEM_NORMAL, text='DS-302 Profile')
- parent.Append(help='', id=wxID_OBJDICTEDITEDITMENUITEMS7,
+ parent.Append(help='', id=ID_OBJDICTEDITEDITMENUITEMS7,
kind=wx.ITEM_NORMAL, text='Other Profile')
self.Bind(wx.EVT_MENU, self.OnUndoMenu,
- id=wxID_OBJDICTEDITEDITMENUITEMS1)
+ id=ID_OBJDICTEDITEDITMENUITEMS1)
self.Bind(wx.EVT_MENU, self.OnRedoMenu,
- id=wxID_OBJDICTEDITEDITMENUITEMS0)
+ id=ID_OBJDICTEDITEDITMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnCommunicationMenu,
- id=wxID_OBJDICTEDITEDITMENUITEMS2)
+ id=ID_OBJDICTEDITEDITMENUITEMS2)
self.Bind(wx.EVT_MENU, self.OnRefreshMenu,
- id=wxID_OBJDICTEDITEDITMENUITEMS4)
+ id=ID_OBJDICTEDITEDITMENUITEMS4)
self.Bind(wx.EVT_MENU, self.OnNodeInfosMenu,
- id=wxID_OBJDICTEDITEDITMENUITEMS6)
+ id=ID_OBJDICTEDITEDITMENUITEMS6)
self.Bind(wx.EVT_MENU, self.OnEditProfileMenu,
- id=wxID_OBJDICTEDITEDITMENUITEMS7)
+ id=ID_OBJDICTEDITEDITMENUITEMS7)
self.Bind(wx.EVT_MENU, self.OnOtherCommunicationMenu,
- id=wxID_OBJDICTEDITEDITMENUITEMS8)
+ id=ID_OBJDICTEDITEDITMENUITEMS8)
def _init_coll_HelpMenu_Items(self, parent):
- # generated method, don't edit
-
- parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS0,
+ parent.Append(help='', id=ID_OBJDICTEDITHELPMENUITEMS0,
kind=wx.ITEM_NORMAL, text='DS-301 Standard\tF1')
self.Bind(wx.EVT_MENU, self.OnHelpDS301Menu,
- id=wxID_OBJDICTEDITHELPMENUITEMS0)
- parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS1,
+ id=ID_OBJDICTEDITHELPMENUITEMS0)
+ parent.Append(help='', id=ID_OBJDICTEDITHELPMENUITEMS1,
kind=wx.ITEM_NORMAL, text='CAN Festival Docs\tF2')
self.Bind(wx.EVT_MENU, self.OnHelpCANFestivalMenu,
- id=wxID_OBJDICTEDITHELPMENUITEMS1)
+ id=ID_OBJDICTEDITHELPMENUITEMS1)
if Html_Window:
- parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS2,
+ parent.Append(help='', id=ID_OBJDICTEDITHELPMENUITEMS2,
kind=wx.ITEM_NORMAL, text='About')
self.Bind(wx.EVT_MENU, self.OnAboutMenu,
- id=wxID_OBJDICTEDITHELPMENUITEMS2)
+ id=ID_OBJDICTEDITHELPMENUITEMS2)
def _init_coll_FileMenu_Items(self, parent):
- # generated method, don't edit
-
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS5,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS5,
kind=wx.ITEM_NORMAL, text='New\tCTRL+N')
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS0,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS0,
kind=wx.ITEM_NORMAL, text='Open\tCTRL+O')
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS1,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS1,
kind=wx.ITEM_NORMAL, text='Save\tCTRL+S')
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS6,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS6,
kind=wx.ITEM_NORMAL, text='Save As...\tALT+S')
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS2,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS2,
kind=wx.ITEM_NORMAL, text='Close\tCTRL+W')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS7,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS7,
kind=wx.ITEM_NORMAL, text='Import EDS file')
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS9,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS9,
kind=wx.ITEM_NORMAL, text='Export to EDS file')
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS8,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS8,
kind=wx.ITEM_NORMAL, text='Build Dictionary\tCTRL+B')
parent.AppendSeparator()
- parent.Append(help='', id=wxID_OBJDICTEDITFILEMENUITEMS4,
+ parent.Append(help='', id=ID_OBJDICTEDITFILEMENUITEMS4,
kind=wx.ITEM_NORMAL, text='Exit')
self.Bind(wx.EVT_MENU, self.OnOpenMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS0)
+ id=ID_OBJDICTEDITFILEMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnSaveMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS1)
+ id=ID_OBJDICTEDITFILEMENUITEMS1)
self.Bind(wx.EVT_MENU, self.OnCloseMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS2)
+ id=ID_OBJDICTEDITFILEMENUITEMS2)
self.Bind(wx.EVT_MENU, self.OnQuitMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS4)
+ id=ID_OBJDICTEDITFILEMENUITEMS4)
self.Bind(wx.EVT_MENU, self.OnNewMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS5)
+ id=ID_OBJDICTEDITFILEMENUITEMS5)
self.Bind(wx.EVT_MENU, self.OnSaveAsMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS6)
+ id=ID_OBJDICTEDITFILEMENUITEMS6)
self.Bind(wx.EVT_MENU, self.OnImportEDSMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS7)
+ id=ID_OBJDICTEDITFILEMENUITEMS7)
self.Bind(wx.EVT_MENU, self.OnExportCMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS8)
+ id=ID_OBJDICTEDITFILEMENUITEMS8)
self.Bind(wx.EVT_MENU, self.OnExportEDSMenu,
- id=wxID_OBJDICTEDITFILEMENUITEMS9)
+ id=ID_OBJDICTEDITFILEMENUITEMS9)
def _init_coll_AddMenu_Items(self, parent):
- # generated method, don't edit
-
- parent.Append(help='', id=wxID_OBJDICTEDITADDMENUITEMS0,
+ parent.Append(help='', id=ID_OBJDICTEDITADDMENUITEMS0,
kind=wx.ITEM_NORMAL, text='SDO Server')
- parent.Append(help='', id=wxID_OBJDICTEDITADDMENUITEMS1,
+ parent.Append(help='', id=ID_OBJDICTEDITADDMENUITEMS1,
kind=wx.ITEM_NORMAL, text='SDO Client')
- parent.Append(help='', id=wxID_OBJDICTEDITADDMENUITEMS2,
+ parent.Append(help='', id=ID_OBJDICTEDITADDMENUITEMS2,
kind=wx.ITEM_NORMAL, text='PDO Transmit')
- parent.Append(help='', id=wxID_OBJDICTEDITADDMENUITEMS3,
+ parent.Append(help='', id=ID_OBJDICTEDITADDMENUITEMS3,
kind=wx.ITEM_NORMAL, text='PDO Receive')
- parent.Append(help='', id=wxID_OBJDICTEDITADDMENUITEMS4,
+ parent.Append(help='', id=ID_OBJDICTEDITADDMENUITEMS4,
kind=wx.ITEM_NORMAL, text='Map Variable')
- parent.Append(help='', id=wxID_OBJDICTEDITADDMENUITEMS5,
+ parent.Append(help='', id=ID_OBJDICTEDITADDMENUITEMS5,
kind=wx.ITEM_NORMAL, text='User Type')
self.Bind(wx.EVT_MENU, self.OnAddSDOServerMenu,
- id=wxID_OBJDICTEDITADDMENUITEMS0)
+ id=ID_OBJDICTEDITADDMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnAddSDOClientMenu,
- id=wxID_OBJDICTEDITADDMENUITEMS1)
+ id=ID_OBJDICTEDITADDMENUITEMS1)
self.Bind(wx.EVT_MENU, self.OnAddPDOTransmitMenu,
- id=wxID_OBJDICTEDITADDMENUITEMS2)
+ id=ID_OBJDICTEDITADDMENUITEMS2)
self.Bind(wx.EVT_MENU, self.OnAddPDOReceiveMenu,
- id=wxID_OBJDICTEDITADDMENUITEMS3)
+ id=ID_OBJDICTEDITADDMENUITEMS3)
self.Bind(wx.EVT_MENU, self.OnAddMapVariableMenu,
- id=wxID_OBJDICTEDITADDMENUITEMS4)
+ id=ID_OBJDICTEDITADDMENUITEMS4)
self.Bind(wx.EVT_MENU, self.OnAddUserTypeMenu,
- id=wxID_OBJDICTEDITADDMENUITEMS5)
+ id=ID_OBJDICTEDITADDMENUITEMS5)
def _init_coll_HelpBar_Fields(self, parent):
- # generated method, don't edit
parent.SetFieldsCount(3)
parent.SetStatusText(number=0, text='')
@@ -296,16 +284,12 @@
parent.SetStatusWidths([100, 110, -1])
def _init_utils(self):
- # generated method, don't edit
self.menuBar1 = wx.MenuBar()
self.menuBar1.SetEvtHandlerEnabled(True)
self.FileMenu = wx.Menu(title='')
-
self.EditMenu = wx.Menu(title='')
-
self.AddMenu = wx.Menu(title='')
-
self.HelpMenu = wx.Menu(title='')
self._init_coll_menuBar1_Menus(self.menuBar1)
@@ -315,23 +299,22 @@
self._init_coll_HelpMenu_Items(self.HelpMenu)
def _init_ctrls(self, prnt):
- # generated method, don't edit
- wx.Frame.__init__(self, id=wxID_OBJDICTEDIT, name='objdictedit',
+ wx.Frame.__init__(self, id=ID_OBJDICTEDIT, name='objdictedit',
parent=prnt, pos=wx.Point(149, 178), size=wx.Size(1000, 700),
style=wx.DEFAULT_FRAME_STYLE, title='Objdictedit')
self._init_utils()
self.SetClientSize(wx.Size(1000, 700))
self.SetMenuBar(self.menuBar1)
- self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=wxID_OBJDICTEDIT)
-
- self.FileOpened = wx.Notebook(id=wxID_OBJDICTEDITFILEOPENED,
+ self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=ID_OBJDICTEDIT)
+
+ self.FileOpened = wx.Notebook(id=ID_OBJDICTEDITFILEOPENED,
name='FileOpened', parent=self, pos=wx.Point(0, 0),
size=wx.Size(0, 0), style=0)
self.FileOpened.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED,
- self.OnFileSelectedChanged, id=wxID_OBJDICTEDITFILEOPENED)
-
- self.HelpBar = wx.StatusBar(id=wxID_OBJDICTEDITHELPBAR, name='HelpBar',
- parent=self, style=wxST_SIZEGRIP)
+ self.OnFileSelectedChanged, id=ID_OBJDICTEDITFILEOPENED)
+
+ self.HelpBar = wx.StatusBar(id=ID_OBJDICTEDITHELPBAR, name='HelpBar',
+ parent=self, style=wx.ST_SIZEGRIP)
self._init_coll_HelpBar_Fields(self.HelpBar)
self.SetStatusBar(self.HelpBar)
@@ -352,9 +335,9 @@
self.Manager.ChangeCurrentNode(window.GetIndex())
self.FileOpened.SetSelection(0)
if self.Manager.CurrentDS302Defined():
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS8, True)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS8, True)
else:
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS8, False)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS8, False)
self.RefreshEditMenu()
self.RefreshBufferState()
self.RefreshProfileMenu()
@@ -419,13 +402,13 @@
index, subIndex = result
result = OpenPDFDocIndex(index, ScriptDirectory)
if type(result) == StringType:
- message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
if not find_index:
result = OpenPDFDocIndex(None, ScriptDirectory)
if type(result) == StringType:
- message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
event.Skip()
@@ -454,10 +437,10 @@
def OnCloseFrame(self, event):
if self.Manager.OneFileHasChanged():
- dialog = wxMessageDialog(self, "There are changes, do you want to save?", "Close Application", wxYES_NO|wxCANCEL|wxICON_QUESTION)
+ dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
answer = dialog.ShowModal()
dialog.Destroy()
- if answer == wxID_YES:
+ if answer == wx.ID_YES:
self.Manager.ChangeCurrentNode(0)
for i in xrange(self.FileOpened.GetPageCount()):
window = self.FileOpened.GetPage(i)
@@ -468,10 +451,10 @@
self.Save()
self.Manager.CloseCurrent(True)
event.Skip()
- elif answer == wxID_NO:
+ elif answer == wx.ID_NO:
for i in xrange(self.FileOpened.GetPageCount()):
self.Manager.CloseCurrent(True)
- wxCallAfter(self.Close)
+ wx.CallAfter(self.Close)
event.Skip()
else:
event.Skip()
@@ -533,34 +516,34 @@
if self.FileOpened.GetPageCount() > 0:
self.menuBar1.EnableTop(1, True)
self.menuBar1.EnableTop(2, True)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS1, True)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS2, True)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS6, True)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS8, True)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS9, True)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS1, True)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS2, True)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS6, True)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS8, True)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS9, True)
else:
self.menuBar1.EnableTop(1, False)
self.menuBar1.EnableTop(2, False)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS1, False)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS2, False)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS6, False)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS8, False)
- self.FileMenu.Enable(wxID_OBJDICTEDITFILEMENUITEMS9, False)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS1, False)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS2, False)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS6, False)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS8, False)
+ self.FileMenu.Enable(ID_OBJDICTEDITFILEMENUITEMS9, False)
def RefreshEditMenu(self):
if self.FileMenu:
if self.FileOpened.GetPageCount() > 0:
undo, redo = self.Manager.GetCurrentBufferState()
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS1, undo)
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS0, redo)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS1, undo)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS0, redo)
else:
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS1, False)
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS0, False)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS1, False)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS0, False)
def RefreshProfileMenu(self):
if self.EditMenu:
profile = self.Manager.GetCurrentProfileName()
- edititem = self.EditMenu.FindItemById(wxID_OBJDICTEDITEDITMENUITEMS7)
+ edititem = self.EditMenu.FindItemById(ID_OBJDICTEDITEDITMENUITEMS7)
if edititem:
length = self.AddMenu.GetMenuItemCount()
for i in xrange(length-6):
@@ -610,7 +593,7 @@
def OnNewMenu(self, event):
self.FilePath = ""
dialog = CreateNodeDialog(self, ScriptDirectory)
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
name, id, nodetype, description = dialog.GetValues()
profile, filepath = dialog.GetProfile()
NMT = dialog.GetNMTManagement()
@@ -621,14 +604,14 @@
new_editingpanel.SetIndex(result)
self.FileOpened.AddPage(new_editingpanel, "")
self.FileOpened.SetSelection(self.FileOpened.GetPageCount() - 1)
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS8, False)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS8, False)
if "DS302" in options:
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS8, True)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS8, True)
self.RefreshBufferState()
self.RefreshProfileMenu()
self.RefreshMainMenu()
else:
- message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
event.Skip()
@@ -639,8 +622,8 @@
directory = os.path.dirname(filepath)
else:
directory = os.getcwd()
- dialog = wxFileDialog(self, "Choose a file", directory, "", "OD files (*.od)|*.od|All files|*.*", wxOPEN|wxCHANGE_DIR)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.FileDialog(self, "Choose a file", directory, "", "OD files (*.od)|*.od|All files|*.*", wx.OPEN|wx.CHANGE_DIR)
+ if dialog.ShowModal() == wx.ID_OK:
filepath = dialog.GetPath()
if os.path.isfile(filepath):
result = self.Manager.OpenFileInCurrent(filepath)
@@ -650,15 +633,15 @@
self.FileOpened.AddPage(new_editingpanel, "")
self.FileOpened.SetSelection(self.FileOpened.GetPageCount() - 1)
if self.Manager.CurrentDS302Defined():
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS8, True)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS8, True)
else:
- self.EditMenu.Enable(wxID_OBJDICTEDITEDITMENUITEMS8, False)
+ self.EditMenu.Enable(ID_OBJDICTEDITEDITMENUITEMS8, False)
self.RefreshEditMenu()
self.RefreshBufferState()
self.RefreshProfileMenu()
self.RefreshMainMenu()
else:
- message = wxMessageDialog(self, e.args[0], "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, e.args[0], "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -679,7 +662,7 @@
elif type(result) != StringType:
self.RefreshBufferState()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
@@ -689,35 +672,35 @@
directory, filename = os.path.split(filepath)
else:
directory, filename = os.getcwd(), "%s.od"%self.Manager.GetCurrentNodeInfos()[0]
- dialog = wxFileDialog(self, "Choose a file", directory, filename, "OD files (*.od)|*.od|All files|*.*", wxSAVE|wxOVERWRITE_PROMPT|wxCHANGE_DIR)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.FileDialog(self, "Choose a file", directory, filename, "OD files (*.od)|*.od|All files|*.*", wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
+ if dialog.ShowModal() == wx.ID_OK:
filepath = dialog.GetPath()
if os.path.isdir(os.path.dirname(filepath)):
result = self.Manager.SaveCurrentInFile(filepath)
if type(result) != StringType:
self.RefreshBufferState()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
- message = wxMessageDialog(self, "%s is not a valid folder!"%os.path.dirname(filepath), "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "%s is not a valid folder!"%os.path.dirname(filepath), "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
def OnCloseMenu(self, event):
- answer = wxID_YES
+ answer = wx.ID_YES
result = self.Manager.CloseCurrent()
if not result:
- dialog = wxMessageDialog(self, "There are changes, do you want to save?", "Close File", wxYES_NO|wxCANCEL|wxICON_QUESTION)
+ dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close File", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
answer = dialog.ShowModal()
dialog.Destroy()
- if answer == wxID_YES:
+ if answer == wx.ID_YES:
self.OnSaveMenu(event)
if self.Manager.CurrentIsSaved():
self.Manager.CloseCurrent()
- elif answer == wxID_NO:
+ elif answer == wx.ID_NO:
self.Manager.CloseCurrent(True)
if self.FileOpened.GetPageCount() > self.Manager.GetBufferNumber():
current = self.FileOpened.GetSelection()
@@ -734,8 +717,8 @@
#-------------------------------------------------------------------------------
def OnImportEDSMenu(self, event):
- dialog = wxFileDialog(self, "Choose a file", os.getcwd(), "", "EDS files (*.eds)|*.eds|All files|*.*", wxOPEN|wxCHANGE_DIR)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.FileDialog(self, "Choose a file", os.getcwd(), "", "EDS files (*.eds)|*.eds|All files|*.*", wx.OPEN|wx.CHANGE_DIR)
+ if dialog.ShowModal() == wx.ID_OK:
filepath = dialog.GetPath()
if os.path.isfile(filepath):
result = self.Manager.ImportCurrentFromEDSFile(filepath)
@@ -748,15 +731,15 @@
self.RefreshCurrentIndexList()
self.RefreshProfileMenu()
self.RefreshMainMenu()
- message = wxMessageDialog(self, "Import successful", "Information", wxOK|wxICON_INFORMATION)
+ message = wx.MessageDialog(self, "Import successful", "Information", wx.OK|wx.ICON_INFORMATION)
message.ShowModal()
message.Destroy()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
- message = wxMessageDialog(self, "\"%s\" is not a valid file!"%filepath, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "\"%s\" is not a valid file!"%filepath, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -764,8 +747,8 @@
def OnExportEDSMenu(self, event):
- dialog = wxFileDialog(self, "Choose a file", os.getcwd(), self.Manager.GetCurrentNodeInfos()[0], "EDS files (*.eds)|*.eds|All files|*.*", wxSAVE|wxOVERWRITE_PROMPT|wxCHANGE_DIR)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.FileDialog(self, "Choose a file", os.getcwd(), self.Manager.GetCurrentNodeInfos()[0], "EDS files (*.eds)|*.eds|All files|*.*", wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
+ if dialog.ShowModal() == wx.ID_OK:
filepath = dialog.GetPath()
if os.path.isdir(os.path.dirname(filepath)):
path, extend = os.path.splitext(filepath)
@@ -773,23 +756,23 @@
filepath = path + ".eds"
result = self.Manager.ExportCurrentToEDSFile(filepath)
if not result:
- message = wxMessageDialog(self, "Export successful", "Information", wxOK|wxICON_INFORMATION)
+ message = wx.MessageDialog(self, "Export successful", "Information", wx.OK|wx.ICON_INFORMATION)
message.ShowModal()
message.Destroy()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
- message = wxMessageDialog(self, "\"%s\" is not a valid folder!"%os.path.dirname(filepath), "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "\"%s\" is not a valid folder!"%os.path.dirname(filepath), "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
event.Skip()
def OnExportCMenu(self, event):
- dialog = wxFileDialog(self, "Choose a file", os.getcwd(), self.Manager.GetCurrentNodeInfos()[0], "CANFestival C files (*.c)|*.c|All files|*.*", wxSAVE|wxOVERWRITE_PROMPT|wxCHANGE_DIR)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.FileDialog(self, "Choose a file", os.getcwd(), self.Manager.GetCurrentNodeInfos()[0], "CANFestival C files (*.c)|*.c|All files|*.*", wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
+ if dialog.ShowModal() == wx.ID_OK:
filepath = dialog.GetPath()
if os.path.isdir(os.path.dirname(filepath)):
path, extend = os.path.splitext(filepath)
@@ -797,15 +780,15 @@
filepath = path + ".c"
result = self.Manager.ExportCurrentToCFile(filepath)
if not result:
- message = wxMessageDialog(self, "Export successful", "Information", wxOK|wxICON_INFORMATION)
+ message = wx.MessageDialog(self, "Export successful", "Information", wx.OK|wx.ICON_INFORMATION)
message.ShowModal()
message.Destroy()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
- message = wxMessageDialog(self, "\"%s\" is not a valid folder!"%os.path.dirname(filepath), "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "\"%s\" is not a valid folder!"%os.path.dirname(filepath), "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -837,7 +820,7 @@
dialog.SetIndexDictionary(dictionary)
dialog.SetCurrentList(current)
dialog.RefreshLists()
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
new_profile = dialog.GetCurrentList()
addinglist = []
removinglist = []
@@ -869,7 +852,7 @@
dialog = NodeInfosDialog(self)
name, id, type, description = self.Manager.GetCurrentNodeInfos()
dialog.SetValues(name, id, type, description)
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
name, id, type, description = dialog.GetValues()
self.Manager.SetCurrentNodeInfos(name, id, type, description)
self.RefreshBufferState()
@@ -890,33 +873,33 @@
if index:
dialog = MapVariableDialog(self)
dialog.SetIndex(index)
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
index, name, struct, number = dialog.GetValues()
result = self.Manager.AddMapVariableToCurrent(index, name, struct, number)
if type(result) != StringType:
self.RefreshBufferState()
self.RefreshCurrentIndexList()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
else:
- message = wxMessageDialog(self, result, "No map variable index left!", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "No map variable index left!", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
def AddUserType(self):
dialog = UserTypeDialog(self)
dialog.SetTypeList(self.Manager.GetCustomisableTypes())
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
type, min, max, length = dialog.GetValues()
result = self.Manager.AddUserTypeToCurrent(type, min, max, length)
if not result:
self.RefreshBufferState()
self.RefreshCurrentIndexList()
else:
- message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, result, "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -968,7 +951,7 @@
return res
def Display_Error_Dialog(e_value):
- message = wxMessageDialog(None, str(e_value), "Error", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(None, str(e_value), "Error", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
@@ -984,7 +967,7 @@
ignored_exceptions = [] # a problem with a line in a module is only reported once per session
-def wxAddExceptHook(path, app_version='[No version]'):#, ignored_exceptions=[]):
+def AddExceptHook(path, app_version='[No version]'):#, ignored_exceptions=[]):
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
@@ -1026,11 +1009,11 @@
sys.excepthook = handle_exception
if __name__ == '__main__':
- app = wxPySimpleApp()
- wxInitAllImageHandlers()
+ app = wx.PySimpleApp()
+ wx.InitAllImageHandlers()
# Install a exception handle for bug reports
- wxAddExceptHook(os.getcwd(),__version__)
+ AddExceptHook(os.getcwd(),__version__)
frame = objdictedit(None)
--- a/objdictgen/subindextable.py Wed Aug 08 08:51:09 2007 +0200
+++ b/objdictgen/subindextable.py Wed Aug 08 14:55:15 2007 +0200
@@ -21,8 +21,6 @@
#License along with this library; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from wxPython.wx import *
-from wxPython.grid import *
import wx
import wx.grid
@@ -31,7 +29,7 @@
from node import OD_Subindex, OD_MultipleSubindexes, OD_IdenticalSubindexes, OD_IdenticalIndexes
ColSizes = [75, 250, 150, 125, 100, 60, 250]
-ColAlignements = [wxALIGN_CENTER, wxALIGN_LEFT, wxALIGN_CENTER, wxALIGN_RIGHT, wxALIGN_CENTER, wxALIGN_CENTER, wxALIGN_LEFT]
+ColAlignements = [wx.ALIGN_CENTER, wx.ALIGN_LEFT, wx.ALIGN_CENTER, wx.ALIGN_RIGHT, wx.ALIGN_CENTER, wx.ALIGN_CENTER, wx.ALIGN_LEFT]
AccessList = "Read Only,Write Only,Read/Write"
RAccessList = "Read Only,Read/Write"
BoolList = "True,False"
@@ -52,14 +50,14 @@
SizeConversion = {1 : "X", 8 : "B", 16 : "W", 24 : "D", 32 : "D", 40 : "L", 48 : "L", 56 : "L", 64 : "L"}
-class SubindexTable(wxPyGridTableBase):
+class SubindexTable(wx.grid.PyGridTableBase):
"""
A custom wxGrid Table using user supplied data
"""
def __init__(self, parent, data, editors, colnames):
# The base class must be initialized *first*
- wxPyGridTableBase.__init__(self)
+ wx.grid.PyGridTableBase.__init__(self)
self.data = data
self.editors = editors
self.CurrentIndex = 0
@@ -112,19 +110,19 @@
def ResetView(self, grid):
"""
- (wxGrid) -> Reset the grid view. Call this to
+ (wx.grid.Grid) -> Reset the grid view. Call this to
update the grid if rows and columns have been added or deleted
"""
grid.BeginBatch()
for current, new, delmsg, addmsg in [
- (self._rows, self.GetNumberRows(), wxGRIDTABLE_NOTIFY_ROWS_DELETED, wxGRIDTABLE_NOTIFY_ROWS_APPENDED),
- (self._cols, self.GetNumberCols(), wxGRIDTABLE_NOTIFY_COLS_DELETED, wxGRIDTABLE_NOTIFY_COLS_APPENDED),
+ (self._rows, self.GetNumberRows(), wx.grid.GRIDTABLE_NOTIFY_ROWS_DELETED, wx.grid.GRIDTABLE_NOTIFY_ROWS_APPENDED),
+ (self._cols, self.GetNumberCols(), wx.grid.GRIDTABLE_NOTIFY_COLS_DELETED, wx.grid.GRIDTABLE_NOTIFY_COLS_APPENDED),
]:
if new < current:
- msg = wxGridTableMessage(self,delmsg,new,current-new)
+ msg = wx.grid.GridTableMessage(self,delmsg,new,current-new)
grid.ProcessTableMessage(msg)
elif new > current:
- msg = wxGridTableMessage(self,addmsg,new-current)
+ msg = wx.grid.GridTableMessage(self,addmsg,new-current)
grid.ProcessTableMessage(msg)
self.UpdateValues(grid)
grid.EndBatch()
@@ -142,20 +140,20 @@
def UpdateValues(self, grid):
"""Update all displayed values"""
# This sends an event to the grid table to update all of the values
- msg = wxGridTableMessage(self, wxGRIDTABLE_REQUEST_VIEW_GET_VALUES)
+ msg = wx.grid.GridTableMessage(self, wx.grid.GRIDTABLE_REQUEST_VIEW_GET_VALUES)
grid.ProcessTableMessage(msg)
def _updateColAttrs(self, grid):
"""
- wxGrid -> update the column attributes to add the
+ wx.grid.Grid -> update the column attributes to add the
appropriate renderer given the column name.
Otherwise default to the default renderer.
"""
for col in range(self.GetNumberCols()):
- attr = wxGridCellAttr()
- attr.SetAlignment(ColAlignements[col], wxALIGN_CENTRE)
+ attr = wx.grid.GridCellAttr()
+ attr.SetAlignment(ColAlignements[col], wx.ALIGN_CENTRE)
grid.SetColAttr(col, attr)
grid.SetColSize(col, ColSizes[col])
@@ -172,55 +170,55 @@
if editortype and self.Editable:
grid.SetReadOnly(row, col, False)
if editortype == "string":
- editor = wxGridCellTextEditor()
- renderer = wxGridCellStringRenderer()
+ editor = wx.grid.GridCellTextEditor()
+ renderer = wx.grid.GridCellStringRenderer()
if colname == "value" and "length" in editors:
editor.SetParameters(editors["length"])
elif editortype == "number":
- editor = wxGridCellNumberEditor()
- renderer = wxGridCellNumberRenderer()
+ editor = wx.grid.GridCellNumberEditor()
+ renderer = wx.grid.GridCellNumberRenderer()
if colname == "value" and "min" in editors and "max" in editors:
editor.SetParameters("%s,%s"%(editors["min"],editors["max"]))
elif editortype == "real":
- editor = wxGridCellFloatEditor()
- renderer = wxGridCellFloatRenderer()
+ editor = wx.grid.GridCellFloatEditor()
+ renderer = wx.grid.GridCellFloatRenderer()
if colname == "value" and "min" in editors and "max" in editors:
editor.SetParameters("%s,%s"%(editors["min"],editors["max"]))
elif editortype == "bool":
- editor = wxGridCellChoiceEditor()
+ editor = wx.grid.GridCellChoiceEditor()
editor.SetParameters(BoolList)
elif editortype == "access":
- editor = wxGridCellChoiceEditor()
+ editor = wx.grid.GridCellChoiceEditor()
editor.SetParameters(AccessList)
elif editortype == "raccess":
- editor = wxGridCellChoiceEditor()
+ editor = wx.grid.GridCellChoiceEditor()
editor.SetParameters(RAccessList)
elif editortype == "option":
- editor = wxGridCellChoiceEditor()
+ editor = wx.grid.GridCellChoiceEditor()
editor.SetParameters(OptionList)
elif editortype == "type":
- editor = wxGridCellChoiceEditor()
+ editor = wx.grid.GridCellChoiceEditor()
if typelist == None:
typelist = self.Parent.Manager.GetCurrentTypeList()
editor.SetParameters(typelist)
elif editortype == "map":
- editor = wxGridCellChoiceEditor()
+ editor = wx.grid.GridCellChoiceEditor()
if maplist == None:
maplist = self.Parent.Manager.GetCurrentMapList()
editor.SetParameters(maplist)
elif editortype == "time":
- editor = wxGridCellTextEditor()
- renderer = wxGridCellStringRenderer()
+ editor = wx.grid.GridCellTextEditor()
+ renderer = wx.grid.GridCellStringRenderer()
elif editortype == "domain":
- editor = wxGridCellTextEditor()
- renderer = wxGridCellStringRenderer()
+ editor = wx.grid.GridCellTextEditor()
+ renderer = wx.grid.GridCellStringRenderer()
else:
grid.SetReadOnly(row, col, True)
grid.SetCellEditor(row, col, editor)
grid.SetCellRenderer(row, col, renderer)
- grid.SetCellBackgroundColour(row, col, wxWHITE)
+ grid.SetCellBackgroundColour(row, col, wx.WHITE)
def SetData(self, data):
self.data = data
@@ -241,98 +239,77 @@
self.data = []
self.editors = []
-[wxID_EDITINGPANEL, wxID_EDITINGPANELADDBUTTON, wxID_EDITINGPANELINDEXCHOICE,
- wxID_EDITINGPANELINDEXLIST, wxID_EDITINGPANELINDEXLISTPANEL, wxID_EDITINGPANELPARTLIST,
- wxID_EDITINGPANELSECONDSPLITTER, wxID_EDITINGPANELSUBINDEXGRID,
- wxID_EDITINGPANELSUBINDEXGRIDPANEL, wxID_EDITINGPANELCALLBACKCHECK,
+[ID_EDITINGPANEL, ID_EDITINGPANELADDBUTTON, ID_EDITINGPANELINDEXCHOICE,
+ ID_EDITINGPANELINDEXLIST, ID_EDITINGPANELINDEXLISTPANEL, ID_EDITINGPANELPARTLIST,
+ ID_EDITINGPANELSECONDSPLITTER, ID_EDITINGPANELSUBINDEXGRID,
+ ID_EDITINGPANELSUBINDEXGRIDPANEL, ID_EDITINGPANELCALLBACKCHECK,
] = [wx.NewId() for _init_ctrls in range(10)]
-[wxID_EDITINGPANELINDEXLISTMENUITEMS0, wxID_EDITINGPANELINDEXLISTMENUITEMS1,
- wxID_EDITINGPANELINDEXLISTMENUITEMS2,
+[ID_EDITINGPANELINDEXLISTMENUITEMS0, ID_EDITINGPANELINDEXLISTMENUITEMS1,
+ ID_EDITINGPANELINDEXLISTMENUITEMS2,
] = [wx.NewId() for _init_coll_IndexListMenu_Items in range(3)]
-[wxID_EDITINGPANELMENU1ITEMS0, wxID_EDITINGPANELMENU1ITEMS1,
+[ID_EDITINGPANELMENU1ITEMS0, ID_EDITINGPANELMENU1ITEMS1,
] = [wx.NewId() for _init_coll_SubindexGridMenu_Items in range(2)]
class EditingPanel(wx.SplitterWindow):
def _init_coll_AddToListSizer_Items(self, parent):
- # generated method, don't edit
-
parent.AddWindow(self.AddButton, 0, border=0, flag=0)
- parent.AddWindow(self.IndexChoice, 0, border=0, flag=wxGROW)
+ parent.AddWindow(self.IndexChoice, 0, border=0, flag=wx.GROW)
def _init_coll_SubindexGridSizer_Items(self, parent):
- # generated method, don't edit
-
parent.AddWindow(self.CallbackCheck, 0, border=0, flag=0)
- parent.AddWindow(self.SubindexGrid, 0, border=0, flag=wxGROW)
+ parent.AddWindow(self.SubindexGrid, 0, border=0, flag=wx.GROW)
def _init_coll_IndexListSizer_Items(self, parent):
- # generated method, don't edit
-
- parent.AddWindow(self.IndexList, 0, border=0, flag=wxGROW)
- parent.AddSizer(self.AddToListSizer, 0, border=0, flag=wxGROW)
+ parent.AddWindow(self.IndexList, 0, border=0, flag=wx.GROW)
+ parent.AddSizer(self.AddToListSizer, 0, border=0, flag=wx.GROW)
def _init_coll_AddToListSizer_Growables(self, parent):
- # generated method, don't edit
-
parent.AddGrowableCol(1)
def _init_coll_SubindexGridSizer_Growables(self, parent):
- # generated method, don't edit
-
parent.AddGrowableCol(0)
parent.AddGrowableRow(1)
def _init_coll_IndexListSizer_Growables(self, parent):
- # generated method, don't edit
-
parent.AddGrowableCol(0)
parent.AddGrowableRow(0)
def _init_coll_SubindexGridMenu_Items(self, parent):
- # generated method, don't edit
-
- parent.Append(help='', id=wxID_EDITINGPANELMENU1ITEMS0,
+ parent.Append(help='', id=ID_EDITINGPANELMENU1ITEMS0,
kind=wx.ITEM_NORMAL, text='Add')
- parent.Append(help='', id=wxID_EDITINGPANELMENU1ITEMS1,
+ parent.Append(help='', id=ID_EDITINGPANELMENU1ITEMS1,
kind=wx.ITEM_NORMAL, text='Delete')
self.Bind(wx.EVT_MENU, self.OnAddSubindexMenu,
- id=wxID_EDITINGPANELMENU1ITEMS0)
+ id=ID_EDITINGPANELMENU1ITEMS0)
self.Bind(wx.EVT_MENU, self.OnDeleteSubindexMenu,
- id=wxID_EDITINGPANELMENU1ITEMS1)
+ id=ID_EDITINGPANELMENU1ITEMS1)
def _init_coll_IndexListMenu_Items(self, parent):
- # generated method, don't edit
-
- parent.Append(help='', id=wxID_EDITINGPANELINDEXLISTMENUITEMS0,
+ parent.Append(help='', id=ID_EDITINGPANELINDEXLISTMENUITEMS0,
kind=wx.ITEM_NORMAL, text='Rename')
- parent.Append(help='', id=wxID_EDITINGPANELINDEXLISTMENUITEMS2,
+ parent.Append(help='', id=ID_EDITINGPANELINDEXLISTMENUITEMS2,
kind=wx.ITEM_NORMAL, text='Modify')
- parent.Append(help='', id=wxID_EDITINGPANELINDEXLISTMENUITEMS1,
+ parent.Append(help='', id=ID_EDITINGPANELINDEXLISTMENUITEMS1,
kind=wx.ITEM_NORMAL, text='Delete')
self.Bind(wx.EVT_MENU, self.OnRenameIndexMenu,
- id=wxID_EDITINGPANELINDEXLISTMENUITEMS0)
+ id=ID_EDITINGPANELINDEXLISTMENUITEMS0)
self.Bind(wx.EVT_MENU, self.OnDeleteIndexMenu,
- id=wxID_EDITINGPANELINDEXLISTMENUITEMS1)
+ id=ID_EDITINGPANELINDEXLISTMENUITEMS1)
self.Bind(wx.EVT_MENU, self.OnModifyIndexMenu,
- id=wxID_EDITINGPANELINDEXLISTMENUITEMS2)
+ id=ID_EDITINGPANELINDEXLISTMENUITEMS2)
def _init_utils(self):
- # generated method, don't edit
self.IndexListMenu = wx.Menu(title='')
-
self.SubindexGridMenu = wx.Menu(title='')
self._init_coll_IndexListMenu_Items(self.IndexListMenu)
self._init_coll_SubindexGridMenu_Items(self.SubindexGridMenu)
def _init_sizers(self):
- # generated method, don't edit
self.IndexListSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
self.SubindexGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
self.AddToListSizer = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0)
self._init_coll_IndexListSizer_Growables(self.IndexListSizer)
@@ -346,37 +323,37 @@
self.IndexListPanel.SetSizer(self.IndexListSizer)
def _init_ctrls(self, prnt):
- wx.SplitterWindow.__init__(self, id=wxID_EDITINGPANEL,
+ wx.SplitterWindow.__init__(self, id=ID_EDITINGPANEL,
name='MainSplitter', parent=prnt, point=wx.Point(0, 0),
size=wx.Size(-1, -1), style=wx.SP_3D)
self._init_utils()
self.SetNeedUpdating(True)
self.SetMinimumPaneSize(1)
- self.PartList = wx.ListBox(choices=[], id=wxID_EDITINGPANELPARTLIST,
+ self.PartList = wx.ListBox(choices=[], id=ID_EDITINGPANELPARTLIST,
name='PartList', parent=self, pos=wx.Point(0, 0),
size=wx.Size(-1, -1), style=0)
self.PartList.Bind(wx.EVT_LISTBOX, self.OnPartListBoxClick,
- id=wxID_EDITINGPANELPARTLIST)
-
- self.SecondSplitter = wx.SplitterWindow(id=wxID_EDITINGPANELSECONDSPLITTER,
- name='SecondSplitter', parent=self, point=wx.Point(0,
- 0), size=wx.Size(-1, -1), style=wx.SP_3D)
+ id=ID_EDITINGPANELPARTLIST)
+
+ self.SecondSplitter = wx.SplitterWindow(id=ID_EDITINGPANELSECONDSPLITTER,
+ name='SecondSplitter', parent=self, point=wx.Point(0, 0),
+ size=wx.Size(-1, -1), style=wx.SP_3D)
self.SecondSplitter.SetMinimumPaneSize(1)
self.SplitHorizontally(self.PartList, self.SecondSplitter,
110)
- self.SubindexGridPanel = wx.Panel(id=wxID_EDITINGPANELSUBINDEXGRIDPANEL,
- name='SubindexGridPanel', parent=self.SecondSplitter, pos=wx.Point(0,
- 0), size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
-
- self.IndexListPanel = wx.Panel(id=wxID_EDITINGPANELINDEXLISTPANEL,
- name='IndexListPanel', parent=self.SecondSplitter, pos=wx.Point(0,
- 0), size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
+ self.SubindexGridPanel = wx.Panel(id=ID_EDITINGPANELSUBINDEXGRIDPANEL,
+ name='SubindexGridPanel', parent=self.SecondSplitter,
+ pos=wx.Point(0, 0), size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
+
+ self.IndexListPanel = wx.Panel(id=ID_EDITINGPANELINDEXLISTPANEL,
+ name='IndexListPanel', parent=self.SecondSplitter,
+ pos=wx.Point(0, 0), size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
self.SecondSplitter.SplitVertically(self.IndexListPanel,
self.SubindexGridPanel, 280)
- self.SubindexGrid = wx.grid.Grid(id=wxID_EDITINGPANELSUBINDEXGRID,
+ self.SubindexGrid = wx.grid.Grid(id=ID_EDITINGPANELSUBINDEXGRID,
name='SubindexGrid', parent=self.SubindexGridPanel, pos=wx.Point(0,
0), size=wx.Size(-1, -1), style=0)
self.SubindexGrid.SetFont(wx.Font(12, 77, wx.NORMAL, wx.NORMAL, False,
@@ -391,27 +368,27 @@
self.OnSubindexGridSelectCell)
self.SubindexGrid.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.OnSubindexGridCellLeftClick)
- self.CallbackCheck = wx.CheckBox(id=wxID_EDITINGPANELCALLBACKCHECK,
+ self.CallbackCheck = wx.CheckBox(id=ID_EDITINGPANELCALLBACKCHECK,
label='Have Callbacks', name='CallbackCheck',
parent=self.SubindexGridPanel, pos=wx.Point(0, 0), size=wx.Size(152,
24), style=0)
self.CallbackCheck.Bind(wx.EVT_CHECKBOX, self.OnCallbackCheck,
- id=wxID_EDITINGPANELCALLBACKCHECK)
-
- self.IndexList = wx.ListBox(choices=[], id=wxID_EDITINGPANELINDEXLIST,
+ id=ID_EDITINGPANELCALLBACKCHECK)
+
+ self.IndexList = wx.ListBox(choices=[], id=ID_EDITINGPANELINDEXLIST,
name='IndexList', parent=self.IndexListPanel, pos=wx.Point(0, 0),
size=wx.Size(-1, -1), style=0)
self.IndexList.Bind(wx.EVT_LISTBOX, self.OnIndexListClick,
- id=wxID_EDITINGPANELINDEXLIST)
+ id=ID_EDITINGPANELINDEXLIST)
self.IndexList.Bind(wx.EVT_RIGHT_UP, self.OnIndexListRightUp)
- self.AddButton = wx.Button(id=wxID_EDITINGPANELADDBUTTON, label='Add',
+ self.AddButton = wx.Button(id=ID_EDITINGPANELADDBUTTON, label='Add',
name='AddButton', parent=self.IndexListPanel, pos=wx.Point(0, 0),
size=wx.Size(50, 30), style=0)
self.AddButton.Bind(wx.EVT_BUTTON, self.OnAddButtonClick,
- id=wxID_EDITINGPANELADDBUTTON)
-
- self.IndexChoice = wx.Choice(choices=[], id=wxID_EDITINGPANELINDEXCHOICE,
+ id=ID_EDITINGPANELADDBUTTON)
+
+ self.IndexChoice = wx.Choice(choices=[], id=ID_EDITINGPANELINDEXCHOICE,
name='IndexChoice', parent=self.IndexListPanel, pos=wx.Point(50,
0), size=wx.Size(-1, 30), style=0)
@@ -450,14 +427,14 @@
def GetSelection(self):
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
subIndex = self.SubindexGrid.GetGridCursorRow()
return index, subIndex
return None
def OnSubindexGridCellLeftClick(self, event):
- wxCallAfter(self.BeginDrag)
+ wx.CallAfter(self.BeginDrag)
event.Skip()
def OnAddButtonClick(self, event):
@@ -497,8 +474,8 @@
event.Skip()
def OnSubindexGridSelectCell(self, event):
- wxCallAfter(self.BeginDrag)
- wxCallAfter(self.Parent.RefreshStatusBar)
+ wx.CallAfter(self.BeginDrag)
+ wx.CallAfter(self.Parent.RefreshStatusBar)
event.Skip()
def BeginDrag(self):
@@ -507,7 +484,7 @@
col = self.SubindexGrid.GetGridCursorCol()
if not self.Editable and col == 0:
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
subindex = self.SubindexGrid.GetGridCursorRow()
entry_infos = self.Manager.GetEntryInfos(index)
@@ -518,8 +495,8 @@
bus_id = self.Parent.GetBusId()
node_id = self.Parent.GetCurrentNodeId()
size = typeinfos["size"]
- data = wxTextDataObject(str(("%s%d.%d.%d.%d"%(SizeConversion[size], bus_id, node_id, index, subindex), "location")))
- dragSource = wxDropSource(self.SubindexGrid)
+ data = wx.TextDataObject(str(("%s%d.%d.%d.%d"%(SizeConversion[size], bus_id, node_id, index, subindex), "location")))
+ dragSource = wx.DropSource(self.SubindexGrid)
dragSource.SetData(data)
dragSource.DoDragDrop()
@@ -531,7 +508,7 @@
selected = self.IndexList.GetSelection()
choice = self.IndexChoice.GetStringSelection()
choiceindex = self.IndexChoice.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
selectedindex = self.ListIndex[selected]
self.IndexList.Clear()
self.IndexChoice.Clear()
@@ -550,7 +527,7 @@
elif i == 2:
self.IndexChoice.Append("SDO Server")
self.IndexChoice.Append("SDO Client")
- if choiceindex != wxNOT_FOUND and choice == self.IndexChoice.GetString(choiceindex):
+ if choiceindex != wx.NOT_FOUND and choice == self.IndexChoice.GetString(choiceindex):
self.IndexChoice.SetStringSelection(choice)
elif i in (3, 4):
self.IndexChoice.Append("PDO Receive")
@@ -568,12 +545,12 @@
else:
self.IndexChoice.Append(name)
self.ChoiceIndex.append(index)
- if choiceindex != wxNOT_FOUND and choice == self.IndexChoice.GetString(choiceindex):
+ if choiceindex != wx.NOT_FOUND and choice == self.IndexChoice.GetString(choiceindex):
self.IndexChoice.SetStringSelection(choice)
if self.Editable:
self.IndexChoice.Enable(self.IndexChoice.GetCount() != 0)
self.AddButton.Enable(self.IndexChoice.GetCount() != 0)
- if selected == wxNOT_FOUND or selected >= len(self.ListIndex) or selectedindex != self.ListIndex[selected]:
+ if selected == wx.NOT_FOUND or selected >= len(self.ListIndex) or selectedindex != self.ListIndex[selected]:
self.Table.Empty()
self.CallbackCheck.SetValue(False)
self.CallbackCheck.Disable()
@@ -585,7 +562,7 @@
def RefreshTable(self):
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if index > 0x260 and self.Editable:
self.CallbackCheck.Enable()
@@ -613,7 +590,7 @@
editor = self.Table.GetEditor(subIndex, col)
self.Manager.SetCurrentEntry(index, subIndex, value, name, editor)
self.Parent.RefreshBufferState()
- wxCallAfter(self.RefreshTable)
+ wx.CallAfter(self.RefreshTable)
event.Skip()
def OnCallbackCheck(self, event):
@@ -621,7 +598,7 @@
index = self.Table.GetCurrentIndex()
self.Manager.SetCurrentEntryCallbacks(index, self.CallbackCheck.GetValue())
self.Parent.RefreshBufferState()
- wxCallAfter(self.RefreshTable)
+ wx.CallAfter(self.RefreshTable)
event.Skip()
#-------------------------------------------------------------------------------
@@ -633,7 +610,7 @@
if not self.FirstCall:
self.FirstCall = True
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if index < 0x260:
self.IndexListMenu.FindItemByPosition(0).Enable(False)
@@ -658,7 +635,7 @@
def OnSubindexGridRightClick(self, event):
if self.Editable:
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if self.Manager.IsCurrentEntry(index):
infos = self.Manager.GetEntryInfos(index)
@@ -669,13 +646,13 @@
def OnRenameIndexMenu(self, event):
if self.Editable:
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if self.Manager.IsCurrentEntry(index):
infos = self.Manager.GetEntryInfos(index)
- dialog = wxTextEntryDialog(self, "Give a new name for index 0x%04X"%index,
- "Rename an index", infos["name"], wxOK|wxCANCEL)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.TextEntryDialog(self, "Give a new name for index 0x%04X"%index,
+ "Rename an index", infos["name"], wx.OK|wx.CANCEL)
+ if dialog.ShowModal() == wx.ID_OK:
self.Manager.SetCurrentEntryName(index, dialog.GetValue())
self.Parent.RefreshBufferState()
self.RefreshIndexList()
@@ -685,7 +662,7 @@
def OnModifyIndexMenu(self, event):
if self.Editable:
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if self.Manager.IsCurrentEntry(index) and index < 0x260:
values, valuetype = self.Manager.GetCustomisedTypeValues(index)
@@ -695,7 +672,7 @@
dialog.SetValues(min = values[2], max = values[3])
elif valuetype == 1:
dialog.SetValues(length = values[2])
- if dialog.ShowModal() == wxID_OK:
+ if dialog.ShowModal() == wx.ID_OK:
type, min, max, length = dialog.GetValues()
self.Manager.SetCurrentUserType(index, type, min, max, length)
self.Parent.RefreshBufferState()
@@ -705,7 +682,7 @@
def OnDeleteIndexMenu(self, event):
if self.Editable:
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if self.Manager.IsCurrentEntry(index):
self.Manager.ManageEntriesOfCurrent([],[index])
@@ -716,19 +693,19 @@
def OnAddSubindexMenu(self, event):
if self.Editable:
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if self.Manager.IsCurrentEntry(index):
- dialog = wxTextEntryDialog(self, "Number of subindexes to add:",
- "Add subindexes", "1", wxOK|wxCANCEL)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.TextEntryDialog(self, "Number of subindexes to add:",
+ "Add subindexes", "1", wx.OK|wx.CANCEL)
+ if dialog.ShowModal() == wx.ID_OK:
try:
number = int(dialog.GetValue())
self.Manager.AddSubentriesToCurrent(index, number)
self.Parent.RefreshBufferState()
self.RefreshIndexList()
except:
- message = wxMessageDialog(self, "An integer is required!", "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "An integer is required!", "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()
@@ -737,19 +714,19 @@
def OnDeleteSubindexMenu(self, event):
if self.Editable:
selected = self.IndexList.GetSelection()
- if selected != wxNOT_FOUND:
+ if selected != wx.NOT_FOUND:
index = self.ListIndex[selected]
if self.Manager.IsCurrentEntry(index):
- dialog = wxTextEntryDialog(self, "Number of subindexes to delete:",
- "Delete subindexes", "1", wxOK|wxCANCEL)
- if dialog.ShowModal() == wxID_OK:
+ dialog = wx.TextEntryDialog(self, "Number of subindexes to delete:",
+ "Delete subindexes", "1", wx.OK|wx.CANCEL)
+ if dialog.ShowModal() == wx.ID_OK:
try:
number = int(dialog.GetValue())
self.Manager.RemoveSubentriesFromCurrent(index, number)
self.Parent.RefreshBufferState()
self.RefreshIndexList()
except:
- message = wxMessageDialog(self, "An integer is required!", "ERROR", wxOK|wxICON_ERROR)
+ message = wx.MessageDialog(self, "An integer is required!", "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
dialog.Destroy()