From 14e9d7fbc2a935ec9c2e6eb9d68e8d250f9614d4 Mon Sep 17 00:00:00 2001 From: jaseg Date: Sat, 18 Jun 2022 17:29:27 +0200 Subject: svg-flatten: add drill handling to outline mode --- svg-flatten/src/main.cpp | 5 +++++ svg-flatten/src/nopencv.cpp | 27 +++++++++++++++++++++++++++ svg-flatten/src/nopencv.hpp | 2 ++ svg-flatten/src/out_dilater.cpp | 4 ++++ svg-flatten/src/out_flattener.cpp | 10 ++++++++++ svg-flatten/src/out_gerber.cpp | 12 ++++++++++++ svg-flatten/src/out_scaler.cpp | 10 ++++++++++ svg-flatten/src/out_sexp.cpp | 4 ++++ svg-flatten/src/out_svg.cpp | 4 ++++ svg-flatten/src/svg_doc.cpp | 31 ++++++++++++++++++++++++++++--- 10 files changed, 106 insertions(+), 3 deletions(-) (limited to 'svg-flatten/src') diff --git a/svg-flatten/src/main.cpp b/svg-flatten/src/main.cpp index 817ba67..188aa57 100644 --- a/svg-flatten/src/main.cpp +++ b/svg-flatten/src/main.cpp @@ -79,6 +79,9 @@ int main(int argc, char **argv) { {"curve_tolerance", {"-c", "--curve-tolerance"}, "Tolerance for curve flattening in mm. Default: 0.1mm.", 1}, + {"drill_test_polsby_popper_tolerance", {"--drill-test-tolerance"}, + "Tolerance for identifying circles as drills in outline mode", + 1}, {"no_header", {"--no-header"}, "Do not export output format header/footer, only export the primitives themselves", 0}, @@ -291,6 +294,7 @@ int main(int argc, char **argv) { double min_feature_size = args["min_feature_size"].as(0.1); /* mm */ double curve_tolerance = args["curve_tolerance"].as(0.1); /* mm */ + double drill_test_polsby_popper_tolerance = args["drill_test_polsby_popper_tolerance"].as(0.1); /* mm */ string ending = ""; auto idx = in_f_name.rfind("."); @@ -423,6 +427,7 @@ int main(int argc, char **argv) { RenderSettings rset { min_feature_size, curve_tolerance, + drill_test_polsby_popper_tolerance, vec_sel, outline_mode, flip_svg_colors, diff --git a/svg-flatten/src/nopencv.cpp b/svg-flatten/src/nopencv.cpp index 121e9e1..e157ab5 100644 --- a/svg-flatten/src/nopencv.cpp +++ b/svg-flatten/src/nopencv.cpp @@ -483,6 +483,33 @@ double gerbolyze::nopencv::polygon_area(Polygon_i &poly) { return acc / 2; } +double gerbolyze::nopencv::polygon_perimeter(Polygon_i &poly) { + double acc = 0; + size_t prev = poly.size() - 1; + for (size_t cur=0; cur gerbolyze::nopencv::Image::Image(int size_x, int size_y, const T *data) { assert(size_x > 0 && size_x < 100000); diff --git a/svg-flatten/src/nopencv.hpp b/svg-flatten/src/nopencv.hpp index 5dd399d..bbc190b 100644 --- a/svg-flatten/src/nopencv.hpp +++ b/svg-flatten/src/nopencv.hpp @@ -119,6 +119,8 @@ namespace gerbolyze { ContourCallback simplify_contours_douglas_peucker(ContourCallback cb); double polygon_area(Polygon_i &poly); + double polygon_perimeter(Polygon_i &poly); + d2p polygon_centroid(Polygon_i &poly); } } diff --git a/svg-flatten/src/out_dilater.cpp b/svg-flatten/src/out_dilater.cpp index e9aefa8..a5b0619 100644 --- a/svg-flatten/src/out_dilater.cpp +++ b/svg-flatten/src/out_dilater.cpp @@ -84,3 +84,7 @@ Dilater &Dilater::operator<<(const Polygon &poly) { return *this; } +Dilater &Dilater::operator<<(const ApertureToken &ap) { + m_sink << ApertureToken(ap.m_size + 2*m_dilation); + return *this; +} diff --git a/svg-flatten/src/out_flattener.cpp b/svg-flatten/src/out_flattener.cpp index 8868ca2..0eae854 100644 --- a/svg-flatten/src/out_flattener.cpp +++ b/svg-flatten/src/out_flattener.cpp @@ -152,6 +152,16 @@ Flattener &Flattener::operator<<(const LayerNameToken &layer_name) { return *this; } +Flattener &Flattener::operator<<(const DrillToken &tok) { + m_sink << tok; + return *this; +} + +Flattener &Flattener::operator<<(const ApertureToken &tok) { + m_sink << tok; + return *this; +} + Flattener &Flattener::operator<<(const Polygon &poly) { if (m_current_polarity == GRB_POL_DARK) { d->add_dark_polygon(poly); diff --git a/svg-flatten/src/out_gerber.cpp b/svg-flatten/src/out_gerber.cpp index b1c5875..c43d07d 100644 --- a/svg-flatten/src/out_gerber.cpp +++ b/svg-flatten/src/out_gerber.cpp @@ -65,6 +65,7 @@ SimpleGerberOutput& SimpleGerberOutput::operator<<(const ApertureToken &ap) { if (ap.m_size == m_current_aperture) { return *this; } + m_current_aperture = ap.m_size; m_aperture_num += 1; @@ -123,6 +124,17 @@ SimpleGerberOutput& SimpleGerberOutput::operator<<(const Polygon &poly) { return *this; } +SimpleGerberOutput &SimpleGerberOutput::operator<<(const DrillToken &tok) { + double x = round((tok.m_center[0] * m_scale + m_offset[0]) * m_gerber_scale); + double y = round((m_height - tok.m_center[1] * m_scale + m_offset[1]) * m_gerber_scale); + + m_out << "X" << setw(m_digits_int + m_digits_frac) << setfill('0') << std::internal /* isn't C++ a marvel of engineering? */ << (long long int)x + << "Y" << setw(m_digits_int + m_digits_frac) << setfill('0') << std::internal << (long long int)y + << "D03*" << endl; + + return *this; +} + void SimpleGerberOutput::footer_impl() { m_out << "M02*" << endl; } diff --git a/svg-flatten/src/out_scaler.cpp b/svg-flatten/src/out_scaler.cpp index 9b7de4e..0320d69 100644 --- a/svg-flatten/src/out_scaler.cpp +++ b/svg-flatten/src/out_scaler.cpp @@ -29,6 +29,7 @@ using namespace gerbolyze; using namespace std; +/* FIXME thoroughly test ApertureToken scale handling */ void PolygonScaler::header(d2p origin, d2p size) { m_sink.header({origin[0] * m_scale, origin[1] * m_scale}, {size[0] * m_scale, size[1] * m_scale}); } @@ -45,7 +46,11 @@ PolygonScaler &PolygonScaler::operator<<(const LayerNameToken &layer_name) { PolygonScaler &PolygonScaler::operator<<(GerberPolarityToken pol) { m_sink << pol; + return *this; +} +PolygonScaler &PolygonScaler::operator<<(const ApertureToken &tok) { + m_sink << ApertureToken(tok.m_size * m_scale); return *this; } @@ -59,3 +64,8 @@ PolygonScaler &PolygonScaler::operator<<(const Polygon &poly) { return *this; } +PolygonScaler &PolygonScaler::operator<<(const DrillToken &tok) { + d2p new_center { tok.m_center[0] * m_scale, tok.m_center[1] * m_scale }; + m_sink << DrillToken(new_center); + return *this; +} diff --git a/svg-flatten/src/out_sexp.cpp b/svg-flatten/src/out_sexp.cpp index 1a7f1d0..6760920 100644 --- a/svg-flatten/src/out_sexp.cpp +++ b/svg-flatten/src/out_sexp.cpp @@ -135,6 +135,10 @@ KicadSexpOutput &KicadSexpOutput::operator<<(const Polygon &poly) { return *this; } +KicadSexpOutput &KicadSexpOutput::operator<<(const DrillToken &tok) { + return *this; +} + void KicadSexpOutput::footer_impl() { m_out << ")" << endl; } diff --git a/svg-flatten/src/out_svg.cpp b/svg-flatten/src/out_svg.cpp index d94edc0..4ecd979 100644 --- a/svg-flatten/src/out_svg.cpp +++ b/svg-flatten/src/out_svg.cpp @@ -77,6 +77,10 @@ SimpleSVGOutput &SimpleSVGOutput::operator<<(const Polygon &poly) { return *this; } +SimpleSVGOutput &SimpleSVGOutput::operator<<(const DrillToken &tok) { + return *this; +} + void SimpleSVGOutput::footer_impl() { //cerr << "svg: footer" << endl; m_out << "" << endl; diff --git a/svg-flatten/src/svg_doc.cpp b/svg-flatten/src/svg_doc.cpp index fb8d311..7ff0a11 100644 --- a/svg-flatten/src/svg_doc.cpp +++ b/svg-flatten/src/svg_doc.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include "svg_import_defs.h" @@ -25,6 +26,7 @@ #include "svg_geom.h" #include "svg_path.h" #include "vec_core.h" +#include "nopencv.hpp" using namespace gerbolyze; using namespace std; @@ -243,7 +245,6 @@ void gerbolyze::SVGDocument::export_svg_path(RenderContext &ctx, const pugi::xml } /* Load path from SVG path data and transform into document units. */ - /* FIXME transform stroke width here? */ stroke_width = ctx.mat().doc2phys_dist(stroke_width); Paths stroke_open, stroke_closed; @@ -260,6 +261,31 @@ void gerbolyze::SVGDocument::export_svg_path(RenderContext &ctx, const pugi::xml /* Skip filling for transparent fills. In outline mode, skip filling if a stroke is also set to avoid double lines. */ if (has_fill && !(ctx.settings().outline_mode && has_stroke)) { + /* In outline mode, identify drills before applying clip */ + if (ctx.settings().outline_mode && fill_color != GRB_PATTERN_FILL) { + /* Polsby-Popper test */ + for (auto &p : fill_paths) { + Polygon_i geom_poly(p.size()); + for (size_t i=0; i