From a25fc1e88ceed3135a9db8fc8c352f435dffaca1 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 24 Feb 2019 17:10:01 +0200 Subject: [PATCH] - fixed bug in Set Origin function --- FlatCAMApp.py | 10 ++++++++-- README.md | 1 + camlib.py | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 42e730e8..fd112f8c 100644 --- a/FlatCAMApp.py +++ b/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 diff --git a/README.md b/README.md index b4fc6bd0..18eb9576 100644 --- a/README.md +++ b/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 diff --git a/camlib.py b/camlib.py index 19fdc078..f2f2abb5 100644 --- a/camlib.py +++ b/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)