LPCManager: comparison LPCManager.py

equal deleted inserted replaced

-:735464c8616a
+:77b6f3c5f1ba
 self.MainTabs["PLCConfig"] = (self.PLCConfig, _("Topology"))
 self.LeftNoteBook.InsertPage(0, self.PLCConfig, _("Topology"), True)
 self.PLCConfigMainSizer = wx.FlexGridSizer(cols=1, hgap=2, rows=2, vgap=2)
 self.PLCParamsSizer = wx.BoxSizer(wx.VERTICAL)
-self.ConfNodeTreeSizer = wx.FlexGridSizer(cols=2, hgap=0, rows=0, vgap=2)
+self.ConfNodeTreeSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=0, vgap=2)
 self.ConfNodeTreeSizer.AddGrowableCol(0)
-self.ConfNodeTreeSizer.AddGrowableCol(1)
 self.PLCConfigMainSizer.AddSizer(self.PLCParamsSizer, 0, border=10, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
 self.PLCConfigMainSizer.AddSizer(self.ConfNodeTreeSizer, 0, border=10, flag=wx.BOTTOM|wx.LEFT|wx.RIGHT)
 self.PLCConfigMainSizer.AddGrowableCol(0)
 self.PLCConfigMainSizer.AddGrowableRow(1)
 if self.CTR.CTNTestModified():
 bkgdclr = CHANGED_TITLE_COLOUR
 else:
 bkgdclr = TITLE_COLOUR
-if self.CTR not in self.ConfNodeInfos:
-self.ConfNodeInfos[self.CTR] = {"right_visible" : False}
 plcwindow.SetBackgroundColour(TITLE_COLOUR)
 plcwindow.Bind(wx.EVT_LEFT_DOWN, self.OnPanelLeftDown)
 self.PLCParamsSizer.AddWindow(plcwindow, 0, border=0, flag=wx.GROW)
 plcwindowsizer = wx.BoxSizer(wx.HORIZONTAL)
 plcwindowsizer.AddSizer(plcwindowmainsizer, 0, border=5, flag=wx.ALL)
 plcwindowbuttonsizer = wx.BoxSizer(wx.HORIZONTAL)
 plcwindowmainsizer.AddSizer(plcwindowbuttonsizer, 0, border=0, flag=wx.ALIGN_CENTER)
-msizer = self.GenerateMethodButtonSizer(self.CTR, plcwindow, not self.ConfNodeInfos[self.CTR]["right_visible"])
+msizer = self.GenerateMethodButtonSizer(self.CTR, plcwindow)
 plcwindowbuttonsizer.AddSizer(msizer, 0, border=0, flag=wx.GROW)
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
 self.Thaw()
-def GenerateMethodButtonSizer(self, confnode, parent, horizontal = True):
+def GenerateMethodButtonSizer(self, confnode, parent):
 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"])
-if horizontal:
+msizer = wx.FlexGridSizer(cols=len(confnode.ConfNodeMethods))
-msizer = wx.FlexGridSizer(cols=len(confnode.ConfNodeMethods))
-else:
-msizer = wx.FlexGridSizer(cols=1)
 for confnode_method in confnode.ConfNodeMethods:
 if "method" in confnode_method and confnode_method.get("shown",True):
 id = wx.NewId()
 label = confnode_method["name"]
 button = GenBitmapTextButton(id=id, parent=parent,
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
 self.Thaw()
 def GenerateTreeBranch(self, confnode):
-leftwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
+nodewindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
 if confnode.CTNTestModified():
 bkgdclr=CHANGED_WINDOW_COLOUR
 else:
 bkgdclr=WINDOW_COLOUR
-leftwindow.SetBackgroundColour(bkgdclr)
+nodewindow.SetBackgroundColour(bkgdclr)
 if confnode not in self.ConfNodeInfos:
-self.ConfNodeInfos[confnode] = {"expanded" : False, "left_visible" : False, "right_visible" : False}
+self.ConfNodeInfos[confnode] = {"expanded" : False, "visible" : False}
 self.ConfNodeInfos[confnode]["children"] = confnode.IECSortedChildren()
 confnode_infos = confnode.GetVariableLocationTree()
 confnode_locations = []
 if len(self.ConfNodeInfos[confnode]["children"]) == 0:
 confnode_locations = confnode_infos["children"]
 if not self.ConfNodeInfos[confnode].has_key("locations_infos"):
 self.ConfNodeInfos[confnode]["locations_infos"] = {"root": {"expanded" : False}}
-self.ConfNodeInfos[confnode]["locations_infos"]["root"]["left"] = None
+self.ConfNodeInfos[confnode]["locations_infos"]["root"]["window"] = None
-self.ConfNodeInfos[confnode]["locations_infos"]["root"]["right"] = None
 self.ConfNodeInfos[confnode]["locations_infos"]["root"]["children"] = []
-self.ConfNodeTreeSizer.AddWindow(leftwindow, 0, border=0, flag=wx.GROW)
+self.ConfNodeTreeSizer.AddWindow(nodewindow, 0, border=0, flag=wx.GROW)
-leftwindowvsizer = wx.BoxSizer(wx.VERTICAL)
+nodewindowvsizer = wx.BoxSizer(wx.VERTICAL)
-leftwindow.SetSizer(leftwindowvsizer)
+nodewindow.SetSizer(nodewindowvsizer)
-leftwindowsizer = wx.BoxSizer(wx.HORIZONTAL)
+nodewindowsizer = wx.BoxSizer(wx.HORIZONTAL)
-leftwindowvsizer.AddSizer(leftwindowsizer, 0, border=0, flag=0)
+nodewindowvsizer.AddSizer(nodewindowsizer, 0, border=0, flag=0)
-#self.GenerateEnableButton(leftwindow, leftwindowsizer, confnode)
+#self.GenerateEnableButton(nodewindow, nodewindowsizer, confnode)
-st = wx.StaticText(leftwindow, -1)
+st = wx.StaticText(nodewindow, -1)
 st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
 st.SetLabel(confnode.GetFullIEC_Channel())
-leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.LEFT|wx.RIGHT)
+nodewindowsizer.AddWindow(st, 0, border=5, flag=wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
 expandbutton_id = wx.NewId()
 expandbutton = wx.lib.buttons.GenBitmapToggleButton(id=expandbutton_id, bitmap=wx.Bitmap(Bpath( 'images', 'plus.png')),
-name='ExpandButton', parent=leftwindow, pos=wx.Point(0, 0),
+name='ExpandButton', parent=nodewindow, pos=wx.Point(0, 0),
 size=wx.Size(13, 13), style=wx.NO_BORDER)
 expandbutton.labelDelta = 0
 expandbutton.SetBezelWidth(0)
 expandbutton.SetUseFocusIndicator(False)
 expandbutton.SetBitmapSelected(wx.Bitmap(Bpath( 'images', 'minus.png')))
 self.RefreshScrollBars()
 event.Skip()
 expandbutton.Bind(wx.EVT_BUTTON, togglebutton, id=expandbutton_id)
 else:
 expandbutton.Enable(False)
-leftwindowsizer.AddWindow(expandbutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+nodewindowsizer.AddWindow(expandbutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-sb = wx.StaticBitmap(leftwindow, -1)
+sb = wx.StaticBitmap(nodewindow, -1)
 icon = confnode_infos.get("icon", None)
 if icon is None:
 icon_bitmap = self.LocationImageList.GetBitmap(self.LocationImageDict[confnode_infos["type"]])
 else:
 icon_bitmap = wx.Bitmap(icon)
 sb.SetBitmap(icon_bitmap)
-leftwindowsizer.AddWindow(sb, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+nodewindowsizer.AddWindow(sb, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
 st_id = wx.NewId()
-st = wx.StaticText(leftwindow, st_id, size=wx.DefaultSize, style=wx.NO_BORDER)
+st = wx.StaticText(nodewindow, st_id, size=wx.DefaultSize, style=wx.NO_BORDER)
 st.SetFont(wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
 st.SetLabel(confnode.MandatoryParams[1].getName())
-leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+nodewindowsizer.AddWindow(st, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-rightwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
+buttons_sizer = self.GenerateMethodButtonSizer(confnode, nodewindow)
-rightwindow.SetBackgroundColour(bkgdclr)
+nodewindowsizer.AddSizer(buttons_sizer, flag=wx.ALIGN_CENTER_VERTICAL)
-rightwindowsizer = self.GenerateMethodButtonSizer(confnode, rightwindow, not self.ConfNodeInfos[confnode]["right_visible"])
-rightwindow.SetSizer(rightwindowsizer)
+self.ConfNodeInfos[confnode]["window"] = nodewindow
-self.ConfNodeTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
-self.ConfNodeInfos[confnode]["left"] = leftwindow
-self.ConfNodeInfos[confnode]["right"] = rightwindow
 for child in self.ConfNodeInfos[confnode]["children"]:
 self.GenerateTreeBranch(child)
 if not self.ConfNodeInfos[child]["expanded"]:
 self.CollapseConfNode(child)
 treectrl.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.GenerateLocationExpandCollapseFunction(locations_infos, False))
 treectrl.AddRoot("")
 self.ConfNodeTreeSizer.AddWindow(treectrl, 0, border=0, flag=0)
-rightwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
+locations_infos["root"]["window"] = treectrl
-rightwindow.SetBackgroundColour(wx.WHITE)
-self.ConfNodeTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
-locations_infos["root"]["left"] = treectrl
-locations_infos["root"]["right"] = rightwindow
 for location in confnode_locations:
 locations_infos["root"]["children"].append("root.%s" % location["name"])
 self.GenerateLocationTreeBranch(treectrl, treectrl.GetRootItem(), locations_infos, "root", location)
 if locations_infos["root"]["expanded"]:
 self.ExpandLocation(locations_infos, "root")
 def ExpandConfNode(self, confnode, force = False):
 for child in self.ConfNodeInfos[confnode]["children"]:
-self.ConfNodeInfos[child]["left"].Show()
+self.ConfNodeInfos[child]["window"].Show()
-self.ConfNodeInfos[child]["right"].Show()
 if force or self.ConfNodeInfos[child]["expanded"]:
 self.ExpandConfNode(child, force)
 if force:
 self.ConfNodeInfos[child]["expanded"] = True
 locations_infos = self.ConfNodeInfos[confnode].get("locations_infos", None)
 if force:
 locations_infos["root"]["expanded"] = True
 def CollapseConfNode(self, confnode, force = False):
 for child in self.ConfNodeInfos[confnode]["children"]:
-self.ConfNodeInfos[child]["left"].Hide()
+self.ConfNodeInfos[child]["window"].Hide()
-self.ConfNodeInfos[child]["right"].Hide()
 self.CollapseConfNode(child, force)
 if force:
 self.ConfNodeInfos[child]["expanded"] = False
 locations_infos = self.ConfNodeInfos[confnode].get("locations_infos", None)
 if locations_infos is not None:
 locations_infos["root"]["expanded"] = False
 def ExpandLocation(self, locations_infos, group, force = False, refresh_size=True):
 locations_infos[group]["expanded"] = True
 if group == "root":
-if locations_infos[group]["left"] is not None:
+if locations_infos[group]["window"] is not None:
-locations_infos[group]["left"].Show()
+locations_infos[group]["window"].Show()
-if locations_infos[group]["right"] is not None:
+elif locations_infos["root"]["window"] is not None:
-locations_infos[group]["right"].Show()
+locations_infos["root"]["window"].Expand(locations_infos[group]["item"])
-elif locations_infos["root"]["left"] is not None:
-locations_infos["root"]["left"].Expand(locations_infos[group]["item"])
 if force:
 for child in locations_infos[group]["children"]:
 self.ExpandLocation(locations_infos, child, force, False)
-if locations_infos["root"]["left"] is not None and refresh_size:
+if locations_infos["root"]["window"] is not None and refresh_size:
-self.RefreshTreeCtrlSize(locations_infos["root"]["left"])
+self.RefreshTreeCtrlSize(locations_infos["root"]["window"])
 def CollapseLocation(self, locations_infos, group, force = False, refresh_size=True):
 locations_infos[group]["expanded"] = False
 if group == "root":
-if locations_infos[group]["left"] is not None:
+if locations_infos[group]["window"] is not None:
-locations_infos[group]["left"].Hide()
+locations_infos[group]["window"].Hide()
-if locations_infos[group]["right"] is not None:
+elif locations_infos["root"]["window"] is not None:
-locations_infos[group]["right"].Hide()
+locations_infos["root"]["window"].Collapse(locations_infos[group]["item"])
-elif locations_infos["root"]["left"] is not None:
-locations_infos["root"]["left"].Collapse(locations_infos[group]["item"])
 if force:
 for child in locations_infos[group]["children"]:
 self.CollapseLocation(locations_infos, child, force, False)
-if locations_infos["root"]["left"] is not None and refresh_size:
+if locations_infos["root"]["window"] is not None and refresh_size:
-self.RefreshTreeCtrlSize(locations_infos["root"]["left"])
+self.RefreshTreeCtrlSize(locations_infos["root"]["window"])
 def GenerateLocationTreeBranch(self, treectrl, root, locations_infos, parent, location):
 location_name = "%s.%s" % (parent, location["name"])
 if not locations_infos.has_key(location_name):
 locations_infos[location_name] = {"expanded" : False}
 self.ExpandLocation(locations_infos, location_name)
 def GenerateLocationBeginDragFunction(self, locations_infos):
 def OnLocationBeginDragFunction(event):
 item = event.GetItem()
-location_name = locations_infos["root"]["left"].GetPyData(item)
+location_name = locations_infos["root"]["window"].GetPyData(item)
 if location_name is not None:
 infos = locations_infos[location_name]["infos"]
 if infos["type"] in [LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY]:
 data = wx.TextDataObject(str((infos["location"], "location", infos["IEC_type"], infos["var_name"], infos["description"])))
 dragSource = wx.DropSource(self)
 return wx.Rect(minx, miny, maxx - minx, maxy - miny)
 def GenerateLocationExpandCollapseFunction(self, locations_infos, expand):
 def OnLocationExpandedFunction(event):
 item = event.GetItem()
-location_name = locations_infos["root"]["left"].GetPyData(item)
+location_name = locations_infos["root"]["window"].GetPyData(item)
 if location_name is not None:
 locations_infos[location_name]["expanded"] = expand
-self.RefreshTreeCtrlSize(locations_infos["root"]["left"])
+self.RefreshTreeCtrlSize(locations_infos["root"]["window"])
 event.Skip()
 return OnLocationExpandedFunction
 def GetButtonCallBackFunction(self, confnode, method):
 """ Generate the callbackfunc for a given confnode method"""

changeset 27	77b6f3c5f1ba
parent 26	735464c8616a
child 28	79ee4178006c