general cleanup and checking for oversights

gwkim9444 · Mar 10, 2021 · 35713e0 · 35713e0
1 parent 627c9d4
commit 35713e0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/GerberCombiner/CombinerProgram.cs b/GerberCombiner/CombinerProgram.cs
@@ -20,6 +20,9 @@ static void Main(string[] args)
             //GS.Split("%SRX1Y1I0.00000J1.76100*%", new GerberLibrary.Core.Primitives.GerberNumberFormat(),true);
             //Console.WriteLine("{0}", GS.Pairs.Count);
             Gerber.ShowProgress = true;
+            Gerber.DumpSanitizedOutput = true;
+            Gerber.WriteSanitized = true;
+
             if (args.Count() < 2)
             {
                 Console.WriteLine("usage: ");

diff --git a/GerberLibrary/Artwork Related/GerberArtWriter.cs b/GerberLibrary/Artwork Related/GerberArtWriter.cs
@@ -538,7 +538,6 @@ private static void ArtGenerator_ReactDiffuse(ProgressLog log, string outline, s
 
                 {
                     int img = 0;
-                    int forceiter = 0;
                     RD_Elem[] FieldA = new RD_Elem[iW * iH];
                     RD_Elem[] FieldB = new RD_Elem[iW * iH];
                     Random R = new Random(0);

diff --git a/GerberLibrary/Core/BillOfMaterials.cs b/GerberLibrary/Core/BillOfMaterials.cs
@@ -623,7 +623,7 @@ public void LoadPrinted(string filename)
 
                 //string Header = "Count,Name,Type,Package,Value,MfgPartNumber,RefDes";
 
-                int idxcount = 0;
+                //int idxcount = 0;
                 int idxname = 1;
                 int idxtype = 2;
                 int idxpackage = 3;

diff --git a/GerberLibrary/Core/GerberMerger.cs b/GerberLibrary/Core/GerberMerger.cs
@@ -126,9 +126,6 @@ public static void MultiMerge(string file1, List<string> filestomergein, string
             File1Lines = PolyLineSet.SanitizeInputLines(File1Lines);
             ParsedGerber File1Parsed = PolyLineSet.ParseGerber274x(Log, File1Lines, true, false, new GerberParserState() { PreCombinePolygons = false, GenerateGeometry = false });
 
-
-
-
             List<string> OutputLines = new List<string>();
             GerberNumberFormat GNF = new GerberNumberFormat();
             GNF.DigitsBefore = Math.Max(File1Parsed.State.CoordinateFormat.DigitsBefore, MaxDigitsBefore);
@@ -477,12 +474,9 @@ public static void MultiMerge(string file1, List<string> filestomergein, string
                                     {
                                         case "LPD":
                                             if (CurrentPolarity != "LPD") { OutputLines.Add("%LPD*%"); CurrentPolarity = "LPD"; }
-
                                             break;
                                         case "LPC":
                                             if (CurrentPolarity != "LPC") { OutputLines.Add("%LPC*%"); CurrentPolarity = "LPC"; }
-
-
                                             break;
 
                                         default:
@@ -507,7 +501,6 @@ public static void MultiMerge(string file1, List<string> filestomergein, string
                                                 {
                                                     Repeating = false;
                                                 }
-
                                             }
                                             else
                                             {

diff --git a/GerberLibrary/Core/GerberPanel.cs b/GerberLibrary/Core/GerberPanel.cs
@@ -1519,14 +1519,14 @@ private static bool AddIntersectionsForTabAndPolyLine(BreakTab t, List<TabInters
                         TI.Direction.X = (V1.X - V2.X) / Len;
                         TI.Direction.Y = (V1.Y - V2.Y) / Len;
                         TI.Angle = Helpers.AngleBetween(t.Center, I1);
-                        bool addedV1 = false;
+                        //bool addedV1 = false;
 
                         bool V1Inside = Helpers.Distance(new PointD(t.Center.X, t.Center.Y), V1) < t.Radius;
                         bool V2Inside = Helpers.Distance(new PointD(t.Center.X, t.Center.Y), V2) < t.Radius;
 
                         if (Helpers.Distance(new PointD(t.Center.X, t.Center.Y), V1) < t.Radius)
                         {
-                            addedV1 = true;
+                          //  addedV1 = true;
                             TI.Start = true;
                         }
 

diff --git a/Project_Utilities/TilingLibrary/SVGThings.cs b/Project_Utilities/TilingLibrary/SVGThings.cs
@@ -535,7 +535,6 @@ public void DecodeStyle(string style)
                                     StrokeColor = ParseColor(a[1]);
                                 }
                                 break;
-                                break;
                             case "fill":
                                 if (a[1] == "none")
                                 {
@@ -570,7 +569,7 @@ private void DecodeStrokeWidth(string v)
                     }
                     catch (Exception E)
                     {
-                        Console.WriteLine(" failed to parse strokewidth {0}", v);
+                        Console.WriteLine(" failed to parse strokewidth {0}: {1}", v, E.Message);
                     }