Просмотр исходного кода

- fixed bug in Set Origin function

Marius Stanciu 7 лет назад
Родитель
Сommit
a25fc1e88c
3 измененных файлов с 14 добавлено и 2 удалено
  1. 8 2
      FlatCAMApp.py
  2. 1 0
      README.md
  3. 5 0
      camlib.py

+ 8 - 2
FlatCAMApp.py

@@ -4102,8 +4102,14 @@ class App(QtCore.QObject):
             for obj in self.collection.get_list():
                 obj.offset((x,y))
                 self.object_changed.emit(obj)
-                # obj.plot()
-            self.plot_all(zoom=False)
+                obj.plot()
+                # Update the object bounding box options
+                a, b, c, d = obj.bounds()
+                obj.options['xmin'] = a
+                obj.options['ymin'] = b
+                obj.options['xmax'] = c
+                obj.options['ymax'] = d
+            # self.plot_all(zoom=False)
             self.inform.emit('[success] Origin set ...')
             self.plotcanvas.vis_disconnect('mouse_press', self.on_set_zero_click)
             self.should_we_save = True

+ 1 - 0
README.md

@@ -22,6 +22,7 @@ CAD program, and create G-Code for Isolation routing.
 - fixed the Set To Origin function when Escape was clicked
 - added all the Tools in a new ToolBar
 - fixed bug that after changing the layout all the toolbar actions are no longer working
+- fixed bug in Set Origin function
 
 23.02.2019
 

+ 5 - 0
camlib.py

@@ -4329,6 +4329,11 @@ class Excellon(Geometry):
         for drill in self.drills:
             drill['point'] = affinity.translate(drill['point'], xoff=dx, yoff=dy)
 
+        # offset solid_geometry
+        for tool in self.tools:
+            for geo in self.tools[tool]['solid_geometry']:
+                geo = affinity.translate(geo, xoff=dx, yoff=dy)
+
         # Slots
         for slot in self.slots:
             slot['stop'] = affinity.translate(slot['stop'], xoff=dx, yoff=dy)