From 75dc0da0e8de143143b3d828e6415ea433bb9c0e Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Sat, 5 Apr 2008 04:30:15 +0000 Subject: [PATCH] Updated for new paramaters to filterStitches() in PesFile. --- embroideryReader/Properties/AssemblyInfo.cs | 6 +- .../bin/Debug/embroideryReader.exe | Bin 151552 -> 151552 bytes .../bin/Release/embroideryReader.exe | Bin 151552 -> 151552 bytes embroideryReader/frmMain.cs | 16 ++- .../frmSettingsDialog.Designer.cs | 107 +++++++++++++++--- embroideryReader/frmSettingsDialog.cs | 39 +++++++ 6 files changed, 143 insertions(+), 25 deletions(-) diff --git a/embroideryReader/Properties/AssemblyInfo.cs b/embroideryReader/Properties/AssemblyInfo.cs index ca31c57..f2fd447 100644 --- a/embroideryReader/Properties/AssemblyInfo.cs +++ b/embroideryReader/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -/* +/* Embridery Reader - an application to view .pes embroidery designs Copyright (C) 2008 Nathan Crawford @@ -54,5 +54,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.2.2.12")] -[assembly: AssemblyFileVersion("1.2.2.12")] +[assembly: AssemblyVersion("1.2.2.19")] +[assembly: AssemblyFileVersion("1.2.2.19")] diff --git a/embroideryReader/bin/Debug/embroideryReader.exe b/embroideryReader/bin/Debug/embroideryReader.exe index 4914e5b8d8c752b95a0997ce8cc642311ca3698b..e7e256c137d923c15f80fb2089f5ac57cb9a97e0 100644 GIT binary patch delta 15591 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 W?QXUGC0#LNXLOeSTlv-r!T$ma+&?A& delta 15060 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

l`@bxVsign_ diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs index 2f1f459..ef6736f 100644 --- a/embroideryReader/frmMain.cs +++ b/embroideryReader/frmMain.cs @@ -173,7 +173,8 @@ namespace embroideryReader { } } - DrawArea = design.designToBitmap(threadThickness); + int threshold = Convert.ToInt32(settings.getValue("filter stitches threshold")); + DrawArea = design.designToBitmap(threadThickness, (settings.getValue("filter stitches") == "true"), threshold); panel1.Width = design.GetWidth() + (int)(threadThickness * 2); panel1.Height = design.GetHeight() + (int)(threadThickness * 2); panel1.Invalidate(); @@ -520,16 +521,19 @@ namespace embroideryReader { threadThickness = Convert.ToSingle(settings.getValue("thread thickness")); } - catch (Exception ex) - { - } + catch (Exception ex) { } } - DrawArea = design.designToBitmap(threadThickness); + int threshold = Convert.ToInt32(settings.getValue("filter stitches threshold")); + DrawArea = design.designToBitmap(threadThickness, (settings.getValue("filter stitches") == "true"), threshold); panel1.Width = design.GetWidth() + (int)(threadThickness * 2); panel1.Height = design.GetHeight() + (int)(threadThickness * 2); panel1.Invalidate(); - if (design.getFormatWarning()) + if (design.getClassWarning()) + { + toolStripStatusLabel1.Text = "This file contains a class that is not yet supported"; + } + else if (design.getFormatWarning()) { toolStripStatusLabel1.Text = "The format of this file is not completely supported"; } diff --git a/embroideryReader/frmSettingsDialog.Designer.cs b/embroideryReader/frmSettingsDialog.Designer.cs index 70ad897..907c56d 100644 --- a/embroideryReader/frmSettingsDialog.Designer.cs +++ b/embroideryReader/frmSettingsDialog.Designer.cs @@ -62,11 +62,19 @@ namespace embroideryReader this.label1 = new System.Windows.Forms.Label(); this.txtThreadThickness = new System.Windows.Forms.TextBox(); 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.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // btnColor // - this.btnColor.Location = new System.Drawing.Point(148, 9); + this.btnColor.Location = new System.Drawing.Point(171, 16); this.btnColor.Name = "btnColor"; this.btnColor.Size = new System.Drawing.Size(75, 23); this.btnColor.TabIndex = 0; @@ -77,7 +85,7 @@ namespace embroideryReader // lblColor // this.lblColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lblColor.Location = new System.Drawing.Point(12, 9); + this.lblColor.Location = new System.Drawing.Point(6, 16); this.lblColor.Name = "lblColor"; this.lblColor.Size = new System.Drawing.Size(130, 52); this.lblColor.TabIndex = 1; @@ -86,7 +94,7 @@ namespace embroideryReader // // btnResetColor // - this.btnResetColor.Location = new System.Drawing.Point(148, 38); + this.btnResetColor.Location = new System.Drawing.Point(171, 45); this.btnResetColor.Name = "btnResetColor"; this.btnResetColor.Size = new System.Drawing.Size(75, 23); this.btnResetColor.TabIndex = 2; @@ -97,7 +105,7 @@ namespace embroideryReader // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(67, 117); + this.btnOK.Location = new System.Drawing.Point(171, 190); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 3; @@ -108,7 +116,7 @@ namespace embroideryReader // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(148, 117); + this.btnCancel.Location = new System.Drawing.Point(252, 190); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 4; @@ -119,7 +127,7 @@ namespace embroideryReader // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 74); + this.label1.Location = new System.Drawing.Point(6, 16); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(92, 13); this.label1.TabIndex = 5; @@ -127,7 +135,7 @@ namespace embroideryReader // // txtThreadThickness // - this.txtThreadThickness.Location = new System.Drawing.Point(110, 71); + this.txtThreadThickness.Location = new System.Drawing.Point(104, 13); this.txtThreadThickness.Name = "txtThreadThickness"; this.txtThreadThickness.Size = new System.Drawing.Size(32, 20); this.txtThreadThickness.TabIndex = 6; @@ -135,35 +143,96 @@ namespace embroideryReader // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(145, 74); + this.label2.Location = new System.Drawing.Point(142, 16); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(33, 13); this.label2.TabIndex = 7; this.label2.Text = "pixels"; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.lblColor); + this.groupBox1.Controls.Add(this.btnColor); + this.groupBox1.Controls.Add(this.btnResetColor); + this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(315, 79); + this.groupBox1.TabIndex = 8; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Background"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label4); + this.groupBox2.Controls.Add(this.label3); + this.groupBox2.Controls.Add(this.txtThreshold); + this.groupBox2.Controls.Add(this.chkUglyStitches); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.txtThreadThickness); + 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.TabIndex = 3; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Stitch drawing"; + // + // chkUglyStitches + // + this.chkUglyStitches.AutoSize = true; + this.chkUglyStitches.Location = new System.Drawing.Point(9, 38); + this.chkUglyStitches.Name = "chkUglyStitches"; + this.chkUglyStitches.Size = new System.Drawing.Size(131, 17); + this.chkUglyStitches.TabIndex = 8; + this.chkUglyStitches.Text = "Remove \'ugly\' stitches"; + this.chkUglyStitches.UseVisualStyleBackColor = true; + // + // 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; + // + // 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:"; + // // frmSettingsDialog // this.AcceptButton = this.btnOK; 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(234, 152); - this.Controls.Add(this.label2); - this.Controls.Add(this.txtThreadThickness); - this.Controls.Add(this.label1); + this.ClientSize = new System.Drawing.Size(339, 225); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); - this.Controls.Add(this.btnResetColor); - this.Controls.Add(this.lblColor); - this.Controls.Add(this.btnColor); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmSettingsDialog"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.Text = "Embroidery Reader Settings"; + this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -178,5 +247,11 @@ namespace embroideryReader private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox txtThreadThickness; private System.Windows.Forms.Label label2; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtThreshold; + private System.Windows.Forms.CheckBox chkUglyStitches; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/embroideryReader/frmSettingsDialog.cs b/embroideryReader/frmSettingsDialog.cs index 8b11e23..182f72e 100644 --- a/embroideryReader/frmSettingsDialog.cs +++ b/embroideryReader/frmSettingsDialog.cs @@ -77,6 +77,24 @@ namespace embroideryReader { txtThreadThickness.Text = "5"; } + + if (settings.getValue("filter stitches") == "true") + { + chkUglyStitches.Checked = true; + } + else + { + chkUglyStitches.Checked = false; + } + + if (settings.getValue("filter stitches threshold") != null) + { + txtThreshold.Text= settings.getValue("filter stitches threshold"); + } + else + { + txtThreshold.Text = "120"; + } } } @@ -157,6 +175,27 @@ namespace embroideryReader catch (Exception ex) { } + + if (chkUglyStitches.Checked) + { + settings.setValue("filter stitches", "true"); + } + else + { + settings.setValue("filter stitches", "false"); + } + + int threshold = 120; + try + { + threshold = Convert.ToInt32(txtThreshold.Text); + if (threshold < 10) + { + threshold = 10; + } + settings.setValue("filter stitches threshold", threshold.ToString()); + } + catch (Exception ex) { } } } } \ No newline at end of file