make parts use sync_from

freecad/kiconnect/bases/BaseObject.py

@@ -54,7 +54,7 @@ class BaseObject:
                 self.feature.addExtension(ext)
 
     def setup_properties(self, feature):
-        feature.addProperty('App::PropertyString', 'Type', 'KiConnect', 'Internal KiConnect Type', read_only=True, hidden=True)
+        feature.addProperty('App::PropertyString', 'Type', 'KiConnect', 'Internal KiConnect Type', hidden=True)
 
     def sync_from(self):
         pass

freecad/kiconnect/board.py

@@ -19,6 +19,7 @@ class BoardObject(BaseObject):
     def __init__(self, feature, kicad_board, board_polygon):
         self.feature = feature
         self.kicad_board = kicad_board
+        self.board_sketch = None
         # TODO add this to FreeCAD Preferences and Property?
         self.do_offset = True
         # TODO needs to be resotred in onDocumentRestored
@@ -72,6 +73,9 @@ class BoardObject(BaseObject):
 
         return self.board_sketch
 
+    def get_polygon(self, kiid):
+        return [ s for s in self.kicad_board.get_shapes() if s.id.value == kiid ][0]
+
     def get_boardpoly(self):
         # TODO remove in favor of extract_polygons class method
         board = self.kicad_board
@@ -128,17 +132,8 @@ class BoardObject(BaseObject):
             Pulls outline from KiCAD PolygonBoard and saves points as Vectors
         '''
 
-        # bit of a quick hack to keep the board in one place, needs more testing
-        if self.do_offset and not self.feature.BoardOffset:
-            bb = self.board_polygon.bounding_box()
-            self.feature.BoardOffset.Base = (App.Vector(bb.pos.x, -bb.pos.y) + App.Vector(bb.size.x, -bb.size.y) / 2) / 1000000.0
-
-        vectors = []
-
-        for node in self.board_polygon.polygons[0].outline:
-            vectors.append(self.point_to_vector(node.point))
-
-        self.feature.Vectors = vectors
+        if self.board_sketch:
+            self.board_sketch.Proxy.sync_from()
 
     def sync_to(self):
         board = self.kicad_board

freecad/kiconnect/board_sketch.py

@@ -23,6 +23,12 @@ class BoardSketchObject(BaseObject):
     def execute(self, feature):
         feature.recompute()
 
+    def get_parent_board(self):
+        try:
+            return self.feature.getParent().getParent().Proxy
+        except:
+            return None
+
     def point_to_vector(self, point, offset=True):
         return (
             App.Vector(point.x,
@@ -39,6 +45,11 @@ class BoardSketchObject(BaseObject):
         feature = self.feature
         vectors = []
 
+        board = self.get_parent_board()
+        if board:
+            self.board_polygon = board.get_polygon(board.polygon_id)
+
+        # board.get_shapes needs to be called to ensure polygons are actually up to date
         for node in self.board_polygon.polygons[0].outline:
             vectors.append(self.point_to_vector(node.point))
 

freecad/kiconnect/commands/Syncable.py

@@ -1,7 +1,8 @@
+import FreeCAD as App
 import FreeCADGui as Gui
 
 class Syncable:
-    SYNCABLES = [ 'KiConnect::Project', 'KiConnect::Board', 'KiConnect::Parts', 'KiConnect::BoardBody', ]
+    SYNCABLES = [ 'KiConnect::Project', 'KiConnect::Board', 'KiConnect::Parts', 'KiConnect::BoardBody', 'KiConnect::BoardSketch' ]
 
     def IsActive(self):
         sel = Gui.Selection.getSelection()
@@ -41,3 +42,5 @@ class Syncable:
                 getattr(feature, self.method)()
 
                 s.recompute()
+
+        App.ActiveDocument.recompute()

freecad/kiconnect/parts.py

@@ -15,12 +15,13 @@ from .bases import BaseObject, BaseViewProvider
 class PartsObject(BaseObject):
     TYPE = 'KiConnect::Parts'
 
+    def __init__(self, feature):
+        super(PartsObject, self).__init__(feature)
+
     def execute(self, feature):
         super(PartsObject, self).execute(feature)
 
-        self.import_footprints()
-
-    def import_footprints(self):
+    def sync_from(self):
         kiconn_board = self.feature.getParentGroup()
         kicad_board = self.get_api().kicad.get_board()
 

freecad/kiconnect/project.py

@@ -32,6 +32,7 @@ class Project:
             kicad_board = self.API.Proxy.kicad.get_board()
 
             polygons = Board.extract_polygons(kicad_board)
+
             for polygon in polygons:
                 self.board = Board.makeBoard(self.feature, kicad_board, polygon)