From 20b6d5e63665bcabefc9330e81ed10af50f06c4e Mon Sep 17 00:00:00 2001
From: Silas Fernandes <silasgcf@gmail.com>
Date: Sun, 20 Jan 2019 22:10:53 -0200
Subject: [PATCH] #GerberPanelizer:   - Added option to use relative path to
 Gerbers folder based in *.gerberset file path;   - Added option to remove
 mouse bite holes of instance;   - Some simple improvements for better
 usability.

#GerberLibrary:
  - Added dummy aperture when silk is processed by board clipping.

#GerberViewer:
  - Changed library version to remove compilation error.
---
 .../Artwork Related/GerberArtWriter.cs        |   7 +
 GerberLibrary/Core/GerberPanel.cs             | 109 ++++++++-
 GerberPanelizer/GerberPanelize.cs             |   5 +
 GerberPanelizer/InstanceDialog.Designer.cs    | 218 +++++++++---------
 GerberPanelizer/InstanceDialog.cs             |  15 +-
 GerberPanelizer/InstanceDialog.resx           |   2 +-
 GerberPanelizer/PanelProperties.Designer.cs   | 134 ++++++-----
 GerberPanelizer/PanelProperties.cs            |   2 +
 GerberViewer/GerberViewer.csproj              |  14 +-
 9 files changed, 323 insertions(+), 183 deletions(-)

diff --git a/GerberLibrary/Artwork Related/GerberArtWriter.cs b/GerberLibrary/Artwork Related/GerberArtWriter.cs
index 5a36259..40ded4f 100644
--- a/GerberLibrary/Artwork Related/GerberArtWriter.cs	
+++ b/GerberLibrary/Artwork Related/GerberArtWriter.cs	
@@ -2202,6 +2202,13 @@ public void Write(string p, double rectx = -1, double recty = -1)
                 }
             }
 
+            if (Apts.Count == 0) { // Add dummy aperture
+                GerberApertureType Apt = new GerberApertureType();
+                Apt.ID = 10;
+                Apt.SetCircle(0.00100076);
+                lines.Add(Apt.BuildGerber(GNF));
+            }
+
             foreach (var a in Polygons)
             {
                 if (a.Vertices.Count > 2)
diff --git a/GerberLibrary/Core/GerberPanel.cs b/GerberLibrary/Core/GerberPanel.cs
index 4935f20..ca84e82 100644
--- a/GerberLibrary/Core/GerberPanel.cs
+++ b/GerberLibrary/Core/GerberPanel.cs
@@ -1347,7 +1347,7 @@ private void FindOutlineIntersections()
                                     // t.Errors.Add("inside a polygon!");
                                     //  t.Valid = false;
                                 }
-                                if (TheSet.DoNotGenerateMouseBites == false) BuildDrillsForTabAndPolyLine(t, c, b.OffsetOutlines[i]);
+                                if (!TheSet.DoNotGenerateMouseBites && !b.RemoveMouseBites) BuildDrillsForTabAndPolyLine(t, c, b.OffsetOutlines[i]);
 
                                 //bool inside = false;
                                 //bool newinside = false;
@@ -1680,16 +1680,84 @@ public void SaveFile(string FileName)
 
                 // Create a new file stream to write the serialized object to a file
                 TextWriter WriteFileStream = new StreamWriter(FileName);
-                SerializerObj.Serialize(WriteFileStream, TheSet);
+
+                if (TheSet.UseRelativePath)
+                {
+                    GerberLayoutSet tempSet;
+
+                    using (MemoryStream Mems = new MemoryStream())
+                    {
+                        XmlSerializer Serializer = new XmlSerializer(typeof(GerberLayoutSet));
+                        Serializer.Serialize(Mems, TheSet);
+                        Mems.Seek(0, SeekOrigin.Begin);
+                        tempSet = (GerberLayoutSet)Serializer.Deserialize(Mems);
+                    }
+
+                    string pathBase = Path.GetDirectoryName(FileName);
+
+                    for (int i = 0; i < tempSet.Instances.Count; i++)
+                    {
+                        string a = tempSet.Instances[i].GerberPath;
+
+                        a = GetRelativePath(pathBase, a);
+
+                        tempSet.Instances[i].GerberPath = a;
+                    }
+
+                    for (int i = 0; i < tempSet.LoadedOutlines.Count; i++)
+                    {
+                        string a = tempSet.LoadedOutlines[i];
+
+                        a = GetRelativePath(pathBase, a);
+
+                        tempSet.LoadedOutlines[i] = a;
+                    }
+
+                    SerializerObj.Serialize(WriteFileStream, tempSet);
+                }
+                else
+                    SerializerObj.Serialize(WriteFileStream, TheSet);
 
                 // Cleanup
                 WriteFileStream.Close();
 
 
             }
-            catch (Exception)
+            catch (Exception e)
+            {
+            }
+        }
+
+        public static string GetRelativePath(string p_startPath, string p_fullDestinationPath)
+        {
+            string[] l_startPathParts = Path.GetFullPath(p_startPath).Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);
+            string[] l_destinationPathParts = p_fullDestinationPath.Split(Path.DirectorySeparatorChar);
+
+            int l_sameCounter = 0;
+            while ((l_sameCounter < l_startPathParts.Length) && (l_sameCounter < l_destinationPathParts.Length) && l_startPathParts[l_sameCounter].Equals(l_destinationPathParts[l_sameCounter], StringComparison.InvariantCultureIgnoreCase))
+            {
+                l_sameCounter++;
+            }
+
+            if (l_sameCounter == 0)
+            {
+                return p_fullDestinationPath; // There is no relative link.
+            }
+
+            System.Text.StringBuilder l_builder = new System.Text.StringBuilder();
+            for (int i = l_sameCounter; i < l_startPathParts.Length; i++)
+            {
+                l_builder.Append(".." + Path.DirectorySeparatorChar);
+            }
+
+            for (int i = l_sameCounter; i < l_destinationPathParts.Length; i++)
             {
+                l_builder.Append(l_destinationPathParts[i] + Path.DirectorySeparatorChar);
             }
