Merge pull request LibrePCB#89 from LibrePCB/cherry-pick-entity-contributions

Cherry pick entity contributions from open pull requests

Author: rnestler

entities/component.py

@@ -2,8 +2,6 @@
 
 from typing import List
 
-from common import indent
-
 from .common import (
     Author, BoolValue, Category, Created, Deprecated, Description, EnumValue, Keywords, Name, Position, Rotation,
     StringValue, UUIDValue, Version
@@ -146,14 +144,17 @@ def __init__(self, uuid: str, norm: Norm, name: Name, description: Description,
         self.norm = norm
         self.name = name
         self.description = description
-        self.gate = gate
+        self.gates = [gate]  # type: List[Gate]
+
+    def add_gate(self, gate_map: Gate) -> None:
+        self.gates.append(gate_map)
 
     def __str__(self) -> str:
         ret = '(variant {} {}\n'.format(self.uuid, self.norm) +\
             ' {}\n'.format(self.name) +\
             ' {}\n'.format(self.description)
-        ret += '\n'.join(indent(1, str(self.gate).splitlines()))
-        ret += '\n)'
+        ret += indent_entities(sorted(self.gates, key=lambda x: str(x.uuid)))
+        ret += ')'
         return ret
 
 

entities/symbol.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from .common import (
-    Author, Category, Created, Deprecated, Description, Keywords, Length, Name, Polygon, Position, Rotation, Text,
+    Author, Category, Circle, Created, Deprecated, Description, Keywords, Length, Name, Polygon, Position, Rotation, Text,
     Version
 )
 from .helper import indent_entities
@@ -37,6 +37,7 @@ def __init__(self, uuid: str, name: Name, description: Description,
         self.category = category
         self.pins = []  # type: List[Pin]
         self.polygons = []  # type: List[Polygon]
+        self.circles = []  # type: List[Circle]
         self.texts = []  # type: List[Text]
 
     def add_pin(self, pin: Pin) -> None:
@@ -45,6 +46,9 @@ def add_pin(self, pin: Pin) -> None:
     def add_polygon(self, polygon: Polygon) -> None:
         self.polygons.append(polygon)
 
+    def add_circle(self, circle: Circle) -> None:
+        self.circles.append(circle)
+
     def add_text(self, text: Text) -> None:
         self.texts.append(text)
 
@@ -60,6 +64,7 @@ def __str__(self) -> str:
             ' {}\n'.format(self.category)
         ret += indent_entities(self.pins)
         ret += indent_entities(self.polygons)
+        ret += indent_entities(self.circles)
         ret += indent_entities(self.texts)
         ret += ')'
         return ret

test_entities.py

@@ -1,6 +1,6 @@
 from entities.common import (
-    Align, Angle, Author, Category, Created, Deprecated, Description, Fill, GrabArea, Height, Keywords, Layer, Length,
-    Name, Polygon, Position, Rotation, Text, Value, Version, Vertex, Width
+    Align, Angle, Author, Category, Circle, Created, Deprecated, Description, Diameter, Fill, GrabArea, Height,
+    Keywords, Layer, Length, Name, Polygon, Position, Rotation, Text, Value, Version, Vertex, Width
 )
 from entities.component import (
     Clock, Component, DefaultValue, ForcedNet, Gate, Negated, Norm, PinSignalMap, Prefix, Required, Role, SchematicOnly,
@@ -88,6 +88,7 @@ def test_symbol() -> None:
     polygon.add_vertex(Vertex(Position(-2.54, -25.4), Angle(0.0)))
     polygon.add_vertex(Vertex(Position(-2.54, 22.86), Angle(0.0)))
     symbol.add_polygon(polygon)
+    symbol.add_circle(Circle('b5599e68-ff6a-464b-9a40-c6ba8ef8daf5', Layer('sym_outlines'), Width(0.254), Fill(False), GrabArea(False), Diameter(1.27), Position(5.715, 0.0)))
     symbol.add_text(Text('b9c4aa19-0a46-400c-9c96-e8c3dfb8f83e', Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(2.54), Position(0.0, 22.86), Rotation(0.0)))
 
     assert str(symbol) == """(librepcb_symbol 01b03c10-7334-4bd5-b2bc-942c18325d2b
@@ -108,6 +109,9 @@ def test_symbol() -> None:
   (vertex (position -2.54 -25.4) (angle 0.0))
   (vertex (position -2.54 22.86) (angle 0.0))
  )
+ (circle b5599e68-ff6a-464b-9a40-c6ba8ef8daf5 (layer sym_outlines)
+  (width 0.254) (fill false) (grab_area false) (diameter 1.27) (position 5.715 0.0)
+ )
  (text b9c4aa19-0a46-400c-9c96-e8c3dfb8f83e (layer sym_names) (value "{{NAME}}")
   (align center bottom) (height 2.54) (position 0.0 22.86) (rotation 0.0)
  )