diff --git a/PesFile/PesFile.cs b/PesFile/PesFile.cs
index 75026e6..230b1aa 100644
--- a/PesFile/PesFile.cs
+++ b/PesFile/PesFile.cs
@@ -558,14 +558,29 @@ namespace PesFile
}
}
- public Bitmap designToBitmap(Single threadThickness, bool filterUglyStitches, double filterUglyStitchesThreshold)
+ public Bitmap designToBitmap(Single threadThickness, bool filterUglyStitches, double filterUglyStitchesThreshold, bool includeGrid)
{
Bitmap DrawArea;
Graphics xGraph;
+ int imageWidth = GetWidth() + (int)(threadThickness * 2);
+ int imageHeight = GetHeight() + (int)(threadThickness * 2);
+ int gridSize = 10;
- DrawArea = new Bitmap(GetWidth() + (int)(threadThickness * 2), GetHeight() + (int)(threadThickness * 2));
-
+ DrawArea = new Bitmap(imageWidth, imageHeight);
xGraph = Graphics.FromImage(DrawArea);
+ if (includeGrid)
+ {
+ for (int xStart = 0; (xStart * gridSize) < imageWidth; xStart++)
+ {
+ for (int yStart = 0; (yStart * gridSize) < imageHeight; yStart++)
+ {
+ if ((xStart % 2) == (yStart % 2))
+ {
+ xGraph.FillRectangle(Brushes.Gray, (xStart * gridSize), (yStart * gridSize), gridSize, gridSize);
+ }
+ }
+ }
+ }
xGraph.TranslateTransform(threadThickness+translateStart.X, threadThickness+translateStart.Y);
//xGraph.FillRectangle(Brushes.White, 0, 0, DrawArea.Width, DrawArea.Height);
diff --git a/embroideryInfo/Program.cs b/embroideryInfo/Program.cs
index fb87691..5621f21 100644
--- a/embroideryInfo/Program.cs
+++ b/embroideryInfo/Program.cs
@@ -41,7 +41,7 @@ namespace embroideryInfo
if (args[0] == "--image" && args.Length > 1)
{
PesFile.PesFile design = new PesFile.PesFile(args[1]);
- Bitmap DrawArea = design.designToBitmap(5, false, 0);
+ Bitmap DrawArea = design.designToBitmap(5, false, 0, false);
Bitmap temp = new Bitmap(DrawArea.Width, DrawArea.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
Graphics tempGraph = Graphics.FromImage(temp);
tempGraph.FillRectangle(Brushes.White, 0, 0, temp.Width, temp.Height);
diff --git a/embroideryReader/EmbroideryReaderSettings.cs b/embroideryReader/EmbroideryReaderSettings.cs
index 76d108e..60e94fa 100644
--- a/embroideryReader/EmbroideryReaderSettings.cs
+++ b/embroideryReader/EmbroideryReaderSettings.cs
@@ -1,7 +1,7 @@
/*
Embroidery Reader - an application to view .pes embroidery designs
-Copyright (C) 2011 Nathan Crawford
+Copyright (C) 2013 Nathan Crawford
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -54,6 +54,8 @@ namespace embroideryReader
private const String SETTING_WINDOW_WIDTH = "window width";
private const String SETTING_WINDOW_HEIGHT = "window height";
+ private const String SETTING_DRAW_GRID = "draw background grid";
+
private const String VALUE_YES = "yes";
private const String VALUE_NO = "no";
@@ -130,6 +132,12 @@ namespace embroideryReader
settings.setValue(SETTING_LAST_SAVE_IMAGE_LOCATION, oldSettings.getValue(SETTING_LAST_SAVE_IMAGE_LOCATION));
}
}
+
+ // Default to background grid enabled
+ if (settings.getValue(SETTING_DRAW_GRID) == null)
+ {
+ settings.setValue(SETTING_DRAW_GRID, VALUE_TRUE);
+ }
}
// This is no longer in the settings file, but I'm keeping it here because
@@ -318,5 +326,22 @@ namespace embroideryReader
settings.setValue(SETTING_WINDOW_HEIGHT, value.ToString());
}
}
+
+ public bool drawBackgroundGrid
+ {
+ get
+ {
+ return (settings.getValue(SETTING_DRAW_GRID) == VALUE_TRUE);
+ }
+ set
+ {
+ String output = VALUE_FALSE;
+ if (value)
+ {
+ output = VALUE_TRUE;
+ }
+ settings.setValue(SETTING_DRAW_GRID, output);
+ }
+ }
}
}
diff --git a/embroideryReader/Program.cs b/embroideryReader/Program.cs
index 0a1b441..41547af 100644
--- a/embroideryReader/Program.cs
+++ b/embroideryReader/Program.cs
@@ -1,7 +1,7 @@
/*
Embroidery Reader - an application to view .pes embroidery designs
-Copyright (C) 2011 Nathan Crawford
+Copyright (C) 2013 Nathan Crawford
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/embroideryReader/frmMain.Designer.cs b/embroideryReader/frmMain.Designer.cs
index 586834d..ec8bc80 100644
--- a/embroideryReader/frmMain.Designer.cs
+++ b/embroideryReader/frmMain.Designer.cs
@@ -105,13 +105,13 @@ namespace embroideryReader
this.toolStripSeparator3,
this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
- this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "File";
//
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
- this.openToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.openToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.openToolStripMenuItem.Text = "Open...";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
@@ -119,20 +119,20 @@ namespace embroideryReader
//
this.saveAsBitmapToolStripMenuItem.Enabled = false;
this.saveAsBitmapToolStripMenuItem.Name = "saveAsBitmapToolStripMenuItem";
- this.saveAsBitmapToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.saveAsBitmapToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.saveAsBitmapToolStripMenuItem.Text = "Save as image...";
this.saveAsBitmapToolStripMenuItem.Click += new System.EventHandler(this.saveAsBitmapToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(163, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(154, 6);
//
// printToolStripMenuItem
//
this.printToolStripMenuItem.Enabled = false;
this.printToolStripMenuItem.Name = "printToolStripMenuItem";
- this.printToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.printToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.printToolStripMenuItem.Text = "Print...";
this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click);
//
@@ -140,19 +140,19 @@ namespace embroideryReader
//
this.printPreviewToolStripMenuItem.Enabled = false;
this.printPreviewToolStripMenuItem.Name = "printPreviewToolStripMenuItem";
- this.printPreviewToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.printPreviewToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.printPreviewToolStripMenuItem.Text = "Print Preview...";
this.printPreviewToolStripMenuItem.Click += new System.EventHandler(this.printPreviewToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(163, 6);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(154, 6);
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
- this.exitToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@@ -163,26 +163,26 @@ namespace embroideryReader
this.toolStripSeparator4,
this.preferencesToolStripMenuItem});
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
- this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+ this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.editToolStripMenuItem.Text = "Edit";
//
// copyToolStripMenuItem
//
this.copyToolStripMenuItem.Enabled = false;
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.copyToolStripMenuItem.Text = "Copy";
this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(152, 6);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
//
// preferencesToolStripMenuItem
//
this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem";
- this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+ this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.preferencesToolStripMenuItem.Text = "Preferences...";
this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.preferencesToolStripMenuItem_Click);
//
@@ -193,14 +193,14 @@ namespace embroideryReader
this.rotateRightToolStripMenuItem,
this.refreshToolStripMenuItem});
this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
- this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20);
+ this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.viewToolStripMenuItem.Text = "View";
//
// rotateLeftToolStripMenuItem
//
this.rotateLeftToolStripMenuItem.Enabled = false;
this.rotateLeftToolStripMenuItem.Name = "rotateLeftToolStripMenuItem";
- this.rotateLeftToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.rotateLeftToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rotateLeftToolStripMenuItem.Text = "Rotate left";
this.rotateLeftToolStripMenuItem.Click += new System.EventHandler(this.rotateLeftToolStripMenuItem_Click);
//
@@ -208,7 +208,7 @@ namespace embroideryReader
//
this.rotateRightToolStripMenuItem.Enabled = false;
this.rotateRightToolStripMenuItem.Name = "rotateRightToolStripMenuItem";
- this.rotateRightToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.rotateRightToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rotateRightToolStripMenuItem.Text = "Rotate right";
this.rotateRightToolStripMenuItem.Click += new System.EventHandler(this.rotateRightToolStripMenuItem_Click);
//
@@ -216,8 +216,8 @@ namespace embroideryReader
//
this.refreshToolStripMenuItem.Enabled = false;
this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
- this.refreshToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
- this.refreshToolStripMenuItem.Text = "Reset";
+ this.refreshToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.refreshToolStripMenuItem.Text = "Reset / Refresh";
this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
//
// helpToolStripMenuItem
@@ -229,13 +229,13 @@ namespace embroideryReader
this.toolStripSeparator1,
this.aboutToolStripMenuItem});
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.helpToolStripMenuItem.Text = "Help";
//
// checkForUpdateToolStripMenuItem
//
this.checkForUpdateToolStripMenuItem.Name = "checkForUpdateToolStripMenuItem";
- this.checkForUpdateToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+ this.checkForUpdateToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
this.checkForUpdateToolStripMenuItem.Text = "Check for update";
this.checkForUpdateToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdateToolStripMenuItem_Click);
//
@@ -243,7 +243,7 @@ namespace embroideryReader
//
this.saveDebugInfoToolStripMenuItem.Enabled = false;
this.saveDebugInfoToolStripMenuItem.Name = "saveDebugInfoToolStripMenuItem";
- this.saveDebugInfoToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+ this.saveDebugInfoToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
this.saveDebugInfoToolStripMenuItem.Text = "Save design debug info";
this.saveDebugInfoToolStripMenuItem.Click += new System.EventHandler(this.saveDebugInfoToolStripMenuItem_Click);
//
@@ -251,19 +251,19 @@ namespace embroideryReader
//
this.showDebugInfoToolStripMenuItem.Enabled = false;
this.showDebugInfoToolStripMenuItem.Name = "showDebugInfoToolStripMenuItem";
- this.showDebugInfoToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+ this.showDebugInfoToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
this.showDebugInfoToolStripMenuItem.Text = "Show design debug info";
this.showDebugInfoToolStripMenuItem.Click += new System.EventHandler(this.showDebugInfoToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(196, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(199, 6);
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
- this.aboutToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+ this.aboutToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
this.aboutToolStripMenuItem.Text = "About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
@@ -335,8 +335,8 @@ namespace embroideryReader
this.MainMenuStrip = this.menuStrip1;
this.Name = "frmMain";
this.Text = "Form1";
- this.Load += new System.EventHandler(this.Form1_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
+ this.Load += new System.EventHandler(this.Form1_Load);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.panel2.ResumeLayout(false);
diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs
index 6d4123b..5fbaafc 100644
--- a/embroideryReader/frmMain.cs
+++ b/embroideryReader/frmMain.cs
@@ -1,7 +1,7 @@
/*
Embroidery Reader - an application to view .pes embroidery designs
-Copyright (C) 2011 Nathan Crawford
+Copyright (C) 2013 Nathan Crawford
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -111,6 +111,14 @@ namespace embroideryReader
}
}
+ private void updateDesignImage()
+ {
+ DrawArea = design.designToBitmap((float)settings.threadThickness, (settings.filterStiches), settings.filterStitchesThreshold, settings.drawBackgroundGrid);
+ panel1.Width = design.GetWidth() + (int)(settings.threadThickness * 2);
+ panel1.Height = design.GetHeight() + (int)(settings.threadThickness * 2);
+ panel1.Invalidate();
+ }
+
private void openFile(string filename)
{
if (!System.IO.File.Exists(filename))
@@ -122,10 +130,7 @@ namespace embroideryReader
{
this.Text = System.IO.Path.GetFileName(filename) + " - " + APP_TITLE;
- DrawArea = design.designToBitmap((float)settings.threadThickness, (settings.filterStiches), settings.filterStitchesThreshold);
- panel1.Width = design.GetWidth() + (int)(settings.threadThickness * 2);
- panel1.Height = design.GetHeight() + (int)(settings.threadThickness * 2);
- panel1.Invalidate();
+ updateDesignImage();
if (design.getFormatWarning())
{
@@ -300,7 +305,7 @@ namespace embroideryReader
float dpiY = 100;
double inchesPerMM = 0.03937007874015748031496062992126;
e.Graphics.ScaleTransform((float)(dpiX * inchesPerMM * 0.1), (float)(dpiY * inchesPerMM * 0.1));
-
+ Bitmap tempDrawArea = design.designToBitmap((float)settings.threadThickness, (settings.filterStiches), settings.filterStitchesThreshold, false);
e.Graphics.DrawImage(DrawArea, 30, 30);
}
}
@@ -329,10 +334,7 @@ namespace embroideryReader
{
if (design != null && design.getStatus() == PesFile.statusEnum.Ready)
{
- DrawArea = design.designToBitmap((float)settings.threadThickness, (settings.filterStiches), (int)settings.filterStitchesThreshold);
- panel1.Width = design.GetWidth() + (int)(settings.threadThickness * 2);
- panel1.Height = design.GetHeight() + (int)(settings.threadThickness * 2);
- panel1.Invalidate();
+ updateDesignImage();
if (design.getClassWarning())
{
diff --git a/embroideryReader/frmMain.resx b/embroideryReader/frmMain.resx
index f8711de..190070d 100644
--- a/embroideryReader/frmMain.resx
+++ b/embroideryReader/frmMain.resx
@@ -112,30 +112,30 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
17, 17
-
+
147, 17
-
+
256, 17
-
+
366, 17
-
+
497, 17
-
+
609, 17
-
+
AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
@@ -309,13 +309,13 @@
wf+0BQAAgAUAAIAFAACAAQAAgAHB/4ABAACAAQAAgAEAALwBAAC8AQAAvAHB/4ABbP///5H/
-
+
760, 17
-
+
888, 17
-
+
43
diff --git a/embroideryReader/frmSettingsDialog.Designer.cs b/embroideryReader/frmSettingsDialog.Designer.cs
index 65b0bf0..106e551 100644
--- a/embroideryReader/frmSettingsDialog.Designer.cs
+++ b/embroideryReader/frmSettingsDialog.Designer.cs
@@ -39,10 +39,11 @@ namespace embroideryReader
this.label2 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.chkUglyStitches = new System.Windows.Forms.CheckBox();
- this.txtThreshold = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.txtThreshold = new System.Windows.Forms.TextBox();
+ this.chkUglyStitches = new System.Windows.Forms.CheckBox();
+ this.chkDrawGrid = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
@@ -80,7 +81,7 @@ namespace embroideryReader
// btnOK
//
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.btnOK.Location = new System.Drawing.Point(171, 190);
+ this.btnOK.Location = new System.Drawing.Point(171, 208);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(75, 23);
this.btnOK.TabIndex = 3;
@@ -91,7 +92,7 @@ namespace embroideryReader
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(252, 190);
+ this.btnCancel.Location = new System.Drawing.Point(252, 208);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 4;
@@ -138,6 +139,7 @@ namespace embroideryReader
//
// groupBox2
//
+ this.groupBox2.Controls.Add(this.chkDrawGrid);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.txtThreshold);
@@ -147,11 +149,36 @@ namespace embroideryReader
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Location = new System.Drawing.Point(12, 97);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(315, 87);
+ this.groupBox2.Size = new System.Drawing.Size(315, 105);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Stitch drawing";
//
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(57, 58);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(67, 13);
+ this.label4.TabIndex = 11;
+ this.label4.Text = "Ugly Length:";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(168, 58);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(33, 13);
+ this.label3.TabIndex = 10;
+ this.label3.Text = "pixels";
+ //
+ // txtThreshold
+ //
+ this.txtThreshold.Location = new System.Drawing.Point(130, 55);
+ this.txtThreshold.Name = "txtThreshold";
+ this.txtThreshold.Size = new System.Drawing.Size(32, 20);
+ this.txtThreshold.TabIndex = 9;
+ //
// chkUglyStitches
//
this.chkUglyStitches.AutoSize = true;
@@ -162,30 +189,15 @@ namespace embroideryReader
this.chkUglyStitches.Text = "Remove \'ugly\' stitches";
this.chkUglyStitches.UseVisualStyleBackColor = true;
//
- // txtThreshold
+ // chkDrawGrid
//
- this.txtThreshold.Location = new System.Drawing.Point(130, 55);
- this.txtThreshold.Name = "txtThreshold";
- this.txtThreshold.Size = new System.Drawing.Size(32, 20);
- this.txtThreshold.TabIndex = 9;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(168, 58);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(33, 13);
- this.label3.TabIndex = 10;
- this.label3.Text = "pixels";
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(57, 58);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 13);
- this.label4.TabIndex = 11;
- this.label4.Text = "Ugly Length:";
+ this.chkDrawGrid.AutoSize = true;
+ this.chkDrawGrid.Location = new System.Drawing.Point(7, 79);
+ this.chkDrawGrid.Name = "chkDrawGrid";
+ this.chkDrawGrid.Size = new System.Drawing.Size(131, 17);
+ this.chkDrawGrid.TabIndex = 12;
+ this.chkDrawGrid.Text = "Draw background grid";
+ this.chkDrawGrid.UseVisualStyleBackColor = true;
//
// frmSettingsDialog
//
@@ -193,7 +205,7 @@ namespace embroideryReader
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
- this.ClientSize = new System.Drawing.Size(339, 225);
+ this.ClientSize = new System.Drawing.Size(339, 244);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnCancel);
@@ -228,5 +240,6 @@ namespace embroideryReader
private System.Windows.Forms.TextBox txtThreshold;
private System.Windows.Forms.CheckBox chkUglyStitches;
private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.CheckBox chkDrawGrid;
}
}
diff --git a/embroideryReader/frmSettingsDialog.cs b/embroideryReader/frmSettingsDialog.cs
index 57fb479..97861ca 100644
--- a/embroideryReader/frmSettingsDialog.cs
+++ b/embroideryReader/frmSettingsDialog.cs
@@ -1,7 +1,7 @@
/*
Embroidery Reader - an application to view .pes embroidery designs
-Copyright (C) 2011 Nathan Crawford
+Copyright (C) 2013 Nathan Crawford
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -115,6 +115,8 @@ namespace embroideryReader
{
settings.filterStitchesThreshold = threshold;
}
+
+ settings.drawBackgroundGrid = chkDrawGrid.Checked;
}
}
}
diff --git a/embroideryReader/frmSettingsDialog.resx b/embroideryReader/frmSettingsDialog.resx
index c0bf804..942532f 100644
--- a/embroideryReader/frmSettingsDialog.resx
+++ b/embroideryReader/frmSettingsDialog.resx
@@ -112,12 +112,12 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
17, 17
\ No newline at end of file
diff --git a/embroideryThumbs/PESThumbnail.cs b/embroideryThumbs/PESThumbnail.cs
index 1c64bd7..fcdbe95 100644
--- a/embroideryThumbs/PESThumbnail.cs
+++ b/embroideryThumbs/PESThumbnail.cs
@@ -1,7 +1,7 @@
/*
Embroidery Reader - an application to view .pes embroidery designs
-Copyright (C) 2011 Nathan Crawford
+Copyright (C) 2013 Nathan Crawford
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -175,7 +175,7 @@ namespace embroideryThumbs
logfile.WriteLine("Called Extract");
logfile.Close();
- System.Drawing.Bitmap designBitmap = designFile.designToBitmap(3, false, 0);
+ System.Drawing.Bitmap designBitmap = designFile.designToBitmap(3, false, 0, false);
IntPtr hBmp = designBitmap.GetHbitmap();