From 2291a58727a4524bd93be9423977eecb70bbc49a Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 23 Feb 2019 18:51:42 +0200 Subject: [PATCH] - fixed a small bug in the Tool Solder Paste: the App don't take into consideration pads already filled with solder paste. --- FlatCAMApp.py | 4 ++-- README.md | 4 ++++ flatcamTools/ToolSolderPaste.py | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 14031adc..48def49b 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -93,8 +93,8 @@ class App(QtCore.QObject): log.addHandler(handler) # Version - version = 8.910 - version_date = "2019/02/23" + version = 8.911 + version_date = "2019/03/2" beta = True # current date now diff --git a/README.md b/README.md index 9e7544b5..71dead16 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +24.02.2019 + +- fixed a small bug in the Tool Solder Paste: the App don't take into consideration pads already filled with solder paste. + 23.02.2019 - remade the SolderPaste geometry generation function in ToolSoderPaste to work in certain scenarios where the Gerber pads in the SolderPaste mask Gerber may be just pads outlines diff --git a/flatcamTools/ToolSolderPaste.py b/flatcamTools/ToolSolderPaste.py index 05b5a2cd..4258b376 100644 --- a/flatcamTools/ToolSolderPaste.py +++ b/flatcamTools/ToolSolderPaste.py @@ -997,7 +997,7 @@ class SolderPaste(FlatCAMTool): geo_obj.special_group = 'solder_paste_tool' geo = LineString() - work_geo = [] + work_geo = self.flat_geometry rest_geo = [] tooluid = 1 @@ -1021,7 +1021,7 @@ class SolderPaste(FlatCAMTool): # We get possible issues if we try to directly use the Polygons, due of possible the interiors, # so we do a hack: get first the exterior in a form of LinearRings and then convert back to Polygon # because intersection does not work on LinearRings - for g in self.flat_geometry: + for g in work_geo: # for whatever reason intersection on LinearRings does not work so we convert back to Polygons poly = Polygon(g) x_min, y_min, x_max, y_max = poly.bounds