test: Write final svgs to expected

pcb2gcode · Feb 17, 2021 · f49127a · f49127a
1 parent ea36baf
commit f49127a
Show file tree

Hide file tree

Showing 164 changed files with 7,087 additions and 0 deletions.
diff --git a/surface_vectorial.cpp b/surface_vectorial.cpp
@@ -166,6 +166,17 @@ vector<polygon_type_fp> find_thermal_reliefs(const multi_polygon_type_fp& millin
   return holes;
 }
 
+void Surface_vectorial::write_svgs(const std::string& tool_suffix, coordinate_type_fp tool_diameter,
+                const multi_linestring_type_fp& toolpaths,
+                coordinate_type_fp tolerance, bool find_contentions) const {
+  vector<vector<pair<linestring_type_fp, bool>>> new_trace_toolpaths;
+  new_trace_toolpaths.emplace({});
+  for (const auto& ls : toolpaths) {
+    new_trace_toolpaths.front().push_back(make_pair(ls, true));
+  }
+  write_svgs(tool_suffix, tool_diameter, new_trace_toolpaths, tolerance, find_contentions);
+}
+
 void Surface_vectorial::write_svgs(const string& tool_suffix, coordinate_type_fp tool_diameter,
                                    const vector<vector<pair<linestring_type_fp, bool>>>& new_trace_toolpaths,
                                    coordinate_type_fp tolerance, bool find_contentions) const {
@@ -862,6 +873,7 @@ vector<pair<coordinate_type_fp, multi_linestring_type_fp>> Surface_vectorial::ge
       write_svgs(tool_suffix, tool_diameter, new_trace_toolpaths, mill->tolerance, tool_index == tool_count - 1);
       auto new_toolpath = flatten(new_trace_toolpaths);
       multi_linestring_type_fp combined_toolpath = post_process_toolpath(isolator, new_toolpath);
+      write_svgs("_final" + tool_suffix, tool_diameter, combined_toolpath, isolator->tolerance, tool_index == tool_count - 1);
       results[tool_index] = make_pair(tool_diameter, mirror_toolpath(combined_toolpath, mirror));
     }
     // Now process any lines that need drawing.

diff --git a/surface_vectorial.hpp b/surface_vectorial.hpp
@@ -107,6 +107,9 @@ class Surface_vectorial: private boost::noncopyable {
   void write_svgs(const std::string& tool_suffix, coordinate_type_fp tool_diameter,
                   const std::vector<std::vector<std::pair<linestring_type_fp, bool>>>& new_trace_toolpaths,
                   coordinate_type_fp tolerance, bool find_contentions) const;
+  void write_svgs(const std::string& tool_suffix, coordinate_type_fp tool_diameter,
+                  const multi_linestring_type_fp& toolpaths,
+                  coordinate_type_fp tolerance, bool find_contentions) const;
 };
 
 class svg_writer {

diff --git a/testing/gerbv_example/D1MiniGSR/expected/processed_back_final.svg b/testing/gerbv_example/D1MiniGSR/expected/processed_back_final.svg
diff --git a/testing/gerbv_example/D1MiniGSR/expected/processed_front_final.svg b/testing/gerbv_example/D1MiniGSR/expected/processed_front_final.svg
diff --git a/testing/gerbv_example/D1MiniGSR/expected/traced_back_final.svg b/testing/gerbv_example/D1MiniGSR/expected/traced_back_final.svg
diff --git a/testing/gerbv_example/D1MiniGSR/expected/traced_front_final.svg b/testing/gerbv_example/D1MiniGSR/expected/traced_front_final.svg
diff --git a/...gerbv_example/KNoT-Gateway Mini Starter Board/expected/processed_back_final.svg b/...gerbv_example/KNoT-Gateway Mini Starter Board/expected/processed_back_final.svg
diff --git a/...erbv_example/KNoT-Gateway Mini Starter Board/expected/processed_front_final.svg b/...erbv_example/KNoT-Gateway Mini Starter Board/expected/processed_front_final.svg
diff --git a/...ng/gerbv_example/KNoT-Gateway Mini Starter Board/expected/traced_back_final.svg b/...ng/gerbv_example/KNoT-Gateway Mini Starter Board/expected/traced_back_final.svg
diff --git a/...g/gerbv_example/KNoT-Gateway Mini Starter Board/expected/traced_front_final.svg b/...g/gerbv_example/KNoT-Gateway Mini Starter Board/expected/traced_front_final.svg
diff --git a/testing/gerbv_example/KNoT_Thing_Starter_Board/expected/contentions_back_final.svg b/testing/gerbv_example/KNoT_Thing_Starter_Board/expected/contentions_back_final.svg