+
+            l_builder.Length--;
+
+            return l_builder.ToString();
         }
 
         public void RemoveInstance(AngledThing angledThing)
@@ -1744,8 +1812,27 @@ public void LoadFile(string filename)
                 GerberLayoutSet newset = (GerberLayoutSet)SerializerObj.Deserialize(ReadFileStream);
                 if (newset != null)
                 {
-                    foreach (var a in newset.LoadedOutlines)
+                    string path = Path.GetDirectoryName(filename);
+                    for (int i = 0; i < newset.Instances.Count; i++)
                     {
+                        string a = newset.Instances[i].GerberPath;
+                        if (!Path.IsPathRooted(a))
+                        {
+                            a = Path.GetFullPath(path + Path.DirectorySeparatorChar + a);
+                            a = a.TrimEnd(Path.DirectorySeparatorChar);
+                            newset.Instances[i].GerberPath = a;
+                        }
+                    }
+
+                    for (int i = 0; i < newset.LoadedOutlines.Count; i++)
+                    {
+                        string a = newset.LoadedOutlines[i];
+                        if (!Path.IsPathRooted(a))
+                        {
+                            a = Path.GetFullPath(path + Path.DirectorySeparatorChar + a);
+                            a = a.TrimEnd(Path.DirectorySeparatorChar);
+                            newset.LoadedOutlines[i] = a;
+                        }
                         AddGerberFolder(a, false);
                     }
                     TheSet = newset;
@@ -1989,6 +2076,7 @@ public class GerberInstance : AngledThing
     {
         public string GerberPath;
         public bool Generated = false;
+        public bool RemoveMouseBites = false;
 
         [System.Xml.Serialization.XmlIgnore]
         public List<PolyLine> TransformedOutlines = new List<PolyLine>();
@@ -2080,6 +2168,7 @@ public class GerberLayoutSet
         public double Smoothing = 1;
         public double ExtraTabDrillDistance = 0;
         public bool ClipToOutlines = true;
+        public bool UseRelativePath = false;
         public string LastExportFolder = "";
 
         public bool DoNotGenerateMouseBites = false;
@@ -2102,7 +2191,7 @@ public List<string> SaveTo(string OutputFolder, Dictionary<string, GerberOutline
                 BOM InstanceBom = BOM.ScanFolderForBoms(a.GerberPath);
                 if (InstanceBom != null && InstanceBom.GetPartCount() > 0)
                 {
-                    MasterBom.MergeBOM(InstanceBom, set, a.Center.X, a.Center.Y,0,0, a.Angle);
+                    MasterBom.MergeBOM(InstanceBom, set, a.Center.X, a.Center.Y, 0, 0, a.Angle);
                 }
 
 
@@ -2148,7 +2237,7 @@ public List<string> SaveTo(string OutputFolder, Dictionary<string, GerberOutline
                         }
                     }
 
-                    instanceID = AddFilesForInstance(OutputFolder,a.Center.X, a.Center.Y, a.Angle, FileList, instanceID, GeneratedFiles, outline, Logger);
+                    instanceID = AddFilesForInstance(OutputFolder, a.Center.X, a.Center.Y, a.Angle, FileList, instanceID, GeneratedFiles, outline, Logger);
 
 
                     instanceID++;
@@ -2174,8 +2263,8 @@ public List<string> SaveTo(string OutputFolder, Dictionary<string, GerberOutline
                 MasterBom.SaveBom(BomFile);
                 MasterBom.SaveCentroids(CentroidFile);
 
-//                GeneratedFiles.Add(CentroidFile);
-  //              GeneratedFiles.Add(BomFile);
+                //                GeneratedFiles.Add(CentroidFile);
+                //              GeneratedFiles.Add(BomFile);
             }
             return GeneratedFiles;
         }
@@ -2202,7 +2291,7 @@ private int AddFilesForInstance(string p, double x, double y, double angle, List
                             ExcellonFile EF = new ExcellonFile();
                             EF.Load(f, scaler);
                             string Filename = Path.Combine(p, (isntid++).ToString() + "_" + Path.GetFileName(f));
-                            EF.Write(Filename, x,y, outline.TheGerber.TranslationSinceLoad.X, outline.TheGerber.TranslationSinceLoad.Y, angle);
+                            EF.Write(Filename, x, y, outline.TheGerber.TranslationSinceLoad.X, outline.TheGerber.TranslationSinceLoad.Y, angle);
                             GeneratedFiles.Add(Filename);
                         }
                         catch (Exception E)
@@ -2232,7 +2321,7 @@ private int AddFilesForInstance(string p, double x, double y, double angle, List
                                     tempfile = Path.Combine(p, (isntid++).ToString() + "_" + Path.GetFileName(f));
                                     GerberImageCreator GIC2 = new GerberImageCreator();
                                     GIC2.AddBoardsToSet(FileList);
-                                    GIC2.ClipBoard(f, tempfile,Logger);
+                                    GIC2.ClipBoard(f, tempfile, Logger);
                                     sourcefile = tempfile;
                                 }
                             }
