From 18f7763e1c3592a043e78d8b98df590606346af6 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Wed, 2 Jan 2008 02:59:15 +0000 Subject: [PATCH] Minor bugfixes, some cosmetic fixes --- PesFile/PesFile.cs | 132 ++++++++++++++++++ PesFile/Properties/AssemblyInfo.cs | 4 +- PesFile/bin/Debug/PesFile.dll | Bin 24576 -> 24576 bytes embroideryInfo/bin/Debug/embroideryInfo.exe | Bin 16384 -> 16384 bytes embroideryReader/Properties/AssemblyInfo.cs | 4 +- .../bin/Debug/embroideryReader.exe | Bin 45056 -> 49152 bytes embroideryReader/embroideryReader.csproj | 10 ++ embroideryReader/frmMain.Designer.cs | 32 +++-- embroideryReader/frmMain.cs | 30 +++- embroideryReader/frmTextbox.Designer.cs | 58 ++++++++ embroideryReader/frmTextbox.cs | 24 ++++ embroideryReader/frmTextbox.resx | 120 ++++++++++++++++ emroideryTester/bin/Debug/emroideryTester.exe | Bin 20480 -> 20480 bytes 13 files changed, 400 insertions(+), 14 deletions(-) create mode 100644 embroideryReader/frmTextbox.Designer.cs create mode 100644 embroideryReader/frmTextbox.cs create mode 100644 embroideryReader/frmTextbox.resx diff --git a/PesFile/PesFile.cs b/PesFile/PesFile.cs index 459f227..cfd39ae 100644 --- a/PesFile/PesFile.cs +++ b/PesFile/PesFile.cs @@ -466,6 +466,137 @@ namespace PesFile public void saveDebugInfo() { System.IO.StreamWriter outfile = new System.IO.StreamWriter(System.IO.Path.ChangeExtension(_filename, ".txt")); + outfile.Write(getDebugInfo()); + outfile.Close(); + //string name = ""; + //outfile.WriteLine("PES header"); + //outfile.WriteLine("PES number:\t" + pesNum); + //for (int i = 0; i < pesHeader.Count; i++) + //{ + // name = (i + 1).ToString(); + // outfile.WriteLine(name + "\t" + pesHeader[i].ToString()); + //} + //if (embOneHeader.Count > 0) + //{ + // outfile.WriteLine("CEmbOne header"); + // for (int i = 0; i < embOneHeader.Count; i++) + // { + // switch (i + 1) + // { + // case 22: + // name = "translate x"; + // break; + // case 23: + // name = "translate y"; + // break; + // case 24: + // name = "width"; + // break; + // case 25: + // name = "height"; + // break; + // default: + // name = (i + 1).ToString(); + // break; + // } + + // outfile.WriteLine(name + "\t" + embOneHeader[i].ToString()); + // } + //} + //if (embPunchHeader.Count > 0) + //{ + // outfile.WriteLine("CEmbPunch header"); + // for (int i = 0; i < embPunchHeader.Count; i++) + // { + // switch (i + 1) + // { + // //case 22: + // // name = "translate x"; + // // break; + // //case 23: + // // name = "translate y"; + // // break; + // //case 24: + // // name = "width"; + // // break; + // //case 25: + // // name = "height"; + // // break; + // default: + // name = (i + 1).ToString(); + // break; + // } + + // outfile.WriteLine(name + "\t" + embPunchHeader[i].ToString()); + // } + //} + //outfile.WriteLine("CSewSeg header"); + //for (int i = 0; i < sewSegHeader.Count; i++) + //{ + // switch (i + 1) + // { + // case 2: + // name = "start color"; + // outfile.WriteLine(name + "\t" + sewSegHeader[i].ToString()); + // break; + // case 3: + // name = "starting stitches"; + // outfile.WriteLine(name + "\t" + sewSegHeader[i].ToString()); + // break; + // case 4: + // name = "base x"; + // outfile.WriteLine(name + "\t" + sewSegHeader[i].ToString()); + // break; + // case 5: + // name = "base y"; + // outfile.WriteLine(name + "\t" + sewSegHeader[i].ToString() + " (" + (sewSegHeader[i] + imageHeight).ToString() + ")"); + // break; + // case 6: + // name = "start x"; + // outfile.WriteLine(name + "\t" + sewSegHeader[i].ToString()); + // break; + // case 7: + // name = "start y"; + // outfile.WriteLine(name + "\t" + sewSegHeader[i].ToString() + " (" + (sewSegHeader[i] + imageHeight).ToString() + ")"); + // break; + // default: + // name = (i + 1).ToString(); + // outfile.WriteLine(name + "\t" + sewSegHeader[i].ToString()); + // break; + // } + // //outfile.WriteLine(name + "\t" + csewsegHeader[i].ToString()); + //} + //outfile.WriteLine("stitches start: " + startStitches.ToString()); + //outfile.WriteLine("block info"); + //outfile.WriteLine("number\tcolor\tstitches"); + //for (int i = 0; i < this.blocks.Count; i++) + //{ + // outfile.WriteLine((i + 1).ToString() + "\t" + blocks[i].colorIndex.ToString() + "\t" + blocks[i].stitchesTotal.ToString()); + //} + //outfile.WriteLine("color table"); + //outfile.WriteLine("number\ta\tb"); + //for (int i = 0; i < colorTable.Count; i++) + //{ + // outfile.WriteLine((i + 1).ToString() + "\t" + colorTable[i].a.ToString() + ", " + colorTable[i].b.ToString()); + //} + //if (blocks.Count > 0) + //{ + // outfile.WriteLine("Extended stitch debug info"); + // for (int blocky = 0; blocky < blocks.Count; blocky++) + // { + // outfile.WriteLine("block " + (blocky + 1).ToString() + " start"); + // for (int stitchy = 0; stitchy < blocks[blocky].stitches.Length; stitchy++) + // { + // outfile.WriteLine(blocks[blocky].stitches[stitchy].X.ToString() + ", " + blocks[blocky].stitches[stitchy].Y.ToString()); + // } + // } + //} + //outfile.Close(); + } + + public string getDebugInfo() + { + System.IO.StringWriter outfile = new System.IO.StringWriter(); string name = ""; outfile.WriteLine("PES header"); outfile.WriteLine("PES number:\t" + pesNum); @@ -590,6 +721,7 @@ namespace PesFile } } outfile.Close(); + return outfile.ToString(); } //public bool isReadyToUse() diff --git a/PesFile/Properties/AssemblyInfo.cs b/PesFile/Properties/AssemblyInfo.cs index 56bd983..94cba8c 100644 --- a/PesFile/Properties/AssemblyInfo.cs +++ b/PesFile/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.1.44")] -[assembly: AssemblyFileVersion("1.0.1.44")] +[assembly: AssemblyVersion("1.0.1.46")] +[assembly: AssemblyFileVersion("1.0.1.46")] diff --git a/PesFile/bin/Debug/PesFile.dll b/PesFile/bin/Debug/PesFile.dll index 26b776d54822df204c822e0fb9fb3a1151629e68..268a71557f8e838a3a7c6680bc35a42b43afafbe 100644 GIT binary patch delta 4794 zcmbtYdvH|M8UN1R-Fvf}2ia`0d6IiKA+mXrkVuwj{^rFh=p;|)ryYw%qo@76F;ST?DYjK?&d9g4MCU=Fkc+CO5>@382`C%Q3o?tulje1q zdvyP%0FhG(W)gXzbOaqlDp3VdVXc!+ngQ>vVwL%bw?vefuX`7zlt4Y|+gxG>v--ph zvHP-)iHZkY2oicq5P6*uhoCj#GI;Zk3SW*lr>PG-DY-I^neJGz=*c?iyfSc#{v3E)wcAjE38nUhz; z)3~Yd)w*a4mVl(Z)Yrng2>h-|RU=PuZqv;J1^(!C*80;bnjh&M6k1AXO&`o=> z3{oTS$?#B4y3M79)1&bWDk+`=yE=Og@qktiO{-6zK8vH8XAfr&ACF^~;7P<-l@udnC|Eof8B5Ju+=(Z{kA@oYS&7eX zd~$@jr^v`|MOHtow)tjJar8_EUO{L(9&F?wq9q=j|9@s3TFf(s<&2^`0@!grkJsbZ z9`t&0<&#GzPwD@@lQ#MIVaboYhneUUBukWjFJdM(5$uJL4=rJ^19@W0JvF}g%*%Uk zd~WpY8T{V~aJ4F@oO!Dke1Emcd)*u?_C*u>yXo+Er%$VqR0mGT%{a2oU?&_0QAYb* zsF7;etnH;n+T(p3vb8J<=KVB zt~T^?$MFeeWq1}C`*du;=};r#cxGy3TfC1fZ~AeTV@Kl$X%@&dalLx_5zQIDLS&|U z;M2-9NtXHp*%`8Bb+|i`Z5Y``lNOP5r@Vu6gQNCPBK!2vGZuFOoIB}Oi+l(o>Gtyb zoR!N-wfwrnT`z{wQBdJysTMCy1kKdEg<*4i=5H;tU$xYwO4?b7%2#e}@l z-AOC5ZH;WRZ*Vm{o1MBU$?L*=MWyL;V-uMX~ zdvr|ipmn%}+_Ck60uk*&C{O5otXuc!3yp^mFKBU7nX5InfzdbETp4pc`YPk8gw6}j z_>@(-x^C;f!%NF}letU%HuW)6gG@~^eife`4GlB@0SMz>hCjzmp%>yaE;sfi=m(kJ z!`iW%flDpKFURWBN20^Nv!j%3AMv;Pf@dA6PfGjt17r zq{mV)_m}3|MRV|kemy)E>vMc{kWMX#!I2#f8~8D5p%Wp&&NTix^@TPSU`p=hU-RtAHtk{hQ830k44(jO3)kGQUlaHFF2?#?z1-Lp*F-}{ zn4F|<)(v}>+!Wt|HBKFB!vl5}@ocs@(fUTC+y+-iB@1+ulTZOq3| zzA(ZI*>J{pt;_3bT8m3v3ol}gidPPP9aPZF-q|w+;enYaf`u(}5WjRY(er5E!p&aV zyDqZw`fK{&lkUtQ`U;1xbYU;;$Rf%FS2}B9cL&=0Fy3X>l}`*z#t4(C1RqS`UkikY zvgNVI+*sZjeOTEJ)nAmC6qP=fSmJOvRH~KO;b8t}5^t1fO57*$pu`U(3MVTooq5iS zXa+*5biH$~Q>C2}fA3_UMo`pA+8B5169Om}ZJ|768GbKLtKiYkDWI$%2Q9Ei6>_xN9yKVdVY}ZR zwJMDm9k)kwrENu>Oy~kx`L|cGPOZu z%em#W985W_l6aJwp<$mz5(A=NT}^f39`$RQigcGzo7k^Lx#4wm%N4YVVRaeJ7w)wPEIVAUQ5lbbXEj8JaFOvNt+4mBA2#}^dDguFky;-ajQ?=)T z?b-pc5fNW2LDR1t1>Pp{KJBkCKc~F~JgmJB95%Pq=*uotYABVy6*W|dO;|&v)BvoP z*i236FOmHoiMeS24ZeeCguW^6L+W{RCSH&etun(~z+^Zc*(Ke02Ts&#Acj%hoG->8p$ z))WygO=J!1F_%vBrDkfWSpyGeq@<)|n46~sdxo+GUT_(TNJ~?JUN0IUyaNZU=AhLa zcEgr6@W=7qoD5CP3S5s&pO=r z>!uT3*xS)N@`<)#hYxsJ`rzUn+t4oL}vE6MG(U>pKY{uY}P}1G4*1w*N88Pn#C&vxeYX1dlg*iF^ delta 4533 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 diff --git a/embroideryInfo/bin/Debug/embroideryInfo.exe b/embroideryInfo/bin/Debug/embroideryInfo.exe index b61bae45f6500281d47fcbb961bc299cb16c8015..7c8e393f51eb9d7c4300efdeeb3f1f25418744bb 100644 GIT binary patch delta 106 zcmZo@U~Fh$oY28M^>@|8?qDVd){PI0gc{SMTUeZP$4XhDoni=>6P$ zKwN>*5UA9h0SK6YI2DM0XaKPU14B@-OYj=wed?bxo4q&iGtaG2;ylg*luzC)DEVFu E0L45bF8}}l diff --git a/embroideryReader/Properties/AssemblyInfo.cs b/embroideryReader/Properties/AssemblyInfo.cs index 767d25b..8fe00a6 100644 --- a/embroideryReader/Properties/AssemblyInfo.cs +++ b/embroideryReader/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.2.1.57")] -[assembly: AssemblyFileVersion("1.2.1.57")] +[assembly: AssemblyVersion("1.2.1.60")] +[assembly: AssemblyFileVersion("1.2.1.60")] diff --git a/embroideryReader/bin/Debug/embroideryReader.exe b/embroideryReader/bin/Debug/embroideryReader.exe index b84ca700e774355e127324a904f2ca051abe4e0f..9aa68ebbad2d46120cc5e5541fb8e54a799fed61 100644 GIT binary patch delta 9291 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 L^M|bNO4t7YpMJa{ delta 6664 zcmc&(dvsOhmEYfY?mhRJ`-GeKi-hDPA(4Puf~6)RU@9nxJW^1|2*ni02{#DD05=zb zil8Pv3Z%#wh*c1&U@C|@BU#W^>#8rNORy~lb!lCWD9d5_=t$?czjKkOT{C~qS?m7J z-oO3$_V+yJBpn@E$AIj-d-gkf=TD;4H9!I36KDuwHBPAtDE>xGvsl z019}%BhTnMh~@RQ`Ef+nJt(L@6Ja3cNaIHLI#NLt=EHFVq~$9k<; z)-%>uS*_Np>_Jg{)EN&k-t#^l&$e?cdib~};-MYN!$JXYep+o9*q{+0?;O595 zpI>f0Tht(D>DJKVD~e~aJ=eD5<}hx9Y%aJ&#Fyz-bMf%9VcffgZ2YNhEP{8sxyV*9 zT8>z(H4B=xw>aPWb8+rfKf7eo<2$*X#bB1-gz+_(T(ZSq9aN&qV=lEG8B%0DJv`TX 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 diff --git a/embroideryReader/embroideryReader.csproj b/embroideryReader/embroideryReader.csproj index a5610ee..7542ea7 100644 --- a/embroideryReader/embroideryReader.csproj +++ b/embroideryReader/embroideryReader.csproj @@ -57,6 +57,12 @@ frmSettingsDialog.cs + + Form + + + frmTextbox.cs + @@ -67,6 +73,10 @@ Designer frmSettingsDialog.cs + + Designer + frmTextbox.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/embroideryReader/frmMain.Designer.cs b/embroideryReader/frmMain.Designer.cs index df0d242..ebf6229 100644 --- a/embroideryReader/frmMain.Designer.cs +++ b/embroideryReader/frmMain.Designer.cs @@ -44,9 +44,9 @@ namespace embroideryReader this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.preferencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rotateLeftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rotateRightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.checkForUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveDebugInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -58,6 +58,7 @@ namespace embroideryReader this.printDocument1 = new System.Drawing.Printing.PrintDocument(); this.printDialog1 = new System.Windows.Forms.PrintDialog(); this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); + this.showDebugInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.panel2.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -181,15 +182,9 @@ namespace embroideryReader this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20); this.viewToolStripMenuItem.Text = "View"; // - // refreshToolStripMenuItem - // - this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; - this.refreshToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.refreshToolStripMenuItem.Text = "Refresh"; - this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click); - // // rotateLeftToolStripMenuItem // + this.rotateLeftToolStripMenuItem.Enabled = false; this.rotateLeftToolStripMenuItem.Name = "rotateLeftToolStripMenuItem"; this.rotateLeftToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rotateLeftToolStripMenuItem.Text = "Rotate left"; @@ -197,16 +192,26 @@ namespace embroideryReader // // rotateRightToolStripMenuItem // + this.rotateRightToolStripMenuItem.Enabled = false; this.rotateRightToolStripMenuItem.Name = "rotateRightToolStripMenuItem"; this.rotateRightToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rotateRightToolStripMenuItem.Text = "Rotate right"; this.rotateRightToolStripMenuItem.Click += new System.EventHandler(this.rotateRightToolStripMenuItem_Click); // + // refreshToolStripMenuItem + // + this.refreshToolStripMenuItem.Enabled = false; + this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; + this.refreshToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.refreshToolStripMenuItem.Text = "Reset"; + this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click); + // // helpToolStripMenuItem // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.checkForUpdateToolStripMenuItem, this.saveDebugInfoToolStripMenuItem, + this.showDebugInfoToolStripMenuItem, this.toolStripSeparator1, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; @@ -284,6 +289,14 @@ namespace embroideryReader this.printPreviewDialog1.Name = "printPreviewDialog1"; this.printPreviewDialog1.Visible = false; // + // showDebugInfoToolStripMenuItem + // + this.showDebugInfoToolStripMenuItem.Enabled = false; + this.showDebugInfoToolStripMenuItem.Name = "showDebugInfoToolStripMenuItem"; + this.showDebugInfoToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.showDebugInfoToolStripMenuItem.Text = "Show debug info"; + this.showDebugInfoToolStripMenuItem.Click += new System.EventHandler(this.showDebugInfoToolStripMenuItem_Click); + // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -295,8 +308,8 @@ namespace embroideryReader this.MainMenuStrip = this.menuStrip1; this.Name = "frmMain"; this.Text = "Form1"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.panel2.ResumeLayout(false); @@ -338,6 +351,7 @@ namespace embroideryReader private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rotateLeftToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rotateRightToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem showDebugInfoToolStripMenuItem; } } diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs index 89f527a..92e9e7b 100644 --- a/embroideryReader/frmMain.cs +++ b/embroideryReader/frmMain.cs @@ -169,6 +169,10 @@ namespace embroideryReader saveDebugInfoToolStripMenuItem.Enabled = true; printPreviewToolStripMenuItem.Enabled = true; printToolStripMenuItem.Enabled = true; + rotateLeftToolStripMenuItem.Enabled = true; + rotateRightToolStripMenuItem.Enabled = true; + refreshToolStripMenuItem.Enabled = true; + showDebugInfoToolStripMenuItem.Enabled = true; panel2.Select(); } else @@ -178,6 +182,10 @@ namespace embroideryReader saveDebugInfoToolStripMenuItem.Enabled = false; printPreviewToolStripMenuItem.Enabled = false; printToolStripMenuItem.Enabled = false; + rotateLeftToolStripMenuItem.Enabled = false; + rotateRightToolStripMenuItem.Enabled = false; + refreshToolStripMenuItem.Enabled = false; + showDebugInfoToolStripMenuItem.Enabled = false; } } @@ -468,7 +476,7 @@ namespace embroideryReader private void refreshToolStripMenuItem_Click(object sender, EventArgs e) { - if (design.getStatus() == PesFile.statusEnum.Ready) + if (design != null && design.getStatus() == PesFile.statusEnum.Ready) { //this.Text = System.IO.Path.GetFileName(filename) + " - Embroidery Reader"; //sizePanel2(); @@ -536,5 +544,25 @@ namespace embroideryReader panel1.Height = temp2; panel1.Invalidate(); } + + private void showDebugInfoToolStripMenuItem_Click(object sender, EventArgs e) + { + if (design != null) + { + try + { + frmTextbox theform = new frmTextbox(); + theform.showText(design.getDebugInfo()); + } + catch (Exception ex) + { + MessageBox.Show("There was an error while saving debug info:" + Environment.NewLine + ex.ToString()); + } + } + else + { + MessageBox.Show("No design loaded."); + } + } } } \ No newline at end of file diff --git a/embroideryReader/frmTextbox.Designer.cs b/embroideryReader/frmTextbox.Designer.cs new file mode 100644 index 0000000..956946d --- /dev/null +++ b/embroideryReader/frmTextbox.Designer.cs @@ -0,0 +1,58 @@ +namespace embroideryReader +{ + partial class frmTextbox + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.textBox1 = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // textBox1 + // + this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox1.Location = new System.Drawing.Point(0, 0); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.textBox1.Size = new System.Drawing.Size(305, 351); + this.textBox1.TabIndex = 0; + // + // frmTextbox + // + this.ClientSize = new System.Drawing.Size(305, 351); + this.Controls.Add(this.textBox1); + this.Name = "frmTextbox"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox textBox1; + } +} \ No newline at end of file diff --git a/embroideryReader/frmTextbox.cs b/embroideryReader/frmTextbox.cs new file mode 100644 index 0000000..be39010 --- /dev/null +++ b/embroideryReader/frmTextbox.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace embroideryReader +{ + public partial class frmTextbox : Form + { + public frmTextbox() + { + InitializeComponent(); + } + + public void showText(string text) + { + textBox1.Text = text; + this.Show(); + } + } +} \ No newline at end of file diff --git a/embroideryReader/frmTextbox.resx b/embroideryReader/frmTextbox.resx new file mode 100644 index 0000000..ff31a6d --- /dev/null +++ b/embroideryReader/frmTextbox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/emroideryTester/bin/Debug/emroideryTester.exe b/emroideryTester/bin/Debug/emroideryTester.exe index 90071086460d308a77aff0157f73b862e415cc2e..2ce99663830c9679bc1d1e6717d73dfd188ddb25 100644 GIT binary patch delta 99 zcmZozz}T>WaY6_4l;2eoyMvh=ST{c4(GW0X^6q*Zxz3?=1>-~y(=M*fe>8qD83NU~ xGXMb-5T^q%j|~v(FfarKy9CE8{78u0HO+P2oTq`_4{xt#2Fg2cR@J$!3;@p6A({XH delta 99 zcmZozz}T>WaY6@k{>p@j-N8%@EE^y2Xb9*CFnvAN5a7LkZlTjrjaKQ+e>8qD83NU~ xGXMb-5T^q%j|~v(FfarKy9D2w?{{S8p?L2ej$eP~XjK^q0_Br8tLofV1^}FdAhrMi