diff --git a/bg_operators.cpp b/bg_operators.cpp index e026f9e82..547604828 100644 --- a/bg_operators.cpp +++ b/bg_operators.cpp @@ -214,7 +214,7 @@ multi_polygon_type_fp reduce(const std::vector& mpolys, multi_polygon_type_fp sum(const std::vector& mpolys) { if (mpolys.size() == 0) { - return multi_polygon_type_fp(); + return {}; } else if (mpolys.size() == 1) { return mpolys[0]; } @@ -228,6 +228,9 @@ multi_polygon_type_fp sum(const std::vector& mpolys) { geos_mpolys_tmp.push_back(to_geos(mpoly)); geos_mpolys.push_back(geos_mpolys_tmp.back().get()); } + if (geos_mpolys.size() == 0) { + return {}; + } try { std::unique_ptr geos_out( geos::operation::geounion::CascadedUnion::Union(&geos_mpolys)); diff --git a/gerberimporter.cpp b/gerberimporter.cpp index 845f755ff..d103f147a 100644 --- a/gerberimporter.cpp +++ b/gerberimporter.cpp @@ -313,12 +313,6 @@ struct mp_pair { filled_closed_lines(filled_closed_lines) {} multi_polygon_type_fp shapes; multi_polygon_type_fp filled_closed_lines; - const mp_pair operator+(const mp_pair& rhs) const { - mp_pair ret; - ret.filled_closed_lines = filled_closed_lines ^ rhs.filled_closed_lines; - ret.shapes = shapes + rhs.shapes; - return ret; - } }; // To speed up the merging, we do them in pairs so that we're mostly merging @@ -360,24 +354,25 @@ multi_polygon_type_fp generate_layers(vectorfirst->stepAndRepeat; mp_pair draw_pair = layer->second; multi_polygon_type_fp draws = draw_pair.*member; - - // First duplicate in the x direction. - auto original_draw = draws; - for (int sr_x = 1; sr_x < stepAndRepeat.X; sr_x++) { - multi_polygon_type_fp translated_draws; - bg::transform(original_draw, translated_draws, - translate(stepAndRepeat.dist_X * sr_x, 0)); - draws = draws + translated_draws; + if (stepAndRepeat.X > 0 || stepAndRepeat.Y > 0) { + vector to_sum{draws}; + + to_sum.reserve(stepAndRepeat.X * stepAndRepeat.Y); + for (int sr_x = 0; sr_x < stepAndRepeat.X; sr_x++) { + for (int sr_y = 0; sr_y < stepAndRepeat.Y; sr_y++) { + if (sr_x == 0 && sr_y == 0) { + continue; // Already got this one. + } + multi_polygon_type_fp translated_draws; + bg::transform(draws, translated_draws, + translate(stepAndRepeat.dist_X * sr_x, + stepAndRepeat.dist_Y * sr_y)); + to_sum.push_back(translated_draws); + } + } + draws = sum(to_sum); } - // Now duplicate in the y direction, with all the x duplicates in there already. - original_draw = draws; - for (int sr_y = 1; sr_y < stepAndRepeat.Y; sr_y++) { - multi_polygon_type_fp translated_draws; - bg::transform(original_draw, translated_draws, - translate(0, stepAndRepeat.dist_Y * sr_y)); - draws = draws + translated_draws; - } if (xor_layers) { output = output ^ draws; } else if (polarity == GERBV_POLARITY_DARK) { @@ -393,12 +388,12 @@ multi_polygon_type_fp generate_layers(vector moire_parts; double crosshair_thickness = parameters[6]; double crosshair_length = parameters[7]; - moire = moire + make_rectangle(center, crosshair_thickness, crosshair_length, 0, 0); - moire = moire + make_rectangle(center, crosshair_length, crosshair_thickness, 0, 0); + moire_parts.push_back(make_rectangle(center, crosshair_thickness, crosshair_length, 0, 0)); + moire_parts.push_back(make_rectangle(center, crosshair_length, crosshair_thickness, 0, 0)); const int max_number_of_rings = parameters[5]; const double outer_ring_diameter = parameters[2]; const double ring_thickness = parameters[3]; @@ -410,10 +405,10 @@ multi_polygon_type_fp make_moire(const double * const parameters, unsigned int c break; if (internal_diameter < 0) internal_diameter = 0; - moire = moire + make_regular_polygon(center, external_diameter, circle_points, 0, - internal_diameter, circle_points); + moire_parts.push_back(make_regular_polygon(center, external_diameter, circle_points, 0, + internal_diameter, circle_points)); } - return moire; + return sum(moire_parts); } multi_polygon_type_fp make_thermal(point_type_fp center, coordinate_type_fp external_diameter, coordinate_type_fp internal_diameter, diff --git a/testing/gerbv_example/am-test-counterclockwise/expected/back.ngc b/testing/gerbv_example/am-test-counterclockwise/expected/back.ngc index e8f73497e..eb5360c9d 100644 --- a/testing/gerbv_example/am-test-counterclockwise/expected/back.ngc +++ b/testing/gerbv_example/am-test-counterclockwise/expected/back.ngc @@ -1146,8 +1146,8 @@ G01 X-8.77768 Y4.54559 G01 X-8.77879 Y4.54505 G01 X-8.87702 Y4.50930 G01 X-8.87822 Y4.50900 -G01 X-8.98173 Y4.49445 -G01 X-8.98296 Y4.49441 +G01 X-8.98173 Y4.49446 +G01 X-8.98296 Y4.49442 G01 X-9.08723 Y4.50171 G01 X-9.08845 Y4.50192 G01 X-9.18893 Y4.53073 @@ -1196,8 +1196,8 @@ G01 X-9.22232 Y5.45441 G01 X-9.22121 Y5.45495 G01 X-9.12298 Y5.49070 G01 X-9.12178 Y5.49100 -G01 X-9.01827 Y5.50555 -G01 X-9.01704 Y5.50559 +G01 X-9.01827 Y5.50554 +G01 X-9.01704 Y5.50558 G01 X-8.91277 Y5.49829 G01 X-8.91155 Y5.49808 G01 X-8.81107 Y5.46927 @@ -1237,12 +1237,12 @@ G01 X-8.61000 Y4.68127 G01 X-8.61074 Y4.67991 G01 X-8.61772 Y4.67171 G01 X-8.61920 Y4.67099 -G01 X-8.69008 Y4.60265 +G01 X-8.68943 Y4.60316 G01 X-8.77946 Y4.54690 G01 X-8.87849 Y4.51095 -G01 X-8.98200 Y4.49640 -G01 X-9.08790 Y4.50382 -G01 X-9.18915 Y4.53293 +G01 X-8.98282 Y4.49638 +G01 X-9.08709 Y4.50367 +G01 X-9.18839 Y4.53263 G01 X-9.28145 Y4.58200 G01 X-9.31547 Y4.61044 G01 X-9.31542 Y4.61067 @@ -1274,8 +1274,8 @@ G01 X-9.38079 Y5.32900 G01 X-9.31056 Y5.39684 G01 X-9.22054 Y5.45310 G01 X-9.12151 Y5.48905 -G01 X-9.01717 Y5.50363 -G01 X-8.91209 Y5.49618 +G01 X-9.01717 Y5.50362 +G01 X-8.91291 Y5.49633 G01 X-8.81161 Y5.46737 G01 X-8.71855 Y5.41800 G01 X-8.68453 Y5.38955 @@ -1313,9 +1313,9 @@ G01 X-8.68299 Y5.38813 G01 X-8.68367 Y5.38777 G01 X-8.68444 Y5.38691 G01 X-8.71947 Y5.41626 -G01 X-8.81216 Y5.46548 +G01 X-8.81178 Y5.46533 G01 X-8.91264 Y5.49429 -G01 X-9.01731 Y5.50166 +G01 X-9.01731 Y5.50165 G01 X-9.12123 Y5.48710 G01 X-9.22023 Y5.45107 G01 X-9.30920 Y5.39543 @@ -1343,10 +1343,10 @@ G01 X-9.31701 Y4.61187 G01 X-9.31633 Y4.61222 G01 X-9.31556 Y4.61308 G01 X-9.28052 Y4.58374 -G01 X-9.18784 Y4.53452 +G01 X-9.18822 Y4.53467 G01 X-9.08736 Y4.50571 -G01 X-8.98269 Y4.49834 -G01 X-8.87876 Y4.51290 +G01 X-8.98269 Y4.49835 +G01 X-8.87877 Y4.51290 G01 X-8.77977 Y4.54893 G01 X-8.69080 Y4.60457 G01 X-8.62013 Y4.67282 diff --git a/testing/gerbv_example/am-test-counterclockwise/expected/outp0_original_back.svg b/testing/gerbv_example/am-test-counterclockwise/expected/outp0_original_back.svg index 0e6a84c49..b9212f5fa 100644 --- a/testing/gerbv_example/am-test-counterclockwise/expected/outp0_original_back.svg +++ b/testing/gerbv_example/am-test-counterclockwise/expected/outp0_original_back.svg @@ -16,9 +16,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-counterclockwise/expected/processed_back.svg b/testing/gerbv_example/am-test-counterclockwise/expected/processed_back.svg index e5527834e..1a39175ff 100644 --- a/testing/gerbv_example/am-test-counterclockwise/expected/processed_back.svg +++ b/testing/gerbv_example/am-test-counterclockwise/expected/processed_back.svg @@ -11,16 +11,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - - - - + + + + + @@ -41,22 +41,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - - @@ -68,9 +68,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-counterclockwise/expected/traced_back.svg b/testing/gerbv_example/am-test-counterclockwise/expected/traced_back.svg index c1a831973..cdc18efe8 100644 --- a/testing/gerbv_example/am-test-counterclockwise/expected/traced_back.svg +++ b/testing/gerbv_example/am-test-counterclockwise/expected/traced_back.svg @@ -27,22 +27,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - - diff --git a/testing/gerbv_example/am-test-extended/expected/back.ngc b/testing/gerbv_example/am-test-extended/expected/back.ngc index fa95d0280..099fdfc3a 100644 --- a/testing/gerbv_example/am-test-extended/expected/back.ngc +++ b/testing/gerbv_example/am-test-extended/expected/back.ngc @@ -544,10 +544,10 @@ G01 X-8.63918 Y4.52119 G01 X-8.72782 Y4.46579 G01 X-8.74661 Y4.45663 G01 X-8.84484 Y4.42088 -G01 X-8.86512 Y4.41582 -G01 X-8.96863 Y4.40127 -G01 X-8.98953 Y4.40054 -G01 X-9.09380 Y4.40784 +G01 X-8.86513 Y4.41582 +G01 X-8.96864 Y4.40128 +G01 X-8.98952 Y4.40055 +G01 X-9.09379 Y4.40784 G01 X-9.11438 Y4.41147 G01 X-9.21486 Y4.44028 G01 X-9.23424 Y4.44811 @@ -583,10 +583,10 @@ G01 X-9.36082 Y5.47881 G01 X-9.27218 Y5.53420 G01 X-9.25339 Y5.54337 G01 X-9.15516 Y5.57912 -G01 X-9.13488 Y5.58418 -G01 X-9.03137 Y5.59873 +G01 X-9.13487 Y5.58418 +G01 X-9.03136 Y5.59872 G01 X-9.01047 Y5.59945 -G01 X-8.90620 Y5.59215 +G01 X-8.90620 Y5.59216 G01 X-8.88562 Y5.58853 G01 X-8.78514 Y5.55972 G01 X-8.76576 Y5.55189 diff --git a/testing/gerbv_example/am-test-extended/expected/outp0_original_back.svg b/testing/gerbv_example/am-test-extended/expected/outp0_original_back.svg index 79fa60842..d1257b056 100644 --- a/testing/gerbv_example/am-test-extended/expected/outp0_original_back.svg +++ b/testing/gerbv_example/am-test-extended/expected/outp0_original_back.svg @@ -16,10 +16,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-extended/expected/processed_back.svg b/testing/gerbv_example/am-test-extended/expected/processed_back.svg index ffa9a3d6f..749a91d50 100644 --- a/testing/gerbv_example/am-test-extended/expected/processed_back.svg +++ b/testing/gerbv_example/am-test-extended/expected/processed_back.svg @@ -11,16 +11,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - - - - + + + + + @@ -42,22 +42,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - - @@ -71,10 +71,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-extended/expected/traced_back.svg b/testing/gerbv_example/am-test-extended/expected/traced_back.svg index efbb8f1a0..73edc048a 100644 --- a/testing/gerbv_example/am-test-extended/expected/traced_back.svg +++ b/testing/gerbv_example/am-test-extended/expected/traced_back.svg @@ -27,22 +27,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - - diff --git a/testing/gerbv_example/am-test-millinfeed/expected/back.ngc b/testing/gerbv_example/am-test-millinfeed/expected/back.ngc index 85b4e5670..84f35b9f9 100644 --- a/testing/gerbv_example/am-test-millinfeed/expected/back.ngc +++ b/testing/gerbv_example/am-test-millinfeed/expected/back.ngc @@ -1510,10 +1510,10 @@ G01 X-8.63918 Y4.52119 G01 X-8.72782 Y4.46579 G01 X-8.74661 Y4.45663 G01 X-8.84484 Y4.42088 -G01 X-8.86512 Y4.41582 -G01 X-8.96863 Y4.40127 -G01 X-8.98953 Y4.40054 -G01 X-9.09380 Y4.40784 +G01 X-8.86513 Y4.41582 +G01 X-8.96864 Y4.40128 +G01 X-8.98952 Y4.40055 +G01 X-9.09379 Y4.40784 G01 X-9.11438 Y4.41147 G01 X-9.21486 Y4.44028 G01 X-9.23424 Y4.44811 @@ -1549,10 +1549,10 @@ G01 X-9.36082 Y5.47881 G01 X-9.27218 Y5.53420 G01 X-9.25339 Y5.54337 G01 X-9.15516 Y5.57912 -G01 X-9.13488 Y5.58418 -G01 X-9.03137 Y5.59873 +G01 X-9.13487 Y5.58418 +G01 X-9.03136 Y5.59872 G01 X-9.01047 Y5.59945 -G01 X-8.90620 Y5.59215 +G01 X-8.90620 Y5.59216 G01 X-8.88562 Y5.58853 G01 X-8.78514 Y5.55972 G01 X-8.76576 Y5.55189 @@ -1593,10 +1593,10 @@ G01 X-8.63918 Y4.52119 G01 X-8.72782 Y4.46579 G01 X-8.74661 Y4.45663 G01 X-8.84484 Y4.42088 -G01 X-8.86512 Y4.41582 -G01 X-8.96863 Y4.40127 -G01 X-8.98953 Y4.40054 -G01 X-9.09380 Y4.40784 +G01 X-8.86513 Y4.41582 +G01 X-8.96864 Y4.40128 +G01 X-8.98952 Y4.40055 +G01 X-9.09379 Y4.40784 G01 X-9.11438 Y4.41147 G01 X-9.21486 Y4.44028 G01 X-9.23424 Y4.44811 @@ -1632,10 +1632,10 @@ G01 X-9.36082 Y5.47881 G01 X-9.27218 Y5.53420 G01 X-9.25339 Y5.54337 G01 X-9.15516 Y5.57912 -G01 X-9.13488 Y5.58418 -G01 X-9.03137 Y5.59873 +G01 X-9.13487 Y5.58418 +G01 X-9.03136 Y5.59872 G01 X-9.01047 Y5.59945 -G01 X-8.90620 Y5.59215 +G01 X-8.90620 Y5.59216 G01 X-8.88562 Y5.58853 G01 X-8.78514 Y5.55972 G01 X-8.76576 Y5.55189 @@ -1676,10 +1676,10 @@ G01 X-8.63918 Y4.52119 G01 X-8.72782 Y4.46579 G01 X-8.74661 Y4.45663 G01 X-8.84484 Y4.42088 -G01 X-8.86512 Y4.41582 -G01 X-8.96863 Y4.40127 -G01 X-8.98953 Y4.40054 -G01 X-9.09380 Y4.40784 +G01 X-8.86513 Y4.41582 +G01 X-8.96864 Y4.40128 +G01 X-8.98952 Y4.40055 +G01 X-9.09379 Y4.40784 G01 X-9.11438 Y4.41147 G01 X-9.21486 Y4.44028 G01 X-9.23424 Y4.44811 @@ -1715,10 +1715,10 @@ G01 X-9.36082 Y5.47881 G01 X-9.27218 Y5.53420 G01 X-9.25339 Y5.54337 G01 X-9.15516 Y5.57912 -G01 X-9.13488 Y5.58418 -G01 X-9.03137 Y5.59873 +G01 X-9.13487 Y5.58418 +G01 X-9.03136 Y5.59872 G01 X-9.01047 Y5.59945 -G01 X-8.90620 Y5.59215 +G01 X-8.90620 Y5.59216 G01 X-8.88562 Y5.58853 G01 X-8.78514 Y5.55972 G01 X-8.76576 Y5.55189 diff --git a/testing/gerbv_example/am-test-millinfeed/expected/outp0_original_back.svg b/testing/gerbv_example/am-test-millinfeed/expected/outp0_original_back.svg index 412b2244e..a5f17a696 100644 --- a/testing/gerbv_example/am-test-millinfeed/expected/outp0_original_back.svg +++ b/testing/gerbv_example/am-test-millinfeed/expected/outp0_original_back.svg @@ -16,9 +16,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-millinfeed/expected/processed_back.svg b/testing/gerbv_example/am-test-millinfeed/expected/processed_back.svg index c98a6cf46..4121d2790 100644 --- a/testing/gerbv_example/am-test-millinfeed/expected/processed_back.svg +++ b/testing/gerbv_example/am-test-millinfeed/expected/processed_back.svg @@ -11,16 +11,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - - - - + + + + + @@ -41,22 +41,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - - @@ -68,9 +68,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-millinfeed/expected/traced_back.svg b/testing/gerbv_example/am-test-millinfeed/expected/traced_back.svg index a64644d2d..20c424a88 100644 --- a/testing/gerbv_example/am-test-millinfeed/expected/traced_back.svg +++ b/testing/gerbv_example/am-test-millinfeed/expected/traced_back.svg @@ -27,22 +27,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - - diff --git a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/back.ngc b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/back.ngc index ea0cdb8d2..8b1a71d27 100644 --- a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/back.ngc +++ b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/back.ngc @@ -472,21 +472,21 @@ G01 X-7.99686 Y2.72467 G01 X-8.08608 Y2.78403 G01 X-8.17263 Y2.84359 G01 X-8.32191 Y2.94812 -G01 X-8.42765 Y3.02401 -G01 X-8.52793 Y3.09976 -G01 X-8.57599 Y3.13754 -G01 X-8.62306 Y3.17558 -G01 X-8.66850 Y3.21337 -G01 X-8.71279 Y3.25130 -G01 X-8.83325 Y3.35602 -G01 X-8.89353 Y3.40969 -G01 X-8.95116 Y3.46361 -G01 X-9.00616 Y3.51784 -G01 X-9.05782 Y3.57167 -G01 X-9.15540 Y3.67632 -G01 X-9.19124 Y3.71570 -G01 X-9.22582 Y3.75566 -G01 X-9.25814 Y3.79504 +G01 X-8.42769 Y3.02404 +G01 X-8.52801 Y3.09982 +G01 X-8.57609 Y3.13762 +G01 X-8.62317 Y3.17568 +G01 X-8.66879 Y3.21362 +G01 X-8.71293 Y3.25142 +G01 X-8.83324 Y3.35601 +G01 X-8.89387 Y3.41001 +G01 X-8.95117 Y3.46363 +G01 X-9.00612 Y3.51781 +G01 X-9.05774 Y3.57159 +G01 X-9.15533 Y3.67624 +G01 X-9.19119 Y3.71564 +G01 X-9.22580 Y3.75563 +G01 X-9.25813 Y3.79504 G01 X-9.28896 Y3.83475 G01 X-9.36785 Y3.93944 G01 X-9.39006 Y3.96968 @@ -820,34 +820,34 @@ G01 X-7.99132 Y2.73300 G01 X-8.08054 Y2.79236 G01 X-8.16690 Y2.85178 G01 X-8.31622 Y2.95635 -G01 X-8.42153 Y3.03192 -G01 X-8.52175 Y3.10762 -G01 X-8.56986 Y3.14544 -G01 X-8.61661 Y3.18323 -G01 X-8.66216 Y3.22110 -G01 X-8.70631 Y3.25892 -G01 X-8.82656 Y3.36345 -G01 X-8.88688 Y3.41716 -G01 X-8.94433 Y3.47091 -G01 X-8.99895 Y3.52477 -G01 X-9.05046 Y3.57844 -G01 X-9.14801 Y3.68305 -G01 X-9.18393 Y3.72253 -G01 X-9.21809 Y3.76201 -G01 X-9.25041 Y3.80139 +G01 X-8.42156 Y3.03195 +G01 X-8.52183 Y3.10768 +G01 X-8.56996 Y3.14552 +G01 X-8.61678 Y3.18336 +G01 X-8.66223 Y3.22117 +G01 X-8.70645 Y3.25904 +G01 X-8.82668 Y3.36356 +G01 X-8.88704 Y3.41731 +G01 X-8.94443 Y3.47102 +G01 X-8.99891 Y3.52474 +G01 X-9.05043 Y3.57841 +G01 X-9.14790 Y3.68293 +G01 X-9.18388 Y3.72247 +G01 X-9.21798 Y3.76187 +G01 X-9.25039 Y3.80138 G01 X-9.28110 Y3.84094 G01 X-9.35986 Y3.94546 -G01 X-9.38178 Y3.97529 -G01 X-9.40266 Y4.00528 -G01 X-9.42233 Y4.03517 +G01 X-9.38185 Y3.97539 +G01 X-9.40258 Y4.00517 +G01 X-9.42226 Y4.03506 G01 X-9.44083 Y4.06501 -G01 X-9.50371 Y4.16965 -G01 X-9.52994 Y4.21590 -G01 X-9.57643 Y4.30864 -G01 X-9.58116 Y4.31878 +G01 X-9.50365 Y4.16954 +G01 X-9.52982 Y4.21567 +G01 X-9.57637 Y4.30852 +G01 X-9.58110 Y4.31864 G01 X-9.60100 Y4.36491 -G01 X-9.61833 Y4.40454 -G01 X-9.63229 Y4.44176 +G01 X-9.61823 Y4.40430 +G01 X-9.63224 Y4.44163 G01 X-9.66828 Y4.54629 G01 X-9.67812 Y4.57747 G01 X-9.68614 Y4.60842 @@ -1537,16 +1537,16 @@ G01 X-8.75384 Y5.85951 G01 X-8.78321 Y5.85485 G01 X-8.81226 Y5.85130 G01 X-8.84552 Y5.84781 -G01 X-8.88951 Y5.84281 +G01 X-8.88954 Y5.84281 G01 X-8.91944 Y5.84007 G01 X-8.92616 Y5.83960 -G01 X-8.96014 Y5.83809 -G01 X-8.99401 Y5.83829 -G01 X-9.07386 Y5.84009 +G01 X-8.96016 Y5.83808 +G01 X-8.99403 Y5.83828 +G01 X-9.07387 Y5.84009 G01 X-9.08067 Y5.84032 G01 X-9.11761 Y5.84259 -G01 X-9.15483 Y5.84685 -G01 X-9.17069 Y5.84912 +G01 X-9.15483 Y5.84684 +G01 X-9.17065 Y5.84912 G01 X-9.25554 Y5.86201 G01 X-9.30403 Y5.87030 G01 X-9.35355 Y5.88140 @@ -1688,17 +1688,17 @@ G01 X-9.37289 Y5.89663 G01 X-9.35125 Y5.89113 G01 X-9.30209 Y5.88011 G01 X-9.25397 Y5.87189 -G01 X-9.16921 Y5.85902 -G01 X-9.15357 Y5.85677 +G01 X-9.16918 Y5.85901 +G01 X-9.15356 Y5.85676 G01 X-9.11674 Y5.85256 G01 X-9.08019 Y5.85031 -G01 X-9.07355 Y5.85008 -G01 X-8.99385 Y5.84829 -G01 X-8.96033 Y5.84809 +G01 X-9.07356 Y5.85008 +G01 X-8.99384 Y5.84828 +G01 X-8.96035 Y5.84808 G01 X-8.92673 Y5.84959 G01 X-8.92025 Y5.85004 -G01 X-8.89053 Y5.85276 -G01 X-8.84665 Y5.85774 +G01 X-8.89056 Y5.85276 +G01 X-8.84658 Y5.85775 G01 X-8.81339 Y5.86123 G01 X-8.78460 Y5.86475 G01 X-8.75549 Y5.86937 @@ -2487,16 +2487,16 @@ G01 X-8.75039 Y5.83981 G01 X-8.78069 Y5.83501 G01 X-8.80988 Y5.83144 G01 X-8.84330 Y5.82793 -G01 X-8.88731 Y5.82294 +G01 X-8.88734 Y5.82294 G01 X-8.91767 Y5.82015 G01 X-8.92520 Y5.81962 -G01 X-8.96013 Y5.81809 -G01 X-8.99452 Y5.81829 -G01 X-9.07443 Y5.82010 +G01 X-8.96015 Y5.81808 +G01 X-8.99461 Y5.81829 +G01 X-9.07446 Y5.82010 G01 X-9.08183 Y5.82036 G01 X-9.11897 Y5.82264 -G01 X-9.15754 Y5.82703 -G01 X-9.17369 Y5.82935 +G01 X-9.15716 Y5.82698 +G01 X-9.17365 Y5.82934 G01 X-9.25848 Y5.84223 G01 X-9.30828 Y5.85075 G01 X-9.35798 Y5.86189 @@ -2545,21 +2545,21 @@ G01 X-9.38606 Y4.01644 G01 X-9.36555 Y3.98698 G01 X-9.34384 Y3.95742 G01 X-9.26519 Y3.85306 -G01 X-9.23482 Y3.81392 -G01 X-9.20276 Y3.77485 -G01 X-9.16893 Y3.73576 -G01 X-9.13328 Y3.69658 -G01 X-9.03595 Y3.59221 -G01 X-8.98466 Y3.53877 -G01 X-8.93052 Y3.48538 -G01 X-8.87345 Y3.43197 -G01 X-8.81337 Y3.37848 -G01 X-8.69323 Y3.27405 -G01 X-8.64923 Y3.23636 -G01 X-8.60396 Y3.19872 -G01 X-8.55737 Y3.16106 -G01 X-8.50950 Y3.12343 -G01 X-8.40972 Y3.04806 +G01 X-9.23480 Y3.81391 +G01 X-9.20273 Y3.77481 +G01 X-9.16888 Y3.73570 +G01 X-9.13321 Y3.69650 +G01 X-9.03587 Y3.59213 +G01 X-8.98462 Y3.53874 +G01 X-8.93053 Y3.48540 +G01 X-8.87350 Y3.43204 +G01 X-8.81349 Y3.37859 +G01 X-8.69337 Y3.27417 +G01 X-8.64935 Y3.23647 +G01 X-8.60407 Y3.19881 +G01 X-8.55747 Y3.16114 +G01 X-8.50958 Y3.12349 +G01 X-8.40976 Y3.04809 G01 X-8.30463 Y2.97265 G01 X-8.15548 Y2.86820 G01 X-8.06936 Y2.80894 @@ -2572,21 +2572,21 @@ G01 X-7.98581 Y2.74134 G01 X-8.07497 Y2.80066 G01 X-8.16118 Y2.85999 G01 X-8.31042 Y2.96449 -G01 X-8.41564 Y3.04001 -G01 X-8.51561 Y3.11551 -G01 X-8.56360 Y3.15324 -G01 X-8.61030 Y3.19099 -G01 X-8.65569 Y3.22872 -G01 X-8.69976 Y3.26647 -G01 X-8.81998 Y3.37097 -G01 X-8.88019 Y3.42458 -G01 X-8.93745 Y3.47817 -G01 X-8.99178 Y3.53174 -G01 X-9.04322 Y3.58534 -G01 X-9.14063 Y3.68981 -G01 X-9.17641 Y3.72912 -G01 X-9.21041 Y3.76840 -G01 X-9.24264 Y3.80768 +G01 X-8.41568 Y3.04004 +G01 X-8.51569 Y3.11557 +G01 X-8.56370 Y3.15332 +G01 X-8.61041 Y3.19108 +G01 X-8.65581 Y3.22883 +G01 X-8.69990 Y3.26660 +G01 X-8.82010 Y3.37108 +G01 X-8.88025 Y3.42465 +G01 X-8.93745 Y3.47819 +G01 X-8.99174 Y3.53171 +G01 X-9.04314 Y3.58526 +G01 X-9.14056 Y3.68973 +G01 X-9.17636 Y3.72906 +G01 X-9.21038 Y3.76836 +G01 X-9.24262 Y3.80767 G01 X-9.27314 Y3.84699 G01 X-9.35186 Y3.95145 G01 X-9.37368 Y3.98116 @@ -2635,16 +2635,16 @@ G01 X-9.36386 Y5.87366 G01 X-9.35579 Y5.87165 G01 X-9.30609 Y5.86051 G01 X-9.25716 Y5.85214 -G01 X-9.17215 Y5.83923 -G01 X-9.15603 Y5.83692 +G01 X-9.17211 Y5.83922 +G01 X-9.15603 Y5.83691 G01 X-9.11836 Y5.83262 G01 X-9.08122 Y5.83034 -G01 X-9.07416 Y5.83009 -G01 X-8.99424 Y5.82829 -G01 X-8.96007 Y5.82809 +G01 X-9.07417 Y5.83009 +G01 X-8.99429 Y5.82828 +G01 X-8.96009 Y5.82808 G01 X-8.92565 Y5.82961 G01 X-8.91858 Y5.83011 -G01 X-8.88843 Y5.83287 +G01 X-8.88847 Y5.83287 G01 X-8.84441 Y5.83787 G01 X-8.81109 Y5.84137 G01 X-8.78190 Y5.84494 diff --git a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/outp0_original_back.svg b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/outp0_original_back.svg index f1addf709..41276c053 100644 --- a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/outp0_original_back.svg +++ b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/outp0_original_back.svg @@ -15,6 +15,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + diff --git a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/processed_back.svg b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/processed_back.svg index 2321f3b5a..8abf121e2 100644 --- a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/processed_back.svg +++ b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/processed_back.svg @@ -11,12 +11,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - + + @@ -27,22 +27,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + - - - - - - - + + + + + + + @@ -55,6 +55,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + diff --git a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/traced_back.svg b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/traced_back.svg index db6227d40..54b5e1da9 100644 --- a/testing/gerbv_example/am-test-voronoi-extra-passes/expected/traced_back.svg +++ b/testing/gerbv_example/am-test-voronoi-extra-passes/expected/traced_back.svg @@ -17,22 +17,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + - - - - - - - + + + + + + + diff --git a/testing/gerbv_example/am-test-voronoi-front/expected/front.ngc b/testing/gerbv_example/am-test-voronoi-front/expected/front.ngc index 11932229b..db626196c 100644 --- a/testing/gerbv_example/am-test-voronoi-front/expected/front.ngc +++ b/testing/gerbv_example/am-test-voronoi-front/expected/front.ngc @@ -261,21 +261,21 @@ G01 X9.39848 Y4.00803 G01 X9.37775 Y3.97825 G01 X9.35587 Y3.94847 G01 X9.27711 Y3.84395 -G01 X9.24655 Y3.80456 -G01 X9.21423 Y3.76518 -G01 X9.18015 Y3.72580 -G01 X9.14431 Y3.68642 -G01 X9.04685 Y3.58189 -G01 X8.99534 Y3.52823 -G01 X8.94091 Y3.47456 -G01 X8.88356 Y3.42089 -G01 X8.82328 Y3.36722 -G01 X8.70303 Y3.26269 -G01 X8.65891 Y3.22490 -G01 X8.61347 Y3.18712 -G01 X8.56672 Y3.14933 -G01 X8.51866 Y3.11155 -G01 X8.41861 Y3.03598 +G01 X9.24653 Y3.80455 +G01 X9.21420 Y3.76514 +G01 X9.18010 Y3.72574 +G01 X9.14424 Y3.68634 +G01 X9.04677 Y3.58182 +G01 X8.99530 Y3.52820 +G01 X8.94092 Y3.47458 +G01 X8.88362 Y3.42096 +G01 X8.82340 Y3.36733 +G01 X8.70317 Y3.26281 +G01 X8.65903 Y3.22501 +G01 X8.61358 Y3.18721 +G01 X8.56682 Y3.14941 +G01 X8.51874 Y3.11161 +G01 X8.41865 Y3.03601 G01 X8.31331 Y2.96041 G01 X8.16403 Y2.85588 G01 X8.07777 Y2.79652 @@ -675,14 +675,14 @@ G01 X8.75679 Y5.60103 G01 X8.77781 Y5.59983 G01 X8.80762 Y5.59902 G01 X8.88205 Y5.60097 -G01 X8.90562 Y5.60037 +G01 X8.90563 Y5.60037 G01 X8.91504 Y5.59963 G01 X8.93724 Y5.59904 -G01 X9.01036 Y5.60096 -G01 X9.03161 Y5.60040 -G01 X9.04179 Y5.59960 -G01 X9.06358 Y5.59904 -G01 X9.13724 Y5.60097 +G01 X9.01037 Y5.60095 +G01 X9.03160 Y5.60040 +G01 X9.04179 Y5.59959 +G01 X9.06358 Y5.59903 +G01 X9.13723 Y5.60097 G01 X9.16286 Y5.60028 G01 X9.16993 Y5.59972 G01 X9.19834 Y5.59901 diff --git a/testing/gerbv_example/am-test-voronoi-front/expected/outp0_original_front.svg b/testing/gerbv_example/am-test-voronoi-front/expected/outp0_original_front.svg index 412b2244e..a5f17a696 100644 --- a/testing/gerbv_example/am-test-voronoi-front/expected/outp0_original_front.svg +++ b/testing/gerbv_example/am-test-voronoi-front/expected/outp0_original_front.svg @@ -16,9 +16,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-voronoi-front/expected/processed_front.svg b/testing/gerbv_example/am-test-voronoi-front/expected/processed_front.svg index 06897c7b0..a0ae7593b 100644 --- a/testing/gerbv_example/am-test-voronoi-front/expected/processed_front.svg +++ b/testing/gerbv_example/am-test-voronoi-front/expected/processed_front.svg @@ -11,16 +11,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - - - - + + + + + @@ -31,8 +31,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + @@ -41,20 +41,20 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + - + - + - - - - - + + + + + + + @@ -68,9 +68,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-voronoi-front/expected/traced_front.svg b/testing/gerbv_example/am-test-voronoi-front/expected/traced_front.svg index d37617222..7289cd73b 100644 --- a/testing/gerbv_example/am-test-voronoi-front/expected/traced_front.svg +++ b/testing/gerbv_example/am-test-voronoi-front/expected/traced_front.svg @@ -17,8 +17,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + @@ -27,20 +27,20 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + - + - + - - - - - + + + + + + + diff --git a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/back.ngc b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/back.ngc index edb9c618c..109bda3dc 100644 --- a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/back.ngc +++ b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/back.ngc @@ -593,22 +593,22 @@ G01 X-9.45984 Y4.01032 G01 X-9.43952 Y3.97946 G01 X-9.41879 Y3.94968 G01 X-9.39580 Y3.91838 -G01 X-9.31661 Y3.81330 -G01 X-9.28520 Y3.77284 -G01 X-9.25204 Y3.73246 -G01 X-9.21713 Y3.69215 -G01 X-9.18129 Y3.65277 -G01 X-9.08342 Y3.54780 -G01 X-9.03045 Y3.49263 -G01 X-8.97602 Y3.43896 -G01 X-8.91772 Y3.38438 -G01 X-8.85608 Y3.32948 -G01 X-8.73556 Y3.22472 -G01 X-8.69144 Y3.18693 -G01 X-8.64544 Y3.14867 -G01 X-8.59762 Y3.11002 -G01 X-8.54880 Y3.07165 -G01 X-8.44776 Y2.99536 +G01 X-9.31661 Y3.81329 +G01 X-9.28519 Y3.77284 +G01 X-9.25201 Y3.73242 +G01 X-9.21708 Y3.69208 +G01 X-9.18122 Y3.65268 +G01 X-9.08334 Y3.54772 +G01 X-9.03041 Y3.49260 +G01 X-8.97602 Y3.43898 +G01 X-8.91687 Y3.38362 +G01 X-8.85665 Y3.32999 +G01 X-8.73569 Y3.22483 +G01 X-8.69100 Y3.18657 +G01 X-8.64555 Y3.14877 +G01 X-8.59825 Y3.11053 +G01 X-8.54888 Y3.07171 +G01 X-8.44780 Y2.99539 G01 X-8.34199 Y2.91945 G01 X-8.19271 Y2.81492 G01 X-8.10547 Y2.75489 @@ -883,22 +883,22 @@ G01 X-8.04269 Y2.65308 G01 X-8.13316 Y2.71326 G01 X-8.22072 Y2.77350 G01 X-8.37067 Y2.87850 -G01 X-8.47691 Y2.95474 -G01 X-8.57893 Y3.03175 -G01 X-8.62852 Y3.07071 -G01 X-8.67740 Y3.11022 -G01 X-8.72284 Y3.14800 -G01 X-8.76808 Y3.18674 -G01 X-8.88889 Y3.29175 -G01 X-8.95189 Y3.34788 -G01 X-9.01112 Y3.40335 -G01 X-9.06555 Y3.45702 -G01 X-9.11999 Y3.51370 -G01 X-9.21827 Y3.61911 -G01 X-9.25411 Y3.65849 -G01 X-9.28984 Y3.69974 -G01 X-9.32385 Y3.74112 -G01 X-9.35612 Y3.78265 +G01 X-8.47696 Y2.95477 +G01 X-8.57901 Y3.03181 +G01 X-8.62862 Y3.07080 +G01 X-8.67752 Y3.11033 +G01 X-8.72297 Y3.14812 +G01 X-8.76821 Y3.18685 +G01 X-8.88901 Y3.29186 +G01 X-8.95195 Y3.34794 +G01 X-9.01113 Y3.40337 +G01 X-9.06744 Y3.45895 +G01 X-9.11990 Y3.51362 +G01 X-9.21819 Y3.61903 +G01 X-9.25405 Y3.65843 +G01 X-9.28981 Y3.69970 +G01 X-9.32384 Y3.74112 +G01 X-9.35611 Y3.78264 G01 X-9.43573 Y3.88829 G01 X-9.45982 Y3.92112 G01 X-9.48055 Y3.95090 @@ -1520,16 +1520,16 @@ G01 X-8.75494 Y5.90502 G01 X-8.76129 Y5.90388 G01 X-8.78946 Y5.89941 G01 X-8.81732 Y5.89602 -G01 X-8.85036 Y5.89255 -G01 X-8.89410 Y5.88758 -G01 X-8.92873 Y5.88452 -G01 X-8.96100 Y5.88308 -G01 X-8.99325 Y5.88328 -G01 X-9.07246 Y5.88507 +G01 X-8.85060 Y5.89252 +G01 X-8.89413 Y5.88758 +G01 X-8.92874 Y5.88452 +G01 X-8.96103 Y5.88307 +G01 X-8.99317 Y5.88328 +G01 X-9.07245 Y5.88506 G01 X-9.07851 Y5.88528 -G01 X-9.11368 Y5.88741 -G01 X-9.14915 Y5.89149 -G01 X-9.16405 Y5.89363 +G01 X-9.11368 Y5.88742 +G01 X-9.14912 Y5.89148 +G01 X-9.16402 Y5.89362 G01 X-9.24850 Y5.90646 G01 X-9.29532 Y5.91444 G01 X-9.34319 Y5.92519 @@ -1629,15 +1629,15 @@ G01 X-8.76431 Y5.95413 G01 X-8.79642 Y5.94893 G01 X-8.82294 Y5.94570 G01 X-8.85576 Y5.94226 -G01 X-8.89920 Y5.93732 -G01 X-8.93160 Y5.93444 -G01 X-8.96197 Y5.93308 -G01 X-8.99241 Y5.93328 -G01 X-9.07090 Y5.93504 -G01 X-9.07611 Y5.93521 -G01 X-9.10930 Y5.93724 -G01 X-9.14284 Y5.94110 -G01 X-9.15667 Y5.94308 +G01 X-8.89923 Y5.93732 +G01 X-8.93161 Y5.93444 +G01 X-8.96200 Y5.93307 +G01 X-8.99222 Y5.93327 +G01 X-9.06206 Y5.93479 +G01 X-9.07610 Y5.93521 +G01 X-9.10931 Y5.93724 +G01 X-9.14278 Y5.94108 +G01 X-9.15665 Y5.94308 G01 X-9.24068 Y5.95585 G01 X-9.28563 Y5.96351 G01 X-9.33168 Y5.97385 @@ -2250,31 +2250,31 @@ G01 X-8.34994 Y5.81726 G01 X-8.33734 Y5.85994 G01 X-8.29746 Y5.90087 G01 X-8.33734 Y5.85994 -G01 X-8.41731 Y5.83407 +G01 X-8.41571 Y5.83458 G01 X-8.46918 Y5.81824 -G01 X-8.47992 Y5.81515 +G01 X-8.48126 Y5.81478 G01 X-8.52054 Y5.80412 -G01 X-8.56190 Y5.79413 +G01 X-8.56338 Y5.79379 G01 X-8.61631 Y5.78191 G01 X-8.67475 Y5.76836 G01 X-8.72551 Y5.75793 -G01 X-8.73734 Y5.75582 -G01 X-8.77037 Y5.75064 -G01 X-8.80136 Y5.74686 +G01 X-8.73556 Y5.75611 +G01 X-8.76684 Y5.75113 +G01 X-8.79956 Y5.74707 G01 X-8.83392 Y5.74345 -G01 X-8.87988 Y5.73826 -G01 X-8.90992 Y5.73551 -G01 X-8.91886 Y5.73486 -G01 X-8.95560 Y5.73319 -G01 X-8.96063 Y5.73309 -G01 X-8.99690 Y5.73333 -G01 X-9.07677 Y5.73513 +G01 X-8.87776 Y5.73848 +G01 X-8.90991 Y5.73551 +G01 X-8.92140 Y5.73471 +G01 X-8.95559 Y5.73318 +G01 X-8.96065 Y5.73308 +G01 X-8.99472 Y5.73328 +G01 X-9.06737 Y5.73486 G01 X-9.08704 Y5.73552 G01 X-9.12418 Y5.73780 -G01 X-9.12942 Y5.73826 -G01 X-9.16683 Y5.74254 -G01 X-9.18650 Y5.74532 -G01 X-9.27317 Y5.75850 +G01 X-9.12939 Y5.73825 +G01 X-9.16680 Y5.74252 +G01 X-9.18647 Y5.74531 +G01 X-9.27074 Y5.75812 G01 X-9.32185 Y5.76682 G01 X-9.32687 Y5.76781 G01 X-9.37657 Y5.77895 @@ -2320,22 +2320,22 @@ G01 X-9.33380 Y4.09165 G01 X-9.31566 Y4.06409 G01 X-9.29641 Y4.03643 G01 X-9.27564 Y4.00817 -G01 X-9.19767 Y3.90469 -G01 X-9.16838 Y3.86694 -G01 X-9.13776 Y3.82963 -G01 X-9.10535 Y3.79218 -G01 X-9.07076 Y3.75418 -G01 X-8.97420 Y3.65062 -G01 X-8.92415 Y3.59847 -G01 X-8.87163 Y3.54668 -G01 X-8.81614 Y3.49475 -G01 X-8.75723 Y3.44230 -G01 X-8.63770 Y3.33840 -G01 X-8.59441 Y3.30132 -G01 X-8.55007 Y3.26445 -G01 X-8.50438 Y3.22753 -G01 X-8.45762 Y3.19076 -G01 X-8.35931 Y3.11651 +G01 X-9.19768 Y3.90470 +G01 X-9.16836 Y3.86693 +G01 X-9.13772 Y3.82958 +G01 X-9.10530 Y3.79213 +G01 X-9.07069 Y3.75410 +G01 X-8.97413 Y3.65055 +G01 X-8.92411 Y3.59844 +G01 X-8.87164 Y3.54670 +G01 X-8.81619 Y3.49482 +G01 X-8.75734 Y3.44241 +G01 X-8.63784 Y3.33852 +G01 X-8.59453 Y3.30143 +G01 X-8.55017 Y3.26454 +G01 X-8.50448 Y3.22760 +G01 X-8.45769 Y3.19082 +G01 X-8.35935 Y3.11654 G01 X-8.25548 Y3.04199 G01 X-8.10700 Y2.93803 G01 X-8.02172 Y2.87934 @@ -3523,16 +3523,16 @@ G01 X-8.74517 Y5.80520 G01 X-8.77644 Y5.80027 G01 X-8.80653 Y5.79660 G01 X-8.83944 Y5.79314 -G01 X-8.88444 Y5.78805 +G01 X-8.88447 Y5.78805 G01 X-8.91448 Y5.78530 G01 X-8.92236 Y5.78473 -G01 X-8.95782 Y5.78314 -G01 X-8.99439 Y5.78329 -G01 X-9.06593 Y5.78485 +G01 X-8.95782 Y5.78313 +G01 X-8.99442 Y5.78328 +G01 X-9.06558 Y5.78483 G01 X-9.08397 Y5.78542 -G01 X-9.12111 Y5.78770 -G01 X-9.16114 Y5.79221 -G01 X-9.17865 Y5.79470 +G01 X-9.12372 Y5.78793 +G01 X-9.16113 Y5.79220 +G01 X-9.17893 Y5.79474 G01 X-9.26353 Y5.80759 G01 X-9.31342 Y5.81610 G01 X-9.36563 Y5.82774 @@ -3581,21 +3581,21 @@ G01 X-9.35707 Y4.03606 G01 X-9.33708 Y4.00734 G01 X-9.31575 Y3.97832 G01 X-9.23739 Y3.87432 -G01 X-9.20746 Y3.83575 -G01 X-9.17599 Y3.79740 -G01 X-9.14275 Y3.75899 -G01 X-9.10754 Y3.72030 -G01 X-9.01053 Y3.61626 -G01 X-8.95974 Y3.56335 -G01 X-8.90627 Y3.51062 -G01 X-8.84985 Y3.45782 -G01 X-8.79025 Y3.40476 -G01 X-8.67037 Y3.30055 -G01 X-8.62666 Y3.26311 -G01 X-8.58177 Y3.22579 -G01 X-8.53555 Y3.18843 -G01 X-8.48814 Y3.15116 -G01 X-8.38896 Y3.07625 +G01 X-9.20744 Y3.83574 +G01 X-9.17596 Y3.79736 +G01 X-9.14270 Y3.75893 +G01 X-9.10747 Y3.72022 +G01 X-9.01045 Y3.61618 +G01 X-8.95970 Y3.56332 +G01 X-8.90628 Y3.51064 +G01 X-8.84991 Y3.45789 +G01 X-8.79037 Y3.40487 +G01 X-8.67051 Y3.30067 +G01 X-8.62678 Y3.26322 +G01 X-8.58188 Y3.22587 +G01 X-8.53565 Y3.18851 +G01 X-8.48822 Y3.15122 +G01 X-8.38900 Y3.07627 G01 X-8.28439 Y3.00120 G01 X-8.13552 Y2.89695 G01 X-8.04975 Y2.83793 @@ -3606,21 +3606,21 @@ G01 X-7.98855 Y2.73716 G01 X-8.07777 Y2.79652 G01 X-8.16403 Y2.85588 G01 X-8.31331 Y2.96041 -G01 X-8.41861 Y3.03598 -G01 X-8.51866 Y3.11155 -G01 X-8.56672 Y3.14933 -G01 X-8.61347 Y3.18712 -G01 X-8.65891 Y3.22490 -G01 X-8.70303 Y3.26269 -G01 X-8.82328 Y3.36722 -G01 X-8.88356 Y3.42089 -G01 X-8.94091 Y3.47456 -G01 X-8.99534 Y3.52823 -G01 X-9.04685 Y3.58189 -G01 X-9.14431 Y3.68642 -G01 X-9.18015 Y3.72580 -G01 X-9.21423 Y3.76518 -G01 X-9.24655 Y3.80456 +G01 X-8.41865 Y3.03601 +G01 X-8.51874 Y3.11161 +G01 X-8.56682 Y3.14941 +G01 X-8.61358 Y3.18721 +G01 X-8.65903 Y3.22501 +G01 X-8.70317 Y3.26281 +G01 X-8.82340 Y3.36733 +G01 X-8.88362 Y3.42096 +G01 X-8.94092 Y3.47458 +G01 X-8.99530 Y3.52820 +G01 X-9.04677 Y3.58182 +G01 X-9.14424 Y3.68634 +G01 X-9.18010 Y3.72574 +G01 X-9.21420 Y3.76514 +G01 X-9.24653 Y3.80455 G01 X-9.27711 Y3.84395 G01 X-9.35587 Y3.94847 G01 X-9.37775 Y3.97825 @@ -3751,16 +3751,16 @@ G01 X-8.75301 Y5.85458 G01 X-8.78251 Y5.84990 G01 X-8.81170 Y5.84633 G01 X-8.84496 Y5.84284 -G01 X-8.88899 Y5.83784 +G01 X-8.88903 Y5.83784 G01 X-8.91903 Y5.83509 G01 X-8.92587 Y5.83461 -G01 X-8.96004 Y5.83309 -G01 X-8.99409 Y5.83329 -G01 X-9.07402 Y5.83509 +G01 X-8.96006 Y5.83308 +G01 X-8.99413 Y5.83328 +G01 X-9.07403 Y5.83509 G01 X-9.08091 Y5.83533 G01 X-9.11805 Y5.83761 -G01 X-9.15546 Y5.84189 -G01 X-9.17143 Y5.84418 +G01 X-9.15546 Y5.84188 +G01 X-9.17139 Y5.84417 G01 X-9.25632 Y5.85707 G01 X-9.30499 Y5.86539 G01 X-9.35470 Y5.87653 diff --git a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/outp0_original_back.svg b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/outp0_original_back.svg index 371e418fe..b2d5eb82b 100644 --- a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/outp0_original_back.svg +++ b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/outp0_original_back.svg @@ -15,6 +15,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + diff --git a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/processed_back.svg b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/processed_back.svg index 836bc2f1f..4731f2810 100644 --- a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/processed_back.svg +++ b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/processed_back.svg @@ -11,12 +11,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - + + @@ -27,22 +27,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + - - - - - - - + + + + + + + @@ -55,6 +55,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + diff --git a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/traced_back.svg b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/traced_back.svg index 48a440d4a..8717dc2a4 100644 --- a/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/traced_back.svg +++ b/testing/gerbv_example/am-test-voronoi-wide-extra-passes/expected/traced_back.svg @@ -17,22 +17,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + - - - - - - - + + + + + + + diff --git a/testing/gerbv_example/am-test-voronoi/expected/back.ngc b/testing/gerbv_example/am-test-voronoi/expected/back.ngc index 7ce9168f8..3f5b4bc4b 100644 --- a/testing/gerbv_example/am-test-voronoi/expected/back.ngc +++ b/testing/gerbv_example/am-test-voronoi/expected/back.ngc @@ -261,21 +261,21 @@ G01 X-9.39848 Y4.00803 G01 X-9.37775 Y3.97825 G01 X-9.35587 Y3.94847 G01 X-9.27711 Y3.84395 -G01 X-9.24655 Y3.80456 -G01 X-9.21423 Y3.76518 -G01 X-9.18015 Y3.72580 -G01 X-9.14431 Y3.68642 -G01 X-9.04685 Y3.58189 -G01 X-8.99534 Y3.52823 -G01 X-8.94091 Y3.47456 -G01 X-8.88356 Y3.42089 -G01 X-8.82328 Y3.36722 -G01 X-8.70303 Y3.26269 -G01 X-8.65891 Y3.22490 -G01 X-8.61347 Y3.18712 -G01 X-8.56672 Y3.14933 -G01 X-8.51866 Y3.11155 -G01 X-8.41861 Y3.03598 +G01 X-9.24653 Y3.80455 +G01 X-9.21420 Y3.76514 +G01 X-9.18010 Y3.72574 +G01 X-9.14424 Y3.68634 +G01 X-9.04677 Y3.58182 +G01 X-8.99530 Y3.52820 +G01 X-8.94092 Y3.47458 +G01 X-8.88362 Y3.42096 +G01 X-8.82340 Y3.36733 +G01 X-8.70317 Y3.26281 +G01 X-8.65903 Y3.22501 +G01 X-8.61358 Y3.18721 +G01 X-8.56682 Y3.14941 +G01 X-8.51874 Y3.11161 +G01 X-8.41865 Y3.03601 G01 X-8.31331 Y2.96041 G01 X-8.16403 Y2.85588 G01 X-8.07777 Y2.79652 @@ -675,14 +675,14 @@ G01 X-8.75679 Y5.60103 G01 X-8.77781 Y5.59983 G01 X-8.80762 Y5.59902 G01 X-8.88205 Y5.60097 -G01 X-8.90562 Y5.60037 +G01 X-8.90563 Y5.60037 G01 X-8.91504 Y5.59963 G01 X-8.93724 Y5.59904 -G01 X-9.01036 Y5.60096 -G01 X-9.03161 Y5.60040 -G01 X-9.04179 Y5.59960 -G01 X-9.06358 Y5.59904 -G01 X-9.13724 Y5.60097 +G01 X-9.01037 Y5.60095 +G01 X-9.03160 Y5.60040 +G01 X-9.04179 Y5.59959 +G01 X-9.06358 Y5.59903 +G01 X-9.13723 Y5.60097 G01 X-9.16286 Y5.60028 G01 X-9.16993 Y5.59972 G01 X-9.19834 Y5.59901 diff --git a/testing/gerbv_example/am-test-voronoi/expected/outp0_original_back.svg b/testing/gerbv_example/am-test-voronoi/expected/outp0_original_back.svg index 412b2244e..a5f17a696 100644 --- a/testing/gerbv_example/am-test-voronoi/expected/outp0_original_back.svg +++ b/testing/gerbv_example/am-test-voronoi/expected/outp0_original_back.svg @@ -16,9 +16,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-voronoi/expected/processed_back.svg b/testing/gerbv_example/am-test-voronoi/expected/processed_back.svg index 06897c7b0..a0ae7593b 100644 --- a/testing/gerbv_example/am-test-voronoi/expected/processed_back.svg +++ b/testing/gerbv_example/am-test-voronoi/expected/processed_back.svg @@ -11,16 +11,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - - - - + + + + + @@ -31,8 +31,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + @@ -41,20 +41,20 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + - + - + - - - - - + + + + + + + @@ -68,9 +68,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test-voronoi/expected/traced_back.svg b/testing/gerbv_example/am-test-voronoi/expected/traced_back.svg index d37617222..7289cd73b 100644 --- a/testing/gerbv_example/am-test-voronoi/expected/traced_back.svg +++ b/testing/gerbv_example/am-test-voronoi/expected/traced_back.svg @@ -17,8 +17,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - + + @@ -27,20 +27,20 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + - + - + - - - - - + + + + + + + diff --git a/testing/gerbv_example/am-test/expected/back.ngc b/testing/gerbv_example/am-test/expected/back.ngc index c9343a0cb..1be42ce20 100644 --- a/testing/gerbv_example/am-test/expected/back.ngc +++ b/testing/gerbv_example/am-test/expected/back.ngc @@ -558,10 +558,10 @@ G01 X-8.63918 Y4.52119 G01 X-8.72782 Y4.46579 G01 X-8.74661 Y4.45663 G01 X-8.84484 Y4.42088 -G01 X-8.86512 Y4.41582 -G01 X-8.96863 Y4.40127 -G01 X-8.98953 Y4.40054 -G01 X-9.09380 Y4.40784 +G01 X-8.86513 Y4.41582 +G01 X-8.96864 Y4.40128 +G01 X-8.98952 Y4.40055 +G01 X-9.09379 Y4.40784 G01 X-9.11438 Y4.41147 G01 X-9.21486 Y4.44028 G01 X-9.23424 Y4.44811 @@ -597,10 +597,10 @@ G01 X-9.36082 Y5.47881 G01 X-9.27218 Y5.53420 G01 X-9.25339 Y5.54337 G01 X-9.15516 Y5.57912 -G01 X-9.13488 Y5.58418 -G01 X-9.03137 Y5.59873 +G01 X-9.13487 Y5.58418 +G01 X-9.03136 Y5.59872 G01 X-9.01047 Y5.59945 -G01 X-8.90620 Y5.59215 +G01 X-8.90620 Y5.59216 G01 X-8.88562 Y5.58853 G01 X-8.78514 Y5.55972 G01 X-8.76576 Y5.55189 diff --git a/testing/gerbv_example/am-test/expected/outp0_original_back.svg b/testing/gerbv_example/am-test/expected/outp0_original_back.svg index 412b2244e..a5f17a696 100644 --- a/testing/gerbv_example/am-test/expected/outp0_original_back.svg +++ b/testing/gerbv_example/am-test/expected/outp0_original_back.svg @@ -16,9 +16,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test/expected/processed_back.svg b/testing/gerbv_example/am-test/expected/processed_back.svg index c98a6cf46..4121d2790 100644 --- a/testing/gerbv_example/am-test/expected/processed_back.svg +++ b/testing/gerbv_example/am-test/expected/processed_back.svg @@ -11,16 +11,16 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - - - - - + + + + + @@ -41,22 +41,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - - @@ -68,9 +68,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - + + + + diff --git a/testing/gerbv_example/am-test/expected/traced_back.svg b/testing/gerbv_example/am-test/expected/traced_back.svg index a64644d2d..20c424a88 100644 --- a/testing/gerbv_example/am-test/expected/traced_back.svg +++ b/testing/gerbv_example/am-test/expected/traced_back.svg @@ -27,22 +27,22 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - - - + + + + + + + + + - + - + - + - - - - - -