diff --git a/GerberPanelizer/GerberPanelize.cs b/GerberPanelizer/GerberPanelize.cs
index 59ed2b7..3ac4758 100644
--- a/GerberPanelizer/GerberPanelize.cs
+++ b/GerberPanelizer/GerberPanelize.cs
@@ -273,6 +273,11 @@ public void exportAllGerbersToolStripMenuItem_Click(object sender, EventArgs e)
             try
             {
                 folderBrowserDialog2.SelectedPath = ThePanel.TheSet.LastExportFolder;
+
+                if (folderBrowserDialog2.SelectedPath.Length == 0) {
+                    folderBrowserDialog2.SelectedPath = Path.GetDirectoryName(LoadedFile);
+                }
+
             }
             catch (Exception)
             {
diff --git a/GerberPanelizer/InstanceDialog.Designer.cs b/GerberPanelizer/InstanceDialog.Designer.cs
index 927e488..1e00ba6 100644
--- a/GerberPanelizer/InstanceDialog.Designer.cs
+++ b/GerberPanelizer/InstanceDialog.Designer.cs
@@ -42,6 +42,10 @@ private void InitializeComponent()
             this.ybox = new System.Windows.Forms.NumericUpDown();
             this.rbox = new System.Windows.Forms.NumericUpDown();
             this.label5 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.Smaller = new System.Windows.Forms.Button();
@@ -53,10 +57,7 @@ private void InitializeComponent()
             this.AClock = new System.Windows.Forms.Button();
             this.RightButton = new System.Windows.Forms.Button();
             this.Bigger = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
+            this.noMouseBites = new System.Windows.Forms.CheckBox();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
@@ -73,9 +74,8 @@ private void InitializeComponent()
             this.panel1.Controls.Add(this.tableLayoutPanel2);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(473, 808);
+            this.panel1.Size = new System.Drawing.Size(355, 656);
             this.panel1.TabIndex = 18;
             // 
             // tableLayoutPanel2
@@ -87,22 +87,22 @@ private void InitializeComponent()
             this.tableLayoutPanel2.Controls.Add(this.panel2, 0, 1);
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             this.tableLayoutPanel2.RowCount = 3;
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(473, 808);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(355, 656);
             this.tableLayoutPanel2.TabIndex = 21;
             // 
             // NameLabel
             // 
             this.NameLabel.AutoSize = true;
             this.NameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.NameLabel.Location = new System.Drawing.Point(4, 0);
-            this.NameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.NameLabel.Location = new System.Drawing.Point(3, 0);
             this.NameLabel.Name = "NameLabel";
-            this.NameLabel.Size = new System.Drawing.Size(64, 25);
+            this.NameLabel.Size = new System.Drawing.Size(51, 20);
             this.NameLabel.TabIndex = 20;
             this.NameLabel.Text = "Name";
             // 
@@ -112,7 +112,7 @@ private void InitializeComponent()
             this.tableLayoutPanel1.ColumnCount = 3;
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 58F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 44F));
             this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.label4, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.xbox, 1, 0);
@@ -125,35 +125,35 @@ private void InitializeComponent()
             this.tableLayoutPanel1.Controls.Add(this.label6, 2, 1);
             this.tableLayoutPanel1.Controls.Add(this.label7, 2, 3);
             this.tableLayoutPanel1.Controls.Add(this.label8, 2, 2);
+            this.tableLayoutPanel1.Controls.Add(this.noMouseBites, 0, 4);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 163);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(2, 131);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 5;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(467, 642);
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 16F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(351, 523);
             this.tableLayoutPanel1.TabIndex = 5;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(4, 0);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Location = new System.Drawing.Point(3, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(21, 17);
+            this.label3.Size = new System.Drawing.Size(17, 13);
             this.label3.TabIndex = 5;
             this.label3.Text = "X:";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(4, 30);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(3, 26);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(21, 17);
+            this.label4.Size = new System.Drawing.Size(17, 13);
             this.label4.TabIndex = 6;
             this.label4.Text = "Y:";
             // 
@@ -165,8 +165,7 @@ private void InitializeComponent()
             0,
             0,
             65536});
-            this.xbox.Location = new System.Drawing.Point(208, 4);
-            this.xbox.Margin = new System.Windows.Forms.Padding(4);
+            this.xbox.Location = new System.Drawing.Point(156, 3);
             this.xbox.Maximum = new decimal(new int[] {
             1000,
             0,
@@ -178,7 +177,7 @@ private void InitializeComponent()
             0,
             -2147483648});
             this.xbox.Name = "xbox";
-            this.xbox.Size = new System.Drawing.Size(115, 22);
+            this.xbox.Size = new System.Drawing.Size(86, 20);
             this.xbox.TabIndex = 0;
             this.xbox.ValueChanged += new System.EventHandler(this.xbox_ValueChanged);
             // 
@@ -190,25 +189,23 @@ private void InitializeComponent()
             0,
             0,
             65536});
-            this.radiusbox.Location = new System.Drawing.Point(208, 94);
-            this.radiusbox.Margin = new System.Windows.Forms.Padding(4);
+            this.radiusbox.Location = new System.Drawing.Point(156, 81);
             this.radiusbox.Maximum = new decimal(new int[] {
             180,
             0,
             0,
             0});
             this.radiusbox.Name = "radiusbox";
-            this.radiusbox.Size = new System.Drawing.Size(115, 22);
+            this.radiusbox.Size = new System.Drawing.Size(86, 20);
             this.radiusbox.TabIndex = 14;
             this.radiusbox.ValueChanged += new System.EventHandler(this.radiusbox_ValueChanged);
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(4, 90);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(3, 78);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(56, 17);
+            this.label2.Size = new System.Drawing.Size(43, 13);
             this.label2.TabIndex = 15;
             this.label2.Text = "Radius:";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -221,8 +218,7 @@ private void InitializeComponent()
             0,
             0,
             65536});
-            this.ybox.Location = new System.Drawing.Point(208, 34);
-            this.ybox.Margin = new System.Windows.Forms.Padding(4);
+            this.ybox.Location = new System.Drawing.Point(156, 29);
             this.ybox.Maximum = new decimal(new int[] {
             1000,
             0,
@@ -234,14 +230,13 @@ private void InitializeComponent()
             0,
             -2147483648});
             this.ybox.Name = "ybox";
