beremiz: comparison editors/ConfTreeNodeEditor.py

equal deleted inserted replaced

-:31e63e25b4cc
+:64beb9e9c749
 from controls import TextCtrlAutoComplete
 from dialogs import BrowseValuesLibraryDialog
 from util.BitmapLibrary import GetBitmap
 if wx.Platform == '__WXMSW__':
-faces = { 'times': 'Times New Roman',
+faces = {
-'mono' : 'Courier New',
+'times': 'Times New Roman',
-'helv' : 'Arial',
+'mono':  'Courier New',
-'other': 'Comic Sans MS',
+'helv':  'Arial',
-'size' : 16,
+'other': 'Comic Sans MS',
-}
+'size':  16,
+}
 else:
-faces = { 'times': 'Times',
+faces = {
-'mono' : 'Courier',
+'times': 'Times',
-'helv' : 'Helvetica',
+'mono':  'Courier',
-'other': 'new century schoolbook',
+'helv':  'Helvetica',
-'size' : 18,
+'other': 'new century schoolbook',
-}
+'size':  18,
+}
 SCROLLBAR_UNIT = 10
 class GenBitmapTextButton(wx.lib.buttons.GenBitmapTextButton):
 def _GetLabelSize(self):
 """ used internally """
 w, h = self.GetTextExtent(self.GetLabel())
 width = w
 return width, height, False
 def DrawLabel(self, dc, width, height, dw=0, dy=0):
 bmp = self.bmpLabel
-if bmp != None:     # if the bitmap is used
+if bmp is not None:     # if the bitmap is used
 if self.bmpDisabled and not self.IsEnabled():
 bmp = self.bmpDisabled
 if self.bmpFocus and self.hasFocus:
 bmp = self.bmpFocus
 if self.bmpSelected and not self.up:
 bmp = self.bmpSelected
-bw,bh = bmp.GetWidth(), bmp.GetHeight()
+bw, bh = bmp.GetWidth(), bmp.GetHeight()
 if not self.up:
 dw = dy = self.labelDelta
-hasMask = bmp.GetMask() != None
+hasMask = bmp.GetMask() is not None
 else:
 bw = bh = 0     # no bitmap -> size is zero
 dc.SetFont(self.GetFont())
 if self.IsEnabled():
 if not self.up:
 dw = dy = self.labelDelta
 pos_x = (width-bw)/2+dw      # adjust for bitmap and text to centre
 pos_y = (height-bh-th)/2+dy
-if bmp !=None:
+if bmp is not None:
-dc.DrawBitmap(bmp, pos_x, pos_y, hasMask) # draw bitmap if available
+dc.DrawBitmap(bmp, pos_x, pos_y, hasMask)  # draw bitmap if available
 pos_x = (width-tw)/2+dw      # adjust for bitmap and text to centre
 pos_y += bh + 2
 dc.DrawText(label, pos_x, pos_y)      # draw the text
 class GenStaticBitmap(wx.StaticBitmap):
 """ Customized GenStaticBitmap, fix transparency redraw bug on wx2.8/win32,
 and accept image name as __init__ parameter, fail silently if file do not exist"""
 def __init__(self, parent, ID, bitmapname,
-pos = wx.DefaultPosition, size = wx.DefaultSize,
+pos=wx.DefaultPosition, size=wx.DefaultSize,
-style = 0,
+style=0,
-name = "genstatbmp"):
+name="genstatbmp"):
 bitmap = GetBitmap(bitmapname)
 if bitmap is None:
 bitmap = wx.EmptyBitmap(0, 0)
 wx.StaticBitmap.__init__(self, parent, ID,
 bitmap,
 pos, size,
 style,
 name)
 class ConfTreeNodeEditor(EditorPanel):
 SHOW_BASE_PARAMS = True
 SHOW_PARAMS = True
 if self.SHOW_PARAMS and len(self.Controler.GetParamsAttributes()) > 0:
 tabs_num += 1
 if tabs_num > 1 or self.SHOW_BASE_PARAMS:
 self.Editor = wx.Panel(parent,
-style=wx.SUNKEN_BORDER|wx.SP_3D)
+style=wx.SUNKEN_BORDER | wx.SP_3D)
 self.MainSizer = wx.BoxSizer(wx.VERTICAL)
 if self.SHOW_BASE_PARAMS:
 baseparamseditor_sizer = wx.BoxSizer(wx.HORIZONTAL)
 self.MainSizer.AddSizer(baseparamseditor_sizer, border=5,
-flag=wx.GROW|wx.ALL)
+flag=wx.GROW | wx.ALL)
 self.FullIECChannel = wx.StaticText(self.Editor, -1)
 self.FullIECChannel.SetFont(
 wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL,
-wx.BOLD, faceName = faces["helv"]))
+wx.BOLD, faceName=faces["helv"]))
 baseparamseditor_sizer.AddWindow(self.FullIECChannel,
 flag=wx.ALIGN_CENTER_VERTICAL)
 updownsizer = wx.BoxSizer(wx.VERTICAL)
 baseparamseditor_sizer.AddSizer(updownsizer, border=5,
-flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL)
+flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL)
-self.IECCUpButton = wx.lib.buttons.GenBitmapTextButton(self.Editor,
+self.IECCUpButton = wx.lib.buttons.GenBitmapTextButton(
-bitmap=GetBitmap('IECCDown'), size=wx.Size(16, 16), style=wx.NO_BORDER)
+self.Editor,
+bitmap=GetBitmap('IECCDown'),
+size=wx.Size(16, 16),
+style=wx.NO_BORDER)
 self.IECCUpButton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(1),
 self.IECCUpButton)
 updownsizer.AddWindow(self.IECCUpButton, flag=wx.ALIGN_LEFT)
