beremiz: comparison Beremiz.py

equal deleted inserted replaced

-:8106a853a7c7
+:984e238e63d0
 name='PLCConfig', parent=self.LeftNoteBook, pos=wx.Point(0, 0),
 size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER|wx.HSCROLL|wx.VSCROLL)
 self.PLCConfig.SetBackgroundColour(wx.WHITE)
 self.PLCConfig.Bind(wx.EVT_LEFT_DOWN, self.OnPanelLeftDown)
 self.PLCConfig.Bind(wx.EVT_SIZE, self.OnMoveWindow)
-self.LeftNoteBook.AddPage(self.PLCConfig, _("Topology"))
+self.BottomNoteBook.InsertPage(0, self.PLCConfig, _("Topology"), True)
 self.LogConsole = wx.TextCtrl(id=ID_BEREMIZLOGCONSOLE, value='',
 name='LogConsole', parent=self.BottomNoteBook, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.TE_MULTILINE|wx.TE_RICH2)
 self.LogConsole.Bind(wx.EVT_LEFT_DCLICK, self.OnLogConsoleDClick)
 self.DisableEvents = False
 self.PluginInfos = {}
-if projectOpen:
+if projectOpen is not None and os.path.isdir(projectOpen):
 self.PluginRoot = PluginsRoot(self, self.Log)
 self.Controler = self.PluginRoot
 self.PluginRoot.LoadProject(projectOpen, buildpath)
 self._Refresh(TYPESTREE, INSTANCESTREE, LIBRARYTREE)
 self.RefreshAll()
 def ExpandLocation(self, locations_infos, group, force = False):
 for child in locations_infos[group]["children"]:
 locations_infos[child]["left"].Show()
 locations_infos[child]["right"].Show()
-if force or not locations_infos[child]["expanded"]:
+if force or locations_infos[child]["expanded"]:
 self.ExpandLocation(locations_infos, child, force)
 if force:
 locations_infos[child]["expanded"] = True
 def CollapseLocation(self, locations_infos, group, force = False):
 self.PluginInfos[plugin] = {"expanded" : False, "right_visible" : False}
 self.PluginInfos[plugin]["children"] = plugin.IECSortedChilds()
 plugin_locations = []
 if len(self.PluginInfos[plugin]["children"]) == 0:
-plugin_locations = plugin.GetVariableLocationTree()
+plugin_locations = plugin.GetVariableLocationTree()["children"]
 if not self.PluginInfos[plugin].has_key("locations_infos"):
 self.PluginInfos[plugin]["locations_infos"] = {"root": {"expanded" : False}}
 self.PluginInfos[plugin]["locations_infos"]["root"]["children"] = []
 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')))
-expandbutton.SetToggle(self.PluginInfos[plugin]["expanded"])
 if len(self.PluginInfos[plugin]["children"]) > 0:
+expandbutton.SetToggle(self.PluginInfos[plugin]["expanded"])
 def togglebutton(event):
 if expandbutton.GetToggle():
 self.ExpandPlugin(plugin)
 else:
 self.CollapsePlugin(plugin)
 self.RefreshScrollBars()
 event.Skip()
 expandbutton.Bind(wx.EVT_BUTTON, togglebutton, id=expandbutton_id)
 elif len(plugin_locations) > 0:
 locations_infos = self.PluginInfos[plugin]["locations_infos"]
+expandbutton.SetToggle(locations_infos["root"]["expanded"])
 def togglebutton(event):
 if expandbutton.GetToggle():
 self.ExpandLocation(locations_infos, "root")
 else:
 self.CollapseLocation(locations_infos, "root")
 locations_infos["root"]["children"].append("root.%s" % location["name"])
 self.GenerateLocationTreeBranch(locations_infos, "root", location)
 if not locations_infos["root"]["expanded"]:
 self.CollapseLocation(locations_infos, "root")
