From 9ef671fb88212157dcaf5566a9c6f56083a02f33 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Fri, 14 Dec 2007 03:11:01 +0000 Subject: [PATCH] Fixed bugs 14 and 18, added thread thickness to options dialog, fixed several small bugs. --- PesFile/PesFile.cs | 8 ++ PesFile/Properties/AssemblyInfo.cs | 4 +- PesFile/bin/Release/PesFile.dll | Bin 24576 -> 24576 bytes embroideryInfo/bin/Release/embroideryInfo.exe | Bin 16384 -> 16384 bytes embroideryReader/Properties/AssemblyInfo.cs | 4 +- .../bin/Release/embroideryReader.exe | Bin 45056 -> 49152 bytes embroideryReader/frmMain.Designer.cs | 43 +++++++++ embroideryReader/frmMain.cs | 84 +++++++++++++++++- embroideryReader/nc_Updater.dll | Bin 16384 -> 20480 bytes .../bin/Release/emroideryTester.exe | Bin 20480 -> 20480 bytes 10 files changed, 138 insertions(+), 5 deletions(-) diff --git a/PesFile/PesFile.cs b/PesFile/PesFile.cs index 83adfff..459f227 100644 --- a/PesFile/PesFile.cs +++ b/PesFile/PesFile.cs @@ -52,6 +52,8 @@ namespace PesFile //of the colors, best guess will be used private bool colorWarning = false; + private bool formatWarning = false; + //bool _readyToUse = false; public PesFile(string filename) @@ -187,6 +189,7 @@ namespace PesFile } else if (tempstring.Contains("CEmbPunch")) { + formatWarning = true; fileIn.BaseStream.Position = restorePos; while (fileIn.BaseStream.Position < restorePos + tempstring.IndexOf("CEmbPunch")) { @@ -609,6 +612,11 @@ namespace PesFile return colorWarning; } + public bool getFormatWarning() + { + return formatWarning; + } + private Color getColorFromIndex(int index) { Color retval;// = Color.White; diff --git a/PesFile/Properties/AssemblyInfo.cs b/PesFile/Properties/AssemblyInfo.cs index 43c521d..56bd983 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.43")] -[assembly: AssemblyFileVersion("1.0.1.43")] +[assembly: AssemblyVersion("1.0.1.44")] +[assembly: AssemblyFileVersion("1.0.1.44")] diff --git a/PesFile/bin/Release/PesFile.dll b/PesFile/bin/Release/PesFile.dll index 986109d9825e29c35094013b21ea244a0d8dd98e..167dd89ec74276b04dbab7a4e0c306c0c608d3e3 100644 GIT binary patch delta 1377 zcmXw(e@t6d6vxlG?YocG(oyIJm=03vgpwjH7P?YY9)Z?HL>5Fw%*;qP*SWbN8%s8Y zLgH|S#K3Nr8E3*jB#vZLlc&b0+gRowW*S1oWz0nrGt6|sI1+y_VvOe<>U+7Ld%ow# z{gs8y398=?M8H| z<>H$j!^iV8&g%f@&6_17(q1NB^_$)0d-b?a0tAL>`P6?w34yL71N#o{J#1C9x&c;g zK&rb2)M@&!`e+ghn_SARbIs77mrd{tA~n|)i1gM?Y}zL4+(bEEAqvIESR&GL6L z_cOd!UZ?E1}PB*d>fIXYAIPmzfLpMT#ymZ)dq%X8yx;X-Nuu zm|4vl;vKCWCG3`#|G2b@$CziC=a?5cdYyTT=me)ePApKyZp(Pz3L(Gr`JiiAd88_@&B99s|F~fDP{DR5h#BoQjGA6e|d> zXEuu%skYj6)gk&xJ)KiKII}ya_J~1>?aZk`RvA{KFjg&&QE;h#eV8ec1v*PUDoiSiL#>xBVlCz#Lp6+O#jhfhF2k#ByzpJk?r^?69@~9-M<1JVcoj z#Lu-~iI=q%&R?UrM@QGX2fgab&+IEeQS%6 zjKmsR8Vqw^U9&LHMOSSFtMil2kMGWOoGRb>*~-yRE|?!~%@-I|mm1&NNRM2~x*dXA zFSTiU&!$yhqL|{x5-E38?kTf!9&cB3i3dfv-MpJvvMG1-up>lQ$GSct^K`R@7&Xrt dmDH)LEeR4UDDoZ6>knmTlj-UFeZyo}{|}+4B?~+Qh z&e$`>8DT$tXUdA_2%vNb*v;)2*GjkU-ucY4y}KNHp$GU!=iIif$XUgjbER$D+MBs8 zmK3Trd3tcmc&IBqs0~Blly*cDxS;r#c7YioJ>%#Wxi{Rs2EmUwuyR zgpZdf&}iIc2t1{D$Z$qGsd&zq=IVLHOKH`7qd22@!)WF5O~r208RBJg6A82kC;ymm zI`=B>ReVkHZB_k5@pEP_eiOsYTZ%=N6GyGJRxTb<+`;5MfE+1nb*(i47lO!_KbKw9 zeK;u3hC}IGEyb^Uw#>1;0-x3g9dlU~Q0i7z-K+I;%^hBG)@U(S$*L8V&<0qwXVnAB zxh1PQwLM&WT&ex&)dpEjuV3kx3215XK7#N*H~;ese%*wtaK#aSU2$SP7(T50X zM3nrha~N^XgmJ&(Br`j(!-)3)zmMR5a;QpkfdWGg?2j4c{e^31GGiO&LUsn z36+U-pIX5_>QV*2GWpem11b)vI7!Y<1Ti6O3SvqeN0KL6Pfya4xX3iDujqMxXuCHQ8L%ZGT*KSu1U>Ue{C` zt7)oS-x6=EjMl|tl^bF;@ycXfOSHBr8Rg4csZfTVD;oGuv>w z`9XVrL%v3}a{0c)tNGMwb3O=-?=HT3_$=y?r|OHie!jlVb1i!|IiBSX>1nuKoA0p8 z8)o&RT0(jfL#_(`UYu{H!aklbiE8Z=$q+a4%f@;Z3#8?{5-W#aVT0}6{CmOZI_p2- C)fm?R diff --git a/embroideryInfo/bin/Release/embroideryInfo.exe b/embroideryInfo/bin/Release/embroideryInfo.exe index 0f42649951c6675bbeae6af81562ae6e2ddd8de8..d70c3dbc00ee683b7231d8c3a5679dd9e4f5219d 100644 GIT binary patch delta 60 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 diff --git a/embroideryReader/frmMain.Designer.cs b/embroideryReader/frmMain.Designer.cs index 1abd9f9..df0d242 100644 --- a/embroideryReader/frmMain.Designer.cs +++ b/embroideryReader/frmMain.Designer.cs @@ -43,6 +43,10 @@ namespace embroideryReader this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 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.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.checkForUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveDebugInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -76,6 +80,7 @@ namespace embroideryReader this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, + this.viewToolStripMenuItem, this.helpToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; @@ -110,6 +115,7 @@ namespace embroideryReader // // printToolStripMenuItem // + this.printToolStripMenuItem.Enabled = false; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.Size = new System.Drawing.Size(160, 22); this.printToolStripMenuItem.Text = "Print..."; @@ -117,6 +123,7 @@ namespace embroideryReader // // printPreviewToolStripMenuItem // + this.printPreviewToolStripMenuItem.Enabled = false; this.printPreviewToolStripMenuItem.Name = "printPreviewToolStripMenuItem"; this.printPreviewToolStripMenuItem.Size = new System.Drawing.Size(160, 22); this.printPreviewToolStripMenuItem.Text = "Print Preview..."; @@ -164,6 +171,37 @@ namespace embroideryReader this.preferencesToolStripMenuItem.Text = "Preferences..."; this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.preferencesToolStripMenuItem_Click); // + // viewToolStripMenuItem + // + this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.rotateLeftToolStripMenuItem, + this.rotateRightToolStripMenuItem, + this.refreshToolStripMenuItem}); + this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; + 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.Name = "rotateLeftToolStripMenuItem"; + this.rotateLeftToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rotateLeftToolStripMenuItem.Text = "Rotate left"; + this.rotateLeftToolStripMenuItem.Click += new System.EventHandler(this.rotateLeftToolStripMenuItem_Click); + // + // rotateRightToolStripMenuItem + // + 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); + // // helpToolStripMenuItem // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -184,6 +222,7 @@ namespace embroideryReader // // saveDebugInfoToolStripMenuItem // + this.saveDebugInfoToolStripMenuItem.Enabled = false; this.saveDebugInfoToolStripMenuItem.Name = "saveDebugInfoToolStripMenuItem"; this.saveDebugInfoToolStripMenuItem.Size = new System.Drawing.Size(197, 22); this.saveDebugInfoToolStripMenuItem.Text = "Save design debug info"; @@ -295,6 +334,10 @@ namespace embroideryReader private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rotateLeftToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rotateRightToolStripMenuItem; } } diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs index 4dedb84..89f527a 100644 --- a/embroideryReader/frmMain.cs +++ b/embroideryReader/frmMain.cs @@ -153,7 +153,11 @@ namespace embroideryReader panel1.Height = design.GetHeight() + (int)(threadThickness * 2); panel1.Invalidate(); - if (design.getColorWarning()) + if (design.getFormatWarning()) + { + toolStripStatusLabel1.Text = "The format of this file is not completely supported"; + } + else if (design.getColorWarning()) { toolStripStatusLabel1.Text = "Colors shown for this design may be inaccurate"; } @@ -162,11 +166,18 @@ namespace embroideryReader toolStripStatusLabel1.Text = ""; } copyToolStripMenuItem.Enabled = true; + saveDebugInfoToolStripMenuItem.Enabled = true; + printPreviewToolStripMenuItem.Enabled = true; + printToolStripMenuItem.Enabled = true; + panel2.Select(); } else { MessageBox.Show("An error occured while reading the file:" + Environment.NewLine + design.getLastError()); copyToolStripMenuItem.Enabled = false; + saveDebugInfoToolStripMenuItem.Enabled = false; + printPreviewToolStripMenuItem.Enabled = false; + printToolStripMenuItem.Enabled = false; } } @@ -454,5 +465,76 @@ namespace embroideryReader Clipboard.SetImage(temp); } } + + private void refreshToolStripMenuItem_Click(object sender, EventArgs e) + { + if (design.getStatus() == PesFile.statusEnum.Ready) + { + //this.Text = System.IO.Path.GetFileName(filename) + " - Embroidery Reader"; + //sizePanel2(); + + Single threadThickness = 5; + if (settings.getValue("thread thickness") != null) + { + try + { + threadThickness = Convert.ToSingle(settings.getValue("thread thickness")); + } + catch (Exception ex) + { + } + } + DrawArea = design.designToBitmap(threadThickness); + panel1.Width = design.GetWidth() + (int)(threadThickness * 2); + panel1.Height = design.GetHeight() + (int)(threadThickness * 2); + panel1.Invalidate(); + + if (design.getFormatWarning()) + { + toolStripStatusLabel1.Text = "The format of this file is not completely supported"; + } + else if (design.getColorWarning()) + { + toolStripStatusLabel1.Text = "Colors shown for this design may be inaccurate"; + } + else + { + toolStripStatusLabel1.Text = ""; + } + //copyToolStripMenuItem.Enabled = true; + //saveDebugInfoToolStripMenuItem.Enabled = true; + //printPreviewToolStripMenuItem.Enabled = true; + //printToolStripMenuItem.Enabled = true; + //panel2.Select(); + } + } + + private void rotateLeftToolStripMenuItem_Click(object sender, EventArgs e) + { + Bitmap temp = new Bitmap(DrawArea.Height,DrawArea.Width); + Graphics g = Graphics.FromImage(temp); + g.RotateTransform(270.0f); + g.DrawImage(DrawArea, -DrawArea.Width, 0); + g.Dispose(); + DrawArea = temp; + int temp2 = panel1.Width; + panel1.Width = panel1.Height; + panel1.Height = temp2; + panel1.Invalidate(); + } + + private void rotateRightToolStripMenuItem_Click(object sender, EventArgs e) + { + Bitmap temp = new Bitmap(DrawArea.Height, DrawArea.Width); + Graphics g = Graphics.FromImage(temp); + g.RotateTransform(90.0f); + g.DrawImage(DrawArea, 0, -DrawArea.Height); + g.Dispose(); + DrawArea = temp; + int temp2 = panel1.Width; + panel1.Width = panel1.Height; + panel1.Height = temp2; + panel1.Invalidate(); + } } } \ No newline at end of file diff --git a/embroideryReader/nc_Updater.dll b/embroideryReader/nc_Updater.dll index 4439d1a5b56885b7939519245d8a6d343388fdda..946d7d962f094db13d671aeb41dce5c487326088 100644 GIT binary patch literal 20480 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 delta 2115 zcmZuyZ){Ul6#w1(+ShLD-u7D8QMSSBx3$KIgKzt=XqK|!@t^nb~UGMgNcmbr+Auhvv@)%1xRVgXmd7Xt3l=NAhVClyr$ zOjHovST}_lO2m{1$9h3g;}b%aTTW{*8z`u)Q82|jDY@rhqZm|kt4Y{;Z;+V8LlrwA z5>my2O(d>V%_a1x^167CNVWb1rC=UaSG`NaZ|SPJlt!x^ra=$WPf!*(bcc6PC>&DZ zv3WiA(8>zk{(7*PRJv{6irVU3A>)4r+N*SX{Zk&hZeQH~wX<~zpAhwGZNKC6XvNk6 zZ%gqHT3O%-FhD2q3-v&vkV|KF=V>EY>nPohKu-eClP#(k=xRu8 zLQIWPv2Ar66~g(8tpFW2NkCN)W1vOQJu7j|^sENeSqumf%}uRR+EgsWu$H_YJO&N> zv6t*AVpQD54Z=Dm@Cg=XD*7avk~t>vti+2FuSmQlv4)GNHi^AF#=BA6OY^HZ&BwWl zPbA*vzmsiO1bQWQDq`XRiFrk&cuC^hl6ha^w}hgJtq2sqTKEv89hba*xw#{>9Y*)W zP52tTMQk=izzd7ckeH#(FFm|NMdO$(dmp2jJfEl;UcfhU%wP7dU|G3_SNQ!9S)vjj zlGsVuinz45NZc+lDKU+r2-qi`afwGIP7ywc(}b(2pP?yqi4_ukxWOOBIsC&P!3U^O zx(Hj8IQ%r~lemfWE0s<70vnYj#0lPqZAu?5W4AJZ?{P@kMfhe>86xVOlEqKBpp4Pg z`H}+W@S}1FVN~H|!UoI`258@5tdO_{-;o`|Z-g5qlaSaaaZvI@bW_5}gRw9sP|136 z6t+o}n|L#dwkAj*uHbxQG=*q)bMt2_PFLP;dhWHR8w__mlirXXPW5DWCJU(?GK2lr z-wjKx&l(L6+4)qVApcEene}sHi#kp*!h5P~$&+IZ0%cW=?3!*M_EHi8-cZxMy zoyOuty~*Lx6iR<`nA!gI`$m()>B6{`Gupdjdy+XMvgD&TmCK9e>`oQ>=k2X#IWA^q z_NQ_MY&GMV!isir->XNF#ZDwqK+4kn!D3B>%D>Qo*!jz!ZaMjE?Bp9i{JF3AZU)W^ z2cPcst-Lm+sO}2t)zo#aYBqy0O)(%kr_Kby?F4#Um`-|CXm)T-(`;azOy+(@Qw`4C zx@L1Qcal^cnvjr&UOMiy&47DEHCU6@qzHSI0-ai|!|6`DM>w&Xvq@=Esu`S-u=quz zRw6JR#{BnKT!%jDF8XM?=ri$TqAM|U^Z3=xV?!H`b&hEluip+;Sb9sh`&9X}N@AQB zwlVGZ@|n==b1jE#mKHfkZ#~e>F14!JS0f6mny*t7(b==nRd*5A_4eppf;sl9tHLOK Q@Gq^I)jMw1Oh+950znCA(*OVf diff --git a/emroideryTester/bin/Release/emroideryTester.exe b/emroideryTester/bin/Release/emroideryTester.exe index eefa7615ec089771bee135ec5c4d4416c1f8c749..9b628c008eb8310f9e7a6e2641b80b6beae234b5 100644 GIT binary patch delta 53 zcmZozz}T>WaY6_4+6##ryQiuPXqx)ehP8EgZuoG)`;E;LiOmKYH<&=Olex7u8Ra&c IYM)jC0BIE!&;S4c delta 53 zcmZozz}T>WaY6@k|Eh$I-BZ;C{@4CD`Mk^8sZB}P<(k3V)0+)6ZZLslCv$6SGRkf? I)jq8P0C!^**Z=?k