-self.IECCDownButton = wx.lib.buttons.GenBitmapButton(self.Editor,
+self.IECCDownButton = wx.lib.buttons.GenBitmapButton(
-bitmap=GetBitmap('IECCUp'), size=wx.Size(16, 16), style=wx.NO_BORDER)
+self.Editor, bitmap=GetBitmap('IECCUp'),
+size=wx.Size(16, 16), style=wx.NO_BORDER)
 self.IECCDownButton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(-1),
 self.IECCDownButton)
 updownsizer.AddWindow(self.IECCDownButton, flag=wx.ALIGN_LEFT)
 self.ConfNodeName = wx.TextCtrl(self.Editor,
 size=wx.Size(150, 25))
 self.ConfNodeName.SetFont(
 wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL,
-wx.BOLD, faceName = faces["helv"]))
+wx.BOLD, faceName=faces["helv"]))
-self.ConfNodeName.Bind(wx.EVT_TEXT,
+self.ConfNodeName.Bind(
-self.GetTextCtrlCallBackFunction(self.ConfNodeName, "BaseParams.Name", True),
+wx.EVT_TEXT,
-self.ConfNodeName)
+self.GetTextCtrlCallBackFunction(self.ConfNodeName, "BaseParams.Name", True),
-baseparamseditor_sizer.AddWindow(self.ConfNodeName, border=5,
+self.ConfNodeName)
-flag=wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+baseparamseditor_sizer.AddWindow(
+self.ConfNodeName, border=5,
+flag=wx.LEFT | wx.RIGHT | wx.ALIGN_CENTER_VERTICAL)
 buttons_sizer = self.GenerateMethodButtonSizer()
 baseparamseditor_sizer.AddSizer(buttons_sizer, flag=wx.ALIGN_CENTER)
 if tabs_num > 1:
 else:
 self.Editor = editor
 if self.SHOW_PARAMS and len(self.Controler.GetParamsAttributes()) > 0:
-panel_style = wx.TAB_TRAVERSAL|wx.HSCROLL|wx.VSCROLL
+panel_style = wx.TAB_TRAVERSAL | wx.HSCROLL | wx.VSCROLL
 if self.ConfNodeNoteBook is None and parent != self.Editor:
 panel_style |= wx.SUNKEN_BORDER
 self.ParamsEditor = wx.ScrolledWindow(parent,
 style=panel_style)
 self.ParamsEditor.Bind(wx.EVT_SIZE, self.OnParamsEditorResize)
 self.ParamsEditor.Bind(wx.EVT_SCROLLWIN, self.OnParamsEditorScroll)
 self.ParamsEditorSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=1, vgap=5)
 self.ParamsEditorSizer.AddGrowableCol(0)
 self.ParamsEditorSizer.AddGrowableRow(0)
 self.ParamsEditor.SetSizer(self.ParamsEditorSizer)
 self.ConfNodeParamsSizer = wx.BoxSizer(wx.VERTICAL)
 self.ParamsEditorSizer.AddSizer(self.ConfNodeParamsSizer, border=5,
-flag=wx.LEFT|wx.RIGHT|wx.BOTTOM)
+flag=wx.LEFT | wx.RIGHT | wx.BOTTOM)
 self.RefreshConfNodeParamsSizer()
 if self.ConfNodeNoteBook is not None:
 self.ConfNodeNoteBook.AddPage(self.ParamsEditor, _("Config"))
 self.ParamsEditorSizer.Layout()
 self.Thaw()
 def GenerateMethodButtonSizer(self):
