beremiz: comparison editors/Viewer.py

equal deleted inserted replaced

-:c3c3d1318130
+:69dfdb26f600
 if pou_name == values[0]:
 message = _("\"%s\" can't use itself!") % pou_name
 elif pou_type == "function" and values[1] != "function":
 message = _("Function Blocks can't be used in Functions!")
 elif self.ParentWindow.Controler.PouIsUsedBy(pou_name, values[0], self.ParentWindow.Debug):
-message = _("\"{a1}\" is already used by \"{a2}\"!").format(a1 = pou_name, a2 = values[0])
+message = _("\"{a1}\" is already used by \"{a2}\"!").format(a1=pou_name, a2=values[0])
 else:
 blockname = values[2]
 if len(values) > 3:
 blockinputs = values[3]
 else:
 message = _("\"%s\" pou already exists!") % blockname
 elif blockname.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]:
 message = _("\"%s\" element for this pou already exists!") % blockname
 else:
 id = self.ParentWindow.GetNewId()
-block = FBD_Block(self.ParentWindow, values[0], blockname, id, inputs = blockinputs)
+block = FBD_Block(self.ParentWindow, values[0], blockname, id, inputs=blockinputs)
 width, height = block.GetMinSize()
 if scaling is not None:
 x = round(float(x) / float(scaling[0])) * scaling[0]
 y = round(float(y) / float(scaling[1])) * scaling[1]
 width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0]
 Class that implements a Viewer based on a wx.ScrolledWindow for drawing and
 manipulating graphic elements
 """
 if wx.VERSION < (2, 6, 0):
-def Bind(self, event, function, id = None):
+def Bind(self, event, function, id=None):
 if id is not None:
 event(self, id, function)
 else:
 event(self, function)
 pos=wx.Point(0, 0), size=wx.Size(0, 0),
 style=wx.HSCROLL | wx.VSCROLL)
 self.Editor.ParentWindow = self
 # Create a new Viewer
-def __init__(self, parent, tagname, window, controler, debug = False, instancepath = ""):
+def __init__(self, parent, tagname, window, controler, debug=False, instancepath=""):
 self.VARIABLE_PANEL_TYPE = controler.GetPouType(tagname.split("::")[1])
 EditorPanel.__init__(self, parent, tagname, window, controler, debug)
 DebugViewer.__init__(self, controler, debug)
 self.ElementRefreshList = []
 self.ElementRefreshList_lock = Lock()
 dc = wx.ClientDC(self.Editor)
-font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"])
+font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName=faces["mono"])
 dc.SetFont(font)
 width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
 while width > 260:
 faces["size"] -= 1
-font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"])
+font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName=faces["mono"])
 dc.SetFont(font)
 width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
 self.SetFont(font)
 self.MiniTextDC = wx.MemoryDC()
-self.MiniTextDC.SetFont(wx.Font(faces["size"] * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["helv"]))
+self.MiniTextDC.SetFont(wx.Font(faces["size"] * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName=faces["helv"]))
 self.CurrentScale = None
 self.SetScale(ZOOM_FACTORS.index(1.0), False)
 self.RefreshHighlightsTimer = wx.Timer(self, -1)
 block.GetType() == CONNECTOR and\
 block.GetName() == name:
 return block
 return None
-def RefreshVisibleElements(self, xp = None, yp = None):
+def RefreshVisibleElements(self, xp=None, yp=None):
 x, y = self.Editor.CalcUnscrolledPosition(0, 0)
 if xp is not None:
 x = xp * self.Editor.GetScrollPixelsPerUnit()[0]
 if yp is not None:
 y = yp * self.Editor.GetScrollPixelsPerUnit()[1]
 self.Flush()
 self.ResetView()
 self.ResetBuffer()
 instance = {}
 # List of ids of already loaded blocks
-instances = self.Controler.GetEditedElementInstancesInfos(self.TagName, debug = self.Debug)
+instances = self.Controler.GetEditedElementInstancesInfos(self.TagName, debug=self.Debug)
 # Load Blocks until they are all loaded
 while len(instances) > 0:
 self.loadInstance(instances.popitem(0)[1], instances, selection)
 if (selection is not None and
 element.SetSize(instance.width, instance.height)
 for i, output_connector in enumerate(instance.outputs):
 connector_pos = wx.Point(*output_connector.position)
 if isinstance(element, FBD_Block):
 connector = element.GetConnector(connector_pos,
-output_name = output_connector.name)
+output_name=output_connector.name)
 elif i < len(connectors["outputs"]):
 connector = connectors["outputs"][i]
 else:
 connector = None
 if connector is not None:
 connector.SetPosition(connector_pos)
 for i, input_connector in enumerate(instance.inputs):
 connector_pos = wx.Point(*input_connector.position)
 if isinstance(element, FBD_Block):
 connector = element.GetConnector(connector_pos,
-input_name = input_connector.name)
+input_name=input_connector.name)
 elif i < len(connectors["inputs"]):
 connector = connectors["inputs"][i]
 else:
 connector = None
 if connector is not None:
 return self.Controler.IsOfType(type, reference, self.Debug)
 def IsEndType(self, type):
 return self.Controler.IsEndType(type)
-def GetBlockType(self, type, inputs = None):
+def GetBlockType(self, type, inputs=None):
 return self.Controler.GetBlockType(type, inputs, self.Debug)
 #-------------------------------------------------------------------------------
 #                          Search Element functions
 #-------------------------------------------------------------------------------
 for wire in self.Wires:
 if wire.HitTest(pos) or wire.TestHandle(event) != (0, 0):
 return wire
 return None
-def FindElement(self, event, exclude_group = False, connectors = True):
+def FindElement(self, event, exclude_group=False, connectors=True):
 dc = self.GetLogicalDC()
 pos = event.GetLogicalPosition(dc)
 if self.SelectedElement and not (exclude_group and isinstance(self.SelectedElement, Graphic_Group)):
 if self.SelectedElement.HitTest(pos, connectors) or self.SelectedElement.TestHandle(event) != (0, 0):
 return self.SelectedElement
 for element in self.GetElements():
 if element.HitTest(pos, connectors) or element.TestHandle(event) != (0, 0):
 return element
 return None
-def FindBlockConnector(self, pos, direction = None, exclude = None):
+def FindBlockConnector(self, pos, direction=None, exclude=None):
 result, error = self.FindBlockConnectorWithError(pos, direction, exclude)
 return result
-def FindBlockConnectorWithError(self, pos, direction = None, exclude = None):
+def FindBlockConnectorWithError(self, pos, direction=None, exclude=None):
 error = False
 startblock = None
 for block in self.Blocks.itervalues():
 connector = block.TestConnector(pos, direction, exclude)
 if connector:
 if self.Editor.HasCapture():
 self.Editor.ReleaseMouse()
 self.Editor.PopupMenu(menu)
 menu.Destroy()
-def PopupBlockMenu(self, connector = None):
+def PopupBlockMenu(self, connector=None):
 menu = wx.Menu(title='')
 if connector is not None and connector.IsCompatible("BOOL"):
 self.AddBlockPinMenuItems(menu, connector)
 else:
 edit = self.SelectedElement.GetType() in self.Controler.GetProjectPouNames(self.Debug)
 if position.y < SCROLL_ZONE and ystart > 0:
 move_window.y = -1
 elif position.y > window_size[1] - SCROLL_ZONE:
 move_window.y = 1
 if move_window.x != 0 or move_window.y != 0:
-self.RefreshVisibleElements(xp = xstart + move_window.x, yp = ystart + move_window.y)
+self.RefreshVisibleElements(xp=xstart + move_window.x, yp=ystart + move_window.y)
 self.Scroll(xstart + move_window.x, ystart + move_window.y)
 self.RefreshScrollBars(move_window.x, move_window.y)
-def BlockCompatibility(self, startblock=None, endblock=None, direction = None):
+def BlockCompatibility(self, startblock=None, endblock=None, direction=None):
 return True
 def GetPopupMenuItems(self):
 start_connector = self.SelectedElement.GetStartConnected()
 start_direction = start_connector.GetDirection()
 id = self.GetNewId()
 values = dialog.GetValues()
 values.setdefault("name", "")
 block = FBD_Block(self, values["type"], values["name"], id,
 values["extension"], values["inputs"],
-executionControl = values["executionControl"],
+executionControl=values["executionControl"],
-executionOrder = values["executionOrder"])
+executionOrder=values["executionOrder"])
 self.Controler.AddEditedElementBlock(self.TagName, id, values["type"], values.get("name", None))
 connector = None
 if wire is not None:
 for input_connector in block.GetConnectors()["inputs"]:
 if input_connector.IsCompatible(
 connector = transition.GetConditionConnector()
 else:
 connector = transition.GetConnectors()["inputs"][0]
 self.AddNewElement(transition, bbox, wire, connector)
-def AddNewDivergence(self, bbox, poss_div_types = None, wire=None):
+def AddNewDivergence(self, bbox, poss_div_types=None, wire=None):
 dialog = SFCDivergenceDialog(self.ParentWindow, self.Controler, self.TagName, poss_div_types)
 dialog.SetPreviewFont(self.GetFont())
 dialog.SetMinElementSize((bbox.width, bbox.height))
 if dialog.ShowModal() == wx.ID_OK:
 id = self.GetNewId()
 if "name" in new_values:
 block.SetName(new_values["name"])
 else:
 block.SetName("")
 block.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"]))
-block.SetType(new_values["type"], new_values["extension"], executionControl = new_values["executionControl"])
+block.SetType(new_values["type"], new_values["extension"], executionControl=new_values["executionControl"])
 block.SetExecutionOrder(new_values["executionOrder"])
 rect = rect.Union(block.GetRedrawRect())
 self.RefreshBlockModel(block)
 self.RefreshBuffer()
 if old_values["executionOrder"] != new_values["executionOrder"]:
 if wx.Platform == '__WXMSW__':
 wx.CallAfter(self.RefreshVisibleElements)
 self.Editor.Freeze()
 wx.CallAfter(self.Editor.Thaw)
 elif event.GetOrientation() == wx.HORIZONTAL:
-self.RefreshVisibleElements(xp = event.GetPosition())
+self.RefreshVisibleElements(xp=event.GetPosition())
 else:
-self.RefreshVisibleElements(yp = event.GetPosition())
+self.RefreshVisibleElements(yp=event.GetPosition())
 # Handle scroll in debug to fully redraw area and ensuring
 # instance path is fully draw without flickering
 if self.Debug and wx.Platform != '__WXMSW__':
 x, y = self.GetViewStart()
 if self.StartMousePos is None or self.StartScreenPos is None:
 rotation = event.GetWheelRotation() / event.GetWheelDelta()
 if event.ShiftDown():
 x, y = self.GetViewStart()
 xp = max(0, min(x - rotation * 3, self.Editor.GetVirtualSize()[0] / self.Editor.GetScrollPixelsPerUnit()[0]))
-self.RefreshVisibleElements(xp = xp)
+self.RefreshVisibleElements(xp=xp)
 self.Scroll(xp, y)
 elif event.ControlDown():
 dc = self.GetLogicalDC()
-self.SetScale(self.CurrentScale + rotation, mouse_event = event)
+self.SetScale(self.CurrentScale + rotation, mouse_event=event)
 self.ParentWindow.RefreshDisplayMenu()
 else:
 x, y = self.GetViewStart()
 yp = max(0, min(y - rotation * 3, self.Editor.GetVirtualSize()[1] / self.Editor.GetScrollPixelsPerUnit()[1]))
-self.RefreshVisibleElements(yp = yp)
+self.RefreshVisibleElements(yp=yp)
 self.Scroll(x, yp)
 def OnMoveWindow(self, event):
 client_size = self.GetClientSize()
 if self.LastClientSize != client_size:
 self.LastClientSize = client_size
 self.RefreshScrollBars()
 self.RefreshVisibleElements()
 event.Skip()
-def DoDrawing(self, dc, printing = False):
+def DoDrawing(self, dc, printing=False):
 if printing:
 if getattr(dc, "printing", False):
 font = wx.Font(self.GetFont().GetPointSize(), wx.MODERN, wx.NORMAL, wx.NORMAL)
 dc.SetFont(font)
 else:

changeset 1744	69dfdb26f600
parent 1743	c3c3d1318130
child 1745	f9d32913bad4