Regression fix - preview images from paneltool are back to normal quality now! - more layers outrecognized (Tina format)

StijnKuipers · StijnKuipers · commit c4c91e218978 · 2017-01-26T02:52:09.000+01:00
diff --git a/GerberLibrary/Core/Enums.cs b/GerberLibrary/Core/Enums.cs
@@ -16,7 +16,9 @@ public enum BoardLayer
         Drill,
         Outline,
         Mill,
-        Unknown
+        Unknown,
+        Notes,
+        Assembly
     }
 
     public enum BoardSide
diff --git a/GerberLibrary/Core/Gerber.cs b/GerberLibrary/Core/Gerber.cs
@@ -344,6 +344,7 @@ public static void DetermineBoardSideAndLayer(string gerberfile, out BoardSide S
                     Side = BoardSide.Both;
                     Layer = BoardLayer.Mill;
                     break;
+                case "fabrd":
                 case "oln":
                 case "gko":
                     Side = BoardSide.Both;
@@ -354,7 +355,18 @@ public static void DetermineBoardSideAndLayer(string gerberfile, out BoardSide S
                     Side = BoardSide.Internal1;
                     Layer = BoardLayer.Copper;
                     break;
-
+                case "adtop":
+                    Side = BoardSide.Top;
+                    Layer = BoardLayer.Assembly;
+                    break;
+                case "adbottom":
+                    Side = BoardSide.Bottom;
+                    Layer = BoardLayer.Assembly;
+                    break;
+                case "notes":
+                    Side = BoardSide.Both;
+                    Layer = BoardLayer.Notes;
+                    break;
                 case "l3":
 
                 case "gl2":
@@ -377,35 +389,42 @@ public static void DetermineBoardSideAndLayer(string gerberfile, out BoardSide S
                     break;
 
                 case "gbp":
+                case "spbottom":
                     Side = BoardSide.Bottom;
                     Layer = BoardLayer.Paste;
                     break;
 
                 case "gtp":
+                case "sptop":
                     Side = BoardSide.Top;
                     Layer = BoardLayer.Paste;
                     break;
 
                 case "gbo":
                 case "ss2":
+                case "ssbottom":
                     Side = BoardSide.Bottom;
                     Layer = BoardLayer.Silk;
                     break;
 
                 case "gto":
                 case "ss1":
+                case "sstop":
                     Side = BoardSide.Top;
                     Layer = BoardLayer.Silk;
                     break;
 
                 case "gbs":
                 case "sm2":
+                case "smbottom":
                     Side = BoardSide.Bottom;
                     Layer = BoardLayer.SolderMask;
                     break;
 
                 case "gts":
                 case "sm1":
+                case "smtop":
+
                     Side = BoardSide.Top;
                     Layer = BoardLayer.SolderMask;
                     break;
@@ -425,6 +444,7 @@ public static void DetermineBoardSideAndLayer(string gerberfile, out BoardSide S
                     Layer = BoardLayer.Copper;
                     break;
 
+                case "bottom":
                 case "bot":
                     Side = BoardSide.Bottom;
                     Layer = BoardLayer.Copper;
@@ -461,7 +481,7 @@ public static void DetermineBoardSideAndLayer(string gerberfile, out BoardSide S
                     Side = BoardSide.Bottom;
                     Layer = BoardLayer.Paste;
                     break;
-
+                case "drill_TOP_BOTTOM":
                 case "drl":
                 case "drill":
                 case "drillnpt":
diff --git a/GerberLibrary/Core/ImageCreator.cs b/GerberLibrary/Core/ImageCreator.cs
@@ -177,9 +177,11 @@ public ParsedGerber AddBoardToSet(MemoryStream MS, string _originalfilename, boo
                     if (Gerber.ExtremelyVerbose) Console.WriteLine("Log: Drill file: {0}", _originalfilename);
                     PLS = PolyLineSet.LoadExcellonDrillFileFromStream(new StreamReader(MS), _originalfilename, false, drillscaler);
                     MS.Seek(0, SeekOrigin.Begin);
-
+                    PLS.Side = BoardSide.Both;
+                    PLS.Layer = BoardLayer.Drill;
                     // ExcellonFile EF = new ExcellonFile();
                     // EF.Load(a);
+                    
                 }
                 else
                 {
@@ -400,6 +402,7 @@ private void AddFileToSet(MemoryStream MS, string aname, ProgressLog Logger, dou
                 zerowidth = true;
                 precombine = true;
             }
+            MS.Seek(0, SeekOrigin.Begin);
             AddBoardToSet(MS, aname, zerowidth, precombine, drillscaler);
         }
 
diff --git a/GerberLibrary/Core/PolyLineSet.cs b/GerberLibrary/Core/PolyLineSet.cs
@@ -209,7 +209,7 @@ public static ParsedGerber LoadExcellonDrillFileFromStream(StreamReader s, strin
             {
                 var Tool = T.Value;
 
-                int sides = (int)(Gerber.ArcQualityScaleFactor * Math.Max(2.0, Tool.Radius));
+                int sides = Math.Max(10,(int)(Gerber.ArcQualityScaleFactor * Math.Max(2.0, Tool.Radius)));
 
 
                 foreach (var Hole in Tool.Drills)
diff --git a/GerberPanelizer/GerberPanelize.cs b/GerberPanelizer/GerberPanelize.cs
@@ -58,7 +58,7 @@ enum SnapMode
         public GerberPanelize(GerberPanelizerParent Host, Treeview tv, InstanceDialog id)
         {
             ParentFrame = Host;
-            Gerber.ArcQualityScaleFactor = 0.1;
+            Gerber.ArcQualityScaleFactor = 15;
             InitializeComponent();
             UpdateAutoProcessButton();
             UpdateSnapBox(SnapMode.MM1);

Original file line number	Diff line number	Diff line change
`@@ -177,9 +177,11 @@ public ParsedGerber AddBoardToSet(MemoryStream MS, string _originalfilename, boo`
`177`	`177`	`if (Gerber.ExtremelyVerbose) Console.WriteLine("Log: Drill file: {0}", _originalfilename);`
`178`	`178`	`PLS = PolyLineSet.LoadExcellonDrillFileFromStream(new StreamReader(MS), _originalfilename, false, drillscaler);`
`179`	`179`	`MS.Seek(0, SeekOrigin.Begin);`
`180`		`-`
	`180`	`+ PLS.Side = BoardSide.Both;`
	`181`	`+ PLS.Layer = BoardLayer.Drill;`
`181`	`182`	`// ExcellonFile EF = new ExcellonFile();`
`182`	`183`	`// EF.Load(a);`
	`184`	`+`
`183`	`185`	`}`
`184`	`186`	`else`
`185`	`187`	`{`
`@@ -400,6 +402,7 @@ private void AddFileToSet(MemoryStream MS, string aname, ProgressLog Logger, dou`
`400`	`402`	`zerowidth = true;`
`401`	`403`	`precombine = true;`
`402`	`404`	`}`
	`405`	`+ MS.Seek(0, SeekOrigin.Begin);`
`403`	`406`	`AddBoardToSet(MS, aname, zerowidth, precombine, drillscaler);`
`404`	`407`	`}`
`405`	`408`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public static ParsedGerber LoadExcellonDrillFileFromStream(StreamReader s, strin`
`209`	`209`	`{`
`210`	`210`	`var Tool = T.Value;`
`211`	`211`
`212`		`- int sides = (int)(Gerber.ArcQualityScaleFactor * Math.Max(2.0, Tool.Radius));`
	`212`	`+ int sides = Math.Max(10,(int)(Gerber.ArcQualityScaleFactor * Math.Max(2.0, Tool.Radius)));`
`213`	`213`
`214`	`214`
`215`	`215`	`foreach (var Hole in Tool.Drills)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ enum SnapMode`
`58`	`58`	`public GerberPanelize(GerberPanelizerParent Host, Treeview tv, InstanceDialog id)`
`59`	`59`	`{`
`60`	`60`	`ParentFrame = Host;`
`61`		`- Gerber.ArcQualityScaleFactor = 0.1;`
	`61`	`+ Gerber.ArcQualityScaleFactor = 15;`
`62`	`62`	`InitializeComponent();`
`63`	`63`	`UpdateAutoProcessButton();`
`64`	`64`	`UpdateSnapBox(SnapMode.MM1);`