-normal_bt_font=wx.Font(faces["size"] / 3, wx.DEFAULT, wx.NORMAL, wx.NORMAL, faceName = faces["helv"])
+normal_bt_font = wx.Font(faces["size"] / 3,    wx.DEFAULT, wx.NORMAL, wx.NORMAL, faceName=faces["helv"])
-mouseover_bt_font=wx.Font(faces["size"] / 3, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline=True, faceName = faces["helv"])
+mouseover_bt_font = wx.Font(faces["size"] / 3, wx.DEFAULT, wx.NORMAL, wx.NORMAL, faceName=faces["helv"], underline=True)
 msizer = wx.BoxSizer(wx.HORIZONTAL)
 for confnode_method in self.Controler.ConfNodeMethods:
-if "method" in confnode_method and confnode_method.get("shown",True):
+if "method" in confnode_method and confnode_method.get("shown", True):
 button = GenBitmapTextButton(self.Editor,
 bitmap=GetBitmap(confnode_method.get("bitmap", "Unknown")),
-label=confnode_method["name"], style=wx.NO_BORDER)
+label=confnode_method["name"],
+style=wx.NO_BORDER)
 button.SetFont(normal_bt_font)
 button.SetToolTipString(confnode_method["tooltip"])
 if confnode_method.get("push", False):
 button.Bind(wx.EVT_LEFT_DOWN, self.GetButtonCallBackFunction(confnode_method["method"], True))
 else:
 button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(confnode_method["method"]), button)
 # a fancy underline on mouseover
 def setFontStyle(b, s):
 def fn(event):
 b.SetFont(s)
 b.Refresh()
 event.Skip()
 return fn
 button.Bind(wx.EVT_ENTER_WINDOW, setFontStyle(button, mouseover_bt_font))
 button.Bind(wx.EVT_LEAVE_WINDOW, setFontStyle(button, normal_bt_font))
-#hack to force size to mini
+# hack to force size to mini
-if not confnode_method.get("enabled",True):
+if not confnode_method.get("enabled", True):
 button.Disable()
 msizer.AddWindow(button, flag=wx.ALIGN_CENTER)
 return msizer
-def GenerateSizerElements(self, sizer, elements, path, clean = True):
+def GenerateSizerElements(self, sizer, elements, path, clean=True):
 if clean:
 sizer.Clear(True)
 first = True
 for element_infos in elements:
 if path:
