beremiz: comparison graphics/GraphicCommons.py

equal deleted inserted replaced

-:14b40afccd69
+:6198190bc121
 def DrawHighlightedText(dc, text, highlights, x, y):
 current_pen = dc.GetPen()
 dc.SetPen(wx.TRANSPARENT_PEN)
 for start, end, highlight_type in highlights:
 dc.SetBrush(wx.Brush(highlight_type[0]))
-offset_width, offset_height = dc.GetTextExtent(text[:start[1]])
+offset_width, _offset_height = dc.GetTextExtent(text[:start[1]])
 part = text[start[1]:end[1] + 1]
 part_width, part_height = dc.GetTextExtent(part)
 dc.DrawRectangle(x + offset_width, y, part_width, part_height)
 dc.SetTextForeground(highlight_type[1])
 dc.DrawText(part, x + offset_width, y)
 max_movey = max(max_movey, movey)
 return max_movex, max_movey
 # Refreshes the group elements to move defined and handle selected
 def ProcessDragging(self, movex, movey, event, scaling):
-handle_type, handle = self.Handle
+handle_type, _handle = self.Handle
 # If it is a move handle, Move this group elements
 if handle_type == HANDLE_MOVE:
 movex = max(-self.BoundingBox.x, movex)
 movey = max(-self.BoundingBox.y, movey)
 if scaling is not None:
 self.Highlights = []
 self.RefreshNameSize()
 def Flush(self):
 self.ParentBlock = None
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 wire.Flush()
 self.Wires = []
 # Returns the RedrawRect
 def GetRedrawRect(self, movex=0, movey=0):
 return self.Type
 # Returns the connector type
 def GetConnectedRedrawRect(self, movex, movey):
 rect = None
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 if rect is None:
 rect = wire.GetRedrawRect()
 else:
 rect = rect.Union(wire.GetRedrawRect())
 return rect
 return self.ParentBlock.IsOfType(type, reference) or self.ParentBlock.IsOfType(reference, type)
 # Changes the connector name
 def SetType(self, type):
 self.Type = type
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 wire.SetValid(wire.IsConnectedCompatible())
 # Returns the connector name
 def GetName(self):
 return self.Name
 if self.ParentBlock.Visible:
 self.ParentBlock.Parent.ElementNeedRefresh(self)
 def RefreshForced(self):
 self.Forced = False
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 self.Forced |= wire.IsForced()
 def RefreshValue(self):
 self.Value = self.ReceivingCurrent()
 def RefreshValid(self):
 self.Valid = True
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 self.Valid &= wire.GetValid()
 def ReceivingCurrent(self):
 current = False
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 value = wire.GetValue()
 if current != "undefined" and isinstance(value, BooleanType):
 current |= wire.GetValue()
 elif value == "undefined":
 current = "undefined"
 return current
 def SpreadCurrent(self, spreading):
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 wire.SetValue(spreading)
 # Changes the connector name size
 def RefreshNameSize(self):
 if self.Name != "":
 if refresh:
 self.ParentBlock.RefreshModel(False)
 # Returns the index of the wire given in the list of connected
 def GetWireIndex(self, wire):
-for i, (tmp_wire, handle) in enumerate(self.Wires):
+for i, (tmp_wire, _handle) in enumerate(self.Wires):
 if tmp_wire == wire:
 return i
 return None
 # Unconnect a wire or all wires connected to the connector
 dc.SetUserScale(scalex, scaley)
 # Adds an highlight to the connector
 def AddHighlight(self, infos, start, end, highlight_type):
 if highlight_type == ERROR_HIGHLIGHT:
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 wire.SetValid(False)
 AddHighlight(self.Highlights, (start, end, highlight_type))
 # Removes an highlight from the connector
 def RemoveHighlight(self, infos, start, end, highlight_type):
 if highlight != (start, end, highlight_type):
 highlights.append(highlight)
 error |= highlight == ERROR_HIGHLIGHT
 self.Highlights = highlights
 if not error:
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 wire.SetValid(wire.IsConnectedCompatible())
 # Removes all the highlights of one particular type from the connector
 def ClearHighlight(self, highlight_type=None):
 error = False
 if highlight[2] != highlight_type:
 highlights.append(highlight)
 error |= highlight == ERROR_HIGHLIGHT
 self.Highlights = highlights
 if not error:
-for wire, handle in self.Wires:
+for wire, _handle in self.Wires:
 wire.SetValid(wire.IsConnectedCompatible())
 # Draws the connector
 def Draw(self, dc):
 if self.Selected:
 i = 0
 while i < len(self.Points) - 1:
 if verify and 0 < i < len(self.Points) - 2 and \
 self.Points[i] == self.Points[i + 1] and \
 self.Segments[-1] == vector(self.Points[i + 1], self.Points[i + 2]):
-for j in xrange(2):
+for dummy in xrange(2):
 self.Points.pop(i)
 else:
 segment = vector(self.Points[i], self.Points[i + 1])
 if is_null_vector(segment) and i > 0:
 segment = (self.Segments[-1][1], self.Segments[-1][0])
 points = [point for point in self.Points]
 segments = [segment for segment in self.Segments]
 i = 1
 while i < len(points) - 1:
 if points[i] == points[i + 1] and segments[i - 1] == segments[i + 1]:
-for j in xrange(2):
+for dummy in xrange(2):
 points.pop(i)
 segments.pop(i)
 else:
 i += 1
 # If the wire isn't in a Ladder Diagram, save the new point list
 # Delete the handled segment by removing the two segment points
 def DeleteSegment(self):
 handle_type, handle = self.Handle
 if handle_type == HANDLE_SEGMENT:
-segment, dir = handle
+segment, _dir = handle
-for i in xrange(2):
+for dummy in xrange(2):
 self.Points.pop(segment)
 self.Segments.pop(segment)
 self.GeneratePoints()
 self.RefreshModel()

changeset 1847	6198190bc121
parent 1846	14b40afccd69
child 1850	614396cbffbf