Skip to content

Fix unterminated comments in merged files #143

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

Open
neinseg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix unterminated comments in merged files #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions GerberLibrary/Core/GerberMerger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,12 +589,12 @@ public static void MultiMerge(string file1, List<string> filestomergein, string
switch ((int)GS.Get("G"))
{
case 70:
OutputLines.Add("G04 skipping 70");
OutputLines.Add("G04 skipping 70*");
otherfile.State.CoordinateFormat.SetImperialMode();

break;
case 71:
OutputLines.Add("G04 skipping 71");
OutputLines.Add("G04 skipping 71*");
otherfile.State.CoordinateFormat.SetMetricMode();

break;
Expand Down Expand Up @@ -1264,12 +1264,12 @@ public static void Merge(string file1, string file2, string output, ProgressLog
switch ((int)GS.Get("G"))
{
case 70:
OutputLines.Add("G04 skipping 70");
OutputLines.Add("G04 skipping 70*");
File2Parsed.State.CoordinateFormat.SetImperialMode();

break;
case 71:
OutputLines.Add("G04 skipping 71");
OutputLines.Add("G04 skipping 71*");
File2Parsed.State.CoordinateFormat.SetMetricMode();

break;
Expand Down