Merge pull request #400 from eyal0/outside_in_thermals

Thermals from outside inward

integration_tests.py

@@ -31,6 +31,7 @@
                   "am-test-extended",
                   "am-test-voronoi",
                   "am-test-voronoi-extra-passes",
+                  "am-test-voronoi-wide-extra-passes",
                   "am-test-voronoi-front",
                   "edge-cuts-inside-cuts",
                   "edge-cuts-broken-loop",

surface_vectorial.cpp

@@ -650,6 +650,7 @@ vector<pair<coordinate_type_fp, vector<shared_ptr<icoords>>>> Surface_vectorial:
         if (tool_index < tool_count - 1) {
           // Don't force isolation.
           if (trace_index < vectorial_surface->first.size()) {
+            // This doesn't run for thermal holes.
             multi_polygon_type_fp temp;
             bg_helpers::buffer(vectorial_surface->first.at(trace_index), temp, tool_diameter/2 - mill->tolerance);
             already_milled_shrunk = already_milled_shrunk + temp;
@@ -830,7 +831,7 @@ vector<multi_polygon_type_fp> Surface_vectorial::offset_polygon(
         // This means that we are milling a thermal so we need to do all the
         // passes here.  We can't count on the passes around the input surface
         // because there is no input surface.
-        factor = double(i) + 1 - steps;
+        factor = -double(i);
       } else {
         factor = ((1-double(steps))/2 + i);
       }

testing/gerbv_example/am-test-voronoi-extra-passes/expected/back.ngc

@@ -1630,54 +1630,54 @@ G01 X-7.11471 Y7.61543
 G04 P0 ( dwell for no time -- G64 should not smooth over this point )
 G00 Z0.08000 ( retract )
 
-G00 X-8.78195 Y5.32328 ( rapid move to begin. )
+G00 X-8.76221 Y5.30672 ( rapid move to begin. )
 G01 F3.00000
 G01 Z-0.00800
 G04 P0 ( dwell for no time -- G64 should not smooth over this point )
 G01 F6.00000
-G01 X-8.78195 Y5.32328
 G01 X-8.76221 Y5.30672
-G01 X-8.98596 Y5.04007
-G01 X-8.99452 Y5.04210
-G01 X-9.00340 Y5.04232
-G01 X-9.01313 Y5.04042
-G01 X-9.02078 Y5.03702
-G01 X-9.28787 Y5.26113
-G01 X-9.24007 Y5.30728
-G01 X-9.17094 Y5.35048
-G01 X-9.09434 Y5.37836
-G01 X-9.01361 Y5.38971
-G01 X-8.93229 Y5.38402
-G01 X-8.85392 Y5.36155
 G01 X-8.78195 Y5.32328
-G01 X-8.78757 Y5.31494
+G01 X-8.85392 Y5.36155
+G01 X-8.93229 Y5.38402
+G01 X-9.01361 Y5.38971
+G01 X-9.09434 Y5.37836
+G01 X-9.17094 Y5.35048
+G01 X-9.24007 Y5.30728
+G01 X-9.28787 Y5.26113
+G01 X-9.02078 Y5.03702
+G01 X-9.01313 Y5.04042
+G01 X-9.00340 Y5.04232
+G01 X-8.99452 Y5.04210
+G01 X-8.98596 Y5.04007
+G01 X-8.76221 Y5.30672
 G01 X-8.77630 Y5.30549
-G01 X-8.98960 Y5.05128
-G01 X-8.99556 Y5.05227
-G01 X-9.00444 Y5.05227
-G01 X-9.01471 Y5.05035
-G01 X-9.01918 Y5.04873
-G01 X-9.27293 Y5.26165
-G01 X-9.23388 Y5.29936
-G01 X-9.16653 Y5.34144
-G01 X-9.09190 Y5.36860
-G01 X-9.01326 Y5.37966
-G01 X-8.93403 Y5.37412
-G01 X-8.85769 Y5.35223
 G01 X-8.78757 Y5.31494
-G01 X-8.79319 Y5.30661
+G01 X-8.85769 Y5.35223
+G01 X-8.93403 Y5.37412
+G01 X-9.01326 Y5.37966
+G01 X-9.09190 Y5.36860
+G01 X-9.16653 Y5.34144
+G01 X-9.23388 Y5.29936
+G01 X-9.27293 Y5.26165
+G01 X-9.01918 Y5.04873
+G01 X-9.01471 Y5.05035
+G01 X-9.00444 Y5.05227
+G01 X-8.99556 Y5.05227
+G01 X-8.98960 Y5.05128
+G01 X-8.77630 Y5.30549
 G01 X-8.79039 Y5.30426
-G01 X-8.99357 Y5.06211
-G01 X-9.00549 Y5.06221
-G01 X-9.01712 Y5.06005
-G01 X-9.25799 Y5.26217
-G01 X-9.22769 Y5.29143
-G01 X-9.16212 Y5.33240
-G01 X-9.08947 Y5.35885
-G01 X-9.01291 Y5.36961
-G01 X-8.93578 Y5.36422
-G01 X-8.86146 Y5.34290
 G01 X-8.79319 Y5.30661
+G01 X-8.86146 Y5.34290
+G01 X-8.93578 Y5.36422
+G01 X-9.01291 Y5.36961
+G01 X-9.08947 Y5.35885
+G01 X-9.16212 Y5.33240
+G01 X-9.22769 Y5.29143
+G01 X-9.25799 Y5.26217
+G01 X-9.01712 Y5.06005
+G01 X-9.00549 Y5.06221
+G01 X-8.99357 Y5.06211
+G01 X-8.79039 Y5.30426
 G01 X-8.80549 Y5.30182
 G01 X-8.86522 Y5.33358
 G01 X-8.93752 Y5.35431
@@ -1710,50 +1710,50 @@ G01 X-9.30091 Y5.19375
 G01 X-9.07240 Y5.00200
 G01 X-9.07228 Y4.99582
 G01 X-9.07098 Y4.98542
-G01 X-9.06133 Y4.98803
-G01 X-9.06245 Y4.99895
-G01 X-9.06200 Y5.00633
-G01 X-9.30299 Y5.20855
-G01 X-9.32654 Y5.17363
-G01 X-9.35551 Y5.10194
-G01 X-9.36893 Y5.02580
-G01 X-9.36623 Y4.94853
-G01 X-9.34753 Y4.87351
-G01 X-9.31364 Y4.80402
-G01 X-9.26604 Y4.74309
-G01 X-9.26323 Y4.74074
 G01 X-9.05999 Y4.98296
+G01 X-9.26323 Y4.74074
+G01 X-9.26604 Y4.74309
+G01 X-9.31364 Y4.80402
+G01 X-9.34753 Y4.87351
+G01 X-9.36623 Y4.94853
+G01 X-9.36893 Y5.02580
+G01 X-9.35551 Y5.10194
+G01 X-9.32654 Y5.17363
+G01 X-9.30299 Y5.20855
+G01 X-9.06200 Y5.00633
+G01 X-9.06233 Y4.99686
 G01 X-9.06133 Y4.98803
-G01 X-9.05145 Y4.98960
-G01 X-9.05245 Y5.00105
-G01 X-9.05142 Y5.01051
-G01 X-9.30507 Y5.22335
-G01 X-9.33542 Y5.17835
-G01 X-9.36517 Y5.10471
-G01 X-9.37896 Y5.02650
-G01 X-9.37619 Y4.94713
-G01 X-9.35698 Y4.87007
-G01 X-9.32216 Y4.79869
-G01 X-9.27327 Y4.73611
-G01 X-9.26200 Y4.72665
+G01 X-9.05999 Y4.98296
 G01 X-9.04877 Y4.98077
+G01 X-9.26200 Y4.72665
+G01 X-9.27327 Y4.73611
+G01 X-9.32216 Y4.79869
+G01 X-9.35698 Y4.87007
+G01 X-9.37619 Y4.94713
+G01 X-9.37896 Y5.02650
+G01 X-9.36517 Y5.10471
+G01 X-9.33542 Y5.17835
+G01 X-9.30507 Y5.22335
+G01 X-9.05142 Y5.01051
+G01 X-9.05239 Y4.99791
 G01 X-9.05145 Y4.98960
-G01 X-9.04157 Y4.99116
-G01 X-9.04245 Y5.00105
-G01 X-9.04157 Y5.00884
-G01 X-9.03997 Y5.01395
-G01 X-9.30715 Y5.23815
-G01 X-9.34430 Y5.18307
-G01 X-9.37484 Y5.10748
-G01 X-9.38899 Y5.02720
-G01 X-9.38615 Y4.94573
-G01 X-9.36643 Y4.86663
-G01 X-9.33069 Y4.79336
-G01 X-9.28050 Y4.72912
-G01 X-9.26077 Y4.71256
+G01 X-9.04877 Y4.98077
 G01 X-9.03693 Y4.97932
+G01 X-9.26077 Y4.71256
+G01 X-9.28050 Y4.72912
+G01 X-9.33069 Y4.79336
+G01 X-9.36643 Y4.86663
+G01 X-9.38615 Y4.94573
+G01 X-9.38899 Y5.02720
+G01 X-9.37484 Y5.10748
+G01 X-9.34430 Y5.18307
+G01 X-9.30715 Y5.23815
+G01 X-9.03997 Y5.01395
+G01 X-9.04157 Y5.00884
+G01 X-9.04245 Y4.99895
+G01 X-9.04130 Y4.99015
 G01 X-9.03920 Y4.98369
-G01 X-9.04157 Y4.99116
+G01 X-9.03693 Y4.97932
 G04 P0 ( dwell for no time -- G64 should not smooth over this point )
 G00 Z0.08000 ( retract )