-            this.ybox.Size = new System.Drawing.Size(115, 22);
+            this.ybox.Size = new System.Drawing.Size(86, 20);
             this.ybox.TabIndex = 1;
             this.ybox.ValueChanged += new System.EventHandler(this.ybox_ValueChanged);
             // 
             // rbox
             // 
-            this.rbox.Location = new System.Drawing.Point(208, 64);
-            this.rbox.Margin = new System.Windows.Forms.Padding(4);
+            this.rbox.Location = new System.Drawing.Point(156, 55);
             this.rbox.Maximum = new decimal(new int[] {
             180,
             0,
@@ -253,27 +248,67 @@ private void InitializeComponent()
             0,
             -2147483648});
             this.rbox.Name = "rbox";
-            this.rbox.Size = new System.Drawing.Size(115, 22);
+            this.rbox.Size = new System.Drawing.Size(86, 20);
             this.rbox.TabIndex = 2;
             this.rbox.ValueChanged += new System.EventHandler(this.rbox_ValueChanged);
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(4, 60);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(3, 52);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(65, 17);
+            this.label5.Size = new System.Drawing.Size(50, 13);
             this.label5.TabIndex = 7;
             this.label5.Text = "Rotation:";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(309, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(23, 13);
+            this.label1.TabIndex = 17;
+            this.label1.Text = "mm";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(309, 26);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(23, 13);
+            this.label6.TabIndex = 18;
+            this.label6.Text = "mm";
+            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(309, 78);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(23, 13);
+            this.label7.TabIndex = 19;
+            this.label7.Text = "mm";
+            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(309, 52);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(25, 13);
+            this.label8.TabIndex = 20;
+            this.label8.Text = "deg";
+            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // panel2
             // 
             this.panel2.Controls.Add(this.tableLayoutPanel3);
-            this.panel2.Location = new System.Drawing.Point(3, 28);
+            this.panel2.Location = new System.Drawing.Point(2, 22);
+            this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(414, 129);
+            this.panel2.Size = new System.Drawing.Size(310, 105);
             this.panel2.TabIndex = 19;
             // 
             // tableLayoutPanel3
@@ -292,12 +327,13 @@ private void InitializeComponent()
             this.tableLayoutPanel3.Controls.Add(this.Bigger, 0, 2);
             this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
             this.tableLayoutPanel3.RowCount = 3;
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(414, 129);
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(310, 105);
             this.tableLayoutPanel3.TabIndex = 18;
             this.tableLayoutPanel3.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanel3_Paint);
             // 
@@ -306,10 +342,9 @@ private void InitializeComponent()
             this.Smaller.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Smaller.ImageKey = "ScaleDown_Hover.jpg";
             this.Smaller.ImageList = this.imageList1;
-            this.Smaller.Location = new System.Drawing.Point(280, 90);
-            this.Smaller.Margin = new System.Windows.Forms.Padding(4);
+            this.Smaller.Location = new System.Drawing.Point(209, 73);
             this.Smaller.Name = "Smaller";
-            this.Smaller.Size = new System.Drawing.Size(130, 35);
+            this.Smaller.Size = new System.Drawing.Size(98, 29);
             this.Smaller.TabIndex = 17;
             this.Smaller.UseVisualStyleBackColor = true;
             this.Smaller.Click += new System.EventHandler(this.Smaller_Click_1);
@@ -340,10 +375,9 @@ private void InitializeComponent()
             this.Clock.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Clock.ImageIndex = 10;
             this.Clock.ImageList = this.imageList1;
-            this.Clock.Location = new System.Drawing.Point(4, 4);
-            this.Clock.Margin = new System.Windows.Forms.Padding(4);
+            this.Clock.Location = new System.Drawing.Point(3, 3);
             this.Clock.Name = "Clock";
-            this.Clock.Size = new System.Drawing.Size(130, 35);
+            this.Clock.Size = new System.Drawing.Size(97, 29);
             this.Clock.TabIndex = 13;
             this.Clock.UseVisualStyleBackColor = true;
             this.Clock.Click += new System.EventHandler(this.Clock_Click_1);
@@ -353,10 +387,9 @@ private void InitializeComponent()
             this.Up.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Up.ImageIndex = 0;
             this.Up.ImageList = this.imageList1;
-            this.Up.Location = new System.Drawing.Point(142, 4);
-            this.Up.Margin = new System.Windows.Forms.Padding(4);
+            this.Up.Location = new System.Drawing.Point(106, 3);
             this.Up.Name = "Up";
-            this.Up.Size = new System.Drawing.Size(130, 35);
+            this.Up.Size = new System.Drawing.Size(97, 29);
             this.Up.TabIndex = 8;
             this.Up.UseVisualStyleBackColor = true;
             this.Up.Click += new System.EventHandler(this.Up_Click_1);
@@ -366,10 +399,9 @@ private void InitializeComponent()
             this.Down.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Down.ImageIndex = 2;
             this.Down.ImageList = this.imageList1;
-            this.Down.Location = new System.Drawing.Point(142, 90);
-            this.Down.Margin = new System.Windows.Forms.Padding(4);
+            this.Down.Location = new System.Drawing.Point(106, 73);
             this.Down.Name = "Down";
-            this.Down.Size = new System.Drawing.Size(130, 35);
+            this.Down.Size = new System.Drawing.Size(97, 29);
             this.Down.TabIndex = 9;
             this.Down.UseVisualStyleBackColor = true;
             this.Down.Click += new System.EventHandler(this.Down_Click_1);
@@ -379,10 +411,9 @@ private void InitializeComponent()
             this.LeftButton.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LeftButton.ImageIndex = 4;
             this.LeftButton.ImageList = this.imageList1;