-LOCATION_BITMAP = {LOCATION_VAR_INPUT: "VAR_INPUT",
+LOCATION_BITMAP = {LOCATION_PLUGIN: "CONFIGURATION",
+LOCATION_MODULE: "RESOURCE",
+LOCATION_GROUP: "PROGRAM",
+LOCATION_VAR_INPUT: "VAR_INPUT",
 LOCATION_VAR_OUTPUT: "VAR_OUTPUT",
 LOCATION_VAR_MEMORY: "VAR_LOCAL"}
 def GenerateLocationTreeBranch(self, locations_infos, parent, location):
 leftwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
 self.PluginTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
 location_name = "%s.%s" % (parent, location["name"])
 if not locations_infos.has_key(location_name):
 locations_infos[location_name] = {"expanded" : False}
-locations_infos[location_name]["children"] = ["%s.%s" % (location_name, child["name"]) for child in location["children"]]
 if location["type"] in [LOCATION_PLUGIN, LOCATION_MODULE, LOCATION_GROUP]:
 leftwindow.SetBackgroundColour(WINDOW_COLOUR)
 rightwindow.SetBackgroundColour(WINDOW_COLOUR)
 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')))
-expandbutton.SetToggle(self.PluginInfos[plugin]["expanded"])
+expandbutton.SetToggle(locations_infos[location_name]["expanded"])
 if len(location["children"]) > 0:
 def togglebutton(event):
 if expandbutton.GetToggle():
 self.ExpandLocation(locations_infos, location_name)
 else:
 leftwindow.SetBackgroundColour(wx.WHITE)
 rightwindow.SetBackgroundColour(wx.WHITE)
-leftwindowsizer.Add(wx.Size(50, 16), 0)
+leftwindowsizer.Add(wx.Size(20, 16), 0)
-st = wx.StaticBitmap(leftwindow, -1)
+sb = wx.StaticBitmap(leftwindow, -1)
-st.SetBitmap(wx.Bitmap(os.path.join(base_folder, "plcopeneditor", 'Images', '%s.png' % self.LOCATION_BITMAP[location["type"]])))
+sb.SetBitmap(wx.Bitmap(os.path.join(base_folder, "plcopeneditor", 'Images', '%s.png' % self.LOCATION_BITMAP[location["type"]])))
-leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.RIGHT)
+leftwindowsizer.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.SetFont(wx.Font(faces["size"] * 0.5, wx.DEFAULT, wx.NORMAL, wx.NORMAL, faceName = faces["helv"]))
+label = location["name"]
-st.SetLabel(location["name"])
 if location["type"] in [LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY]:
+label += " (%s)" % location["location"]
 infos = location.copy()
 infos.pop("children")
+st.SetFont(wx.Font(faces["size"] * 0.5, wx.DEFAULT, wx.NORMAL, wx.NORMAL, faceName = faces["helv"]))
 st.Bind(wx.EVT_LEFT_DOWN, self.GenerateLocationLeftDownFunction(infos))
+else:
+st.SetFont(wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
+st.SetLabel(label)
 leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
 locations_infos[location_name]["left"] = leftwindow
 locations_infos[location_name]["right"] = rightwindow
-for child in locations_infos[location_name]["children"]:
+locations_infos[location_name]["children"] = []
-self.GenerateLocationTreeBranch(child)
+for child in location["children"]:
-if not locations_infos[child]["expanded"]:
+child_name = "%s.%s" % (location_name, child["name"])
-self.CollapseLocation(locations_infos, child)
+locations_infos[location_name]["children"].append(child_name)
+self.GenerateLocationTreeBranch(locations_infos, location_name, child)
+if not locations_infos[child_name]["expanded"]:
+self.CollapseLocation(locations_infos, child_name)
 def GenerateLocationLeftDownFunction(self, infos):
 def OnLocationLeftDownFunction(event):
 data = wx.TextDataObject(str((infos["location"], "location", infos["IEC_type"], infos["name"], infos["description"])))
 dragSource = wx.DropSource(self)

changeset 402	984e238e63d0
parent 401	8106a853a7c7
child 403	ae4a85291441