Commit Graph

132 Commits

Author SHA1 Message Date
Thomas Duffin
2c9a307483 Fixes #135
The polygon passed to clear_polygon() is generated using shapely’s buffer() function on line FlatCAMObj.py:1095.

When the margin given to the buffer() function is small, a single Polygon object is returned. If the margin is large enough it causes the polygon to be broken into pieces and a Multipolygon is returned instead. A visualisation of this can be seen in the shapely manual in the object.buffer() section.

The first thing clear_polygon() does is buffer the polygon again to take the tool diameter into account and the Polygon/Multipolygon generated by this is handled further down the function. The buffer() function used to take the tool diameter into account can be called happily on both Polygon and Multipolygon objects so there is no reason to block Multipolygons being passed to clear_polygon().

Therefore simply adding Multipolygon to the acceptable types in the assert statement on line camlib.py:382 fixes this bug and causes no further issues.
2015-10-25 23:14:11 +00:00
Juan Pablo Caram
d22b47f4af Log level back to debug after release. 2015-10-20 20:47:45 -04:00
Juan Pablo Caram
a679883adf RTree now using shapely object's id() instead of __hash__. Fixes 1#163. 2015-10-20 19:53:39 -04:00
Juan Pablo Caram
982ab16f28 Release version 8.4 2015-10-18 19:24:04 -04:00
Juan Pablo Caram
ee684e8101 Further work on multi-pass cuts. 2015-10-11 20:58:21 -04:00
Juan Pablo Caram
d687fb5287 Started multi-pass cuts. 2015-10-04 21:45:19 -04:00
Juan Pablo Caram
b5f428deea Added "interiors" shell command. 2015-10-04 21:25:00 -04:00
Juan Pablo Caram
4110940d49 Minor fix to "millholes" shell docs. Added get_exterior() method to Geometry. 2015-10-04 20:48:06 -04:00
Juan Pablo Caram
1942fe3bed Create polygon for path drawn so far when D03 is encountered. Fixes #150. 2015-10-02 19:09:44 -04:00
Juan Pablo Caram
d8c5d46cd0 Workaround for #152. Check for empty polygons before adding. 2015-09-28 21:25:31 -04:00
Juan Pablo Caram
22119072d3 Cleanup. And fixes #148. 2015-09-11 14:45:08 -04:00
Juan Pablo Caram
6fa0e91875 Fixed #139, Polygon aperture twice as large. 2015-08-29 22:30:58 -04:00
Jørn Sandvik Nilsson
44f5da3326 Added parameter "spindlespeed" to cncjob and drillcncjob. Will generate gcode "M03 S4000" (4000 rpm), or "M03" if omitted. 2015-07-17 09:49:24 +02:00
phdussud
0bf21458c6 Resolve issue 144
Added a test for the new mechanism
Added a gerber test file
2015-06-26 13:42:55 -07:00
phdussud
f5e481d1fa Best effort to generate isolation path cutting on the conventional side 2015-06-20 17:50:02 -07:00
jpcaram
cd39a55696 Support for optional '+' on Gerber numbers. Solvers #142. 2015-06-20 17:29:03 -04:00
phdussud
a8e8b9f0b6 Added S and T to the list of allowed Gcode commands. 2015-06-06 14:14:30 -07:00
jpcaram
31ddb9cf7c Multiple statement per line problem fixed (Issue #125). 2015-04-17 12:46:48 -04:00
Juan Pablo Caram
4ec72bc3f0 Fix for multiple statements per line. Tests pending. 2015-04-16 22:17:06 -04:00
jpcaram
aa951e277b Fixed conflict with PyQt5. Cleanup. Log level back to debug. 2015-03-31 10:41:32 -04:00
Juan Pablo Caram
476f1e5858 Version 8.3 for Windows. 2015-02-22 17:34:57 -05:00
jpcaram
873db32aad Fixed gerber parse error related to extra trace. 2015-02-17 17:54:51 -05:00
Juan Pablo Caram
519df2385f Final 8.2 for Windows. Removed cd into app folder. 2015-02-13 17:39:22 -05:00
Juan Pablo Caram
dda9bb1864 Version 8.2. Log level to WARNING. Removed unused scipy.optimize. 2015-02-13 16:57:42 -05:00
jpcaram
9dec4ff32f Activity shown for CNC Job generation via context manager. 2015-02-13 14:37:54 -05:00
jpcaram
2c699406f7 Activity indicator as context manager when opening files. Opening gerber from File->Open Gerber launches open_gerber in thread. 2015-02-13 14:05:06 -05:00
jpcaram
8da39d54d4 Desctivates canvas callbacks in drawing tool when deactivated. 2015-02-12 17:06:29 -05:00
jpcaram
247901655c Complete tool change sequence for gcode generated from excellon. 2015-02-07 19:32:02 -05:00
jpcaram
41e63c4390 Added paint_connect to standard paint algorithm. Resolves issue #103. 2015-02-07 18:41:29 -05:00
jpcaram
bba4f3a8bb Tool change support for gcode from excellon. Untested. 2015-02-07 13:32:58 -05:00
jpcaram
17a3316ce4 Improved speed in FlatCAMRTreeStorage. 2015-02-06 17:16:11 -05:00
jpcaram
e353413cd3 Disabled "Ok"/"Update Geometry" button after first update. Solves issue #105. 2015-02-05 09:18:54 -05:00
jpcaram
87fdf0a581 Another fixed bug introduced to clear_poly() in previous commit. Added process widget. 2015-01-30 18:10:06 -05:00
jpcaram
f92255b8f9 Fixed bug introduced to clear_poly() in previous commit. 2015-01-30 15:17:57 -05:00
jpcaram
d903356a55 Solved units change problem during parsing (issue #80). 2015-01-30 14:41:56 -05:00
jpcaram
3aa1746b23 Refactored basic painting algorithm to generate FlatCAMRtreeStorage. 2015-01-30 13:47:25 -05:00
jpcaram
4389f173a8 Removed path_join() from painting algorithm as paint_join() should do the trick alone. 2015-01-29 17:22:09 -05:00
jpcaram
c2c7a83855 Seed painting algorithm working with optimizations. 2015-01-29 17:02:06 -05:00
jpcaram
6733ebbfa8 Refactored paint_connect() and path_connect() to receive and return FlatCAMRTreeStorage objects. Updated unittests acordingly. 2015-01-29 15:52:03 -05:00
jpcaram
a1345f0a58 Fixes to path_connect() related to LinearRings. Added test cases. 2015-01-27 18:16:22 -05:00
jpcaram
573581ca80 Fixes to path_connect() and added units tests for it. 2015-01-26 17:52:26 -05:00
jpcaram
6b51f03db2 "Paint connect" functional. Added to seed-based painting and unit-tested. "Path connect" still pending. Disabled. "Path connect" unit test added. 2015-01-25 16:55:22 -05:00
jpcaram
9632d9a98f First write (untested) of paint_connect. 2015-01-22 21:23:10 -05:00
jpcaram
a42c3f6e10 Functional Geometry.path_connect() and added to seed-based painting algorithm. 2015-01-22 18:43:39 -05:00
jpcaram
a7dc9bcc09 Path optimization: Connect adjacent paths. 2015-01-22 18:11:09 -05:00
jpcaram
e5185dd66f Cleanup of camlib.CNCjob. 2015-01-22 17:23:18 -05:00
jpcaram
fd2657a8d7 Solves seed painting problem in issue #102. 2015-01-21 09:50:01 -05:00
Juan Pablo Caram
6361ad3338 Path check. 2015-01-19 17:17:16 -05:00
Juan Pablo Caram
922aa6734d Added python-simplejson line to setup_ubuntu.sh. 2015-01-19 12:41:34 -05:00
Juan Pablo Caram
670dd48127 Added "excellon_zeros" application default. It get propagated to the Excellon class. 2015-01-18 21:10:19 -05:00