-            this.LeftButton.Location = new System.Drawing.Point(4, 47);
-            this.LeftButton.Margin = new System.Windows.Forms.Padding(4);
+            this.LeftButton.Location = new System.Drawing.Point(3, 38);
             this.LeftButton.Name = "LeftButton";
-            this.LeftButton.Size = new System.Drawing.Size(130, 35);
+            this.LeftButton.Size = new System.Drawing.Size(97, 29);
             this.LeftButton.TabIndex = 10;
             this.LeftButton.UseVisualStyleBackColor = true;
             this.LeftButton.Click += new System.EventHandler(this.Left_Click_1);
@@ -392,10 +423,9 @@ private void InitializeComponent()
             this.AClock.Dock = System.Windows.Forms.DockStyle.Fill;
             this.AClock.ImageKey = "RotateLeft.jpg";
             this.AClock.ImageList = this.imageList1;
-            this.AClock.Location = new System.Drawing.Point(280, 4);
-            this.AClock.Margin = new System.Windows.Forms.Padding(4);
+            this.AClock.Location = new System.Drawing.Point(209, 3);
             this.AClock.Name = "AClock";
-            this.AClock.Size = new System.Drawing.Size(130, 35);
+            this.AClock.Size = new System.Drawing.Size(98, 29);
             this.AClock.TabIndex = 12;
             this.AClock.UseVisualStyleBackColor = true;
             this.AClock.Click += new System.EventHandler(this.AClock_Click_1);
@@ -405,10 +435,9 @@ private void InitializeComponent()
             this.RightButton.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RightButton.ImageIndex = 6;
             this.RightButton.ImageList = this.imageList1;
-            this.RightButton.Location = new System.Drawing.Point(280, 47);
-            this.RightButton.Margin = new System.Windows.Forms.Padding(4);
+            this.RightButton.Location = new System.Drawing.Point(209, 38);
             this.RightButton.Name = "RightButton";
-            this.RightButton.Size = new System.Drawing.Size(130, 35);
+            this.RightButton.Size = new System.Drawing.Size(98, 29);
             this.RightButton.TabIndex = 11;
             this.RightButton.UseVisualStyleBackColor = true;
             this.RightButton.Click += new System.EventHandler(this.Right_Click_1);
@@ -418,67 +447,35 @@ private void InitializeComponent()
             this.Bigger.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Bigger.ImageKey = "ScaleUp.jpg";
             this.Bigger.ImageList = this.imageList1;
-            this.Bigger.Location = new System.Drawing.Point(4, 90);
-            this.Bigger.Margin = new System.Windows.Forms.Padding(4);
+            this.Bigger.Location = new System.Drawing.Point(3, 73);
             this.Bigger.Name = "Bigger";
             this.Bigger.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.Bigger.Size = new System.Drawing.Size(130, 35);
+            this.Bigger.Size = new System.Drawing.Size(97, 29);
             this.Bigger.TabIndex = 16;
             this.Bigger.UseVisualStyleBackColor = true;
             this.Bigger.Click += new System.EventHandler(this.Bigger_Click_1);
             // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(412, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(30, 17);
-            this.label1.TabIndex = 17;
-            this.label1.Text = "mm";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label6
+            // noMouseBites
             // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(412, 30);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(30, 17);
-            this.label6.TabIndex = 18;
-            this.label6.Text = "mm";
-            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(412, 90);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(30, 17);
-            this.label7.TabIndex = 19;
-            this.label7.Text = "mm";
-            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(412, 60);
-            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(32, 17);
-            this.label8.TabIndex = 20;
-            this.label8.Text = "deg";
-            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.noMouseBites.AutoSize = true;
+            this.tableLayoutPanel1.SetColumnSpan(this.noMouseBites, 2);
+            this.noMouseBites.Enabled = false;
+            this.noMouseBites.Location = new System.Drawing.Point(7, 106);
+            this.noMouseBites.Margin = new System.Windows.Forms.Padding(7, 2, 2, 2);
+            this.noMouseBites.Name = "noMouseBites";
+            this.noMouseBites.Size = new System.Drawing.Size(122, 17);
+            this.noMouseBites.TabIndex = 26;
+            this.noMouseBites.Text = "Remove mousebites";
+            this.noMouseBites.UseVisualStyleBackColor = true;
+            this.noMouseBites.CheckedChanged += new System.EventHandler(this.noMouseBites_CheckedChanged);
             // 
             // InstanceDialog
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(473, 808);
+            this.ClientSize = new System.Drawing.Size(355, 656);
             this.ControlBox = false;
             this.Controls.Add(this.panel1);
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "InstanceDialog";
@@ -527,5 +524,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.CheckBox noMouseBites;
     }
 }
\ No newline at end of file
diff --git a/GerberPanelizer/InstanceDialog.cs b/GerberPanelizer/InstanceDialog.cs
index 0060e90..5d56776 100644
--- a/GerberPanelizer/InstanceDialog.cs
+++ b/GerberPanelizer/InstanceDialog.cs
@@ -33,6 +33,9 @@ public void UpdateBoxes(GerberPanelize newTarget)
             double rad = 0;
 
             radiusbox.Enabled = false;
+            noMouseBites.Checked = false;
+            noMouseBites.Enabled = false;
+
             Bigger.Enabled = false;
             Smaller.Enabled = false;
 
@@ -48,8 +51,10 @@ public void UpdateBoxes(GerberPanelize newTarget)
            
            if (TargetInstance.SelectedInstance.GetType() == typeof(GerberInstance))
             {
-                  GerberInstance GI = TargetInstance.SelectedInstance as GerberInstance;
-                  NameLabel.Text = Path.GetFileName(Path.GetDirectoryName( GI.GerberPath));
+                GerberInstance GI = TargetInstance.SelectedInstance as GerberInstance;
+                NameLabel.Text = Path.GetFileName(Path.GetDirectoryName( GI.GerberPath));
+                noMouseBites.Enabled = true;
+                noMouseBites.Checked = GI.RemoveMouseBites;
             }
             
             xbox.Value = (decimal)x;
