freecad/kiconnect/api.py

@@ -22,7 +22,6 @@ class APIObject(BaseObject):
         feature.addProperty('App::PropertyBool', 'Connected', 'KiConnect', 'Is socket connected')
         feature.addProperty('App::PropertyInteger', 'DocumentCount', 'KiConnect', 'Count of open Documnets')
 
-        # XXX onDocumentRestored should not be called on creation
         self.onDocumentRestored(feature)
 
         self.ping_connection()
@@ -45,6 +44,7 @@ class APIObject(BaseObject):
             setattr(self, 'boards', {})
 
         self.kicad = KiCad()
+        self.refresh_polygons()
 
         parent = feature.getParent()
         if not parent: return

freecad/kiconnect/board.py

@@ -4,7 +4,6 @@ import FreeCAD as App
 from . import settings
 import Part
 
-from kipy import board_types as BoardTypes
 from kipy.board_types import Footprint3DModel, BoardArc, BoardPolygon, BoardSegment, PadStackShape
 from kipy.geometry import PolygonWithHoles, PolyLine, PolyLineNode, Vector2
 from kipy.proto.common.types import KiCadObjectType
@@ -198,8 +197,7 @@ def makeBoard(parent, kicad_board, polygon):
 def extract_polygons(board):
     # find polygons of Edge Cuts
     edge_cuts = [ edge for edge in  board.get_shapes() if edge.layer == BoardLayer.BL_Edge_Cuts ]
-
+    polygons = [ edge for edge in edge_cuts if (isinstance(edge, BoardPolygon) or isinstance(edge, BoardArc)) ]
-    polygons = [ edge for edge in edge_cuts if (isinstance(edge, BoardPolygon) or isinstance(edge, BoardArc) or isinstance(edge, BoardTypes.BoardCircle)) ]
 
     return polygons
 

freecad/kiconnect/board_sketch.py

@@ -5,7 +5,6 @@ from . import settings
 import Part
 import Sketcher
 
-from kipy import board_types as BoardTypes
 from kipy.board_types import Footprint3DModel, BoardPolygon, BoardSegment, PadStackShape
 from kipy.geometry import PolygonWithHoles, PolyLine, PolyLineNode, Vector2
 from kipy.proto.common.types import KiCadObjectType
@@ -58,18 +57,12 @@ class BoardSketchObject(BaseObject):
         if not board_polygon:
             raise BoardPolyNotFoundException('Board Polygon not found: ' + self.polygon_id)
 
-        # XXX: arc_count is a hack to address
-        # https://codeberg.org/kiconnect/KiConnect/issues/2
-        # below every other arc is skipped.
         arc_count = 0
         start = None
 
+        outline = board_polygon.polygons[0].outline
         line = []
 
-        if isinstance(board_polygon, BoardTypes.BoardCircle):
-            print(board_polygon)
-        else:
-            outline = board_polygon.polygons[0].outline
         for node in outline:
             if node.has_arc:
                 arc_count = arc_count + 1
@@ -79,6 +72,7 @@ class BoardSketchObject(BaseObject):
 
                 arc = node.arc
 
+
                 arc_start = self.point_to_vector(arc.start)
                 arc_mid = self.point_to_vector(arc.mid)
                 arc_end = self.point_to_vector(arc.end)
@@ -118,7 +112,6 @@ class BoardSketchObject(BaseObject):
 
             if len(line) == 2:
                 idx = feature.addGeometry(Part.LineSegment(line[0], line[1]))
-                    if idx > 0:
                 feature.addConstraint(Sketcher.Constraint("Coincident", idx - 1, 2, idx, 1))
 
                 if line[0].x == line[1].x:
@@ -127,21 +120,13 @@ class BoardSketchObject(BaseObject):
                 if line[0].y == line[1].y:
                     feature.addConstraint(Sketcher.Constraint("Horizontal", idx))
 
-                    line = [line[1]]
+                line = [ line[1] ]
 
 
         if len(line) == 1:
-                # XXX what if the final piece of geo is an arc?
             idx = feature.addGeometry(Part.LineSegment(start, line[0]))
-
             feature.addConstraint(Sketcher.Constraint("Coincident", 0, 1, idx, 1))
             feature.addConstraint(Sketcher.Constraint("Coincident", idx - 1, 2, idx, 2))
-
-                if line[0].x == start.x:
-                    feature.addConstraint(Sketcher.Constraint("Vertical", idx))
-
-                if line[0].y == start.y:
-                    feature.addConstraint(Sketcher.Constraint("Horizontal", idx))
         else:
             FreeCAD.Console.PrintError("Bad line segment:", line)
 

freecad/kiconnect/commands/cmd_reload.py

@@ -28,7 +28,7 @@ class Reload:
         except:
             print('failed to remove KiConnect')
 
-        for mod in [mod for mod in sys.modules if 'kicon' in mod or 'kipy' in mod]:
+        for mod in [mod for mod in sys.modules if 'kicon' in mod]: 
             print(f'Reloading {mod}')
 
             importlib.reload(sys.modules[mod])