beremiz: comparison graphics/GraphicCommons.py

equal deleted inserted replaced

-:c02818d7e29f
+:7e61baa047f0
 (3, 2) : 4,
 (2, 1) : 5,
 (2, 3) : 5
 }
 def round_scaling(x, n, constraint=0):
 fraction = float(x) / float(n)
 if constraint == -1:
 xround = int(fraction)
 else:
 """
 Basic vector operations for calculate wire points
 """
-# Create a vector from two points and define if vector must be normal
 def vector(p1, p2, normal = True):
+"""
+Create a vector from two points and define if vector must be normal
+"""
 vector = (p2.x - p1.x, p2.y - p1.y)
 if normal:
 return normalize(vector)
 return vector
-# Calculate the norm of a given vector
 def norm(v):
+"""
+Calculate the norm of a given vector
+"""
 return sqrt(v[0] * v[0] + v[1] * v[1])
-# Normalize a given vector
 def normalize(v):
+"""
+Normalize a given vector
+"""
 v_norm = norm(v)
 # Verifie if it is not a null vector
 if v_norm > 0:
 return (v[0] / v_norm, v[1] / v_norm)
 else:
 return v
-# Calculate the scalar product of two vectors
 def is_null_vector(v):
+"""
+Calculate the scalar product of two vectors
+"""
 return v == (0, 0)
-# Calculate the scalar product of two vectors
 def add_vectors(v1, v2):
+"""
+Calculate the scalar product of two vectors
+"""
 return (v1[0] + v2[0], v1[1] + v2[1])
-# Calculate the scalar product of two vectors
 def product(v1, v2):
+"""
+Calculate the scalar product of two vectors
+"""
 return v1[0] * v2[0] + v1[1] * v2[1]
-"""
-Function that calculates the nearest point of the grid defined by scaling for the given point
-"""
 def GetScaledEventPosition(event, dc, scaling):
+"""
+Function that calculates the nearest point of the grid defined by scaling for the given point
+"""
 pos = event.GetLogicalPosition(dc)
 if scaling:
 pos.x = round(float(pos.x) / float(scaling[0])) * scaling[0]
 pos.y = round(float(pos.y) / float(scaling[1])) * scaling[1]
 return pos
-"""
-Function that choose a direction during the wire points generation
-"""
 def DirectionChoice(v_base, v_target, dir_target):
+"""
+Function that choose a direction during the wire points generation
+"""
 dir_product = product(v_base, v_target)
 if dir_product < 0:
 return (-v_base[0], -v_base[1])
 elif dir_product == 0 and product(v_base, dir_target) != 0:
 return dir_target
 return v_base
 def MiterPen(colour, width=1, style=wx.SOLID):
 pen = wx.Pen(colour, width, style)
 pen.SetJoin(wx.JOIN_MITER)
 pen.SetCap(wx.CAP_PROJECTING)
 return pen
 #-------------------------------------------------------------------------------
 #                    Helpers for highlighting text
 #-------------------------------------------------------------------------------
 def AddHighlight(highlights, infos):
 RemoveHighlight(highlights, infos)
 highlights.append(infos)
 def RemoveHighlight(highlights, infos):
 if infos in highlights:
 highlights.remove(infos)
 return True
 return False
 def ClearHighlight(highlights, highlight_type=None):
 if highlight_type is not None:
 return [highlight for highlight in highlights if highlight[2] != highlight_type]
 return []
 def DrawHighlightedText(dc, text, highlights, x, y):
 current_pen = dc.GetPen()
 dc.SetPen(wx.TRANSPARENT_PEN)
 for start, end, highlight_type in highlights:
 #-------------------------------------------------------------------------------
 #                           Graphic element base class
 #-------------------------------------------------------------------------------
-"""
-Class that implements a generic graphic element
-"""
 class Graphic_Element(ToolTipProducer):
+"""
+Class that implements a generic graphic element
+"""
 # Create a new graphic element
 def __init__(self, parent, id = None):
 ToolTipProducer.__init__(self, parent)
 self.Parent = parent
 #-------------------------------------------------------------------------------
 #                           Group of graphic elements
 #-------------------------------------------------------------------------------
-"""
-Class that implements a group of graphic elements
-"""
 class Graphic_Group(Graphic_Element):
+"""
+Class that implements a group of graphic elements
+"""
 # Create a new group of graphic elements
 def __init__(self, parent):
 Graphic_Element.__init__(self, parent)
 self.Elements = []
 #-------------------------------------------------------------------------------
 #                         Connector for all types of blocks
 #-------------------------------------------------------------------------------
-"""
-Class that implements a connector for any type of block
-"""
 class Connector(DebugDataConsumer, ToolTipProducer):
+"""
+Class that implements a connector for any type of block
+"""
 # Create a new connector
 def __init__(self, parent, name, type, position, direction, negated = False, edge = "none", onlyone = False):
 DebugDataConsumer.__init__(self)
 ToolTipProducer.__init__(self, parent.Parent)
 #-------------------------------------------------------------------------------
 #                           Common Wire Element
 #-------------------------------------------------------------------------------
-"""
-Class that implements a wire for connecting two blocks
-"""
 class Wire(Graphic_Element, DebugDataConsumer):
+"""
+Class that implements a wire for connecting two blocks
+"""
 # Create a new wire
 def __init__(self, parent, start = None, end = None):
 Graphic_Element.__init__(self, parent)
 DebugDataConsumer.__init__(self)
 #-------------------------------------------------------------------------------
 #                           Graphic comment element
 #-------------------------------------------------------------------------------
 def FilterHighlightsByRow(highlights, row, length):
 _highlights = []
 for start, end, highlight_type in highlights:
 if start[0] <= row and end[0] >= row:
 if start[0] < row:
 if end[0] > row:
 end = (row, length)
 _highlights.append((start, end, highlight_type))
 return _highlights
 def FilterHighlightsByColumn(highlights, start_col, end_col):
 _highlights = []
 for start, end, highlight_type in highlights:
 if end[1] > start_col and start[1] < end_col:
 start = (start[0], max(start[1], start_col) - start_col)
 end = (end[0], min(end[1], end_col) - start_col)
 _highlights.append((start, end, highlight_type))
 return _highlights
-"""
-Class that implements a comment
-"""
 class Comment(Graphic_Element):
+"""
+Class that implements a comment
+"""
 # Create a new comment
 def __init__(self, parent, content, id = None):
 Graphic_Element.__init__(self, parent)
 self.Id = id

changeset 1736	7e61baa047f0
parent 1730	64d8f52bc8c8
child 1739	ec153828ded2