-element_path = "%s.%s"%(path, element_infos["name"])
+element_path = "%s.%s" % (path, element_infos["name"])
 else:
 element_path = element_infos["name"]
 if element_infos["type"] == "element":
 name = element_infos["name"]
 value = element_infos["value"]
 label = _(name)
 if value is not None:
 label += " - %s" % _(value)
 staticbox = wx.StaticBox(self.ParamsEditor,
 label=_(label), size=wx.Size(10, 0))
 staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
 flags = (wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 if first:
 flags |= wx.TOP
 sizer.AddSizer(staticboxsizer, border=5, flag=flags)
 boxsizer.AddGrowableCol(1)
 flags = (wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 if first:
 flags |= wx.TOP
 sizer.AddSizer(boxsizer, border=5, flag=flags)
-staticbitmap = GenStaticBitmap(ID=-1, bitmapname=element_infos["name"],
+staticbitmap = GenStaticBitmap(
-name="%s_bitmap"%element_infos["name"], parent=self.ParamsEditor,
+ID=-1, bitmapname=element_infos["name"],
+name="%s_bitmap" % element_infos["name"], parent=self.ParamsEditor,
 pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
 boxsizer.AddWindow(staticbitmap, border=5, flag=wx.RIGHT)
 statictext = wx.StaticText(self.ParamsEditor,
-label="%s:"%_(element_infos["name"]))
+label="%s:" % _(element_infos["name"]))
 boxsizer.AddWindow(statictext, border=5,
-flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT)
+flag=wx.ALIGN_CENTER_VERTICAL | wx.RIGHT)
 if isinstance(element_infos["type"], types.ListType):
 if isinstance(element_infos["value"], types.TupleType):
 browse_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
 boxsizer.AddSizer(browse_boxsizer)
 textctrl = wx.TextCtrl(self.ParamsEditor,
 size=wx.Size(275, -1), style=wx.TE_READONLY)
 if element_infos["value"] is not None:
 textctrl.SetValue(element_infos["value"][0])
 value_infos = element_infos["value"][1]
 else:
 value_infos = None
 self.GetBrowseCallBackFunction(element_infos["name"], textctrl, element_infos["type"],
 value_infos, element_path),
 button)
 else:
 combobox = wx.ComboBox(self.ParamsEditor,
 size=wx.Size(300, -1), style=wx.CB_READONLY)
 boxsizer.AddWindow(combobox)
 if element_infos["use"] == "optional":
 combobox.Append("")
 if len(element_infos["type"]) > 0 and isinstance(element_infos["type"][0], types.TupleType):
 combobox.Append(choice)
 name = element_infos["name"]
 value = element_infos["value"]
 staticbox = wx.StaticBox(self.ParamsEditor,
-label="%s - %s"%(_(name), _(value)), size=wx.Size(10, 0))
+label="%s - %s" % (_(name), _(value)),
+size=wx.Size(10, 0))
 staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
 sizer.AddSizer(staticboxsizer, border=5, flag=wx.GROW | wx.BOTTOM | wx.LEFT | wx.RIGHT)
 self.GenerateSizerElements(staticboxsizer, element_infos["children"], element_path)
 callback = self.GetChoiceContentCallBackFunction(combobox, staticboxsizer, element_path)
 else:
 if "min" in element_infos["type"]:
 scmin = element_infos["type"]["min"]
 if "max" in element_infos["type"]:
 scmax = element_infos["type"]["max"]
 spinctrl = wx.SpinCtrl(self.ParamsEditor,
-size=wx.Size(300, -1), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT)
+size=wx.Size(300, -1),
+style=wx.SP_ARROW_KEYS | wx.ALIGN_RIGHT)
 spinctrl.SetRange(scmin, scmax)
 boxsizer.AddWindow(spinctrl)
 if element_infos["value"] is not None:
 spinctrl.SetValue(element_infos["value"])
 spinctrl.Bind(wx.EVT_SPINCTRL,
 checkbox.SetValue(element_infos["value"])
 checkbox.Bind(wx.EVT_CHECKBOX,
 self.GetCheckBoxCallBackFunction(checkbox, element_path),
 checkbox)
-elif element_infos["type"] in ["unsignedLong", "long","integer"]:
+elif element_infos["type"] in ["unsignedLong", "long", "integer"]:
 if element_infos["type"].startswith("unsigned"):
 scmin = 0
 else:
 scmin = -(2**31)
 scmax = 2**31-1
 spinctrl = wx.SpinCtrl(self.ParamsEditor,
-size=wx.Size(300, -1), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT)
+size=wx.Size(300, -1),
+style=wx.SP_ARROW_KEYS | wx.ALIGN_RIGHT)
 spinctrl.SetRange(scmin, scmax)
 boxsizer.AddWindow(spinctrl)
 if element_infos["value"] is not None:
 spinctrl.SetValue(element_infos["value"])
 spinctrl.Bind(wx.EVT_SPINCTRL,
 textctrl.Bind(wx.EVT_KILL_FOCUS, callback)
 first = False
 sizer.Layout()
 self.RefreshScrollbars()
 def GetItemChannelChangedFunction(self, dir):
 def OnConfNodeTreeItemChannelChanged(event):
 confnode_IECChannel = self.Controler.BaseParams.getIEC_Channel()
 res = self.SetConfNodeParamsAttribute("BaseParams.IEC_Channel", confnode_IECChannel + dir)
 wx.CallAfter(self.RefreshIECChannelControlsState)
 """ Generate the callbackfunc for a given confnode method"""
 def OnButtonClick(event):
 # Disable button to prevent re-entrant call
 event.GetEventObject().Disable()
 # Call
-getattr(self.Controler,method)()
+getattr(self.Controler, method)()
 # Re-enable button
 event.GetEventObject().Enable()
 if not push:
 event.Skip()
 event.Skip()
 return OnCheckBoxChanged
 def GetBrowseCallBackFunction(self, name, textctrl, library, value_infos, path):
 infos = [value_infos]
 def OnBrowseButton(event):
 dialog = BrowseValuesLibraryDialog(self, name, library, infos[0])
 if dialog.ShowModal() == wx.ID_OK:
 value, value_infos = self.SetConfNodeParamsAttribute(path, dialog.GetValueInfos())
 textctrl.ChangeValue(value)
 maxx, maxy = self.ParamsEditorSizer.GetMinSize()
 posx = max(0, min(xstart, (maxx - window_size[0]) / SCROLLBAR_UNIT))
 posy = max(0, min(ystart, (maxy - window_size[1]) / SCROLLBAR_UNIT))
 self.ParamsEditor.Scroll(posx, posy)
 self.ParamsEditor.SetScrollbars(SCROLLBAR_UNIT, SCROLLBAR_UNIT,
-maxx / SCROLLBAR_UNIT, maxy / SCROLLBAR_UNIT, posx, posy)
+maxx / SCROLLBAR_UNIT, maxy / SCROLLBAR_UNIT,
+posx, posy)
 def OnParamsEditorResize(self, event):
 self.RefreshScrollbars()
 event.Skip()
 control = self.ParamsEditor.FindFocus()
 if isinstance(control, TextCtrlAutoComplete):
 control.DismissListBox()
 self.Refresh()
 event.Skip()

changeset 1784	64beb9e9c749
parent 1768	691083b5682a
child 1846	14b40afccd69