--- a/dialogs/LDElementDialog.py Fri Jun 15 18:03:25 2012 +0200
+++ b/dialogs/LDElementDialog.py Mon Jun 25 20:03:53 2012 +0200
@@ -30,170 +30,99 @@
# Edit Ladder Element Properties Dialog
#-------------------------------------------------------------------------------
-
-[ID_LDELEMENTDIALOG, ID_LDELEMENTDIALOGSPACER,
- ID_LDELEMENTDIALOGNAME, ID_LDELEMENTDIALOGRADIOBUTTON1,
- ID_LDELEMENTDIALOGRADIOBUTTON2, ID_LDELEMENTDIALOGRADIOBUTTON3,
- ID_LDELEMENTDIALOGRADIOBUTTON4, ID_LDELEMENTDIALOGRADIOBUTTON5,
- ID_LDELEMENTDIALOGRADIOBUTTON6, ID_LDELEMENTDIALOGPREVIEW,
- ID_LDELEMENTDIALOGSTATICTEXT1, ID_LDELEMENTDIALOGSTATICTEXT2,
- ID_LDELEMENTDIALOGSTATICTEXT3,
-] = [wx.NewId() for _init_ctrls in range(13)]
-
class LDElementDialog(wx.Dialog):
- if wx.VERSION < (2, 6, 0):
- def Bind(self, event, function, id = None):
- if id is not None:
- event(self, id, function)
- else:
- event(self, function)
-
- def _init_coll_flexGridSizer1_Items(self, parent):
- 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, 1, border=5, flag=wx.GROW|wx.RIGHT)
- parent.AddSizer(self.RightGridSizer, 1, 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.AddSizer(self.RadioButtonSizer, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.ElementName, 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(7)
-
- def _init_coll_RadioButtonSizer_Items(self, parent):
- parent.AddWindow(self.radioButton1, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.radioButton2, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.radioButton3, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.radioButton4, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.radioButton5, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.radioButton6, 0, border=0, flag=wx.GROW)
-
- def _init_coll_RightGridSizer_Items(self, parent):
- parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.Preview, 0, border=0, flag=wx.GROW)
-
- def _init_coll_RightGridSizer_Growables(self, parent):
- parent.AddGrowableCol(0)
- parent.AddGrowableRow(1)
-
- def _init_sizers(self):
- 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=5, vgap=5)
- self.RadioButtonSizer = wx.BoxSizer(wx.VERTICAL)
- 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_LeftGridSizer_Items(self.LeftGridSizer)
- self._init_coll_LeftGridSizer_Growables(self.LeftGridSizer)
- self._init_coll_RadioButtonSizer_Items(self.RadioButtonSizer)
- self._init_coll_RightGridSizer_Items(self.RightGridSizer)
- self._init_coll_RightGridSizer_Growables(self.RightGridSizer)
-
- self.SetSizer(self.flexGridSizer1)
-
- def _init_ctrls(self, prnt, ctrler, title, extra_size = 0):
- wx.Dialog.__init__(self, id=ID_LDELEMENTDIALOG,
- name='LDElementDialog', parent=prnt,
- size=wx.Size(350, 260 + extra_size), style=wx.DEFAULT_DIALOG_STYLE,
- title=title)
- self.SetClientSize(wx.Size(350, 260 + extra_size))
-
- self.staticText1 = wx.StaticText(id=ID_LDELEMENTDIALOGSTATICTEXT1,
- label=_('Modifier:'), name='staticText1', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
-
- self.staticText2 = wx.StaticText(id=ID_LDELEMENTDIALOGSTATICTEXT2,
- label=_('Name:'), name='staticText2', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
-
- self.staticText3 = wx.StaticText(id=ID_LDELEMENTDIALOGSTATICTEXT3,
- label=_('Preview:'), name='staticText3', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
-
- self.radioButton1 = wx.RadioButton(id=ID_LDELEMENTDIALOGRADIOBUTTON1,
- label=_("Normal"), name='radioButton1', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 24), style=wx.RB_GROUP)
- self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_LDELEMENTDIALOGRADIOBUTTON1)
- self.radioButton1.SetValue(True)
-
- self.radioButton2 = wx.RadioButton(id=ID_LDELEMENTDIALOGRADIOBUTTON2,
- label=_("Negated"), name='radioButton2', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
- self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_LDELEMENTDIALOGRADIOBUTTON2)
-
- self.radioButton3 = wx.RadioButton(id=ID_LDELEMENTDIALOGRADIOBUTTON3,
- label=_("Set"), name='radioButton3', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
- self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_LDELEMENTDIALOGRADIOBUTTON3)
-
- self.radioButton4 = wx.RadioButton(id=ID_LDELEMENTDIALOGRADIOBUTTON4,
- label=_("Reset"), name='radioButton4', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
- self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_LDELEMENTDIALOGRADIOBUTTON4)
-
- self.radioButton5 = wx.RadioButton(id=ID_LDELEMENTDIALOGRADIOBUTTON5,
- label=_("Rising Edge"), name='radioButton5', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
- self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_LDELEMENTDIALOGRADIOBUTTON5)
-
- self.radioButton6 = wx.RadioButton(id=ID_LDELEMENTDIALOGRADIOBUTTON6,
- label=_("Falling Edge"), name='radioButton6', parent=self,
- pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
- self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_LDELEMENTDIALOGRADIOBUTTON6)
-
- self.ElementName = wx.ComboBox(id=ID_LDELEMENTDIALOGNAME,
- name='Name', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(0, 28), style=wx.CB_READONLY)
- self.Bind(wx.EVT_COMBOBOX, self.OnNameChanged, id=ID_LDELEMENTDIALOGNAME)
-
- self.Preview = wx.Panel(id=ID_LDELEMENTDIALOGPREVIEW,
- name='Preview', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL|wx.SIMPLE_BORDER)
+ def __init__(self, parent, controller, type):
+ if type == "contact":
+ wx.Dialog.__init__(self, parent, size=wx.Size(350, 310),
+ title=_("Edit Contact Values"))
+ else:
+ wx.Dialog.__init__(self, parent, size=wx.Size(350, 260),
+ title=_("Edit Coil Values"))
+
+ main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+ main_sizer.AddGrowableCol(0)
+ main_sizer.AddGrowableRow(0)
+
+ column_sizer = wx.BoxSizer(wx.HORIZONTAL)
+ main_sizer.AddSizer(column_sizer, border=20,
+ flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+
+ if type == "contact":
+ left_gridsizer = wx.FlexGridSizer(cols=1, hgap=0, rows=9, vgap=5)
+ else:
+ left_gridsizer = wx.FlexGridSizer(cols=1, hgap=0, rows=7, vgap=5)
+ left_gridsizer.AddGrowableCol(0)
+ column_sizer.AddSizer(left_gridsizer, 1, border=5,
+ flag=wx.GROW|wx.RIGHT)
+
+ modifier_label = wx.StaticText(self, label=_('Modifier:'))
+ left_gridsizer.AddWindow(modifier_label, flag=wx.GROW)
+
+ self.Normal = wx.RadioButton(self, label=_("Normal"), style=wx.RB_GROUP)
+ self.Normal.SetValue(True)
+ self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, self.Normal)
+ left_gridsizer.AddWindow(self.Normal, flag=wx.GROW)
+
+ self.Negated = wx.RadioButton(self, label=_("Negated"))
+ self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, self.Negated)
+ left_gridsizer.AddWindow(self.Negated, flag=wx.GROW)
+
+ if type == "contact":
+ self.Set = wx.RadioButton(self, label=_("Set"))
+ self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, self.Set)
+ left_gridsizer.AddWindow(self.Set, flag=wx.GROW)
+
+ self.Reset = wx.RadioButton(self, label=_("Reset"))
+ self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, self.Reset)
+ left_gridsizer.AddWindow(self.Reset, flag=wx.GROW)
+
+ self.RisingEdge = wx.RadioButton(self, label=_("Rising Edge"))
+ self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, self.RisingEdge)
+ left_gridsizer.AddWindow(self.RisingEdge, flag=wx.GROW)
+
+ self.FallingEdge = wx.RadioButton(self, label=_("Falling Edge"))
+ self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, self.FallingEdge)
+ left_gridsizer.AddWindow(self.FallingEdge, flag=wx.GROW)
+
+ element_name_label = wx.StaticText(self, label=_('Name:'))
+ left_gridsizer.AddWindow(element_name_label, flag=wx.GROW)
+
+ self.ElementName = wx.ComboBox(self, style=wx.CB_READONLY)
+ self.Bind(wx.EVT_COMBOBOX, self.OnNameChanged, self.ElementName)
+ left_gridsizer.AddWindow(self.ElementName, flag=wx.GROW)
+
+ right_gridsizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
+ right_gridsizer.AddGrowableCol(0)
+ right_gridsizer.AddGrowableRow(1)
+ column_sizer.AddSizer(right_gridsizer, 1, border=5,
+ flag=wx.GROW|wx.LEFT)
+
+ preview_sizer = wx.StaticText(self, label=_('Preview:'))
+ right_gridsizer.AddWindow(preview_sizer, flag=wx.GROW)
+
+ self.Preview = wx.Panel(self,
+ style=wx.TAB_TRAVERSAL|wx.SIMPLE_BORDER)
self.Preview.SetBackgroundColour(wx.Colour(255,255,255))
setattr(self.Preview, "GetDrawingMode", lambda:FREEDRAWING_MODE)
setattr(self.Preview, "GetScaling", lambda:None)
- setattr(self.Preview, "IsOfType", ctrler.IsOfType)
-
- self.Spacer = wx.Panel(id=ID_LDELEMENTDIALOGSPACER,
- 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|wx.CENTRE)
-
- if wx.VERSION >= (2, 5, 0):
- self.Preview.Bind(wx.EVT_PAINT, self.OnPaint)
+ setattr(self.Preview, "IsOfType", controller.IsOfType)
+ self.Preview.Bind(wx.EVT_PAINT, self.OnPaint)
+
+ button_sizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
+ main_sizer.AddSizer(button_sizer, border=20,
+ flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+ self.SetSizer(main_sizer)
+
+ if type == "contact":
+ self.Element = LD_Contact(self.Preview, CONTACT_NORMAL, "")
else:
- wx.EVT_PAINT(self.Preview, self.OnPaint)
-
- self._init_sizers()
-
- def __init__(self, parent, controler, type):
+ self.Element = LD_Coil(self.Preview, COIL_NORMAL, "")
+
self.Type = type
- if type == "contact":
- self._init_ctrls(parent, controler, _("Edit Contact Values"))
- self.Element = LD_Contact(self.Preview, CONTACT_NORMAL, "")
- self.radioButton3.Hide()
- self.radioButton4.Hide()
- elif type == "coil":
- self._init_ctrls(parent, controler, _("Edit Coil Values"), 50)
- self.Element = LD_Coil(self.Preview, COIL_NORMAL, "")
-
- self.radioButton1.SetFocus()
+
+ self.Normal.SetFocus()
def SetPreviewFont(self, font):
self.Preview.SetFont(font)
@@ -218,26 +147,26 @@
self.Element.SetType(value)
if self.Type == "contact":
if value == CONTACT_NORMAL:
- self.radioButton1.SetValue(True)
+ self.Normal.SetValue(True)
elif value == CONTACT_REVERSE:
- self.radioButton2.SetValue(True)
+ self.Negated.SetValue(True)
elif value == CONTACT_RISING:
- self.radioButton5.SetValue(True)
+ self.RisingEdge.SetValue(True)
elif value == CONTACT_FALLING:
- self.radioButton6.SetValue(True)
+ self.FallingEdge.SetValue(True)
elif self.Type == "coil":
if value == COIL_NORMAL:
- self.radioButton1.SetValue(True)
+ self.Normal.SetValue(True)
elif value == COIL_REVERSE:
- self.radioButton2.SetValue(True)
+ self.Negated.SetValue(True)
elif value == COIL_SET:
- self.radioButton3.SetValue(True)
+ self.Set.SetValue(True)
elif value == COIL_RESET:
- self.radioButton4.SetValue(True)
+ self.Reset.SetValue(True)
elif value == COIL_RISING:
- self.radioButton5.SetValue(True)
+ self.RisingEdge.SetValue(True)
elif value == COIL_FALLING:
- self.radioButton6.SetValue(True)
+ self.FallingEdge.SetValue(True)
def GetValues(self):
values = {}
@@ -248,26 +177,26 @@
def OnTypeChanged(self, event):
if self.Type == "contact":
- if self.radioButton1.GetValue():
+ if self.Normal.GetValue():
self.Element.SetType(CONTACT_NORMAL)
- elif self.radioButton2.GetValue():
+ elif self.Negated.GetValue():
self.Element.SetType(CONTACT_REVERSE)
- elif self.radioButton5.GetValue():
+ elif self.RisingEdge.GetValue():
self.Element.SetType(CONTACT_RISING)
- elif self.radioButton6.GetValue():
+ elif self.FallingEdge.GetValue():
self.Element.SetType(CONTACT_FALLING)
elif self.Type == "coil":
- if self.radioButton1.GetValue():
+ if self.Normal.GetValue():
self.Element.SetType(COIL_NORMAL)
- elif self.radioButton2.GetValue():
+ elif self.Negated.GetValue():
self.Element.SetType(COIL_REVERSE)
- elif self.radioButton3.GetValue():
+ elif self.Set.GetValue():
self.Element.SetType(COIL_SET)
- elif self.radioButton4.GetValue():
+ elif self.Reset.GetValue():
self.Element.SetType(COIL_RESET)
- elif self.radioButton5.GetValue():
+ elif self.RisingEdge.GetValue():
self.Element.SetType(COIL_RISING)
- elif self.radioButton6.GetValue():
+ elif self.FallingEdge.GetValue():
self.Element.SetType(COIL_FALLING)
self.RefreshPreview()
event.Skip()