mirror
/
EmbroideryReader
kopia lustrzana https://github.com/njcrawford/EmbroideryReader
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed bugs 14 and 18, added thread thickness to options dialog, fixed several small bugs.

Branch_1.5.0
Nathan Crawford 2007-12-14 03:11:01 +00:00
rodzic 2ae0f499b0
commit 9ef671fb88
10 zmienionych plików z 138 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
PesFile/PesFile.cs
Wyświetl plik

@ -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;

4
PesFile/Properties/AssemblyInfo.cs
Wyświetl plik

@ -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")]

BIN
PesFile/bin/Release/PesFile.dll
Wyświetl plik

Plik binarny nie jest wyświetlany.

BIN
embroideryInfo/bin/Release/embroideryInfo.exe
Wyświetl plik

Plik binarny nie jest wyświetlany.

4
embroideryReader/Properties/AssemblyInfo.cs
Wyświetl plik

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.2.1.33")]
[assembly: AssemblyFileVersion("1.2.1.33")]
[assembly: AssemblyVersion("1.2.1.57")]
[assembly: AssemblyFileVersion("1.2.1.57")]

BIN
embroideryReader/bin/Release/embroideryReader.exe
Wyświetl plik

Plik binarny nie jest wyświetlany.

43
embroideryReader/frmMain.Designer.cs wygenerowano
Wyświetl plik

@ -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;
}
}

84
embroideryReader/frmMain.cs
Wyświetl plik

@ -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();
}
}
}

BIN
embroideryReader/nc_Updater.dll
Wyświetl plik

Plik binarny nie jest wyświetlany.

BIN
emroideryTester/bin/Release/emroideryTester.exe
Wyświetl plik

Plik binarny nie jest wyświetlany.