Skip to content

fix: Use the merged paths for making eulerian paths. #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eyal0 merged 2 commits into from
May 6, 2023
Merged

fix: Use the merged paths for making eulerian paths. #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4af0375
test: EasyEDA files from Easy-SDR project with bad outline loops.
eyal0 May 6, 2023
c74468e
fix: Use the merged paths for making eulerian paths.
eyal0 May 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gerberimporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ mp_pair paths_to_shapes(const coordinate_type_fp& diameter, const multi_linestri
}
// This converts the many small line segments into the longest paths possible.
multi_linestring_type_fp euler_paths_with_rings =
eulerian_paths::make_eulerian_paths(paths, true, true);
eulerian_paths::make_eulerian_paths(new_paths, true, true);
multi_linestring_type_fp euler_paths;
for (const auto& ls : euler_paths_with_rings) {
auto all_ls = get_all_ls(ls);
Expand Down
1 change: 1 addition & 0 deletions integration_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"backtrack",
"backtrack_0",
"D1MiniGSR",
"Easy-SDR_HF_Upconverter_SMD_Gerbers",
"edge-cuts-broken-loop",
"edge-cuts-inside-cuts",
"example_board_new_default",
Expand Down
44 changes: 44 additions & 0 deletions testing/gerbv_example/Easy-SDR_HF_Upconverter_SMD_Gerbers/Gerber_BoardOutline.GKO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
G04 Layer: BoardOutline*
G04 EasyEDA v6.4.7, 2020-09-29T11:03:38+03:00*
G04 9486de1159244eee9c784153b90ba1e7,e225996ff9fb4a0db64c6d6541834e49,10*
G04 Gerber Generator version 0.2*
G04 Scale: 100 percent, Rotated: No, Reflected: No *
G04 Dimensions in millimeters *
G04 leading zeros omitted , absolute positions ,3 integer and 3 decimal *
%FSLAX33Y33*%
%MOMM*%
G90*
D02*

%ADD10C,0.254000*%
G54D10*
G01X0Y0D02*
G01X0Y5333D01*
G01X1905Y5333D01*
G01X1905Y12445D01*
G01X0Y12445D01*
G01X0Y12446D02*
G01X0Y15113D01*
G01X0Y46990D02*
G01X79502Y46990D01*
G01X0Y27940D02*
G01X0Y46990D01*
G01X0Y15113D02*
G01X0Y27940D01*
G01X79502Y25655D02*
G01X79502Y24131D01*
G01X77597Y24131D01*
G01X77597Y17019D01*
G01X79502Y17019D01*
G01X79502Y17019D02*
G01X79502Y15622D01*
G01X0Y0D02*
G01X79502Y0D01*
G01X79502Y0D02*
G01X79502Y15622D01*
G01X79502Y25655D02*
G01X79502Y46990D01*

%LPD*%
M00*
M02*
Loading