@@ -82,6 +87,7 @@ void UpdateInstance()
 
             {
                 GerberInstance GI = TargetInstance.SelectedInstance as GerberInstance;
+                GI.RemoveMouseBites = noMouseBites.Checked;
                 GI.RebuildTransformed(TargetInstance.ThePanel.GerberOutlines[GI.GerberPath], TargetInstance.ThePanel.TheSet.ExtraTabDrillDistance);
             }
             
@@ -216,5 +222,10 @@ private void Smaller_Click_1(object sender, EventArgs e)
         {
             Smaller_Click(sender, e);
         }
+
+        private void noMouseBites_CheckedChanged(object sender, EventArgs e)
+        {
+            UpdateInstance();
+        }
     }
 }
diff --git a/GerberPanelizer/InstanceDialog.resx b/GerberPanelizer/InstanceDialog.resx
index cf138b6..3891f2c 100644
--- a/GerberPanelizer/InstanceDialog.resx
+++ b/GerberPanelizer/InstanceDialog.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAo
-        GwAAAk1TRnQBSQFMAgEBEAEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        GwAAAk1TRnQBSQFMAgEBEAEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/GerberPanelizer/PanelProperties.Designer.cs b/GerberPanelizer/PanelProperties.Designer.cs
index a5cb4e4..ccfddc4 100644
--- a/GerberPanelizer/PanelProperties.Designer.cs
+++ b/GerberPanelizer/PanelProperties.Designer.cs
@@ -52,6 +52,7 @@ private void InitializeComponent()
             this.label12 = new System.Windows.Forms.Label();
             this.ClipToOutlines = new System.Windows.Forms.CheckBox();
             this.noMouseBites = new System.Windows.Forms.CheckBox();
+            this.RelativePath = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.WidthBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.HeightBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MarginBox)).BeginInit();
@@ -63,14 +64,15 @@ private void InitializeComponent()
             // WidthBox
             // 
             this.WidthBox.DecimalPlaces = 2;
-            this.WidthBox.Location = new System.Drawing.Point(187, 19);
+            this.WidthBox.Location = new System.Drawing.Point(140, 15);
+            this.WidthBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.WidthBox.Maximum = new decimal(new int[] {
             100000,
             0,
             0,
             0});
             this.WidthBox.Name = "WidthBox";
-            this.WidthBox.Size = new System.Drawing.Size(120, 22);
+            this.WidthBox.Size = new System.Drawing.Size(90, 20);
             this.WidthBox.TabIndex = 0;
             this.WidthBox.Value = new decimal(new int[] {
             100,
@@ -81,14 +83,15 @@ private void InitializeComponent()
             // HeightBox
             // 
             this.HeightBox.DecimalPlaces = 2;
-            this.HeightBox.Location = new System.Drawing.Point(187, 47);
+            this.HeightBox.Location = new System.Drawing.Point(140, 38);
+            this.HeightBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.HeightBox.Maximum = new decimal(new int[] {
             100000,
             0,
             0,
             0});
             this.HeightBox.Name = "HeightBox";
-            this.HeightBox.Size = new System.Drawing.Size(120, 22);
+            this.HeightBox.Size = new System.Drawing.Size(90, 20);
             this.HeightBox.TabIndex = 1;
             this.HeightBox.Value = new decimal(new int[] {
             100,
@@ -104,14 +107,15 @@ private void InitializeComponent()
             0,
             0,
             65536});
-            this.MarginBox.Location = new System.Drawing.Point(187, 75);
+            this.MarginBox.Location = new System.Drawing.Point(140, 61);
+            this.MarginBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.MarginBox.Maximum = new decimal(new int[] {
             100000,
             0,
             0,
             0});
             this.MarginBox.Name = "MarginBox";
-            this.MarginBox.Size = new System.Drawing.Size(120, 22);
+            this.MarginBox.Size = new System.Drawing.Size(90, 20);
             this.MarginBox.TabIndex = 2;
             this.MarginBox.Value = new decimal(new int[] {
             2,
@@ -122,9 +126,10 @@ private void InitializeComponent()
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(135, 19);
+            this.label1.Location = new System.Drawing.Point(101, 15);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(44, 17);
+            this.label1.Size = new System.Drawing.Size(35, 13);
             this.label1.TabIndex = 3;
             this.label1.Text = "Width";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -132,9 +137,10 @@ private void InitializeComponent()
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(137, 47);
+            this.label2.Location = new System.Drawing.Point(103, 38);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(49, 17);
+            this.label2.Size = new System.Drawing.Size(38, 13);
             this.label2.TabIndex = 4;
             this.label2.Text = "Height";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -142,9 +148,10 @@ private void InitializeComponent()
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(25, 77);
+            this.label3.Location = new System.Drawing.Point(19, 63);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(156, 17);
+            this.label3.Size = new System.Drawing.Size(118, 13);
             this.label3.TabIndex = 5;
             this.label3.Text = "Margin between boards";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -152,9 +159,10 @@ private void InitializeComponent()
             // button1
             // 
             this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.button1.Location = new System.Drawing.Point(216, 332);
+            this.button1.Location = new System.Drawing.Point(162, 307);
+            this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(91, 28);
+            this.button1.Size = new System.Drawing.Size(68, 23);
             this.button1.TabIndex = 6;
             this.button1.Text = "Ok";
             this.button1.UseVisualStyleBackColor = true;
@@ -163,9 +171,10 @@ private void InitializeComponent()
             // button2
             // 
             this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.button2.Location = new System.Drawing.Point(41, 332);
+            this.button2.Location = new System.Drawing.Point(31, 307);
+            this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(91, 28);
+            this.button2.Size = new System.Drawing.Size(68, 23);
             this.button2.TabIndex = 7;
             this.button2.Text = "Cancel";
             this.button2.UseVisualStyleBackColor = true;
@@ -174,9 +183,10 @@ private void InitializeComponent()
             // FillEmpty
             // 
             this.FillEmpty.AutoSize = true;
-            this.FillEmpty.Location = new System.Drawing.Point(187, 111);
+            this.FillEmpty.Location = new System.Drawing.Point(140, 90);
+            this.FillEmpty.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.FillEmpty.Name = "FillEmpty";
-            this.FillEmpty.Size = new System.Drawing.Size(122, 21);
+            this.FillEmpty.Size = new System.Drawing.Size(93, 17);
             this.FillEmpty.TabIndex = 9;
             this.FillEmpty.Text = "Fill empty area";
             this.FillEmpty.UseVisualStyleBackColor = true;
@@ -189,14 +199,15 @@ private void InitializeComponent()
             0,
             0,
             65536});
-            this.filloffsetbox.Location = new System.Drawing.Point(187, 142);
+            this.filloffsetbox.Location = new System.Drawing.Point(140, 115);
+            this.filloffsetbox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.filloffsetbox.Maximum = new decimal(new int[] {
             100000,
             0,
             0,
             0});
             this.filloffsetbox.Name = "filloffsetbox";
-            this.filloffsetbox.Size = new System.Drawing.Size(120, 22);
+            this.filloffsetbox.Size = new System.Drawing.Size(90, 20);
             this.filloffsetbox.TabIndex = 10;
             this.filloffsetbox.Value = new decimal(new int[] {
             2,
@@ -207,9 +218,10 @@ private void InitializeComponent()
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(21, 144);
+            this.label4.Location = new System.Drawing.Point(16, 117);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(160, 17);
+            this.label4.Size = new System.Drawing.Size(118, 13);
             this.label4.TabIndex = 11;
             this.label4.Text = "Fill offset for empty area";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -217,9 +229,10 @@ private void InitializeComponent()
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(21, 172);
+            this.label5.Location = new System.Drawing.Point(16, 140);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(149, 17);
+            this.label5.Size = new System.Drawing.Size(111, 13);
             this.label5.TabIndex = 13;
             this.label5.Text = "Empty area smoothing";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -232,14 +245,15 @@ private void InitializeComponent()
             0,
             0,
             65536});
-            this.smoothoffsetbox.Location = new System.Drawing.Point(187, 170);
+            this.smoothoffsetbox.Location = new System.Drawing.Point(140, 138);
+            this.smoothoffsetbox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.smoothoffsetbox.Maximum = new decimal(new int[] {
             100000,
             0,
             0,
             0});
             this.smoothoffsetbox.Name = "smoothoffsetbox";
-            this.smoothoffsetbox.Size = new System.Drawing.Size(120, 22);
+            this.smoothoffsetbox.Size = new System.Drawing.Size(90, 20);
             this.smoothoffsetbox.TabIndex = 12;
             this.smoothoffsetbox.Value = new decimal(new int[] {
             2,
@@ -250,9 +264,10 @@ private void InitializeComponent()
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(10, 220);
+            this.label6.Location = new System.Drawing.Point(8, 179);
+            this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(171, 17);
+            this.label6.Size = new System.Drawing.Size(127, 13);
             this.label6.TabIndex = 15;
             this.label6.Text = "Extra distance for tabdrills";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -265,14 +280,15 @@ private void InitializeComponent()
             0,
             0,
             65536});
-            this.ExtraTabDrillDistance.Location = new System.Drawing.Point(187, 218);
+            this.ExtraTabDrillDistance.Location = new System.Drawing.Point(140, 177);
+            this.ExtraTabDrillDistance.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ExtraTabDrillDistance.Maximum = new decimal(new int[] {
             100000,
             0,
             0,
             0});
             this.ExtraTabDrillDistance.Name = "ExtraTabDrillDistance";
-            this.ExtraTabDrillDistance.Size = new System.Drawing.Size(120, 22);
+            this.ExtraTabDrillDistance.Size = new System.Drawing.Size(90, 20);
             this.ExtraTabDrillDistance.TabIndex = 14;
             this.ExtraTabDrillDistance.Value = new decimal(new int[] {
             2,
@@ -283,10 +299,9 @@ private void InitializeComponent()
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(314, 24);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Location = new System.Drawing.Point(236, 20);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(30, 17);
+            this.label7.Size = new System.Drawing.Size(23, 13);
             this.label7.TabIndex = 18;
             this.label7.Text = "mm";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -294,10 +309,9 @@ private void InitializeComponent()
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(314, 52);
-            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Location = new System.Drawing.Point(236, 42);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(30, 17);
+            this.label8.Size = new System.Drawing.Size(23, 13);
             this.label8.TabIndex = 19;
             this.label8.Text = "mm";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -305,10 +319,9 @@ private void InitializeComponent()
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(314, 80);
-            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Location = new System.Drawing.Point(236, 65);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(30, 17);
+            this.label9.Size = new System.Drawing.Size(23, 13);
             this.label9.TabIndex = 20;
             this.label9.Text = "mm";
             this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -316,10 +329,9 @@ private void InitializeComponent()
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(314, 175);
-            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label10.Location = new System.Drawing.Point(236, 142);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(30, 17);
+            this.label10.Size = new System.Drawing.Size(23, 13);
             this.label10.TabIndex = 21;
             this.label10.Text = "mm";
             this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -327,10 +339,9 @@ private void InitializeComponent()
             // label11
             // 
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(314, 147);
-            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label11.Location = new System.Drawing.Point(236, 119);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(30, 17);
+            this.label11.Size = new System.Drawing.Size(23, 13);
             this.label11.TabIndex = 22;
             this.label11.Text = "mm";
             this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -338,10 +349,9 @@ private void InitializeComponent()
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(314, 223);
-            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label12.Location = new System.Drawing.Point(236, 181);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(30, 17);
+            this.label12.Size = new System.Drawing.Size(23, 13);
             this.label12.TabIndex = 23;
             this.label12.Text = "mm";
             this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -349,9 +359,10 @@ private void InitializeComponent()
             // ClipToOutlines
             // 
             this.ClipToOutlines.AutoSize = true;
-            this.ClipToOutlines.Location = new System.Drawing.Point(185, 261);
+            this.ClipToOutlines.Location = new System.Drawing.Point(139, 212);
+            this.ClipToOutlines.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ClipToOutlines.Name = "ClipToOutlines";
-            this.ClipToOutlines.Size = new System.Drawing.Size(163, 21);
+            this.ClipToOutlines.Size = new System.Drawing.Size(124, 17);
             this.ClipToOutlines.TabIndex = 24;
             this.ClipToOutlines.Text = "Clip to board outlines";
             this.ClipToOutlines.UseVisualStyleBackColor = true;
@@ -359,21 +370,34 @@ private void InitializeComponent()
             // noMouseBites
             // 
             this.noMouseBites.AutoSize = true;
-            this.noMouseBites.Location = new System.Drawing.Point(187, 288);
+            this.noMouseBites.Location = new System.Drawing.Point(139, 234);
+            this.noMouseBites.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.noMouseBites.Name = "noMouseBites";
-            this.noMouseBites.Size = new System.Drawing.Size(209, 21);
+            this.noMouseBites.Size = new System.Drawing.Size(159, 17);
             this.noMouseBites.TabIndex = 25;
             this.noMouseBites.Text = "Do not generate mousebites";
             this.noMouseBites.UseVisualStyleBackColor = true;
             this.noMouseBites.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
+            // RelativePath
+            // 
+            this.RelativePath.AutoSize = true;
+            this.RelativePath.Location = new System.Drawing.Point(139, 255);
+            this.RelativePath.Margin = new System.Windows.Forms.Padding(2);
+            this.RelativePath.Name = "RelativePath";
+            this.RelativePath.Size = new System.Drawing.Size(106, 17);
+            this.RelativePath.TabIndex = 26;
+            this.RelativePath.Text = "Use relative path";
+            this.RelativePath.UseVisualStyleBackColor = true;
+            // 
             // PanelProperties
             // 
             this.AcceptButton = this.button1;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.button2;
-            this.ClientSize = new System.Drawing.Size(419, 401);
+            this.ClientSize = new System.Drawing.Size(314, 354);
+            this.Controls.Add(this.RelativePath);
             this.Controls.Add(this.noMouseBites);
             this.Controls.Add(this.ClipToOutlines);
             this.Controls.Add(this.label12);
@@ -398,6 +422,7 @@ private void InitializeComponent()
             this.Controls.Add(this.HeightBox);
             this.Controls.Add(this.WidthBox);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "PanelProperties";
             this.Text = "Panel Properties";
             ((System.ComponentModel.ISupportInitialize)(this.WidthBox)).EndInit();
@@ -436,5 +461,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label12;
         private System.Windows.Forms.CheckBox ClipToOutlines;
         private System.Windows.Forms.CheckBox noMouseBites;
+        private System.Windows.Forms.CheckBox RelativePath;
     }
 }
\ No newline at end of file
diff --git a/GerberPanelizer/PanelProperties.cs b/GerberPanelizer/PanelProperties.cs
index 5b941f8..623d151 100644
--- a/GerberPanelizer/PanelProperties.cs
+++ b/GerberPanelizer/PanelProperties.cs
@@ -29,6 +29,7 @@ public PanelProperties(GerberLibrary.GerberPanel ThePanel)
             ExtraTabDrillDistance.Value = (decimal)ParentPanel.TheSet.ExtraTabDrillDistance;
             FillEmpty.Checked = ParentPanel.TheSet.ConstructNegativePolygon;
             noMouseBites.Checked = ParentPanel.TheSet.DoNotGenerateMouseBites;
+            RelativePath.Checked = ParentPanel.TheSet.UseRelativePath;
         }
 
         private void OkButton(object sender, EventArgs e)
@@ -42,6 +43,7 @@ private void OkButton(object sender, EventArgs e)
             ParentPanel.TheSet.Smoothing = (double)smoothoffsetbox.Value;
             ParentPanel.TheSet.DoNotGenerateMouseBites = noMouseBites.Checked;
             ParentPanel.TheSet.ClipToOutlines = ClipToOutlines.Checked;
+            ParentPanel.TheSet.UseRelativePath = RelativePath.Checked;
             Close();
         }
 
diff --git a/GerberViewer/GerberViewer.csproj b/GerberViewer/GerberViewer.csproj
index 76dd362..85f4f0f 100644
--- a/GerberViewer/GerberViewer.csproj
+++ b/GerberViewer/GerberViewer.csproj
@@ -67,12 +67,12 @@
       <HintPath>..\GerberProjects\packages\Triangle.0.0.6-Beta3\lib\net45\Triangle.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.11.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\GerberProjects\packages\DockPanelSuite.2.11.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+      <HintPath>..\GerberProjects\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=2.11.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\GerberProjects\packages\DockPanelSuite.ThemeVS2015.2.11.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
+    <Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+      <HintPath>..\GerberProjects\packages\DockPanelSuite.ThemeVS2015.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -119,7 +119,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <None Include="OpenTK.dll.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -143,4 +145,4 @@
     <Content Include="favicon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file