diff --git a/LaserGRBL/AssemblyInfo.cs b/LaserGRBL/AssemblyInfo.cs index 6847bce7..703ed066 100644 --- a/LaserGRBL/AssemblyInfo.cs +++ b/LaserGRBL/AssemblyInfo.cs @@ -31,5 +31,5 @@ // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // utilizzando l'asterisco (*) come descritto di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("6.1.1")] +[assembly: AssemblyVersion ("6.2.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/LaserGRBL/Generator/CuttingTest.Designer.cs b/LaserGRBL/Generator/CuttingTest.Designer.cs index cf8d5fc2..9d098b48 100644 --- a/LaserGRBL/Generator/CuttingTest.Designer.cs +++ b/LaserGRBL/Generator/CuttingTest.Designer.cs @@ -605,6 +605,7 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.CancelButton = this.BtnCancel; this.ClientSize = new System.Drawing.Size(805, 265); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; diff --git a/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs b/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs index e286d241..b28f53ee 100644 --- a/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs +++ b/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs @@ -686,6 +686,7 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.CancelButton = this.BtnCancel; this.ClientSize = new System.Drawing.Size(805, 265); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; diff --git a/LaserGRBL/Generator/ShakeTest.Designer.cs b/LaserGRBL/Generator/ShakeTest.Designer.cs new file mode 100644 index 00000000..f79f8e96 --- /dev/null +++ b/LaserGRBL/Generator/ShakeTest.Designer.cs @@ -0,0 +1,351 @@ +namespace LaserGRBL.Generator +{ + partial class ShakeTest + { + /// + /// 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() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShakeTest)); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnCancel = new System.Windows.Forms.Button(); + this.BtnCreate = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); + this.label8 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.IiCrossSpeed = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.label4 = new System.Windows.Forms.Label(); + this.CbLimit = new System.Windows.Forms.ComboBox(); + this.label6 = new System.Windows.Forms.Label(); + this.IiCrossPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.CbAxis = new System.Windows.Forms.ComboBox(); + this.label7 = new System.Windows.Forms.Label(); + this.IiAxisLen = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.tableLayoutPanel4.SuspendLayout(); + this.tableLayoutPanel5.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.White; + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(3, 3); + this.pictureBox1.Name = "pictureBox1"; + this.tableLayoutPanel5.SetRowSpan(this.pictureBox1, 4); + this.pictureBox1.Size = new System.Drawing.Size(300, 366); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // tableLayoutPanel4 + // + this.tableLayoutPanel4.AutoSize = true; + this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel4.ColumnCount = 3; + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel4.Controls.Add(this.BtnCancel, 1, 0); + this.tableLayoutPanel4.Controls.Add(this.BtnCreate, 2, 0); + this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel4.Location = new System.Drawing.Point(309, 317); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + this.tableLayoutPanel4.RowCount = 1; + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.Size = new System.Drawing.Size(609, 52); + this.tableLayoutPanel4.TabIndex = 6; + // + // BtnCancel + // + this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.BtnCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.BtnCancel.Location = new System.Drawing.Point(452, 3); + this.BtnCancel.Name = "BtnCancel"; + this.BtnCancel.Size = new System.Drawing.Size(74, 27); + this.BtnCancel.TabIndex = 6; + this.BtnCancel.Text = "Cancel"; + this.BtnCancel.UseVisualStyleBackColor = true; + // + // BtnCreate + // + this.BtnCreate.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.BtnCreate.Location = new System.Drawing.Point(532, 3); + this.BtnCreate.Name = "BtnCreate"; + this.BtnCreate.Size = new System.Drawing.Size(74, 27); + this.BtnCreate.TabIndex = 7; + this.BtnCreate.Text = "Create!"; + this.BtnCreate.UseVisualStyleBackColor = true; + this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(310, 4); + this.label1.Margin = new System.Windows.Forms.Padding(4); + this.label1.MaximumSize = new System.Drawing.Size(600, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(598, 247); + this.label1.TabIndex = 0; + this.label1.Text = resources.GetString("label1.Text"); + // + // tableLayoutPanel5 + // + this.tableLayoutPanel5.AutoSize = true; + this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel5.ColumnCount = 2; + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel4, 1, 3); + this.tableLayoutPanel5.Controls.Add(this.label1, 1, 0); + this.tableLayoutPanel5.Controls.Add(this.pictureBox1, 0, 0); + this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel6, 1, 2); + this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel5.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel5.Name = "tableLayoutPanel5"; + this.tableLayoutPanel5.RowCount = 4; + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 5F)); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.Size = new System.Drawing.Size(921, 372); + this.tableLayoutPanel5.TabIndex = 1; + // + // tableLayoutPanel6 + // + this.tableLayoutPanel6.AutoSize = true; + this.tableLayoutPanel6.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel6.ColumnCount = 7; + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.Controls.Add(this.label8, 3, 0); + this.tableLayoutPanel6.Controls.Add(this.label2, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.label3, 0, 1); + this.tableLayoutPanel6.Controls.Add(this.label5, 1, 1); + this.tableLayoutPanel6.Controls.Add(this.IiCrossSpeed, 2, 1); + this.tableLayoutPanel6.Controls.Add(this.label4, 5, 0); + this.tableLayoutPanel6.Controls.Add(this.CbLimit, 6, 0); + this.tableLayoutPanel6.Controls.Add(this.label6, 3, 1); + this.tableLayoutPanel6.Controls.Add(this.IiCrossPower, 4, 1); + this.tableLayoutPanel6.Controls.Add(this.CbAxis, 2, 0); + this.tableLayoutPanel6.Controls.Add(this.label7, 1, 0); + this.tableLayoutPanel6.Controls.Add(this.IiAxisLen, 4, 0); + this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel6.Location = new System.Drawing.Point(309, 263); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + this.tableLayoutPanel6.RowCount = 2; + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.Size = new System.Drawing.Size(609, 48); + this.tableLayoutPanel6.TabIndex = 1; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(202, 7); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(40, 13); + this.label8.TabIndex = 10; + this.label8.Text = "Lenght"; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 7); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(51, 13); + this.label2.TabIndex = 0; + this.label2.Text = "Test type"; + // + // label3 + // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(3, 31); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(83, 13); + this.label3.TabIndex = 1; + this.label3.Text = "Cross engraving"; + // + // label5 + // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(92, 31); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(38, 13); + this.label5.TabIndex = 4; + this.label5.Text = "Speed"; + // + // IiCrossSpeed + // + this.IiCrossSpeed.CurrentValue = 1000; + this.IiCrossSpeed.ForcedText = null; + this.IiCrossSpeed.ForceMinMax = false; + this.IiCrossSpeed.Location = new System.Drawing.Point(136, 30); + this.IiCrossSpeed.MaxValue = 10000; + this.IiCrossSpeed.MinValue = 10; + this.IiCrossSpeed.Name = "IiCrossSpeed"; + this.IiCrossSpeed.Size = new System.Drawing.Size(60, 15); + this.IiCrossSpeed.TabIndex = 4; + // + // label4 + // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(314, 7); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(60, 13); + this.label4.TabIndex = 2; + this.label4.Text = "Limit speed"; + // + // CbLimit + // + this.CbLimit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbLimit.FormattingEnabled = true; + this.CbLimit.Location = new System.Drawing.Point(380, 3); + this.CbLimit.MaxDropDownItems = 6; + this.CbLimit.Name = "CbLimit"; + this.CbLimit.Size = new System.Drawing.Size(146, 21); + this.CbLimit.TabIndex = 3; + // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(202, 31); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(37, 13); + this.label6.TabIndex = 7; + this.label6.Text = "Power"; + // + // IiCrossPower + // + this.IiCrossPower.CurrentValue = 100; + this.IiCrossPower.ForcedText = null; + this.IiCrossPower.ForceMinMax = false; + this.IiCrossPower.Location = new System.Drawing.Point(248, 30); + this.IiCrossPower.MaxValue = 1000; + this.IiCrossPower.MinValue = 1; + this.IiCrossPower.Name = "IiCrossPower"; + this.IiCrossPower.Size = new System.Drawing.Size(60, 15); + this.IiCrossPower.TabIndex = 5; + // + // CbAxis + // + this.CbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbAxis.FormattingEnabled = true; + this.CbAxis.Items.AddRange(new object[] { + "X", + "Y"}); + this.CbAxis.Location = new System.Drawing.Point(136, 3); + this.CbAxis.Name = "CbAxis"; + this.CbAxis.Size = new System.Drawing.Size(60, 21); + this.CbAxis.TabIndex = 1; + this.CbAxis.SelectedIndexChanged += new System.EventHandler(this.CbAxis_SelectedIndexChanged); + // + // label7 + // + this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(92, 7); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(26, 13); + this.label7.TabIndex = 9; + this.label7.Text = "Axis"; + // + // IiAxisLen + // + this.IiAxisLen.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.IiAxisLen.CurrentValue = 100; + this.IiAxisLen.ForcedText = null; + this.IiAxisLen.ForceMinMax = false; + this.IiAxisLen.Location = new System.Drawing.Point(248, 6); + this.IiAxisLen.MinValue = 50; + this.IiAxisLen.Name = "IiAxisLen"; + this.IiAxisLen.Size = new System.Drawing.Size(60, 15); + this.IiAxisLen.TabIndex = 2; + // + // ShakeTest + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSize = true; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.CancelButton = this.BtnCancel; + this.ClientSize = new System.Drawing.Size(921, 372); + this.Controls.Add(this.tableLayoutPanel5); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "ShakeTest"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Shake Test"; + this.Load += new System.EventHandler(this.ShakeTest_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel5.PerformLayout(); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel6.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; + private System.Windows.Forms.Button BtnCancel; + private System.Windows.Forms.Button BtnCreate; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel6; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox CbAxis; + private System.Windows.Forms.ComboBox CbLimit; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label5; + private UserControls.NumericInput.IntegerInputRanged IiCrossSpeed; + private System.Windows.Forms.Label label6; + private UserControls.NumericInput.IntegerInputRanged IiCrossPower; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private UserControls.NumericInput.IntegerInputRanged IiAxisLen; + } +} \ No newline at end of file diff --git a/LaserGRBL/Generator/ShakeTest.cs b/LaserGRBL/Generator/ShakeTest.cs new file mode 100644 index 00000000..3fe3aa54 --- /dev/null +++ b/LaserGRBL/Generator/ShakeTest.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace LaserGRBL.Generator +{ + public partial class ShakeTest : Form + { + GrblCore mCore; + + public ShakeTest(GrblCore core) + { + InitializeComponent(); + mCore = core; + } + + public static void CreateAndShowDialog(Form parent, GrblCore core) + { + using (ShakeTest f = new ShakeTest(core)) + f.ShowDialog(parent); + } + + private void BtnCreate_Click(object sender, EventArgs e) + { + mCore.LoadedFile.GenerateShakeTest(CbAxis.SelectedItem as string, (int)(CbLimit.SelectedItem), IiAxisLen.CurrentValue, IiCrossPower.CurrentValue, IiCrossSpeed.CurrentValue); + Close(); + } + + private void ShakeTest_Load(object sender, EventArgs e) + { + AssignMinMaxLimit(); + RestoreDefault(); + } + + private void RestoreDefault() + { + IiCrossSpeed.CurrentValue = 1000; + IiCrossPower.CurrentValue = 100; + CbAxis.SelectedIndex = 0; + } + + private void AssignMinMaxLimit() + { + int maxrateX = 20000; + int maxrateY = 20000; + + int maxPwm = 1000; + + try {maxrateX = (int)GrblCore.Configuration.MaxRateX;} + catch (Exception ex) { } + try { maxrateY = (int)GrblCore.Configuration.MaxRateY; } + catch (Exception ex) { } + try { maxPwm = (int)GrblCore.Configuration.MaxPWM; } + catch (Exception ex) { } + + + + IiCrossSpeed.MaxValue = Math.Min( maxrateX, maxrateY); + IiCrossPower.MaxValue = maxPwm; + } + + private void CbAxis_SelectedIndexChanged(object sender, EventArgs e) + { + int maxrateA = 20000; + int maxlenA = 400; + + try { maxrateA = ((string)CbAxis.SelectedItem == "X") ? (int)GrblCore.Configuration.MaxRateX : (int)GrblCore.Configuration.MaxRateY; } + catch (Exception ex) { } + + try { maxlenA = ((string)CbAxis.SelectedItem == "X") ? (int)GrblCore.Configuration.TableWidth : (int)GrblCore.Configuration.TableHeight; } + catch (Exception ex) { } + + IiAxisLen.MaxValue = maxlenA; + IiAxisLen.CurrentValue = maxlenA; + + string mcurlimit = CbLimit.SelectedItem as string; + CbLimit.BeginUpdate(); + CbLimit.Items.Clear(); + + CbLimit.Items.Add(maxrateA); + + for (int i = maxrateA / 1000 * 1000; i > 0; i-= 1000) + if (!CbLimit.Items.Contains(i)) + CbLimit.Items.Add(i); + + CbLimit.EndUpdate(); + + if (mcurlimit != null && CbLimit.Items.Contains(mcurlimit)) + CbLimit.SelectedItem = mcurlimit; + else + CbLimit.SelectedIndex = 0; + } + } +} diff --git a/LaserGRBL/Generator/ShakeTest.resx b/LaserGRBL/Generator/ShakeTest.resx new file mode 100644 index 00000000..3029fe8a --- /dev/null +++ b/LaserGRBL/Generator/ShakeTest.resx @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + /wDR0/zv6T+Zs7bC+vn1d6fm1dIw6RV0WivbXntLi0Ojft9D0ze/c7+cyd+9+R/26oD/ABV4Y56nkfJl + X/kCpD/FZ07v1HKPwFI/9EpaKT4P+Mvo91+UzOY7Cpqd+qXe603tl7d3p11bsd+1tdnp2f6b+QhYn+M/ + p1nTr78vGdi51e77PhBzrfV9odX+tMpFNO+39E/1P5v+cSH+KzpPfPzD8PRH/uspD/Fb0Xvm53+dT/7y + pelSh/jN6Z+yTkGhw6oJA6dL4Pv2A/bvQ+z7PS/T/wDgez1FHJ/xn9PZ0ym/GxnX9RfHrYDnOrbXofU/ + XXUOota1w2s9P+c3/wCD96n/AONb0P8A7mZ3+fT/AO8yf/xrug/9ys3/ALcr/wDedL0qY5v+M7pVTsb7 + FRZltsI+17t1Jpb7d2xttW3Ks9z/AGVP2fo/55LqX+M7pVNbD0yizPtL4eywPxmhkH9ILLqn737tu2rY + pj/Fh9X++RmH/rjP4UqQ/wAWP1d/0mWf+uj+DEvSpxPrb9Yfqt9YMWs1WZFHUMXc7FuND9pke/Gu/wCC + u2M9/wDgbfTt+h6ldnJNsaRr7T/rwvSh/iz+rY5OUf8Ar7v4KQ/xa/VkcjIP/X3/AN6VhTzN/wBbMe36 + os6A3DLbxWyh1vt9ENrLXfaWQ71ftDtnqbPT9l/6T1f9JzYtcLmMo3uyXnbSynd6jidNtXo/pXbv+DXp + jP8AFv8AVVpl1Nzx4OyLY/6NjVsdL6B0bpAP7OxK8dzhDrGibHD919791z/7b0rCnB+o31Pf0druo9Ra + B1G5uxlQIIorJDnVyz2Ovtc1vrvb7PZXVV/hLbuuSSTVP//W9VSSSSUpJJJJSkkkklKSSSSUpJJJJSkk + kklKSSSSUpJJJJSkkkklKSSSSU//1/VUkkklKSSSSUpJJJJSkkkklKSSSSUpJJJJSkkkklKSSSSUpJJJ + JSkkkklP/9D1VJJJJSkkkklKSSSSUpJJJJSkkkklKSSSSUpJJJJSkkkklKSSSSUpJJJJT//Z/9sAQwAE + AwMDAwMEAwMEBgQDBAYHBQQEBQcIBgYHBgYICggJCQkJCAoKDAwMDAwKDAwMDAwMDAwMDAwMDAwMDAwM + DAwM/9sAQwEEBQUIBwgPCgoPFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwM + 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 + 9AA1w/x0/wD/2Q== + + + + This test allows you to check the reliability of your machine in performing rapid movements without position misalignments. +It is a fundamental test for fine-tuning of your engraver. + +It work by engraving a small reference cross, than shaking your laser head with lot of rapid movement, and then going back to original position and tracing the cross again. + +The test is completed successfully if the initial cross and the final cross match (overlap). +If your engraver is unable to complete this test successfully you will need to check: + +1. That the machine does not slip on the table due to vibrations during work. +2. The table itself and the workpiece do not shake during the test, due to vibrations. +3. That the drive belts are tensioned correctly +4. The screws and nuts are correctly tightened +5. The laser carriage has no mechanical resistance during movement at some points of its travel +6. The electrical wires do not act as a hindrance to the movement and do not detach/move from their connectors during the movement. + +If these conditions are met, but the machine is not able to perform this test successfully, you can try to slightly decrease the speed limits set in the "Grbl Configuration ($110-$111)" or maximum accelerations. + + \ No newline at end of file diff --git a/LaserGRBL/GrblFile.cs b/LaserGRBL/GrblFile.cs index 89886639..ef5c1a91 100644 --- a/LaserGRBL/GrblFile.cs +++ b/LaserGRBL/GrblFile.cs @@ -702,6 +702,118 @@ public void GenerateGreyscaleTest(int f_row, int s_col, int f_start, int f_end, RiseOnFileLoaded(filename, elapsed); } + internal void GenerateShakeTest(string axis, int flimit, int axislen, int cpower, int cspeed) + { + string filename = $"Shake Test {axis}"; + + RiseOnFileLoading(filename); + + long start = Tools.HiResTimer.TotalMilliseconds; + + list.Clear(); + mRange.ResetRange(); + + list.Add(new GrblCommand("M5")); //laser OFF + list.Add(new GrblCommand("G1 F1000 X0 Y0 S0")); //move to origin (slowly) + list.Add(new GrblCommand($"G1 F{cspeed} X7 Y10")); //positioning + list.Add(new GrblCommand("M4")); //laser ON + list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X13 Y10")); //drow cross + list.Add(new GrblCommand("M5")); //laser OFF + list.Add(new GrblCommand($"G1 F{cspeed} X10 Y7")); //positioning + list.Add(new GrblCommand("M4")); //laser ON + list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X10 Y13")); //drow cross + list.Add(new GrblCommand("M5")); //laser OFF + list.Add(new GrblCommand("G1 F1000 X10 Y10 S0")); //move to cross center (slowly) + + GenerateShakeTest2(axis, flimit, axislen, 10, 50, 0.5); + GenerateShakeTest2(axis, flimit, axislen, 10, 100, 2); + GenerateShakeTest2(axis, flimit, axislen, 10, 200, 4); + GenerateShakeTest2(axis, flimit, axislen, 10, 400, 8); + + list.Add(new GrblCommand($"G1 F{cspeed} X10 Y10 S0")); //move to cross center (fast) + + list.Add(new GrblCommand($"G1 F{cspeed} X7 Y10")); //positioning + list.Add(new GrblCommand("M4")); //laser ON + list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X13 Y10")); //drow cross + list.Add(new GrblCommand("M5")); //laser OFF + list.Add(new GrblCommand($"G1 F{cspeed} X10 Y7")); //positioning + list.Add(new GrblCommand("M4")); //laser ON + list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X10 Y13")); //drow cross + list.Add(new GrblCommand("M5")); //laser OFF + list.Add(new GrblCommand("G1 F1000 X0 Y0 S0")); //move to origin (slowly) + + Analyze(); + long elapsed = Tools.HiResTimer.TotalMilliseconds - start; + + RiseOnFileLoaded(filename, elapsed); + } + + long map(long x, long in_min, long in_max, long out_min, long out_max) + { + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; + } + + private void GenerateShakeTest2(string axis, int flimit, int axislen, int o, int trip, double step) + { + for (int c = trip / 2; c < axislen - trip / 2; c += trip) //centro dei punti di oscillazione + { + for (double i = 0; i < trip / 3; i += step) + { + list.Add(new GrblCommand($"G1 F{flimit} {axis}{formatnumber(o + c + i)}")); + list.Add(new GrblCommand($"G1 F{flimit} {axis}{formatnumber(o + c - i)}")); + } + } + } + + //internal void GenerateShakeTest(string axis, int flimit, int axislen, int cpower, int cspeed) + //{ + // string filename = $"Shake Test {axis}"; + + // RiseOnFileLoading(filename); + + // long start = Tools.HiResTimer.TotalMilliseconds; + + // list.Clear(); + // mRange.ResetRange(); + + // list.Add(new GrblCommand("M5")); //laser OFF + // list.Add(new GrblCommand("G1 F1000 X0 Y0 S0")); //move to origin (slowly) + // list.Add(new GrblCommand($"G1 F{cspeed} X7 Y10")); //positioning + // list.Add(new GrblCommand("M4")); //laser ON + // list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X13 Y10")); //drow cross + // list.Add(new GrblCommand("M5")); //laser OFF + // list.Add(new GrblCommand($"G1 F{cspeed} X10 Y7")); //positioning + // list.Add(new GrblCommand("M4")); //laser ON + // list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X10 Y13")); //drow cross + // list.Add(new GrblCommand("M5")); //laser OFF + // list.Add(new GrblCommand("G1 F1000 X10 Y10 S0")); //move to cross center (slowly) + + // int ca = 10; + // int da = 1; + // while ((ca + da) < axislen) + // { + // ca += da; + // list.Add(new GrblCommand($"G1 F{flimit} {axis}{ca}")); + // ca -= da; + // list.Add(new GrblCommand($"G1 F{flimit} {axis}{ca}")); + // da += 5; + // } + + // list.Add(new GrblCommand($"G1 F{cspeed} X7 Y10")); //positioning + // list.Add(new GrblCommand("M4")); //laser ON + // list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X13 Y10")); //drow cross + // list.Add(new GrblCommand("M5")); //laser OFF + // list.Add(new GrblCommand($"G1 F{cspeed} X10 Y7")); //positioning + // list.Add(new GrblCommand("M4")); //laser ON + // list.Add(new GrblCommand($"G1 F{cspeed} S{cpower} X10 Y13")); //drow cross + // list.Add(new GrblCommand("M5")); //laser OFF + + // Analyze(); + // long elapsed = Tools.HiResTimer.TotalMilliseconds - start; + + // RiseOnFileLoaded(filename, elapsed); + //} + // For Marlin, as we sen M106 command, we need to know last color send //private int lastColorSend = 0; private void ImageLine2Line(Bitmap bmp, L2LConf c) diff --git a/LaserGRBL/LaserGRBL.csproj b/LaserGRBL/LaserGRBL.csproj index d67b0615..91c8ccd1 100644 --- a/LaserGRBL/LaserGRBL.csproj +++ b/LaserGRBL/LaserGRBL.csproj @@ -145,6 +145,12 @@ PowerVsSpeedForm.cs + + Form + + + ShakeTest.cs + Form @@ -876,6 +882,9 @@ PowerVsSpeedForm.cs + + ShakeTest.cs + GrblConfig.cs @@ -1494,6 +1503,7 @@ RasterToLaserForm.cs + Designer RasterToLaserForm.cs diff --git a/LaserGRBL/MainForm.Designer.cs b/LaserGRBL/MainForm.Designer.cs index 462880a2..401e846b 100644 --- a/LaserGRBL/MainForm.Designer.cs +++ b/LaserGRBL/MainForm.Designer.cs @@ -87,7 +87,6 @@ private void InitializeComponent() this.MnPowerVsSpeed = new System.Windows.Forms.ToolStripMenuItem(); this.MnCuttingTest = new System.Windows.Forms.ToolStripMenuItem(); this.MnAccuracyTest = new System.Windows.Forms.ToolStripMenuItem(); - this.MnFocusTest = new System.Windows.Forms.ToolStripMenuItem(); this.MNEsp8266 = new System.Windows.Forms.ToolStripMenuItem(); this.MNGrblEmulator = new System.Windows.Forms.ToolStripMenuItem(); this.schemaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -150,6 +149,7 @@ private void InitializeComponent() this.licenseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AwakeTimer = new System.Windows.Forms.Timer(this.components); this.MultipleInstanceTimer = new System.Windows.Forms.Timer(this.components); + this.shakeTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -552,7 +552,7 @@ private void InitializeComponent() this.MnPowerVsSpeed, this.MnCuttingTest, this.MnAccuracyTest, - this.MnFocusTest}); + this.shakeTestToolStripMenuItem}); this.MnGenerate.Name = "MnGenerate"; resources.ApplyResources(this.MnGenerate, "MnGenerate"); // @@ -574,11 +574,6 @@ private void InitializeComponent() resources.ApplyResources(this.MnAccuracyTest, "MnAccuracyTest"); this.MnAccuracyTest.Click += new System.EventHandler(this.MnAccuracyTest_Click); // - // MnFocusTest - // - this.MnFocusTest.Name = "MnFocusTest"; - resources.ApplyResources(this.MnFocusTest, "MnFocusTest"); - // // MNEsp8266 // this.MNEsp8266.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1001,6 +996,12 @@ private void InitializeComponent() this.MultipleInstanceTimer.Interval = 1000; this.MultipleInstanceTimer.Tick += new System.EventHandler(this.MultipleInstanceTimer_Tick); // + // shakeTestToolStripMenuItem + // + this.shakeTestToolStripMenuItem.Name = "shakeTestToolStripMenuItem"; + resources.ApplyResources(this.shakeTestToolStripMenuItem, "shakeTestToolStripMenuItem"); + this.shakeTestToolStripMenuItem.Click += new System.EventHandler(this.shakeTestToolStripMenuItem_Click); + // // MainForm // this.AllowDrop = true; @@ -1150,7 +1151,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem MnPowerVsSpeed; private System.Windows.Forms.ToolStripMenuItem MnCuttingTest; private System.Windows.Forms.ToolStripMenuItem MnAccuracyTest; - private System.Windows.Forms.ToolStripMenuItem MnFocusTest; + private System.Windows.Forms.ToolStripMenuItem shakeTestToolStripMenuItem; } } diff --git a/LaserGRBL/MainForm.cs b/LaserGRBL/MainForm.cs index 08e24db2..1d9728c4 100644 --- a/LaserGRBL/MainForm.cs +++ b/LaserGRBL/MainForm.cs @@ -1066,6 +1066,11 @@ private void MnAccuracyTest_Click(object sender, EventArgs e) { Core.OpenFile(this, "LaserGRBL.Generator.SVG.LaserGRBL-accuracy-test-file.svg", false); } + + private void shakeTestToolStripMenuItem_Click(object sender, EventArgs e) + { + Generator.ShakeTest.CreateAndShowDialog(this, Core); + } } diff --git a/LaserGRBL/MainForm.resx b/LaserGRBL/MainForm.resx index dbe8a022..f805da0a 100644 --- a/LaserGRBL/MainForm.resx +++ b/LaserGRBL/MainForm.resx @@ -1068,31 +1068,28 @@ &File - 178, 22 + 180, 22 Power vs Speed test - 178, 22 + 180, 22 Cutting Test - 178, 22 + 180, 22 Accuracy Test - - 178, 22 + + 180, 22 - - Focus Test - - - False + + Shake Test 66, 20 @@ -10503,12 +10500,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MnFocusTest - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MNEsp8266 @@ -10881,6 +10872,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + shakeTestToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs index 689be1d7..10022132 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs @@ -72,8 +72,13 @@ private void InitializeComponent() this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); this.GbSize = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnUnlockProportion = new LaserGRBL.UserControls.ImageButton(); this.label9 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); + this.IIOffsetX = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.IIOffsetY = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.IISizeH = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.IISizeW = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); this.label6 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); @@ -81,41 +86,36 @@ private void InitializeComponent() this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.label1 = new System.Windows.Forms.Label(); this.CbAutosize = new System.Windows.Forms.CheckBox(); + this.IIDpi = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.BtnDPI = new LaserGRBL.UserControls.ImageButton(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnReset = new LaserGRBL.UserControls.ImageButton(); + this.BtnCenter = new LaserGRBL.UserControls.ImageButton(); this.GbSpeed = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); this.LblBorderTracing = new System.Windows.Forms.Label(); this.LblBorderTracingmm = new System.Windows.Forms.Label(); + this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.IILinearFilling = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); this.LblLinearFillingmm = new System.Windows.Forms.Label(); this.LblLinearFilling = new System.Windows.Forms.Label(); + this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); this.GbLaser = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); this.LblSmin = new System.Windows.Forms.Label(); + this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); this.LblLaserMode = new System.Windows.Forms.Label(); + this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); this.CBLaserON = new System.Windows.Forms.ComboBox(); this.LblSmax = new System.Windows.Forms.Label(); + this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); this.LblMinPerc = new System.Windows.Forms.Label(); this.LblMaxPerc = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.BtnCancel = new System.Windows.Forms.Button(); this.BtnCreate = new System.Windows.Forms.Button(); this.TT = new System.Windows.Forms.ToolTip(this.components); - this.BtnUnlockProportion = new LaserGRBL.UserControls.ImageButton(); - this.IIOffsetX = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IIOffsetY = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IISizeH = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IISizeW = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IIDpi = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnDPI = new LaserGRBL.UserControls.ImageButton(); - this.BtnReset = new LaserGRBL.UserControls.ImageButton(); - this.BtnCenter = new LaserGRBL.UserControls.ImageButton(); - this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.IILinearFilling = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); - this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); - this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); - this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); this.tableLayoutPanel9.SuspendLayout(); this.GbSize.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); @@ -162,187 +162,6 @@ private void InitializeComponent() this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 5, 3); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; // - // label9 - // - resources.ApplyResources(this.label9, "label9"); - this.label9.Name = "label9"; - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // - // label6 - // - resources.ApplyResources(this.label6, "label6"); - this.label6.Name = "label6"; - // - // label10 - // - resources.ApplyResources(this.label10, "label10"); - this.label10.Name = "label10"; - // - // label7 - // - resources.ApplyResources(this.label7, "label7"); - this.label7.Name = "label7"; - // - // label11 - // - resources.ApplyResources(this.label11, "label11"); - this.label11.Name = "label11"; - // - // tableLayoutPanel2 - // - resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); - this.tableLayoutPanel3.SetColumnSpan(this.tableLayoutPanel2, 6); - this.tableLayoutPanel2.Controls.Add(this.label1, 2, 0); - this.tableLayoutPanel2.Controls.Add(this.CbAutosize, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.IIDpi, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.BtnDPI, 3, 0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // CbAutosize - // - resources.ApplyResources(this.CbAutosize, "CbAutosize"); - this.CbAutosize.Name = "CbAutosize"; - this.CbAutosize.UseVisualStyleBackColor = true; - this.CbAutosize.CheckedChanged += new System.EventHandler(this.CbAutosize_CheckedChanged); - // - // tableLayoutPanel4 - // - resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); - this.tableLayoutPanel4.Controls.Add(this.BtnReset, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.BtnCenter, 1, 0); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - // - // GbSpeed - // - resources.ApplyResources(this.GbSpeed, "GbSpeed"); - this.GbSpeed.Controls.Add(this.tableLayoutPanel6); - this.GbSpeed.Name = "GbSpeed"; - this.GbSpeed.TabStop = false; - // - // tableLayoutPanel6 - // - resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); - this.tableLayoutPanel6.Controls.Add(this.LblBorderTracing, 0, 0); - this.tableLayoutPanel6.Controls.Add(this.LblBorderTracingmm, 2, 0); - this.tableLayoutPanel6.Controls.Add(this.IIBorderTracing, 1, 0); - this.tableLayoutPanel6.Controls.Add(this.IILinearFilling, 1, 1); - this.tableLayoutPanel6.Controls.Add(this.LblLinearFillingmm, 2, 1); - this.tableLayoutPanel6.Controls.Add(this.LblLinearFilling, 0, 1); - this.tableLayoutPanel6.Controls.Add(this.BtnPSHelper, 4, 0); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - // - // LblBorderTracing - // - resources.ApplyResources(this.LblBorderTracing, "LblBorderTracing"); - this.LblBorderTracing.Name = "LblBorderTracing"; - // - // LblBorderTracingmm - // - resources.ApplyResources(this.LblBorderTracingmm, "LblBorderTracingmm"); - this.LblBorderTracingmm.Name = "LblBorderTracingmm"; - // - // LblLinearFillingmm - // - resources.ApplyResources(this.LblLinearFillingmm, "LblLinearFillingmm"); - this.LblLinearFillingmm.Name = "LblLinearFillingmm"; - // - // LblLinearFilling - // - resources.ApplyResources(this.LblLinearFilling, "LblLinearFilling"); - this.LblLinearFilling.Name = "LblLinearFilling"; - // - // GbLaser - // - resources.ApplyResources(this.GbLaser, "GbLaser"); - this.GbLaser.Controls.Add(this.tableLayoutPanel7); - this.GbLaser.Name = "GbLaser"; - this.GbLaser.TabStop = false; - // - // tableLayoutPanel7 - // - resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); - this.tableLayoutPanel7.Controls.Add(this.BtnModulationInfo, 3, 1); - this.tableLayoutPanel7.Controls.Add(this.LblSmin, 0, 1); - this.tableLayoutPanel7.Controls.Add(this.IIMinPower, 1, 1); - this.tableLayoutPanel7.Controls.Add(this.LblLaserMode, 0, 0); - this.tableLayoutPanel7.Controls.Add(this.BtnOnOffInfo, 3, 0); - this.tableLayoutPanel7.Controls.Add(this.CBLaserON, 1, 0); - this.tableLayoutPanel7.Controls.Add(this.LblSmax, 0, 2); - this.tableLayoutPanel7.Controls.Add(this.IIMaxPower, 1, 2); - this.tableLayoutPanel7.Controls.Add(this.LblMinPerc, 2, 1); - this.tableLayoutPanel7.Controls.Add(this.LblMaxPerc, 2, 2); - this.tableLayoutPanel7.Name = "tableLayoutPanel7"; - // - // LblSmin - // - resources.ApplyResources(this.LblSmin, "LblSmin"); - this.LblSmin.Name = "LblSmin"; - // - // LblLaserMode - // - resources.ApplyResources(this.LblLaserMode, "LblLaserMode"); - this.LblLaserMode.Name = "LblLaserMode"; - // - // CBLaserON - // - this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); - resources.ApplyResources(this.CBLaserON, "CBLaserON"); - this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CBLaserON.FormattingEnabled = true; - this.CBLaserON.Name = "CBLaserON"; - this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); - // - // LblSmax - // - resources.ApplyResources(this.LblSmax, "LblSmax"); - this.LblSmax.Name = "LblSmax"; - // - // LblMinPerc - // - resources.ApplyResources(this.LblMinPerc, "LblMinPerc"); - this.LblMinPerc.Name = "LblMinPerc"; - // - // LblMaxPerc - // - resources.ApplyResources(this.LblMaxPerc, "LblMaxPerc"); - this.LblMaxPerc.Name = "LblMaxPerc"; - // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 2, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // - // BtnCancel - // - this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.BtnCancel, "BtnCancel"); - this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.UseVisualStyleBackColor = true; - // - // BtnCreate - // - resources.ApplyResources(this.BtnCreate, "BtnCreate"); - this.BtnCreate.Name = "BtnCreate"; - this.BtnCreate.UseVisualStyleBackColor = true; - this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); - // - // TT - // - this.TT.AutoPopDelay = 10000; - this.TT.InitialDelay = 500; - this.TT.ReshowDelay = 100; - // // BtnUnlockProportion // this.BtnUnlockProportion.AltImage = ((System.Drawing.Image)(resources.GetObject("BtnUnlockProportion.AltImage"))); @@ -357,6 +176,16 @@ private void InitializeComponent() this.BtnUnlockProportion.UseAltImage = false; this.BtnUnlockProportion.Click += new System.EventHandler(this.BtnUnlockProportion_Click); // + // label9 + // + resources.ApplyResources(this.label9, "label9"); + this.label9.Name = "label9"; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // // IIOffsetX // resources.ApplyResources(this.IIOffsetX, "IIOffsetX"); @@ -407,6 +236,48 @@ private void InitializeComponent() this.IISizeW.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeW_CurrentValueChanged); this.IISizeW.OnTheFlyValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeW_OnTheFlyValueChanged); // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.Name = "label7"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // + // tableLayoutPanel2 + // + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); + this.tableLayoutPanel3.SetColumnSpan(this.tableLayoutPanel2, 6); + this.tableLayoutPanel2.Controls.Add(this.label1, 2, 0); + this.tableLayoutPanel2.Controls.Add(this.CbAutosize, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.IIDpi, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.BtnDPI, 3, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // CbAutosize + // + resources.ApplyResources(this.CbAutosize, "CbAutosize"); + this.CbAutosize.Name = "CbAutosize"; + this.CbAutosize.UseVisualStyleBackColor = true; + this.CbAutosize.CheckedChanged += new System.EventHandler(this.CbAutosize_CheckedChanged); + // // IIDpi // resources.ApplyResources(this.IIDpi, "IIDpi"); @@ -433,6 +304,13 @@ private void InitializeComponent() this.BtnDPI.UseAltImage = false; this.BtnDPI.Click += new System.EventHandler(this.BtnDPI_Click); // + // tableLayoutPanel4 + // + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); + this.tableLayoutPanel4.Controls.Add(this.BtnReset, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.BtnCenter, 1, 0); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + // // BtnReset // this.BtnReset.AltImage = null; @@ -461,6 +339,35 @@ private void InitializeComponent() this.BtnCenter.UseAltImage = false; this.BtnCenter.Click += new System.EventHandler(this.BtnCenter_Click); // + // GbSpeed + // + resources.ApplyResources(this.GbSpeed, "GbSpeed"); + this.GbSpeed.Controls.Add(this.tableLayoutPanel6); + this.GbSpeed.Name = "GbSpeed"; + this.GbSpeed.TabStop = false; + // + // tableLayoutPanel6 + // + resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); + this.tableLayoutPanel6.Controls.Add(this.LblBorderTracing, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.LblBorderTracingmm, 2, 0); + this.tableLayoutPanel6.Controls.Add(this.IIBorderTracing, 1, 0); + this.tableLayoutPanel6.Controls.Add(this.IILinearFilling, 1, 1); + this.tableLayoutPanel6.Controls.Add(this.LblLinearFillingmm, 2, 1); + this.tableLayoutPanel6.Controls.Add(this.LblLinearFilling, 0, 1); + this.tableLayoutPanel6.Controls.Add(this.BtnPSHelper, 4, 0); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + // + // LblBorderTracing + // + resources.ApplyResources(this.LblBorderTracing, "LblBorderTracing"); + this.LblBorderTracing.Name = "LblBorderTracing"; + // + // LblBorderTracingmm + // + resources.ApplyResources(this.LblBorderTracingmm, "LblBorderTracingmm"); + this.LblBorderTracingmm.Name = "LblBorderTracingmm"; + // // IIBorderTracing // resources.ApplyResources(this.IIBorderTracing, "IIBorderTracing"); @@ -485,6 +392,16 @@ private void InitializeComponent() this.IILinearFilling.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; this.IILinearFilling.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMarkSpeedCurrentValueChanged); // + // LblLinearFillingmm + // + resources.ApplyResources(this.LblLinearFillingmm, "LblLinearFillingmm"); + this.LblLinearFillingmm.Name = "LblLinearFillingmm"; + // + // LblLinearFilling + // + resources.ApplyResources(this.LblLinearFilling, "LblLinearFilling"); + this.LblLinearFilling.Name = "LblLinearFilling"; + // // BtnPSHelper // this.BtnPSHelper.AltImage = null; @@ -500,6 +417,28 @@ private void InitializeComponent() this.BtnPSHelper.UseAltImage = false; this.BtnPSHelper.Click += new System.EventHandler(this.BtnPSHelper_Click); // + // GbLaser + // + resources.ApplyResources(this.GbLaser, "GbLaser"); + this.GbLaser.Controls.Add(this.tableLayoutPanel7); + this.GbLaser.Name = "GbLaser"; + this.GbLaser.TabStop = false; + // + // tableLayoutPanel7 + // + resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); + this.tableLayoutPanel7.Controls.Add(this.BtnModulationInfo, 3, 1); + this.tableLayoutPanel7.Controls.Add(this.LblSmin, 0, 1); + this.tableLayoutPanel7.Controls.Add(this.IIMinPower, 1, 1); + this.tableLayoutPanel7.Controls.Add(this.LblLaserMode, 0, 0); + this.tableLayoutPanel7.Controls.Add(this.BtnOnOffInfo, 3, 0); + this.tableLayoutPanel7.Controls.Add(this.CBLaserON, 1, 0); + this.tableLayoutPanel7.Controls.Add(this.LblSmax, 0, 2); + this.tableLayoutPanel7.Controls.Add(this.IIMaxPower, 1, 2); + this.tableLayoutPanel7.Controls.Add(this.LblMinPerc, 2, 1); + this.tableLayoutPanel7.Controls.Add(this.LblMaxPerc, 2, 2); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + // // BtnModulationInfo // this.BtnModulationInfo.AltImage = null; @@ -515,6 +454,11 @@ private void InitializeComponent() this.BtnModulationInfo.UseAltImage = false; this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); // + // LblSmin + // + resources.ApplyResources(this.LblSmin, "LblSmin"); + this.LblSmin.Name = "LblSmin"; + // // IIMinPower // resources.ApplyResources(this.IIMinPower, "IIMinPower"); @@ -526,6 +470,11 @@ private void InitializeComponent() this.IIMinPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; this.IIMinPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMinPowerCurrentValueChanged); // + // LblLaserMode + // + resources.ApplyResources(this.LblLaserMode, "LblLaserMode"); + this.LblLaserMode.Name = "LblLaserMode"; + // // BtnOnOffInfo // this.BtnOnOffInfo.AltImage = null; @@ -540,6 +489,20 @@ private void InitializeComponent() this.BtnOnOffInfo.UseAltImage = false; this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); // + // CBLaserON + // + this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); + resources.ApplyResources(this.CBLaserON, "CBLaserON"); + this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBLaserON.FormattingEnabled = true; + this.CBLaserON.Name = "CBLaserON"; + this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); + // + // LblSmax + // + resources.ApplyResources(this.LblSmax, "LblSmax"); + this.LblSmax.Name = "LblSmax"; + // // IIMaxPower // resources.ApplyResources(this.IIMaxPower, "IIMaxPower"); @@ -552,10 +515,48 @@ private void InitializeComponent() this.IIMaxPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; this.IIMaxPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMaxPowerCurrentValueChanged); // + // LblMinPerc + // + resources.ApplyResources(this.LblMinPerc, "LblMinPerc"); + this.LblMinPerc.Name = "LblMinPerc"; + // + // LblMaxPerc + // + resources.ApplyResources(this.LblMaxPerc, "LblMaxPerc"); + this.LblMaxPerc.Name = "LblMaxPerc"; + // + // tableLayoutPanel1 + // + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); + this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 2, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + // + // BtnCancel + // + this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.BtnCancel, "BtnCancel"); + this.BtnCancel.Name = "BtnCancel"; + this.BtnCancel.UseVisualStyleBackColor = true; + // + // BtnCreate + // + resources.ApplyResources(this.BtnCreate, "BtnCreate"); + this.BtnCreate.Name = "BtnCreate"; + this.BtnCreate.UseVisualStyleBackColor = true; + this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); + // + // TT + // + this.TT.AutoPopDelay = 10000; + this.TT.InitialDelay = 500; + this.TT.ReshowDelay = 100; + // // ConvertSizeAndOptionForm // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.BtnCancel; this.Controls.Add(this.tableLayoutPanel9); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "ConvertSizeAndOptionForm"; diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx index e4375917..475a5e82 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx @@ -208,7 +208,7 @@ BtnUnlockProportion - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -298,7 +298,7 @@ IIOffsetX - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -319,7 +319,7 @@ IIOffsetY - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -340,7 +340,7 @@ IISizeH - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -361,7 +361,7 @@ IISizeW - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -625,7 +625,7 @@ IIDpi - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -681,7 +681,7 @@ BtnDPI - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -775,7 +775,7 @@ BtnReset - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -816,7 +816,7 @@ BtnCenter - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -1011,7 +1011,7 @@ IIBorderTracing - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1038,7 +1038,7 @@ IILinearFilling - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1149,7 +1149,7 @@ BtnPSHelper - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1266,7 +1266,7 @@ Click for more information... BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1323,7 +1323,7 @@ Click for more information... IIMinPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1402,7 +1402,7 @@ Click for more information... BtnOnOffInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1483,7 +1483,7 @@ Click for more information... IIMaxPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1752,9 +1752,6 @@ Click for more information... 289, 300 - - NoControl - 4, 4, 4, 4 diff --git a/LaserGRBL/RasterConverter/RasterToLaserForm.Designer.cs b/LaserGRBL/RasterConverter/RasterToLaserForm.Designer.cs index 499f9768..58ca2263 100644 --- a/LaserGRBL/RasterConverter/RasterToLaserForm.Designer.cs +++ b/LaserGRBL/RasterConverter/RasterToLaserForm.Designer.cs @@ -28,1219 +28,1221 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RasterToLaserForm)); - this.TlpMain = new System.Windows.Forms.TableLayoutPanel(); - this.TCOriginalPreview = new System.Windows.Forms.TabControl(); - this.TpPreview = new System.Windows.Forms.TabPage(); - this.WB = new LaserGRBL.UserControls.WaitingProgressBar(); - this.PbConverted = new System.Windows.Forms.PictureBox(); - this.TpOriginal = new System.Windows.Forms.TabPage(); - this.PbOriginal = new System.Windows.Forms.PictureBox(); - this.FlipControl = new System.Windows.Forms.TableLayoutPanel(); - this.BtnOutliner = new LaserGRBL.UserControls.ImageButton(); - this.BtnFill = new LaserGRBL.UserControls.ImageButton(); - this.BtFlipV = new LaserGRBL.UserControls.ImageButton(); - this.BtFlipH = new LaserGRBL.UserControls.ImageButton(); - this.BtRotateCW = new LaserGRBL.UserControls.ImageButton(); - this.BtRotateCCW = new LaserGRBL.UserControls.ImageButton(); - this.BtnRevert = new LaserGRBL.UserControls.ImageButton(); - this.BtnCrop = new LaserGRBL.UserControls.ImageButton(); - this.BtnReverse = new LaserGRBL.UserControls.ImageButton(); - this.BtnAutoTrim = new LaserGRBL.UserControls.ImageButton(); - this.TlpLeft = new System.Windows.Forms.TableLayoutPanel(); - this.GbPassthrough = new System.Windows.Forms.GroupBox(); - this.TbPassthroughInfo = new System.Windows.Forms.TextBox(); - this.GbParameters = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.CbResize = new LaserGRBL.UserControls.EnumComboBox(); - this.LblGrayscale = new System.Windows.Forms.Label(); - this.CbMode = new LaserGRBL.UserControls.EnumComboBox(); - this.TBRed = new LaserGRBL.UserControls.ColorSlider(); - this.LblRed = new System.Windows.Forms.Label(); - this.LblBlue = new System.Windows.Forms.Label(); - this.LblGreen = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.TBGreen = new LaserGRBL.UserControls.ColorSlider(); - this.TbBright = new LaserGRBL.UserControls.ColorSlider(); - this.TBBlue = new LaserGRBL.UserControls.ColorSlider(); - this.TbContrast = new LaserGRBL.UserControls.ColorSlider(); - this.label3 = new System.Windows.Forms.Label(); - this.CbThreshold = new System.Windows.Forms.CheckBox(); - this.label28 = new System.Windows.Forms.Label(); - this.TbThreshold = new LaserGRBL.UserControls.ColorSlider(); - this.TBWhiteClip = new LaserGRBL.UserControls.ColorSlider(); - this.label4 = new System.Windows.Forms.Label(); - this.GbCenterlineOptions = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.TBLineThreshold = new LaserGRBL.UserControls.ColorSlider(); - this.TBCornerThreshold = new LaserGRBL.UserControls.ColorSlider(); - this.CbLineThreshold = new System.Windows.Forms.CheckBox(); - this.CbCornerThreshold = new System.Windows.Forms.CheckBox(); - this.GbVectorizeOptions = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnAdaptiveQualityInfo = new LaserGRBL.UserControls.ImageButton(); - this.CbAdaptiveQuality = new System.Windows.Forms.CheckBox(); - this.LAdaptiveQuality = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.UDSpotRemoval = new System.Windows.Forms.NumericUpDown(); - this.CbSpotRemoval = new System.Windows.Forms.CheckBox(); - this.label24 = new System.Windows.Forms.Label(); - this.label23 = new System.Windows.Forms.Label(); - this.UDOptimize = new System.Windows.Forms.NumericUpDown(); - this.UDSmoothing = new System.Windows.Forms.NumericUpDown(); - this.CbOptimize = new System.Windows.Forms.CheckBox(); - this.CbSmoothing = new System.Windows.Forms.CheckBox(); - this.label14 = new System.Windows.Forms.Label(); - this.CbFillingDirection = new LaserGRBL.UserControls.EnumComboBox(); - this.LblFillingQuality = new System.Windows.Forms.Label(); - this.UDFillingQuality = new System.Windows.Forms.NumericUpDown(); - this.LblFillingLineLbl = new System.Windows.Forms.Label(); - this.UDDownSample = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.CbDownSample = new System.Windows.Forms.CheckBox(); - this.lOptimizeFast = new System.Windows.Forms.Label(); - this.BtnFillingQualityInfo = new LaserGRBL.UserControls.ImageButton(); - this.CbOptimizeFast = new System.Windows.Forms.CheckBox(); - this.GbLineToLineOptions = new System.Windows.Forms.GroupBox(); - this.TLP = new System.Windows.Forms.TableLayoutPanel(); - this.CbDirections = new LaserGRBL.UserControls.EnumComboBox(); - this.UDQuality = new System.Windows.Forms.NumericUpDown(); - this.CbLinePreview = new System.Windows.Forms.CheckBox(); - this.label5 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.LblDitherMode = new System.Windows.Forms.Label(); - this.CbDither = new System.Windows.Forms.ComboBox(); - this.BtnQualityInfo = new LaserGRBL.UserControls.ImageButton(); - this.GbConversionTool = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.RbNoProcessing = new System.Windows.Forms.RadioButton(); - this.RbCenterline = new System.Windows.Forms.RadioButton(); - this.RbDithering = new System.Windows.Forms.RadioButton(); - this.RbVectorize = new System.Windows.Forms.RadioButton(); - this.RbLineToLineTracing = new System.Windows.Forms.RadioButton(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnCancel = new System.Windows.Forms.Button(); - this.BtnCreate = new System.Windows.Forms.Button(); - this.WT = new System.Windows.Forms.Timer(this.components); - this.TT = new System.Windows.Forms.ToolTip(this.components); - this.TlpMain.SuspendLayout(); - this.TCOriginalPreview.SuspendLayout(); - this.TpPreview.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PbConverted)).BeginInit(); - this.TpOriginal.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PbOriginal)).BeginInit(); - this.FlipControl.SuspendLayout(); - this.TlpLeft.SuspendLayout(); - this.GbPassthrough.SuspendLayout(); - this.GbParameters.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.GbCenterlineOptions.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - this.GbVectorizeOptions.SuspendLayout(); - this.tableLayoutPanel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.UDSpotRemoval)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDOptimize)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDSmoothing)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDFillingQuality)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDDownSample)).BeginInit(); - this.GbLineToLineOptions.SuspendLayout(); - this.TLP.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.UDQuality)).BeginInit(); - this.GbConversionTool.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // TlpMain - // - resources.ApplyResources(this.TlpMain, "TlpMain"); - this.TlpMain.Controls.Add(this.TCOriginalPreview, 1, 0); - this.TlpMain.Controls.Add(this.FlipControl, 1, 1); - this.TlpMain.Controls.Add(this.TlpLeft, 0, 0); - this.TlpMain.Controls.Add(this.tableLayoutPanel1, 3, 1); - this.TlpMain.Name = "TlpMain"; - // - // TCOriginalPreview - // - this.TlpMain.SetColumnSpan(this.TCOriginalPreview, 3); - this.TCOriginalPreview.Controls.Add(this.TpPreview); - this.TCOriginalPreview.Controls.Add(this.TpOriginal); - resources.ApplyResources(this.TCOriginalPreview, "TCOriginalPreview"); - this.TCOriginalPreview.Name = "TCOriginalPreview"; - this.TCOriginalPreview.SelectedIndex = 0; - // - // TpPreview - // - this.TpPreview.Controls.Add(this.WB); - this.TpPreview.Controls.Add(this.PbConverted); - resources.ApplyResources(this.TpPreview, "TpPreview"); - this.TpPreview.Name = "TpPreview"; - this.TpPreview.UseVisualStyleBackColor = true; - // - // WB - // - resources.ApplyResources(this.WB, "WB"); - this.WB.BarColor = System.Drawing.Color.SteelBlue; - this.WB.BorderColor = System.Drawing.Color.Black; - this.WB.BouncingMode = LaserGRBL.UserControls.WaitingProgressBar.BouncingModeEnum.PingPong; - this.WB.DrawProgressString = false; - this.WB.FillColor = System.Drawing.Color.White; - this.WB.FillStyle = LaserGRBL.UserControls.FillStyles.Solid; - this.WB.Interval = 25D; - this.WB.Maximum = 20D; - this.WB.Minimum = 0D; - this.WB.Name = "WB"; - this.WB.ProgressStringDecimals = 0; - this.WB.Reverse = true; - this.WB.Running = false; - this.WB.Step = 1D; - this.WB.ThrowExceprion = false; - this.WB.Value = 0D; - // - // PbConverted - // - this.PbConverted.BackColor = System.Drawing.Color.White; - resources.ApplyResources(this.PbConverted, "PbConverted"); - this.PbConverted.Name = "PbConverted"; - this.PbConverted.TabStop = false; - this.PbConverted.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PbConvertedMouseDown); - this.PbConverted.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PbConvertedMouseMove); - this.PbConverted.MouseUp += new System.Windows.Forms.MouseEventHandler(this.PbConvertedMouseUp); - this.PbConverted.Resize += new System.EventHandler(this.PbConverted_Resize); - // - // TpOriginal - // - this.TpOriginal.Controls.Add(this.PbOriginal); - resources.ApplyResources(this.TpOriginal, "TpOriginal"); - this.TpOriginal.Name = "TpOriginal"; - this.TpOriginal.UseVisualStyleBackColor = true; - // - // PbOriginal - // - this.PbOriginal.BackColor = System.Drawing.Color.White; - resources.ApplyResources(this.PbOriginal, "PbOriginal"); - this.PbOriginal.Name = "PbOriginal"; - this.PbOriginal.TabStop = false; - // - // FlipControl - // - resources.ApplyResources(this.FlipControl, "FlipControl"); - this.FlipControl.Controls.Add(this.BtnOutliner, 9, 0); - this.FlipControl.Controls.Add(this.BtnFill, 8, 0); - this.FlipControl.Controls.Add(this.BtFlipV, 5, 0); - this.FlipControl.Controls.Add(this.BtFlipH, 4, 0); - this.FlipControl.Controls.Add(this.BtRotateCW, 2, 0); - this.FlipControl.Controls.Add(this.BtRotateCCW, 3, 0); - this.FlipControl.Controls.Add(this.BtnRevert, 0, 0); - this.FlipControl.Controls.Add(this.BtnCrop, 6, 0); - this.FlipControl.Controls.Add(this.BtnReverse, 10, 0); - this.FlipControl.Controls.Add(this.BtnAutoTrim, 7, 0); - this.FlipControl.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.AddColumns; - this.FlipControl.Name = "FlipControl"; - // - // BtnOutliner - // - this.BtnOutliner.AltImage = null; - this.BtnOutliner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnOutliner.Caption = null; - this.BtnOutliner.Coloration = System.Drawing.Color.Empty; - this.BtnOutliner.Image = ((System.Drawing.Image)(resources.GetObject("BtnOutliner.Image"))); - resources.ApplyResources(this.BtnOutliner, "BtnOutliner"); - this.BtnOutliner.Name = "BtnOutliner"; - this.BtnOutliner.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnOutliner, resources.GetString("BtnOutliner.ToolTip")); - this.BtnOutliner.UseAltImage = false; - this.BtnOutliner.Click += new System.EventHandler(this.BtnOutliner_Click); - // - // BtnFill - // - this.BtnFill.AltImage = null; - this.BtnFill.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnFill.Caption = null; - this.BtnFill.Coloration = System.Drawing.Color.Empty; - this.BtnFill.Image = ((System.Drawing.Image)(resources.GetObject("BtnFill.Image"))); - resources.ApplyResources(this.BtnFill, "BtnFill"); - this.BtnFill.Name = "BtnFill"; - this.BtnFill.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnFill, resources.GetString("BtnFill.ToolTip")); - this.BtnFill.UseAltImage = false; - this.BtnFill.Click += new System.EventHandler(this.BtnFillClick); - // - // BtFlipV - // - this.BtFlipV.AltImage = null; - this.BtFlipV.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtFlipV.Caption = null; - this.BtFlipV.Coloration = System.Drawing.Color.Empty; - this.BtFlipV.Image = ((System.Drawing.Image)(resources.GetObject("BtFlipV.Image"))); - resources.ApplyResources(this.BtFlipV, "BtFlipV"); - this.BtFlipV.Name = "BtFlipV"; - this.BtFlipV.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtFlipV, resources.GetString("BtFlipV.ToolTip")); - this.BtFlipV.UseAltImage = false; - this.BtFlipV.Click += new System.EventHandler(this.BtFlipVClick); - // - // BtFlipH - // - this.BtFlipH.AltImage = null; - this.BtFlipH.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtFlipH.Caption = null; - this.BtFlipH.Coloration = System.Drawing.Color.Empty; - this.BtFlipH.Image = ((System.Drawing.Image)(resources.GetObject("BtFlipH.Image"))); - resources.ApplyResources(this.BtFlipH, "BtFlipH"); - this.BtFlipH.Name = "BtFlipH"; - this.BtFlipH.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtFlipH, resources.GetString("BtFlipH.ToolTip")); - this.BtFlipH.UseAltImage = false; - this.BtFlipH.Click += new System.EventHandler(this.BtFlipHClick); - // - // BtRotateCW - // - this.BtRotateCW.AltImage = null; - this.BtRotateCW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtRotateCW.Caption = null; - this.BtRotateCW.Coloration = System.Drawing.Color.Empty; - this.BtRotateCW.Image = ((System.Drawing.Image)(resources.GetObject("BtRotateCW.Image"))); - resources.ApplyResources(this.BtRotateCW, "BtRotateCW"); - this.BtRotateCW.Name = "BtRotateCW"; - this.BtRotateCW.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtRotateCW, resources.GetString("BtRotateCW.ToolTip")); - this.BtRotateCW.UseAltImage = false; - this.BtRotateCW.Click += new System.EventHandler(this.BtRotateCWClick); - // - // BtRotateCCW - // - this.BtRotateCCW.AltImage = null; - this.BtRotateCCW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtRotateCCW.Caption = null; - this.BtRotateCCW.Coloration = System.Drawing.Color.Empty; - this.BtRotateCCW.Image = ((System.Drawing.Image)(resources.GetObject("BtRotateCCW.Image"))); - resources.ApplyResources(this.BtRotateCCW, "BtRotateCCW"); - this.BtRotateCCW.Name = "BtRotateCCW"; - this.BtRotateCCW.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtRotateCCW, resources.GetString("BtRotateCCW.ToolTip")); - this.BtRotateCCW.UseAltImage = false; - this.BtRotateCCW.Click += new System.EventHandler(this.BtRotateCCWClick); - // - // BtnRevert - // - this.BtnRevert.AltImage = null; - this.BtnRevert.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnRevert.Caption = null; - this.BtnRevert.Coloration = System.Drawing.Color.Empty; - this.BtnRevert.Image = ((System.Drawing.Image)(resources.GetObject("BtnRevert.Image"))); - resources.ApplyResources(this.BtnRevert, "BtnRevert"); - this.BtnRevert.Name = "BtnRevert"; - this.BtnRevert.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnRevert, resources.GetString("BtnRevert.ToolTip")); - this.BtnRevert.UseAltImage = false; - this.BtnRevert.Click += new System.EventHandler(this.BtnRevertClick); - // - // BtnCrop - // - this.BtnCrop.AltImage = null; - this.BtnCrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnCrop.Caption = null; - this.BtnCrop.Coloration = System.Drawing.Color.Empty; - this.BtnCrop.Image = ((System.Drawing.Image)(resources.GetObject("BtnCrop.Image"))); - resources.ApplyResources(this.BtnCrop, "BtnCrop"); - this.BtnCrop.Name = "BtnCrop"; - this.BtnCrop.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnCrop, resources.GetString("BtnCrop.ToolTip")); - this.BtnCrop.UseAltImage = false; - this.BtnCrop.Click += new System.EventHandler(this.BtnCropClick); - // - // BtnReverse - // - this.BtnReverse.AltImage = null; - this.BtnReverse.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnReverse.Caption = null; - this.BtnReverse.Coloration = System.Drawing.Color.Empty; - this.BtnReverse.Image = ((System.Drawing.Image)(resources.GetObject("BtnReverse.Image"))); - resources.ApplyResources(this.BtnReverse, "BtnReverse"); - this.BtnReverse.Name = "BtnReverse"; - this.BtnReverse.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnReverse, resources.GetString("BtnReverse.ToolTip")); - this.BtnReverse.UseAltImage = false; - this.BtnReverse.Click += new System.EventHandler(this.BtnReverse_Click); - // - // BtnAutoTrim - // - this.BtnAutoTrim.AltImage = null; - this.BtnAutoTrim.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnAutoTrim.Caption = null; - this.BtnAutoTrim.Coloration = System.Drawing.Color.Empty; - this.BtnAutoTrim.Image = ((System.Drawing.Image)(resources.GetObject("BtnAutoTrim.Image"))); - resources.ApplyResources(this.BtnAutoTrim, "BtnAutoTrim"); - this.BtnAutoTrim.Name = "BtnAutoTrim"; - this.BtnAutoTrim.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnAutoTrim, resources.GetString("BtnAutoTrim.ToolTip")); - this.BtnAutoTrim.UseAltImage = false; - this.BtnAutoTrim.Click += new System.EventHandler(this.BtnAutoTrim_Click); - // - // TlpLeft - // - resources.ApplyResources(this.TlpLeft, "TlpLeft"); - this.TlpLeft.Controls.Add(this.GbPassthrough, 0, 2); - this.TlpLeft.Controls.Add(this.GbParameters, 0, 0); - this.TlpLeft.Controls.Add(this.GbCenterlineOptions, 0, 3); - this.TlpLeft.Controls.Add(this.GbVectorizeOptions, 0, 5); - this.TlpLeft.Controls.Add(this.GbLineToLineOptions, 0, 4); - this.TlpLeft.Controls.Add(this.GbConversionTool, 0, 1); - this.TlpLeft.Name = "TlpLeft"; - this.TlpMain.SetRowSpan(this.TlpLeft, 2); - // - // GbPassthrough - // - resources.ApplyResources(this.GbPassthrough, "GbPassthrough"); - this.GbPassthrough.Controls.Add(this.TbPassthroughInfo); - this.GbPassthrough.Name = "GbPassthrough"; - this.GbPassthrough.TabStop = false; - // - // TbPassthroughInfo - // - resources.ApplyResources(this.TbPassthroughInfo, "TbPassthroughInfo"); - this.TbPassthroughInfo.Name = "TbPassthroughInfo"; - this.TbPassthroughInfo.ReadOnly = true; - // - // GbParameters - // - resources.ApplyResources(this.GbParameters, "GbParameters"); - this.GbParameters.Controls.Add(this.tableLayoutPanel2); - this.GbParameters.Name = "GbParameters"; - this.GbParameters.TabStop = false; - // - // tableLayoutPanel2 - // - resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); - this.tableLayoutPanel2.Controls.Add(this.CbResize, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.LblGrayscale, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.CbMode, 1, 1); - this.tableLayoutPanel2.Controls.Add(this.TBRed, 1, 2); - this.tableLayoutPanel2.Controls.Add(this.LblRed, 0, 2); - this.tableLayoutPanel2.Controls.Add(this.LblBlue, 0, 4); - this.tableLayoutPanel2.Controls.Add(this.LblGreen, 0, 3); - this.tableLayoutPanel2.Controls.Add(this.label2, 0, 5); - this.tableLayoutPanel2.Controls.Add(this.TBGreen, 1, 3); - this.tableLayoutPanel2.Controls.Add(this.TbBright, 1, 5); - this.tableLayoutPanel2.Controls.Add(this.TBBlue, 1, 4); - this.tableLayoutPanel2.Controls.Add(this.TbContrast, 1, 6); - this.tableLayoutPanel2.Controls.Add(this.label3, 0, 6); - this.tableLayoutPanel2.Controls.Add(this.CbThreshold, 0, 8); - this.tableLayoutPanel2.Controls.Add(this.label28, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.TbThreshold, 1, 8); - this.tableLayoutPanel2.Controls.Add(this.TBWhiteClip, 1, 7); - this.tableLayoutPanel2.Controls.Add(this.label4, 0, 7); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - // - // CbResize - // - resources.ApplyResources(this.CbResize, "CbResize"); - this.CbResize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbResize.FormattingEnabled = true; - this.CbResize.Name = "CbResize"; - this.CbResize.SelectedItem = null; - this.TT.SetToolTip(this.CbResize, resources.GetString("CbResize.ToolTip")); - this.CbResize.SelectedIndexChanged += new System.EventHandler(this.CbResizeSelectedIndexChanged); - // - // LblGrayscale - // - resources.ApplyResources(this.LblGrayscale, "LblGrayscale"); - this.LblGrayscale.Name = "LblGrayscale"; - // - // CbMode - // - resources.ApplyResources(this.CbMode, "CbMode"); - this.CbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbMode.FormattingEnabled = true; - this.CbMode.Name = "CbMode"; - this.CbMode.SelectedItem = null; - this.TT.SetToolTip(this.CbMode, resources.GetString("CbMode.ToolTip")); - this.CbMode.SelectedIndexChanged += new System.EventHandler(this.CbMode_SelectedIndexChanged); - // - // TBRed - // - resources.ApplyResources(this.TBRed, "TBRed"); - this.TBRed.BackColor = System.Drawing.Color.Transparent; - this.TBRed.BarInnerColor = System.Drawing.Color.Firebrick; - this.TBRed.BarOuterColor = System.Drawing.Color.DarkRed; - this.TBRed.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TBRed.ElapsedInnerColor = System.Drawing.Color.Red; - this.TBRed.ElapsedOuterColor = System.Drawing.Color.DarkRed; - this.TBRed.LargeChange = ((uint)(5u)); - this.TBRed.Maximum = 160; - this.TBRed.Minimum = 40; - this.TBRed.Name = "TBRed"; - this.TBRed.SmallChange = ((uint)(1u)); - this.TBRed.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TBRed.ThumbSize = 8; - this.TBRed.Value = 100; - this.TBRed.ValueChanged += new System.EventHandler(this.TBRed_ValueChanged); - this.TBRed.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); - // - // LblRed - // - resources.ApplyResources(this.LblRed, "LblRed"); - this.LblRed.Name = "LblRed"; - // - // LblBlue - // - resources.ApplyResources(this.LblBlue, "LblBlue"); - this.LblBlue.Name = "LblBlue"; - // - // LblGreen - // - resources.ApplyResources(this.LblGreen, "LblGreen"); - this.LblGreen.Name = "LblGreen"; - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.Name = "label2"; - // - // TBGreen - // - resources.ApplyResources(this.TBGreen, "TBGreen"); - this.TBGreen.BackColor = System.Drawing.Color.Transparent; - this.TBGreen.BarInnerColor = System.Drawing.Color.Green; - this.TBGreen.BarOuterColor = System.Drawing.Color.DarkGreen; - this.TBGreen.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TBGreen.LargeChange = ((uint)(5u)); - this.TBGreen.Maximum = 160; - this.TBGreen.Minimum = 40; - this.TBGreen.Name = "TBGreen"; - this.TBGreen.SmallChange = ((uint)(1u)); - this.TBGreen.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TBGreen.ThumbSize = 8; - this.TBGreen.Value = 100; - this.TBGreen.ValueChanged += new System.EventHandler(this.TBGreen_ValueChanged); - this.TBGreen.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); - // - // TbBright - // - resources.ApplyResources(this.TbBright, "TbBright"); - this.TbBright.BackColor = System.Drawing.Color.Transparent; - this.TbBright.BarInnerColor = System.Drawing.Color.DimGray; - this.TbBright.BarOuterColor = System.Drawing.Color.Black; - this.TbBright.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TbBright.ElapsedInnerColor = System.Drawing.Color.White; - this.TbBright.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.TbBright.LargeChange = ((uint)(5u)); - this.TbBright.Maximum = 160; - this.TbBright.Minimum = 40; - this.TbBright.Name = "TbBright"; - this.TbBright.SmallChange = ((uint)(1u)); - this.TbBright.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TbBright.ThumbSize = 8; - this.TbBright.Value = 100; - this.TbBright.ValueChanged += new System.EventHandler(this.TbBright_ValueChanged); - this.TbBright.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); - // - // TBBlue - // - resources.ApplyResources(this.TBBlue, "TBBlue"); - this.TBBlue.BackColor = System.Drawing.Color.Transparent; - this.TBBlue.BarInnerColor = System.Drawing.Color.MediumBlue; - this.TBBlue.BarOuterColor = System.Drawing.Color.DarkBlue; - this.TBBlue.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TBBlue.ElapsedInnerColor = System.Drawing.Color.DodgerBlue; - this.TBBlue.ElapsedOuterColor = System.Drawing.Color.SteelBlue; - this.TBBlue.LargeChange = ((uint)(5u)); - this.TBBlue.Maximum = 160; - this.TBBlue.Minimum = 40; - this.TBBlue.Name = "TBBlue"; - this.TBBlue.SmallChange = ((uint)(1u)); - this.TBBlue.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TBBlue.ThumbSize = 8; - this.TBBlue.Value = 100; - this.TBBlue.ValueChanged += new System.EventHandler(this.TBBlue_ValueChanged); - this.TBBlue.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); - // - // TbContrast - // - resources.ApplyResources(this.TbContrast, "TbContrast"); - this.TbContrast.BackColor = System.Drawing.Color.Transparent; - this.TbContrast.BarInnerColor = System.Drawing.Color.DimGray; - this.TbContrast.BarOuterColor = System.Drawing.Color.Black; - this.TbContrast.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TbContrast.ElapsedInnerColor = System.Drawing.Color.White; - this.TbContrast.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.TbContrast.LargeChange = ((uint)(5u)); - this.TbContrast.Maximum = 160; - this.TbContrast.Minimum = 40; - this.TbContrast.Name = "TbContrast"; - this.TbContrast.SmallChange = ((uint)(1u)); - this.TbContrast.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TbContrast.ThumbSize = 8; - this.TbContrast.Value = 100; - this.TbContrast.ValueChanged += new System.EventHandler(this.TbContrast_ValueChanged); - this.TbContrast.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; - // - // CbThreshold - // - resources.ApplyResources(this.CbThreshold, "CbThreshold"); - this.CbThreshold.Name = "CbThreshold"; - this.TT.SetToolTip(this.CbThreshold, resources.GetString("CbThreshold.ToolTip")); - this.CbThreshold.UseVisualStyleBackColor = true; - this.CbThreshold.CheckedChanged += new System.EventHandler(this.CbThreshold_CheckedChanged); - // - // label28 - // - resources.ApplyResources(this.label28, "label28"); - this.label28.Name = "label28"; - // - // TbThreshold - // - resources.ApplyResources(this.TbThreshold, "TbThreshold"); - this.TbThreshold.BackColor = System.Drawing.Color.Transparent; - this.TbThreshold.BarInnerColor = System.Drawing.Color.DimGray; - this.TbThreshold.BarOuterColor = System.Drawing.Color.Black; - this.TbThreshold.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TbThreshold.ElapsedInnerColor = System.Drawing.Color.White; - this.TbThreshold.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.TbThreshold.LargeChange = ((uint)(5u)); - this.TbThreshold.Name = "TbThreshold"; - this.TbThreshold.SmallChange = ((uint)(1u)); - this.TbThreshold.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TbThreshold.ThumbSize = 8; - this.TbThreshold.ValueChanged += new System.EventHandler(this.TbThreshold_ValueChanged); - this.TbThreshold.DoubleClick += new System.EventHandler(this.OnThresholdDoubleClick); - // - // TBWhiteClip - // - resources.ApplyResources(this.TBWhiteClip, "TBWhiteClip"); - this.TBWhiteClip.BackColor = System.Drawing.Color.Transparent; - this.TBWhiteClip.BarInnerColor = System.Drawing.Color.DimGray; - this.TBWhiteClip.BarOuterColor = System.Drawing.Color.Black; - this.TBWhiteClip.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TBWhiteClip.ElapsedInnerColor = System.Drawing.Color.White; - this.TBWhiteClip.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.TBWhiteClip.LargeChange = ((uint)(5u)); - this.TBWhiteClip.Name = "TBWhiteClip"; - this.TBWhiteClip.SmallChange = ((uint)(1u)); - this.TBWhiteClip.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TBWhiteClip.ThumbSize = 8; - this.TBWhiteClip.Value = 5; - this.TBWhiteClip.ValueChanged += new System.EventHandler(this.TBWhiteClip_ValueChanged); - this.TBWhiteClip.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TBWhiteClip_MouseDown); - this.TBWhiteClip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TBWhiteClip_MouseUp); - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // - // GbCenterlineOptions - // - resources.ApplyResources(this.GbCenterlineOptions, "GbCenterlineOptions"); - this.GbCenterlineOptions.Controls.Add(this.tableLayoutPanel3); - this.GbCenterlineOptions.Name = "GbCenterlineOptions"; - this.GbCenterlineOptions.TabStop = false; - // - // tableLayoutPanel3 - // - resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); - this.tableLayoutPanel3.Controls.Add(this.label6, 0, 1); - this.tableLayoutPanel3.Controls.Add(this.label7, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.TBLineThreshold, 2, 1); - this.tableLayoutPanel3.Controls.Add(this.TBCornerThreshold, 2, 0); - this.tableLayoutPanel3.Controls.Add(this.CbLineThreshold, 3, 1); - this.tableLayoutPanel3.Controls.Add(this.CbCornerThreshold, 3, 0); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - // - // label6 - // - resources.ApplyResources(this.label6, "label6"); - this.label6.Name = "label6"; - // - // label7 - // - resources.ApplyResources(this.label7, "label7"); - this.label7.Name = "label7"; - // - // TBLineThreshold - // - resources.ApplyResources(this.TBLineThreshold, "TBLineThreshold"); - this.TBLineThreshold.BackColor = System.Drawing.Color.Transparent; - this.TBLineThreshold.BarInnerColor = System.Drawing.Color.LightGoldenrodYellow; - this.TBLineThreshold.BarOuterColor = System.Drawing.Color.Gold; - this.TBLineThreshold.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TBLineThreshold.ElapsedInnerColor = System.Drawing.Color.Yellow; - this.TBLineThreshold.ElapsedOuterColor = System.Drawing.Color.Gold; - this.TBLineThreshold.LargeChange = ((uint)(5u)); - this.TBLineThreshold.Name = "TBLineThreshold"; - this.TBLineThreshold.SmallChange = ((uint)(1u)); - this.TBLineThreshold.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TBLineThreshold.ThumbSize = 8; - this.TT.SetToolTip(this.TBLineThreshold, resources.GetString("TBLineThreshold.ToolTip")); - this.TBLineThreshold.Value = 10; - this.TBLineThreshold.ValueChanged += new System.EventHandler(this.TBLineThreshold_ValueChanged); - this.TBLineThreshold.DoubleClick += new System.EventHandler(this.TBLineThreshold_DoubleClick); - // - // TBCornerThreshold - // - resources.ApplyResources(this.TBCornerThreshold, "TBCornerThreshold"); - this.TBCornerThreshold.BackColor = System.Drawing.Color.Transparent; - this.TBCornerThreshold.BarInnerColor = System.Drawing.Color.LightGoldenrodYellow; - this.TBCornerThreshold.BarOuterColor = System.Drawing.Color.Gold; - this.TBCornerThreshold.BorderRoundRectSize = new System.Drawing.Size(8, 8); - this.TBCornerThreshold.ElapsedInnerColor = System.Drawing.Color.Yellow; - this.TBCornerThreshold.ElapsedOuterColor = System.Drawing.Color.Gold; - this.TBCornerThreshold.LargeChange = ((uint)(5u)); - this.TBCornerThreshold.Maximum = 360; - this.TBCornerThreshold.Name = "TBCornerThreshold"; - this.TBCornerThreshold.SmallChange = ((uint)(1u)); - this.TBCornerThreshold.ThumbRoundRectSize = new System.Drawing.Size(4, 4); - this.TBCornerThreshold.ThumbSize = 8; - this.TT.SetToolTip(this.TBCornerThreshold, resources.GetString("TBCornerThreshold.ToolTip")); - this.TBCornerThreshold.Value = 110; - this.TBCornerThreshold.ValueChanged += new System.EventHandler(this.TBCornerThreshold_ValueChanged); - this.TBCornerThreshold.DoubleClick += new System.EventHandler(this.TBCornerThreshold_DoubleClick); - // - // CbLineThreshold - // - resources.ApplyResources(this.CbLineThreshold, "CbLineThreshold"); - this.CbLineThreshold.Name = "CbLineThreshold"; - this.CbLineThreshold.UseVisualStyleBackColor = true; - this.CbLineThreshold.CheckedChanged += new System.EventHandler(this.CbUseLineThreshold_CheckedChanged); - // - // CbCornerThreshold - // - resources.ApplyResources(this.CbCornerThreshold, "CbCornerThreshold"); - this.CbCornerThreshold.Name = "CbCornerThreshold"; - this.CbCornerThreshold.UseVisualStyleBackColor = true; - this.CbCornerThreshold.CheckedChanged += new System.EventHandler(this.CbCornerThreshold_CheckedChanged); - // - // GbVectorizeOptions - // - resources.ApplyResources(this.GbVectorizeOptions, "GbVectorizeOptions"); - this.GbVectorizeOptions.Controls.Add(this.tableLayoutPanel5); - this.GbVectorizeOptions.Name = "GbVectorizeOptions"; - this.GbVectorizeOptions.TabStop = false; - // - // tableLayoutPanel5 - // - resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); - this.tableLayoutPanel5.Controls.Add(this.BtnAdaptiveQualityInfo, 3, 4); - this.tableLayoutPanel5.Controls.Add(this.CbAdaptiveQuality, 1, 4); - this.tableLayoutPanel5.Controls.Add(this.LAdaptiveQuality, 0, 4); - this.tableLayoutPanel5.Controls.Add(this.label22, 0, 0); - this.tableLayoutPanel5.Controls.Add(this.UDSpotRemoval, 1, 0); - this.tableLayoutPanel5.Controls.Add(this.CbSpotRemoval, 2, 0); - this.tableLayoutPanel5.Controls.Add(this.label24, 0, 2); - this.tableLayoutPanel5.Controls.Add(this.label23, 0, 1); - this.tableLayoutPanel5.Controls.Add(this.UDOptimize, 1, 2); - this.tableLayoutPanel5.Controls.Add(this.UDSmoothing, 1, 1); - this.tableLayoutPanel5.Controls.Add(this.CbOptimize, 2, 2); - this.tableLayoutPanel5.Controls.Add(this.CbSmoothing, 2, 1); - this.tableLayoutPanel5.Controls.Add(this.label14, 0, 6); - this.tableLayoutPanel5.Controls.Add(this.CbFillingDirection, 1, 6); - this.tableLayoutPanel5.Controls.Add(this.LblFillingQuality, 0, 7); - this.tableLayoutPanel5.Controls.Add(this.UDFillingQuality, 1, 7); - this.tableLayoutPanel5.Controls.Add(this.LblFillingLineLbl, 2, 7); - this.tableLayoutPanel5.Controls.Add(this.UDDownSample, 1, 3); - this.tableLayoutPanel5.Controls.Add(this.label1, 0, 3); - this.tableLayoutPanel5.Controls.Add(this.CbDownSample, 2, 3); - this.tableLayoutPanel5.Controls.Add(this.lOptimizeFast, 0, 5); - this.tableLayoutPanel5.Controls.Add(this.BtnFillingQualityInfo, 3, 7); - this.tableLayoutPanel5.Controls.Add(this.CbOptimizeFast, 1, 5); - this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - // - // BtnAdaptiveQualityInfo - // - this.BtnAdaptiveQualityInfo.AltImage = null; - resources.ApplyResources(this.BtnAdaptiveQualityInfo, "BtnAdaptiveQualityInfo"); - this.BtnAdaptiveQualityInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnAdaptiveQualityInfo.Caption = null; - this.BtnAdaptiveQualityInfo.Coloration = System.Drawing.Color.Empty; - this.BtnAdaptiveQualityInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnAdaptiveQualityInfo.Image"))); - this.BtnAdaptiveQualityInfo.Name = "BtnAdaptiveQualityInfo"; - this.BtnAdaptiveQualityInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnAdaptiveQualityInfo, resources.GetString("BtnAdaptiveQualityInfo.ToolTip")); - this.BtnAdaptiveQualityInfo.UseAltImage = false; - this.BtnAdaptiveQualityInfo.Click += new System.EventHandler(this.BtnAdaptiveQualityInfo_Click); - // - // CbAdaptiveQuality - // - resources.ApplyResources(this.CbAdaptiveQuality, "CbAdaptiveQuality"); - this.CbAdaptiveQuality.Name = "CbAdaptiveQuality"; - this.CbAdaptiveQuality.UseVisualStyleBackColor = true; - this.CbAdaptiveQuality.CheckedChanged += new System.EventHandler(this.CbAdaptiveQuality_CheckedChanged); - // - // LAdaptiveQuality - // - resources.ApplyResources(this.LAdaptiveQuality, "LAdaptiveQuality"); - this.LAdaptiveQuality.Name = "LAdaptiveQuality"; - // - // label22 - // - resources.ApplyResources(this.label22, "label22"); - this.label22.Name = "label22"; - // - // UDSpotRemoval - // - resources.ApplyResources(this.UDSpotRemoval, "UDSpotRemoval"); - this.UDSpotRemoval.Minimum = new decimal(new int[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RasterToLaserForm)); + this.TlpMain = new System.Windows.Forms.TableLayoutPanel(); + this.TCOriginalPreview = new System.Windows.Forms.TabControl(); + this.TpPreview = new System.Windows.Forms.TabPage(); + this.WB = new LaserGRBL.UserControls.WaitingProgressBar(); + this.PbConverted = new System.Windows.Forms.PictureBox(); + this.TpOriginal = new System.Windows.Forms.TabPage(); + this.PbOriginal = new System.Windows.Forms.PictureBox(); + this.FlipControl = new System.Windows.Forms.TableLayoutPanel(); + this.BtnOutliner = new LaserGRBL.UserControls.ImageButton(); + this.BtnFill = new LaserGRBL.UserControls.ImageButton(); + this.BtFlipV = new LaserGRBL.UserControls.ImageButton(); + this.BtFlipH = new LaserGRBL.UserControls.ImageButton(); + this.BtRotateCW = new LaserGRBL.UserControls.ImageButton(); + this.BtRotateCCW = new LaserGRBL.UserControls.ImageButton(); + this.BtnRevert = new LaserGRBL.UserControls.ImageButton(); + this.BtnCrop = new LaserGRBL.UserControls.ImageButton(); + this.BtnReverse = new LaserGRBL.UserControls.ImageButton(); + this.BtnAutoTrim = new LaserGRBL.UserControls.ImageButton(); + this.TlpLeft = new System.Windows.Forms.TableLayoutPanel(); + this.GbPassthrough = new System.Windows.Forms.GroupBox(); + this.TbPassthroughInfo = new System.Windows.Forms.TextBox(); + this.GbParameters = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.CbResize = new LaserGRBL.UserControls.EnumComboBox(); + this.LblGrayscale = new System.Windows.Forms.Label(); + this.CbMode = new LaserGRBL.UserControls.EnumComboBox(); + this.TBRed = new LaserGRBL.UserControls.ColorSlider(); + this.LblRed = new System.Windows.Forms.Label(); + this.LblBlue = new System.Windows.Forms.Label(); + this.LblGreen = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.TBGreen = new LaserGRBL.UserControls.ColorSlider(); + this.TbBright = new LaserGRBL.UserControls.ColorSlider(); + this.TBBlue = new LaserGRBL.UserControls.ColorSlider(); + this.TbContrast = new LaserGRBL.UserControls.ColorSlider(); + this.label3 = new System.Windows.Forms.Label(); + this.CbThreshold = new System.Windows.Forms.CheckBox(); + this.label28 = new System.Windows.Forms.Label(); + this.TbThreshold = new LaserGRBL.UserControls.ColorSlider(); + this.TBWhiteClip = new LaserGRBL.UserControls.ColorSlider(); + this.label4 = new System.Windows.Forms.Label(); + this.GbCenterlineOptions = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.TBLineThreshold = new LaserGRBL.UserControls.ColorSlider(); + this.TBCornerThreshold = new LaserGRBL.UserControls.ColorSlider(); + this.CbLineThreshold = new System.Windows.Forms.CheckBox(); + this.CbCornerThreshold = new System.Windows.Forms.CheckBox(); + this.GbVectorizeOptions = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnAdaptiveQualityInfo = new LaserGRBL.UserControls.ImageButton(); + this.CbAdaptiveQuality = new System.Windows.Forms.CheckBox(); + this.LAdaptiveQuality = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.UDSpotRemoval = new System.Windows.Forms.NumericUpDown(); + this.CbSpotRemoval = new System.Windows.Forms.CheckBox(); + this.label24 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.UDOptimize = new System.Windows.Forms.NumericUpDown(); + this.UDSmoothing = new System.Windows.Forms.NumericUpDown(); + this.CbOptimize = new System.Windows.Forms.CheckBox(); + this.CbSmoothing = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.CbFillingDirection = new LaserGRBL.UserControls.EnumComboBox(); + this.LblFillingQuality = new System.Windows.Forms.Label(); + this.UDFillingQuality = new System.Windows.Forms.NumericUpDown(); + this.LblFillingLineLbl = new System.Windows.Forms.Label(); + this.UDDownSample = new System.Windows.Forms.NumericUpDown(); + this.label1 = new System.Windows.Forms.Label(); + this.CbDownSample = new System.Windows.Forms.CheckBox(); + this.lOptimizeFast = new System.Windows.Forms.Label(); + this.BtnFillingQualityInfo = new LaserGRBL.UserControls.ImageButton(); + this.CbOptimizeFast = new System.Windows.Forms.CheckBox(); + this.GbLineToLineOptions = new System.Windows.Forms.GroupBox(); + this.TLP = new System.Windows.Forms.TableLayoutPanel(); + this.CbDirections = new LaserGRBL.UserControls.EnumComboBox(); + this.UDQuality = new System.Windows.Forms.NumericUpDown(); + this.CbLinePreview = new System.Windows.Forms.CheckBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.LblDitherMode = new System.Windows.Forms.Label(); + this.CbDither = new System.Windows.Forms.ComboBox(); + this.BtnQualityInfo = new LaserGRBL.UserControls.ImageButton(); + this.GbConversionTool = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.RbNoProcessing = new System.Windows.Forms.RadioButton(); + this.RbCenterline = new System.Windows.Forms.RadioButton(); + this.RbDithering = new System.Windows.Forms.RadioButton(); + this.RbVectorize = new System.Windows.Forms.RadioButton(); + this.RbLineToLineTracing = new System.Windows.Forms.RadioButton(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnCancel = new System.Windows.Forms.Button(); + this.BtnCreate = new System.Windows.Forms.Button(); + this.WT = new System.Windows.Forms.Timer(this.components); + this.TT = new System.Windows.Forms.ToolTip(this.components); + this.TlpMain.SuspendLayout(); + this.TCOriginalPreview.SuspendLayout(); + this.TpPreview.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PbConverted)).BeginInit(); + this.TpOriginal.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PbOriginal)).BeginInit(); + this.FlipControl.SuspendLayout(); + this.TlpLeft.SuspendLayout(); + this.GbPassthrough.SuspendLayout(); + this.GbParameters.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.GbCenterlineOptions.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + this.GbVectorizeOptions.SuspendLayout(); + this.tableLayoutPanel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.UDSpotRemoval)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDOptimize)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDSmoothing)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDFillingQuality)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDDownSample)).BeginInit(); + this.GbLineToLineOptions.SuspendLayout(); + this.TLP.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.UDQuality)).BeginInit(); + this.GbConversionTool.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // TlpMain + // + resources.ApplyResources(this.TlpMain, "TlpMain"); + this.TlpMain.Controls.Add(this.TCOriginalPreview, 1, 0); + this.TlpMain.Controls.Add(this.FlipControl, 1, 1); + this.TlpMain.Controls.Add(this.TlpLeft, 0, 0); + this.TlpMain.Controls.Add(this.tableLayoutPanel1, 3, 1); + this.TlpMain.Name = "TlpMain"; + // + // TCOriginalPreview + // + this.TlpMain.SetColumnSpan(this.TCOriginalPreview, 3); + this.TCOriginalPreview.Controls.Add(this.TpPreview); + this.TCOriginalPreview.Controls.Add(this.TpOriginal); + resources.ApplyResources(this.TCOriginalPreview, "TCOriginalPreview"); + this.TCOriginalPreview.Name = "TCOriginalPreview"; + this.TCOriginalPreview.SelectedIndex = 0; + // + // TpPreview + // + this.TpPreview.Controls.Add(this.WB); + this.TpPreview.Controls.Add(this.PbConverted); + resources.ApplyResources(this.TpPreview, "TpPreview"); + this.TpPreview.Name = "TpPreview"; + this.TpPreview.UseVisualStyleBackColor = true; + // + // WB + // + resources.ApplyResources(this.WB, "WB"); + this.WB.BarColor = System.Drawing.Color.SteelBlue; + this.WB.BorderColor = System.Drawing.Color.Black; + this.WB.BouncingMode = LaserGRBL.UserControls.WaitingProgressBar.BouncingModeEnum.PingPong; + this.WB.DrawProgressString = false; + this.WB.FillColor = System.Drawing.Color.White; + this.WB.FillStyle = LaserGRBL.UserControls.FillStyles.Solid; + this.WB.Interval = 25D; + this.WB.Maximum = 20D; + this.WB.Minimum = 0D; + this.WB.Name = "WB"; + this.WB.ProgressStringDecimals = 0; + this.WB.Reverse = true; + this.WB.Running = false; + this.WB.Step = 1D; + this.WB.ThrowExceprion = false; + this.WB.Value = 0D; + // + // PbConverted + // + this.PbConverted.BackColor = System.Drawing.Color.White; + resources.ApplyResources(this.PbConverted, "PbConverted"); + this.PbConverted.Name = "PbConverted"; + this.PbConverted.TabStop = false; + this.PbConverted.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PbConvertedMouseDown); + this.PbConverted.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PbConvertedMouseMove); + this.PbConverted.MouseUp += new System.Windows.Forms.MouseEventHandler(this.PbConvertedMouseUp); + this.PbConverted.Resize += new System.EventHandler(this.PbConverted_Resize); + // + // TpOriginal + // + this.TpOriginal.Controls.Add(this.PbOriginal); + resources.ApplyResources(this.TpOriginal, "TpOriginal"); + this.TpOriginal.Name = "TpOriginal"; + this.TpOriginal.UseVisualStyleBackColor = true; + // + // PbOriginal + // + this.PbOriginal.BackColor = System.Drawing.Color.White; + resources.ApplyResources(this.PbOriginal, "PbOriginal"); + this.PbOriginal.Name = "PbOriginal"; + this.PbOriginal.TabStop = false; + // + // FlipControl + // + resources.ApplyResources(this.FlipControl, "FlipControl"); + this.FlipControl.Controls.Add(this.BtnOutliner, 9, 0); + this.FlipControl.Controls.Add(this.BtnFill, 8, 0); + this.FlipControl.Controls.Add(this.BtFlipV, 5, 0); + this.FlipControl.Controls.Add(this.BtFlipH, 4, 0); + this.FlipControl.Controls.Add(this.BtRotateCW, 2, 0); + this.FlipControl.Controls.Add(this.BtRotateCCW, 3, 0); + this.FlipControl.Controls.Add(this.BtnRevert, 0, 0); + this.FlipControl.Controls.Add(this.BtnCrop, 6, 0); + this.FlipControl.Controls.Add(this.BtnReverse, 10, 0); + this.FlipControl.Controls.Add(this.BtnAutoTrim, 7, 0); + this.FlipControl.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.AddColumns; + this.FlipControl.Name = "FlipControl"; + // + // BtnOutliner + // + this.BtnOutliner.AltImage = null; + this.BtnOutliner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnOutliner.Caption = null; + this.BtnOutliner.Coloration = System.Drawing.Color.Empty; + this.BtnOutliner.Image = ((System.Drawing.Image)(resources.GetObject("BtnOutliner.Image"))); + resources.ApplyResources(this.BtnOutliner, "BtnOutliner"); + this.BtnOutliner.Name = "BtnOutliner"; + this.BtnOutliner.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnOutliner, resources.GetString("BtnOutliner.ToolTip")); + this.BtnOutliner.UseAltImage = false; + this.BtnOutliner.Click += new System.EventHandler(this.BtnOutliner_Click); + // + // BtnFill + // + this.BtnFill.AltImage = null; + this.BtnFill.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnFill.Caption = null; + this.BtnFill.Coloration = System.Drawing.Color.Empty; + this.BtnFill.Image = ((System.Drawing.Image)(resources.GetObject("BtnFill.Image"))); + resources.ApplyResources(this.BtnFill, "BtnFill"); + this.BtnFill.Name = "BtnFill"; + this.BtnFill.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnFill, resources.GetString("BtnFill.ToolTip")); + this.BtnFill.UseAltImage = false; + this.BtnFill.Click += new System.EventHandler(this.BtnFillClick); + // + // BtFlipV + // + this.BtFlipV.AltImage = null; + this.BtFlipV.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtFlipV.Caption = null; + this.BtFlipV.Coloration = System.Drawing.Color.Empty; + this.BtFlipV.Image = ((System.Drawing.Image)(resources.GetObject("BtFlipV.Image"))); + resources.ApplyResources(this.BtFlipV, "BtFlipV"); + this.BtFlipV.Name = "BtFlipV"; + this.BtFlipV.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtFlipV, resources.GetString("BtFlipV.ToolTip")); + this.BtFlipV.UseAltImage = false; + this.BtFlipV.Click += new System.EventHandler(this.BtFlipVClick); + // + // BtFlipH + // + this.BtFlipH.AltImage = null; + this.BtFlipH.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtFlipH.Caption = null; + this.BtFlipH.Coloration = System.Drawing.Color.Empty; + this.BtFlipH.Image = ((System.Drawing.Image)(resources.GetObject("BtFlipH.Image"))); + resources.ApplyResources(this.BtFlipH, "BtFlipH"); + this.BtFlipH.Name = "BtFlipH"; + this.BtFlipH.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtFlipH, resources.GetString("BtFlipH.ToolTip")); + this.BtFlipH.UseAltImage = false; + this.BtFlipH.Click += new System.EventHandler(this.BtFlipHClick); + // + // BtRotateCW + // + this.BtRotateCW.AltImage = null; + this.BtRotateCW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtRotateCW.Caption = null; + this.BtRotateCW.Coloration = System.Drawing.Color.Empty; + this.BtRotateCW.Image = ((System.Drawing.Image)(resources.GetObject("BtRotateCW.Image"))); + resources.ApplyResources(this.BtRotateCW, "BtRotateCW"); + this.BtRotateCW.Name = "BtRotateCW"; + this.BtRotateCW.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtRotateCW, resources.GetString("BtRotateCW.ToolTip")); + this.BtRotateCW.UseAltImage = false; + this.BtRotateCW.Click += new System.EventHandler(this.BtRotateCWClick); + // + // BtRotateCCW + // + this.BtRotateCCW.AltImage = null; + this.BtRotateCCW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtRotateCCW.Caption = null; + this.BtRotateCCW.Coloration = System.Drawing.Color.Empty; + this.BtRotateCCW.Image = ((System.Drawing.Image)(resources.GetObject("BtRotateCCW.Image"))); + resources.ApplyResources(this.BtRotateCCW, "BtRotateCCW"); + this.BtRotateCCW.Name = "BtRotateCCW"; + this.BtRotateCCW.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtRotateCCW, resources.GetString("BtRotateCCW.ToolTip")); + this.BtRotateCCW.UseAltImage = false; + this.BtRotateCCW.Click += new System.EventHandler(this.BtRotateCCWClick); + // + // BtnRevert + // + this.BtnRevert.AltImage = null; + this.BtnRevert.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnRevert.Caption = null; + this.BtnRevert.Coloration = System.Drawing.Color.Empty; + this.BtnRevert.Image = ((System.Drawing.Image)(resources.GetObject("BtnRevert.Image"))); + resources.ApplyResources(this.BtnRevert, "BtnRevert"); + this.BtnRevert.Name = "BtnRevert"; + this.BtnRevert.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnRevert, resources.GetString("BtnRevert.ToolTip")); + this.BtnRevert.UseAltImage = false; + this.BtnRevert.Click += new System.EventHandler(this.BtnRevertClick); + // + // BtnCrop + // + this.BtnCrop.AltImage = null; + this.BtnCrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnCrop.Caption = null; + this.BtnCrop.Coloration = System.Drawing.Color.Empty; + this.BtnCrop.Image = ((System.Drawing.Image)(resources.GetObject("BtnCrop.Image"))); + resources.ApplyResources(this.BtnCrop, "BtnCrop"); + this.BtnCrop.Name = "BtnCrop"; + this.BtnCrop.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnCrop, resources.GetString("BtnCrop.ToolTip")); + this.BtnCrop.UseAltImage = false; + this.BtnCrop.Click += new System.EventHandler(this.BtnCropClick); + // + // BtnReverse + // + this.BtnReverse.AltImage = null; + this.BtnReverse.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnReverse.Caption = null; + this.BtnReverse.Coloration = System.Drawing.Color.Empty; + this.BtnReverse.Image = ((System.Drawing.Image)(resources.GetObject("BtnReverse.Image"))); + resources.ApplyResources(this.BtnReverse, "BtnReverse"); + this.BtnReverse.Name = "BtnReverse"; + this.BtnReverse.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnReverse, resources.GetString("BtnReverse.ToolTip")); + this.BtnReverse.UseAltImage = false; + this.BtnReverse.Click += new System.EventHandler(this.BtnReverse_Click); + // + // BtnAutoTrim + // + this.BtnAutoTrim.AltImage = null; + this.BtnAutoTrim.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnAutoTrim.Caption = null; + this.BtnAutoTrim.Coloration = System.Drawing.Color.Empty; + this.BtnAutoTrim.Image = ((System.Drawing.Image)(resources.GetObject("BtnAutoTrim.Image"))); + resources.ApplyResources(this.BtnAutoTrim, "BtnAutoTrim"); + this.BtnAutoTrim.Name = "BtnAutoTrim"; + this.BtnAutoTrim.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnAutoTrim, resources.GetString("BtnAutoTrim.ToolTip")); + this.BtnAutoTrim.UseAltImage = false; + this.BtnAutoTrim.Click += new System.EventHandler(this.BtnAutoTrim_Click); + // + // TlpLeft + // + resources.ApplyResources(this.TlpLeft, "TlpLeft"); + this.TlpLeft.Controls.Add(this.GbPassthrough, 0, 2); + this.TlpLeft.Controls.Add(this.GbParameters, 0, 0); + this.TlpLeft.Controls.Add(this.GbCenterlineOptions, 0, 3); + this.TlpLeft.Controls.Add(this.GbVectorizeOptions, 0, 5); + this.TlpLeft.Controls.Add(this.GbLineToLineOptions, 0, 4); + this.TlpLeft.Controls.Add(this.GbConversionTool, 0, 1); + this.TlpLeft.Name = "TlpLeft"; + this.TlpMain.SetRowSpan(this.TlpLeft, 2); + // + // GbPassthrough + // + resources.ApplyResources(this.GbPassthrough, "GbPassthrough"); + this.GbPassthrough.Controls.Add(this.TbPassthroughInfo); + this.GbPassthrough.Name = "GbPassthrough"; + this.GbPassthrough.TabStop = false; + // + // TbPassthroughInfo + // + resources.ApplyResources(this.TbPassthroughInfo, "TbPassthroughInfo"); + this.TbPassthroughInfo.Name = "TbPassthroughInfo"; + this.TbPassthroughInfo.ReadOnly = true; + // + // GbParameters + // + resources.ApplyResources(this.GbParameters, "GbParameters"); + this.GbParameters.Controls.Add(this.tableLayoutPanel2); + this.GbParameters.Name = "GbParameters"; + this.GbParameters.TabStop = false; + // + // tableLayoutPanel2 + // + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); + this.tableLayoutPanel2.Controls.Add(this.CbResize, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.LblGrayscale, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.CbMode, 1, 1); + this.tableLayoutPanel2.Controls.Add(this.TBRed, 1, 2); + this.tableLayoutPanel2.Controls.Add(this.LblRed, 0, 2); + this.tableLayoutPanel2.Controls.Add(this.LblBlue, 0, 4); + this.tableLayoutPanel2.Controls.Add(this.LblGreen, 0, 3); + this.tableLayoutPanel2.Controls.Add(this.label2, 0, 5); + this.tableLayoutPanel2.Controls.Add(this.TBGreen, 1, 3); + this.tableLayoutPanel2.Controls.Add(this.TbBright, 1, 5); + this.tableLayoutPanel2.Controls.Add(this.TBBlue, 1, 4); + this.tableLayoutPanel2.Controls.Add(this.TbContrast, 1, 6); + this.tableLayoutPanel2.Controls.Add(this.label3, 0, 6); + this.tableLayoutPanel2.Controls.Add(this.CbThreshold, 0, 8); + this.tableLayoutPanel2.Controls.Add(this.label28, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.TbThreshold, 1, 8); + this.tableLayoutPanel2.Controls.Add(this.TBWhiteClip, 1, 7); + this.tableLayoutPanel2.Controls.Add(this.label4, 0, 7); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + // + // CbResize + // + resources.ApplyResources(this.CbResize, "CbResize"); + this.CbResize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbResize.FormattingEnabled = true; + this.CbResize.Name = "CbResize"; + this.CbResize.SelectedItem = null; + this.TT.SetToolTip(this.CbResize, resources.GetString("CbResize.ToolTip")); + this.CbResize.SelectedIndexChanged += new System.EventHandler(this.CbResizeSelectedIndexChanged); + // + // LblGrayscale + // + resources.ApplyResources(this.LblGrayscale, "LblGrayscale"); + this.LblGrayscale.Name = "LblGrayscale"; + // + // CbMode + // + resources.ApplyResources(this.CbMode, "CbMode"); + this.CbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbMode.FormattingEnabled = true; + this.CbMode.Name = "CbMode"; + this.CbMode.SelectedItem = null; + this.TT.SetToolTip(this.CbMode, resources.GetString("CbMode.ToolTip")); + this.CbMode.SelectedIndexChanged += new System.EventHandler(this.CbMode_SelectedIndexChanged); + // + // TBRed + // + resources.ApplyResources(this.TBRed, "TBRed"); + this.TBRed.BackColor = System.Drawing.Color.Transparent; + this.TBRed.BarInnerColor = System.Drawing.Color.Firebrick; + this.TBRed.BarOuterColor = System.Drawing.Color.DarkRed; + this.TBRed.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TBRed.ElapsedInnerColor = System.Drawing.Color.Red; + this.TBRed.ElapsedOuterColor = System.Drawing.Color.DarkRed; + this.TBRed.LargeChange = ((uint)(5u)); + this.TBRed.Maximum = 160; + this.TBRed.Minimum = 40; + this.TBRed.Name = "TBRed"; + this.TBRed.SmallChange = ((uint)(1u)); + this.TBRed.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TBRed.ThumbSize = 8; + this.TBRed.Value = 100; + this.TBRed.ValueChanged += new System.EventHandler(this.TBRed_ValueChanged); + this.TBRed.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); + // + // LblRed + // + resources.ApplyResources(this.LblRed, "LblRed"); + this.LblRed.Name = "LblRed"; + // + // LblBlue + // + resources.ApplyResources(this.LblBlue, "LblBlue"); + this.LblBlue.Name = "LblBlue"; + // + // LblGreen + // + resources.ApplyResources(this.LblGreen, "LblGreen"); + this.LblGreen.Name = "LblGreen"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // TBGreen + // + resources.ApplyResources(this.TBGreen, "TBGreen"); + this.TBGreen.BackColor = System.Drawing.Color.Transparent; + this.TBGreen.BarInnerColor = System.Drawing.Color.Green; + this.TBGreen.BarOuterColor = System.Drawing.Color.DarkGreen; + this.TBGreen.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TBGreen.LargeChange = ((uint)(5u)); + this.TBGreen.Maximum = 160; + this.TBGreen.Minimum = 40; + this.TBGreen.Name = "TBGreen"; + this.TBGreen.SmallChange = ((uint)(1u)); + this.TBGreen.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TBGreen.ThumbSize = 8; + this.TBGreen.Value = 100; + this.TBGreen.ValueChanged += new System.EventHandler(this.TBGreen_ValueChanged); + this.TBGreen.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); + // + // TbBright + // + resources.ApplyResources(this.TbBright, "TbBright"); + this.TbBright.BackColor = System.Drawing.Color.Transparent; + this.TbBright.BarInnerColor = System.Drawing.Color.DimGray; + this.TbBright.BarOuterColor = System.Drawing.Color.Black; + this.TbBright.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TbBright.ElapsedInnerColor = System.Drawing.Color.White; + this.TbBright.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.TbBright.LargeChange = ((uint)(5u)); + this.TbBright.Maximum = 160; + this.TbBright.Minimum = 40; + this.TbBright.Name = "TbBright"; + this.TbBright.SmallChange = ((uint)(1u)); + this.TbBright.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TbBright.ThumbSize = 8; + this.TbBright.Value = 100; + this.TbBright.ValueChanged += new System.EventHandler(this.TbBright_ValueChanged); + this.TbBright.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); + // + // TBBlue + // + resources.ApplyResources(this.TBBlue, "TBBlue"); + this.TBBlue.BackColor = System.Drawing.Color.Transparent; + this.TBBlue.BarInnerColor = System.Drawing.Color.MediumBlue; + this.TBBlue.BarOuterColor = System.Drawing.Color.DarkBlue; + this.TBBlue.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TBBlue.ElapsedInnerColor = System.Drawing.Color.DodgerBlue; + this.TBBlue.ElapsedOuterColor = System.Drawing.Color.SteelBlue; + this.TBBlue.LargeChange = ((uint)(5u)); + this.TBBlue.Maximum = 160; + this.TBBlue.Minimum = 40; + this.TBBlue.Name = "TBBlue"; + this.TBBlue.SmallChange = ((uint)(1u)); + this.TBBlue.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TBBlue.ThumbSize = 8; + this.TBBlue.Value = 100; + this.TBBlue.ValueChanged += new System.EventHandler(this.TBBlue_ValueChanged); + this.TBBlue.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); + // + // TbContrast + // + resources.ApplyResources(this.TbContrast, "TbContrast"); + this.TbContrast.BackColor = System.Drawing.Color.Transparent; + this.TbContrast.BarInnerColor = System.Drawing.Color.DimGray; + this.TbContrast.BarOuterColor = System.Drawing.Color.Black; + this.TbContrast.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TbContrast.ElapsedInnerColor = System.Drawing.Color.White; + this.TbContrast.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.TbContrast.LargeChange = ((uint)(5u)); + this.TbContrast.Maximum = 160; + this.TbContrast.Minimum = 40; + this.TbContrast.Name = "TbContrast"; + this.TbContrast.SmallChange = ((uint)(1u)); + this.TbContrast.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TbContrast.ThumbSize = 8; + this.TbContrast.Value = 100; + this.TbContrast.ValueChanged += new System.EventHandler(this.TbContrast_ValueChanged); + this.TbContrast.DoubleClick += new System.EventHandler(this.OnRGBCBDoubleClick); + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // CbThreshold + // + resources.ApplyResources(this.CbThreshold, "CbThreshold"); + this.CbThreshold.Name = "CbThreshold"; + this.TT.SetToolTip(this.CbThreshold, resources.GetString("CbThreshold.ToolTip")); + this.CbThreshold.UseVisualStyleBackColor = true; + this.CbThreshold.CheckedChanged += new System.EventHandler(this.CbThreshold_CheckedChanged); + // + // label28 + // + resources.ApplyResources(this.label28, "label28"); + this.label28.Name = "label28"; + // + // TbThreshold + // + resources.ApplyResources(this.TbThreshold, "TbThreshold"); + this.TbThreshold.BackColor = System.Drawing.Color.Transparent; + this.TbThreshold.BarInnerColor = System.Drawing.Color.DimGray; + this.TbThreshold.BarOuterColor = System.Drawing.Color.Black; + this.TbThreshold.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TbThreshold.ElapsedInnerColor = System.Drawing.Color.White; + this.TbThreshold.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.TbThreshold.LargeChange = ((uint)(5u)); + this.TbThreshold.Name = "TbThreshold"; + this.TbThreshold.SmallChange = ((uint)(1u)); + this.TbThreshold.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TbThreshold.ThumbSize = 8; + this.TbThreshold.ValueChanged += new System.EventHandler(this.TbThreshold_ValueChanged); + this.TbThreshold.DoubleClick += new System.EventHandler(this.OnThresholdDoubleClick); + // + // TBWhiteClip + // + resources.ApplyResources(this.TBWhiteClip, "TBWhiteClip"); + this.TBWhiteClip.BackColor = System.Drawing.Color.Transparent; + this.TBWhiteClip.BarInnerColor = System.Drawing.Color.DimGray; + this.TBWhiteClip.BarOuterColor = System.Drawing.Color.Black; + this.TBWhiteClip.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TBWhiteClip.ElapsedInnerColor = System.Drawing.Color.White; + this.TBWhiteClip.ElapsedOuterColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.TBWhiteClip.LargeChange = ((uint)(5u)); + this.TBWhiteClip.Name = "TBWhiteClip"; + this.TBWhiteClip.SmallChange = ((uint)(1u)); + this.TBWhiteClip.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TBWhiteClip.ThumbSize = 8; + this.TBWhiteClip.Value = 5; + this.TBWhiteClip.ValueChanged += new System.EventHandler(this.TBWhiteClip_ValueChanged); + this.TBWhiteClip.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TBWhiteClip_MouseDown); + this.TBWhiteClip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TBWhiteClip_MouseUp); + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // GbCenterlineOptions + // + resources.ApplyResources(this.GbCenterlineOptions, "GbCenterlineOptions"); + this.GbCenterlineOptions.Controls.Add(this.tableLayoutPanel3); + this.GbCenterlineOptions.Name = "GbCenterlineOptions"; + this.GbCenterlineOptions.TabStop = false; + // + // tableLayoutPanel3 + // + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); + this.tableLayoutPanel3.Controls.Add(this.label6, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.label7, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.TBLineThreshold, 2, 1); + this.tableLayoutPanel3.Controls.Add(this.TBCornerThreshold, 2, 0); + this.tableLayoutPanel3.Controls.Add(this.CbLineThreshold, 3, 1); + this.tableLayoutPanel3.Controls.Add(this.CbCornerThreshold, 3, 0); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.Name = "label7"; + // + // TBLineThreshold + // + resources.ApplyResources(this.TBLineThreshold, "TBLineThreshold"); + this.TBLineThreshold.BackColor = System.Drawing.Color.Transparent; + this.TBLineThreshold.BarInnerColor = System.Drawing.Color.LightGoldenrodYellow; + this.TBLineThreshold.BarOuterColor = System.Drawing.Color.Gold; + this.TBLineThreshold.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TBLineThreshold.ElapsedInnerColor = System.Drawing.Color.Yellow; + this.TBLineThreshold.ElapsedOuterColor = System.Drawing.Color.Gold; + this.TBLineThreshold.LargeChange = ((uint)(5u)); + this.TBLineThreshold.Name = "TBLineThreshold"; + this.TBLineThreshold.SmallChange = ((uint)(1u)); + this.TBLineThreshold.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TBLineThreshold.ThumbSize = 8; + this.TT.SetToolTip(this.TBLineThreshold, resources.GetString("TBLineThreshold.ToolTip")); + this.TBLineThreshold.Value = 10; + this.TBLineThreshold.ValueChanged += new System.EventHandler(this.TBLineThreshold_ValueChanged); + this.TBLineThreshold.DoubleClick += new System.EventHandler(this.TBLineThreshold_DoubleClick); + // + // TBCornerThreshold + // + resources.ApplyResources(this.TBCornerThreshold, "TBCornerThreshold"); + this.TBCornerThreshold.BackColor = System.Drawing.Color.Transparent; + this.TBCornerThreshold.BarInnerColor = System.Drawing.Color.LightGoldenrodYellow; + this.TBCornerThreshold.BarOuterColor = System.Drawing.Color.Gold; + this.TBCornerThreshold.BorderRoundRectSize = new System.Drawing.Size(8, 8); + this.TBCornerThreshold.ElapsedInnerColor = System.Drawing.Color.Yellow; + this.TBCornerThreshold.ElapsedOuterColor = System.Drawing.Color.Gold; + this.TBCornerThreshold.LargeChange = ((uint)(5u)); + this.TBCornerThreshold.Maximum = 360; + this.TBCornerThreshold.Name = "TBCornerThreshold"; + this.TBCornerThreshold.SmallChange = ((uint)(1u)); + this.TBCornerThreshold.ThumbRoundRectSize = new System.Drawing.Size(4, 4); + this.TBCornerThreshold.ThumbSize = 8; + this.TT.SetToolTip(this.TBCornerThreshold, resources.GetString("TBCornerThreshold.ToolTip")); + this.TBCornerThreshold.Value = 110; + this.TBCornerThreshold.ValueChanged += new System.EventHandler(this.TBCornerThreshold_ValueChanged); + this.TBCornerThreshold.DoubleClick += new System.EventHandler(this.TBCornerThreshold_DoubleClick); + // + // CbLineThreshold + // + resources.ApplyResources(this.CbLineThreshold, "CbLineThreshold"); + this.CbLineThreshold.Name = "CbLineThreshold"; + this.CbLineThreshold.UseVisualStyleBackColor = true; + this.CbLineThreshold.CheckedChanged += new System.EventHandler(this.CbUseLineThreshold_CheckedChanged); + // + // CbCornerThreshold + // + resources.ApplyResources(this.CbCornerThreshold, "CbCornerThreshold"); + this.CbCornerThreshold.Name = "CbCornerThreshold"; + this.CbCornerThreshold.UseVisualStyleBackColor = true; + this.CbCornerThreshold.CheckedChanged += new System.EventHandler(this.CbCornerThreshold_CheckedChanged); + // + // GbVectorizeOptions + // + resources.ApplyResources(this.GbVectorizeOptions, "GbVectorizeOptions"); + this.GbVectorizeOptions.Controls.Add(this.tableLayoutPanel5); + this.GbVectorizeOptions.Name = "GbVectorizeOptions"; + this.GbVectorizeOptions.TabStop = false; + // + // tableLayoutPanel5 + // + resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); + this.tableLayoutPanel5.Controls.Add(this.BtnAdaptiveQualityInfo, 3, 4); + this.tableLayoutPanel5.Controls.Add(this.CbAdaptiveQuality, 1, 4); + this.tableLayoutPanel5.Controls.Add(this.LAdaptiveQuality, 0, 4); + this.tableLayoutPanel5.Controls.Add(this.label22, 0, 0); + this.tableLayoutPanel5.Controls.Add(this.UDSpotRemoval, 1, 0); + this.tableLayoutPanel5.Controls.Add(this.CbSpotRemoval, 2, 0); + this.tableLayoutPanel5.Controls.Add(this.label24, 0, 2); + this.tableLayoutPanel5.Controls.Add(this.label23, 0, 1); + this.tableLayoutPanel5.Controls.Add(this.UDOptimize, 1, 2); + this.tableLayoutPanel5.Controls.Add(this.UDSmoothing, 1, 1); + this.tableLayoutPanel5.Controls.Add(this.CbOptimize, 2, 2); + this.tableLayoutPanel5.Controls.Add(this.CbSmoothing, 2, 1); + this.tableLayoutPanel5.Controls.Add(this.label14, 0, 6); + this.tableLayoutPanel5.Controls.Add(this.CbFillingDirection, 1, 6); + this.tableLayoutPanel5.Controls.Add(this.LblFillingQuality, 0, 7); + this.tableLayoutPanel5.Controls.Add(this.UDFillingQuality, 1, 7); + this.tableLayoutPanel5.Controls.Add(this.LblFillingLineLbl, 2, 7); + this.tableLayoutPanel5.Controls.Add(this.UDDownSample, 1, 3); + this.tableLayoutPanel5.Controls.Add(this.label1, 0, 3); + this.tableLayoutPanel5.Controls.Add(this.CbDownSample, 2, 3); + this.tableLayoutPanel5.Controls.Add(this.lOptimizeFast, 0, 5); + this.tableLayoutPanel5.Controls.Add(this.BtnFillingQualityInfo, 3, 7); + this.tableLayoutPanel5.Controls.Add(this.CbOptimizeFast, 1, 5); + this.tableLayoutPanel5.Name = "tableLayoutPanel5"; + // + // BtnAdaptiveQualityInfo + // + this.BtnAdaptiveQualityInfo.AltImage = null; + resources.ApplyResources(this.BtnAdaptiveQualityInfo, "BtnAdaptiveQualityInfo"); + this.BtnAdaptiveQualityInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnAdaptiveQualityInfo.Caption = null; + this.BtnAdaptiveQualityInfo.Coloration = System.Drawing.Color.Empty; + this.BtnAdaptiveQualityInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnAdaptiveQualityInfo.Image"))); + this.BtnAdaptiveQualityInfo.Name = "BtnAdaptiveQualityInfo"; + this.BtnAdaptiveQualityInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnAdaptiveQualityInfo, resources.GetString("BtnAdaptiveQualityInfo.ToolTip")); + this.BtnAdaptiveQualityInfo.UseAltImage = false; + this.BtnAdaptiveQualityInfo.Click += new System.EventHandler(this.BtnAdaptiveQualityInfo_Click); + // + // CbAdaptiveQuality + // + resources.ApplyResources(this.CbAdaptiveQuality, "CbAdaptiveQuality"); + this.CbAdaptiveQuality.Name = "CbAdaptiveQuality"; + this.CbAdaptiveQuality.UseVisualStyleBackColor = true; + this.CbAdaptiveQuality.CheckedChanged += new System.EventHandler(this.CbAdaptiveQuality_CheckedChanged); + // + // LAdaptiveQuality + // + resources.ApplyResources(this.LAdaptiveQuality, "LAdaptiveQuality"); + this.LAdaptiveQuality.Name = "LAdaptiveQuality"; + // + // label22 + // + resources.ApplyResources(this.label22, "label22"); + this.label22.Name = "label22"; + // + // UDSpotRemoval + // + resources.ApplyResources(this.UDSpotRemoval, "UDSpotRemoval"); + this.UDSpotRemoval.Minimum = new decimal(new int[] { 2, 0, 0, 0}); - this.UDSpotRemoval.Name = "UDSpotRemoval"; - this.TT.SetToolTip(this.UDSpotRemoval, resources.GetString("UDSpotRemoval.ToolTip")); - this.UDSpotRemoval.Value = new decimal(new int[] { + this.UDSpotRemoval.Name = "UDSpotRemoval"; + this.TT.SetToolTip(this.UDSpotRemoval, resources.GetString("UDSpotRemoval.ToolTip")); + this.UDSpotRemoval.Value = new decimal(new int[] { 2, 0, 0, 0}); - this.UDSpotRemoval.ValueChanged += new System.EventHandler(this.UDSpotRemoval_ValueChanged); - // - // CbSpotRemoval - // - resources.ApplyResources(this.CbSpotRemoval, "CbSpotRemoval"); - this.CbSpotRemoval.Name = "CbSpotRemoval"; - this.CbSpotRemoval.UseVisualStyleBackColor = true; - this.CbSpotRemoval.CheckedChanged += new System.EventHandler(this.CbSpotRemoval_CheckedChanged); - // - // label24 - // - resources.ApplyResources(this.label24, "label24"); - this.label24.Name = "label24"; - // - // label23 - // - resources.ApplyResources(this.label23, "label23"); - this.label23.Name = "label23"; - // - // UDOptimize - // - resources.ApplyResources(this.UDOptimize, "UDOptimize"); - this.UDOptimize.DecimalPlaces = 1; - this.UDOptimize.Increment = new decimal(new int[] { + this.UDSpotRemoval.ValueChanged += new System.EventHandler(this.UDSpotRemoval_ValueChanged); + // + // CbSpotRemoval + // + resources.ApplyResources(this.CbSpotRemoval, "CbSpotRemoval"); + this.CbSpotRemoval.Name = "CbSpotRemoval"; + this.CbSpotRemoval.UseVisualStyleBackColor = true; + this.CbSpotRemoval.CheckedChanged += new System.EventHandler(this.CbSpotRemoval_CheckedChanged); + // + // label24 + // + resources.ApplyResources(this.label24, "label24"); + this.label24.Name = "label24"; + // + // label23 + // + resources.ApplyResources(this.label23, "label23"); + this.label23.Name = "label23"; + // + // UDOptimize + // + resources.ApplyResources(this.UDOptimize, "UDOptimize"); + this.UDOptimize.DecimalPlaces = 1; + this.UDOptimize.Increment = new decimal(new int[] { 1, 0, 0, 65536}); - this.UDOptimize.Maximum = new decimal(new int[] { + this.UDOptimize.Maximum = new decimal(new int[] { 50, 0, 0, 0}); - this.UDOptimize.Minimum = new decimal(new int[] { + this.UDOptimize.Minimum = new decimal(new int[] { 2, 0, 0, 65536}); - this.UDOptimize.Name = "UDOptimize"; - this.TT.SetToolTip(this.UDOptimize, resources.GetString("UDOptimize.ToolTip")); - this.UDOptimize.Value = new decimal(new int[] { + this.UDOptimize.Name = "UDOptimize"; + this.TT.SetToolTip(this.UDOptimize, resources.GetString("UDOptimize.ToolTip")); + this.UDOptimize.Value = new decimal(new int[] { 2, 0, 0, 65536}); - this.UDOptimize.ValueChanged += new System.EventHandler(this.UDOptimize_ValueChanged); - // - // UDSmoothing - // - resources.ApplyResources(this.UDSmoothing, "UDSmoothing"); - this.UDSmoothing.DecimalPlaces = 1; - this.UDSmoothing.Increment = new decimal(new int[] { + this.UDOptimize.ValueChanged += new System.EventHandler(this.UDOptimize_ValueChanged); + // + // UDSmoothing + // + resources.ApplyResources(this.UDSmoothing, "UDSmoothing"); + this.UDSmoothing.DecimalPlaces = 1; + this.UDSmoothing.Increment = new decimal(new int[] { 1, 0, 0, 65536}); - this.UDSmoothing.Name = "UDSmoothing"; - this.TT.SetToolTip(this.UDSmoothing, resources.GetString("UDSmoothing.ToolTip")); - this.UDSmoothing.Value = new decimal(new int[] { + this.UDSmoothing.Name = "UDSmoothing"; + this.TT.SetToolTip(this.UDSmoothing, resources.GetString("UDSmoothing.ToolTip")); + this.UDSmoothing.Value = new decimal(new int[] { 10, 0, 0, 65536}); - this.UDSmoothing.ValueChanged += new System.EventHandler(this.UDSmoothing_ValueChanged); - // - // CbOptimize - // - resources.ApplyResources(this.CbOptimize, "CbOptimize"); - this.CbOptimize.Name = "CbOptimize"; - this.CbOptimize.UseVisualStyleBackColor = true; - this.CbOptimize.CheckedChanged += new System.EventHandler(this.CbOptimize_CheckedChanged); - // - // CbSmoothing - // - resources.ApplyResources(this.CbSmoothing, "CbSmoothing"); - this.CbSmoothing.Name = "CbSmoothing"; - this.CbSmoothing.UseVisualStyleBackColor = true; - this.CbSmoothing.CheckedChanged += new System.EventHandler(this.CbSmoothing_CheckedChanged); - // - // label14 - // - resources.ApplyResources(this.label14, "label14"); - this.label14.Name = "label14"; - // - // CbFillingDirection - // - resources.ApplyResources(this.CbFillingDirection, "CbFillingDirection"); - this.tableLayoutPanel5.SetColumnSpan(this.CbFillingDirection, 3); - this.CbFillingDirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbFillingDirection.FormattingEnabled = true; - this.CbFillingDirection.Name = "CbFillingDirection"; - this.CbFillingDirection.SelectedItem = null; - this.TT.SetToolTip(this.CbFillingDirection, resources.GetString("CbFillingDirection.ToolTip")); - this.CbFillingDirection.SelectedIndexChanged += new System.EventHandler(this.CbFillingDirection_SelectedIndexChanged); - // - // LblFillingQuality - // - resources.ApplyResources(this.LblFillingQuality, "LblFillingQuality"); - this.LblFillingQuality.Name = "LblFillingQuality"; - // - // UDFillingQuality - // - resources.ApplyResources(this.UDFillingQuality, "UDFillingQuality"); - this.UDFillingQuality.DecimalPlaces = 3; - this.UDFillingQuality.Maximum = new decimal(new int[] { + this.UDSmoothing.ValueChanged += new System.EventHandler(this.UDSmoothing_ValueChanged); + // + // CbOptimize + // + resources.ApplyResources(this.CbOptimize, "CbOptimize"); + this.CbOptimize.Name = "CbOptimize"; + this.CbOptimize.UseVisualStyleBackColor = true; + this.CbOptimize.CheckedChanged += new System.EventHandler(this.CbOptimize_CheckedChanged); + // + // CbSmoothing + // + resources.ApplyResources(this.CbSmoothing, "CbSmoothing"); + this.CbSmoothing.Name = "CbSmoothing"; + this.CbSmoothing.UseVisualStyleBackColor = true; + this.CbSmoothing.CheckedChanged += new System.EventHandler(this.CbSmoothing_CheckedChanged); + // + // label14 + // + resources.ApplyResources(this.label14, "label14"); + this.label14.Name = "label14"; + // + // CbFillingDirection + // + resources.ApplyResources(this.CbFillingDirection, "CbFillingDirection"); + this.tableLayoutPanel5.SetColumnSpan(this.CbFillingDirection, 3); + this.CbFillingDirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbFillingDirection.FormattingEnabled = true; + this.CbFillingDirection.Name = "CbFillingDirection"; + this.CbFillingDirection.SelectedItem = null; + this.TT.SetToolTip(this.CbFillingDirection, resources.GetString("CbFillingDirection.ToolTip")); + this.CbFillingDirection.SelectedIndexChanged += new System.EventHandler(this.CbFillingDirection_SelectedIndexChanged); + // + // LblFillingQuality + // + resources.ApplyResources(this.LblFillingQuality, "LblFillingQuality"); + this.LblFillingQuality.Name = "LblFillingQuality"; + // + // UDFillingQuality + // + resources.ApplyResources(this.UDFillingQuality, "UDFillingQuality"); + this.UDFillingQuality.DecimalPlaces = 3; + this.UDFillingQuality.Maximum = new decimal(new int[] { 50, 0, 0, 0}); - this.UDFillingQuality.Minimum = new decimal(new int[] { + this.UDFillingQuality.Minimum = new decimal(new int[] { 1, 0, 0, 65536}); - this.UDFillingQuality.Name = "UDFillingQuality"; - this.TT.SetToolTip(this.UDFillingQuality, resources.GetString("UDFillingQuality.ToolTip")); - this.UDFillingQuality.Value = new decimal(new int[] { + this.UDFillingQuality.Name = "UDFillingQuality"; + this.TT.SetToolTip(this.UDFillingQuality, resources.GetString("UDFillingQuality.ToolTip")); + this.UDFillingQuality.Value = new decimal(new int[] { 3, 0, 0, 0}); - this.UDFillingQuality.ValueChanged += new System.EventHandler(this.UDFillingQuality_ValueChanged); - // - // LblFillingLineLbl - // - resources.ApplyResources(this.LblFillingLineLbl, "LblFillingLineLbl"); - this.LblFillingLineLbl.Name = "LblFillingLineLbl"; - // - // UDDownSample - // - resources.ApplyResources(this.UDDownSample, "UDDownSample"); - this.UDDownSample.DecimalPlaces = 1; - this.UDDownSample.Increment = new decimal(new int[] { + this.UDFillingQuality.ValueChanged += new System.EventHandler(this.UDFillingQuality_ValueChanged); + // + // LblFillingLineLbl + // + resources.ApplyResources(this.LblFillingLineLbl, "LblFillingLineLbl"); + this.LblFillingLineLbl.Name = "LblFillingLineLbl"; + // + // UDDownSample + // + resources.ApplyResources(this.UDDownSample, "UDDownSample"); + this.UDDownSample.DecimalPlaces = 1; + this.UDDownSample.Increment = new decimal(new int[] { 1, 0, 0, 65536}); - this.UDDownSample.Maximum = new decimal(new int[] { + this.UDDownSample.Maximum = new decimal(new int[] { 10, 0, 0, 0}); - this.UDDownSample.Minimum = new decimal(new int[] { + this.UDDownSample.Minimum = new decimal(new int[] { 1, 0, 0, 0}); - this.UDDownSample.Name = "UDDownSample"; - this.TT.SetToolTip(this.UDDownSample, resources.GetString("UDDownSample.ToolTip")); - this.UDDownSample.Value = new decimal(new int[] { + this.UDDownSample.Name = "UDDownSample"; + this.TT.SetToolTip(this.UDDownSample, resources.GetString("UDDownSample.ToolTip")); + this.UDDownSample.Value = new decimal(new int[] { 1, 0, 0, 0}); - this.UDDownSample.ValueChanged += new System.EventHandler(this.UDDownSample_ValueChanged); - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // CbDownSample - // - resources.ApplyResources(this.CbDownSample, "CbDownSample"); - this.CbDownSample.Name = "CbDownSample"; - this.CbDownSample.UseVisualStyleBackColor = true; - this.CbDownSample.CheckedChanged += new System.EventHandler(this.CbDownSample_CheckedChanged); - // - // lOptimizeFast - // - resources.ApplyResources(this.lOptimizeFast, "lOptimizeFast"); - this.lOptimizeFast.Name = "lOptimizeFast"; - // - // BtnFillingQualityInfo - // - this.BtnFillingQualityInfo.AltImage = null; - resources.ApplyResources(this.BtnFillingQualityInfo, "BtnFillingQualityInfo"); - this.BtnFillingQualityInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnFillingQualityInfo.Caption = null; - this.BtnFillingQualityInfo.Coloration = System.Drawing.Color.Empty; - this.BtnFillingQualityInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnFillingQualityInfo.Image"))); - this.BtnFillingQualityInfo.Name = "BtnFillingQualityInfo"; - this.BtnFillingQualityInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnFillingQualityInfo, resources.GetString("BtnFillingQualityInfo.ToolTip")); - this.BtnFillingQualityInfo.UseAltImage = false; - this.BtnFillingQualityInfo.Click += new System.EventHandler(this.BtnFillingQualityInfo_Click); - // - // CbOptimizeFast - // - resources.ApplyResources(this.CbOptimizeFast, "CbOptimizeFast"); - this.CbOptimizeFast.Name = "CbOptimizeFast"; - this.CbOptimizeFast.UseVisualStyleBackColor = true; - this.CbOptimizeFast.CheckedChanged += new System.EventHandler(this.CbOptimizeFast_CheckedChanged); - // - // GbLineToLineOptions - // - resources.ApplyResources(this.GbLineToLineOptions, "GbLineToLineOptions"); - this.GbLineToLineOptions.Controls.Add(this.TLP); - this.GbLineToLineOptions.Name = "GbLineToLineOptions"; - this.GbLineToLineOptions.TabStop = false; - // - // TLP - // - resources.ApplyResources(this.TLP, "TLP"); - this.TLP.Controls.Add(this.CbDirections, 1, 1); - this.TLP.Controls.Add(this.UDQuality, 1, 2); - this.TLP.Controls.Add(this.CbLinePreview, 0, 3); - this.TLP.Controls.Add(this.label5, 0, 2); - this.TLP.Controls.Add(this.label27, 0, 1); - this.TLP.Controls.Add(this.label8, 2, 2); - this.TLP.Controls.Add(this.LblDitherMode, 0, 0); - this.TLP.Controls.Add(this.CbDither, 1, 0); - this.TLP.Controls.Add(this.BtnQualityInfo, 3, 2); - this.TLP.Name = "TLP"; - // - // CbDirections - // - resources.ApplyResources(this.CbDirections, "CbDirections"); - this.TLP.SetColumnSpan(this.CbDirections, 3); - this.CbDirections.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbDirections.FormattingEnabled = true; - this.CbDirections.Name = "CbDirections"; - this.CbDirections.SelectedItem = null; - this.TT.SetToolTip(this.CbDirections, resources.GetString("CbDirections.ToolTip")); - this.CbDirections.SelectedIndexChanged += new System.EventHandler(this.CbDirectionsSelectedIndexChanged); - // - // UDQuality - // - this.UDQuality.DecimalPlaces = 3; - resources.ApplyResources(this.UDQuality, "UDQuality"); - this.UDQuality.Maximum = new decimal(new int[] { + this.UDDownSample.ValueChanged += new System.EventHandler(this.UDDownSample_ValueChanged); + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // CbDownSample + // + resources.ApplyResources(this.CbDownSample, "CbDownSample"); + this.CbDownSample.Name = "CbDownSample"; + this.CbDownSample.UseVisualStyleBackColor = true; + this.CbDownSample.CheckedChanged += new System.EventHandler(this.CbDownSample_CheckedChanged); + // + // lOptimizeFast + // + resources.ApplyResources(this.lOptimizeFast, "lOptimizeFast"); + this.lOptimizeFast.Name = "lOptimizeFast"; + // + // BtnFillingQualityInfo + // + this.BtnFillingQualityInfo.AltImage = null; + resources.ApplyResources(this.BtnFillingQualityInfo, "BtnFillingQualityInfo"); + this.BtnFillingQualityInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnFillingQualityInfo.Caption = null; + this.BtnFillingQualityInfo.Coloration = System.Drawing.Color.Empty; + this.BtnFillingQualityInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnFillingQualityInfo.Image"))); + this.BtnFillingQualityInfo.Name = "BtnFillingQualityInfo"; + this.BtnFillingQualityInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnFillingQualityInfo, resources.GetString("BtnFillingQualityInfo.ToolTip")); + this.BtnFillingQualityInfo.UseAltImage = false; + this.BtnFillingQualityInfo.Click += new System.EventHandler(this.BtnFillingQualityInfo_Click); + // + // CbOptimizeFast + // + resources.ApplyResources(this.CbOptimizeFast, "CbOptimizeFast"); + this.CbOptimizeFast.Name = "CbOptimizeFast"; + this.CbOptimizeFast.UseVisualStyleBackColor = true; + this.CbOptimizeFast.CheckedChanged += new System.EventHandler(this.CbOptimizeFast_CheckedChanged); + // + // GbLineToLineOptions + // + resources.ApplyResources(this.GbLineToLineOptions, "GbLineToLineOptions"); + this.GbLineToLineOptions.Controls.Add(this.TLP); + this.GbLineToLineOptions.Name = "GbLineToLineOptions"; + this.GbLineToLineOptions.TabStop = false; + // + // TLP + // + resources.ApplyResources(this.TLP, "TLP"); + this.TLP.Controls.Add(this.CbDirections, 1, 1); + this.TLP.Controls.Add(this.UDQuality, 1, 2); + this.TLP.Controls.Add(this.CbLinePreview, 0, 3); + this.TLP.Controls.Add(this.label5, 0, 2); + this.TLP.Controls.Add(this.label27, 0, 1); + this.TLP.Controls.Add(this.label8, 2, 2); + this.TLP.Controls.Add(this.LblDitherMode, 0, 0); + this.TLP.Controls.Add(this.CbDither, 1, 0); + this.TLP.Controls.Add(this.BtnQualityInfo, 3, 2); + this.TLP.Name = "TLP"; + // + // CbDirections + // + resources.ApplyResources(this.CbDirections, "CbDirections"); + this.TLP.SetColumnSpan(this.CbDirections, 3); + this.CbDirections.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbDirections.FormattingEnabled = true; + this.CbDirections.Name = "CbDirections"; + this.CbDirections.SelectedItem = null; + this.TT.SetToolTip(this.CbDirections, resources.GetString("CbDirections.ToolTip")); + this.CbDirections.SelectedIndexChanged += new System.EventHandler(this.CbDirectionsSelectedIndexChanged); + // + // UDQuality + // + this.UDQuality.DecimalPlaces = 3; + resources.ApplyResources(this.UDQuality, "UDQuality"); + this.UDQuality.Maximum = new decimal(new int[] { 50, 0, 0, 0}); - this.UDQuality.Minimum = new decimal(new int[] { + this.UDQuality.Minimum = new decimal(new int[] { 1, 0, 0, 0}); - this.UDQuality.Name = "UDQuality"; - this.TT.SetToolTip(this.UDQuality, resources.GetString("UDQuality.ToolTip")); - this.UDQuality.Value = new decimal(new int[] { + this.UDQuality.Name = "UDQuality"; + this.TT.SetToolTip(this.UDQuality, resources.GetString("UDQuality.ToolTip")); + this.UDQuality.Value = new decimal(new int[] { 3, 0, 0, 0}); - this.UDQuality.ValueChanged += new System.EventHandler(this.UDQuality_ValueChanged); - // - // CbLinePreview - // - resources.ApplyResources(this.CbLinePreview, "CbLinePreview"); - this.CbLinePreview.Checked = true; - this.CbLinePreview.CheckState = System.Windows.Forms.CheckState.Checked; - this.TLP.SetColumnSpan(this.CbLinePreview, 3); - this.CbLinePreview.Name = "CbLinePreview"; - this.TT.SetToolTip(this.CbLinePreview, resources.GetString("CbLinePreview.ToolTip")); - this.CbLinePreview.UseVisualStyleBackColor = true; - this.CbLinePreview.CheckedChanged += new System.EventHandler(this.CbLinePreview_CheckedChanged); - // - // label5 - // - resources.ApplyResources(this.label5, "label5"); - this.label5.Name = "label5"; - // - // label27 - // - resources.ApplyResources(this.label27, "label27"); - this.label27.Name = "label27"; - // - // label8 - // - resources.ApplyResources(this.label8, "label8"); - this.label8.Name = "label8"; - // - // LblDitherMode - // - resources.ApplyResources(this.LblDitherMode, "LblDitherMode"); - this.LblDitherMode.Name = "LblDitherMode"; - // - // CbDither - // - resources.ApplyResources(this.CbDither, "CbDither"); - this.TLP.SetColumnSpan(this.CbDither, 3); - this.CbDither.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbDither.FormattingEnabled = true; - this.CbDither.Name = "CbDither"; - this.CbDither.SelectedIndexChanged += new System.EventHandler(this.CbDither_SelectedIndexChanged); - // - // BtnQualityInfo - // - this.BtnQualityInfo.AltImage = null; - resources.ApplyResources(this.BtnQualityInfo, "BtnQualityInfo"); - this.BtnQualityInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnQualityInfo.Caption = null; - this.BtnQualityInfo.Coloration = System.Drawing.Color.Empty; - this.BtnQualityInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnQualityInfo.Image"))); - this.BtnQualityInfo.Name = "BtnQualityInfo"; - this.BtnQualityInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnQualityInfo, resources.GetString("BtnQualityInfo.ToolTip")); - this.BtnQualityInfo.UseAltImage = false; - this.BtnQualityInfo.Click += new System.EventHandler(this.BtnQualityInfo_Click); - // - // GbConversionTool - // - resources.ApplyResources(this.GbConversionTool, "GbConversionTool"); - this.GbConversionTool.Controls.Add(this.tableLayoutPanel4); - this.GbConversionTool.Name = "GbConversionTool"; - this.GbConversionTool.TabStop = false; - // - // tableLayoutPanel4 - // - resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); - this.tableLayoutPanel4.Controls.Add(this.RbNoProcessing, 0, 4); - this.tableLayoutPanel4.Controls.Add(this.RbCenterline, 0, 3); - this.tableLayoutPanel4.Controls.Add(this.RbDithering, 0, 1); - this.tableLayoutPanel4.Controls.Add(this.RbVectorize, 0, 2); - this.tableLayoutPanel4.Controls.Add(this.RbLineToLineTracing, 0, 0); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - // - // RbNoProcessing - // - resources.ApplyResources(this.RbNoProcessing, "RbNoProcessing"); - this.RbNoProcessing.Name = "RbNoProcessing"; - this.TT.SetToolTip(this.RbNoProcessing, resources.GetString("RbNoProcessing.ToolTip")); - this.RbNoProcessing.UseVisualStyleBackColor = true; - this.RbNoProcessing.CheckedChanged += new System.EventHandler(this.RbNoProcessing_CheckedChanged); - // - // RbCenterline - // - resources.ApplyResources(this.RbCenterline, "RbCenterline"); - this.RbCenterline.Name = "RbCenterline"; - this.TT.SetToolTip(this.RbCenterline, resources.GetString("RbCenterline.ToolTip")); - this.RbCenterline.UseVisualStyleBackColor = true; - this.RbCenterline.CheckedChanged += new System.EventHandler(this.RbCenterline_CheckedChanged); - this.RbCenterline.Click += new System.EventHandler(this.RbCenterline_Click); - // - // RbDithering - // - resources.ApplyResources(this.RbDithering, "RbDithering"); - this.RbDithering.Name = "RbDithering"; - this.TT.SetToolTip(this.RbDithering, resources.GetString("RbDithering.ToolTip")); - this.RbDithering.UseVisualStyleBackColor = true; - this.RbDithering.CheckedChanged += new System.EventHandler(this.RbDithering_CheckedChanged); - // - // RbVectorize - // - resources.ApplyResources(this.RbVectorize, "RbVectorize"); - this.RbVectorize.Name = "RbVectorize"; - this.TT.SetToolTip(this.RbVectorize, resources.GetString("RbVectorize.ToolTip")); - this.RbVectorize.UseVisualStyleBackColor = true; - this.RbVectorize.CheckedChanged += new System.EventHandler(this.RbVectorize_CheckedChanged); - // - // RbLineToLineTracing - // - resources.ApplyResources(this.RbLineToLineTracing, "RbLineToLineTracing"); - this.RbLineToLineTracing.Checked = true; - this.RbLineToLineTracing.Name = "RbLineToLineTracing"; - this.RbLineToLineTracing.TabStop = true; - this.TT.SetToolTip(this.RbLineToLineTracing, resources.GetString("RbLineToLineTracing.ToolTip")); - this.RbLineToLineTracing.UseVisualStyleBackColor = true; - this.RbLineToLineTracing.CheckedChanged += new System.EventHandler(this.RbLineToLineTracing_CheckedChanged); - this.RbLineToLineTracing.Click += new System.EventHandler(this.RbLineToLineTracing_Click); - // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 1, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // - // BtnCancel - // - resources.ApplyResources(this.BtnCancel, "BtnCancel"); - this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.UseVisualStyleBackColor = true; - this.BtnCancel.Click += new System.EventHandler(this.BtnCancelClick); - // - // BtnCreate - // - resources.ApplyResources(this.BtnCreate, "BtnCreate"); - this.BtnCreate.Name = "BtnCreate"; - this.BtnCreate.UseVisualStyleBackColor = true; - this.BtnCreate.Click += new System.EventHandler(this.BtnCreateClick); - // - // WT - // - this.WT.Interval = 50; - this.WT.Tick += new System.EventHandler(this.WTTick); - // - // RasterToLaserForm - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.TlpMain); - this.MinimizeBox = false; - this.Name = "RasterToLaserForm"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RasterToLaserFormFormClosing); - this.Load += new System.EventHandler(this.RasterToLaserForm_Load); - this.TlpMain.ResumeLayout(false); - this.TlpMain.PerformLayout(); - this.TCOriginalPreview.ResumeLayout(false); - this.TpPreview.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.PbConverted)).EndInit(); - this.TpOriginal.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.PbOriginal)).EndInit(); - this.FlipControl.ResumeLayout(false); - this.TlpLeft.ResumeLayout(false); - this.TlpLeft.PerformLayout(); - this.GbPassthrough.ResumeLayout(false); - this.GbPassthrough.PerformLayout(); - this.GbParameters.ResumeLayout(false); - this.GbParameters.PerformLayout(); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel2.PerformLayout(); - this.GbCenterlineOptions.ResumeLayout(false); - this.GbCenterlineOptions.PerformLayout(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); - this.GbVectorizeOptions.ResumeLayout(false); - this.GbVectorizeOptions.PerformLayout(); - this.tableLayoutPanel5.ResumeLayout(false); - this.tableLayoutPanel5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.UDSpotRemoval)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDOptimize)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDSmoothing)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDFillingQuality)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.UDDownSample)).EndInit(); - this.GbLineToLineOptions.ResumeLayout(false); - this.GbLineToLineOptions.PerformLayout(); - this.TLP.ResumeLayout(false); - this.TLP.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.UDQuality)).EndInit(); - this.GbConversionTool.ResumeLayout(false); - this.GbConversionTool.PerformLayout(); - this.tableLayoutPanel4.ResumeLayout(false); - this.tableLayoutPanel4.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); - this.ResumeLayout(false); + this.UDQuality.ValueChanged += new System.EventHandler(this.UDQuality_ValueChanged); + // + // CbLinePreview + // + resources.ApplyResources(this.CbLinePreview, "CbLinePreview"); + this.CbLinePreview.Checked = true; + this.CbLinePreview.CheckState = System.Windows.Forms.CheckState.Checked; + this.TLP.SetColumnSpan(this.CbLinePreview, 3); + this.CbLinePreview.Name = "CbLinePreview"; + this.TT.SetToolTip(this.CbLinePreview, resources.GetString("CbLinePreview.ToolTip")); + this.CbLinePreview.UseVisualStyleBackColor = true; + this.CbLinePreview.CheckedChanged += new System.EventHandler(this.CbLinePreview_CheckedChanged); + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // label27 + // + resources.ApplyResources(this.label27, "label27"); + this.label27.Name = "label27"; + // + // label8 + // + resources.ApplyResources(this.label8, "label8"); + this.label8.Name = "label8"; + // + // LblDitherMode + // + resources.ApplyResources(this.LblDitherMode, "LblDitherMode"); + this.LblDitherMode.Name = "LblDitherMode"; + // + // CbDither + // + resources.ApplyResources(this.CbDither, "CbDither"); + this.TLP.SetColumnSpan(this.CbDither, 3); + this.CbDither.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbDither.FormattingEnabled = true; + this.CbDither.Name = "CbDither"; + this.CbDither.SelectedIndexChanged += new System.EventHandler(this.CbDither_SelectedIndexChanged); + // + // BtnQualityInfo + // + this.BtnQualityInfo.AltImage = null; + resources.ApplyResources(this.BtnQualityInfo, "BtnQualityInfo"); + this.BtnQualityInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnQualityInfo.Caption = null; + this.BtnQualityInfo.Coloration = System.Drawing.Color.Empty; + this.BtnQualityInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnQualityInfo.Image"))); + this.BtnQualityInfo.Name = "BtnQualityInfo"; + this.BtnQualityInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnQualityInfo, resources.GetString("BtnQualityInfo.ToolTip")); + this.BtnQualityInfo.UseAltImage = false; + this.BtnQualityInfo.Click += new System.EventHandler(this.BtnQualityInfo_Click); + // + // GbConversionTool + // + resources.ApplyResources(this.GbConversionTool, "GbConversionTool"); + this.GbConversionTool.Controls.Add(this.tableLayoutPanel4); + this.GbConversionTool.Name = "GbConversionTool"; + this.GbConversionTool.TabStop = false; + // + // tableLayoutPanel4 + // + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); + this.tableLayoutPanel4.Controls.Add(this.RbNoProcessing, 0, 4); + this.tableLayoutPanel4.Controls.Add(this.RbCenterline, 0, 3); + this.tableLayoutPanel4.Controls.Add(this.RbDithering, 0, 1); + this.tableLayoutPanel4.Controls.Add(this.RbVectorize, 0, 2); + this.tableLayoutPanel4.Controls.Add(this.RbLineToLineTracing, 0, 0); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + // + // RbNoProcessing + // + resources.ApplyResources(this.RbNoProcessing, "RbNoProcessing"); + this.RbNoProcessing.Name = "RbNoProcessing"; + this.TT.SetToolTip(this.RbNoProcessing, resources.GetString("RbNoProcessing.ToolTip")); + this.RbNoProcessing.UseVisualStyleBackColor = true; + this.RbNoProcessing.CheckedChanged += new System.EventHandler(this.RbNoProcessing_CheckedChanged); + // + // RbCenterline + // + resources.ApplyResources(this.RbCenterline, "RbCenterline"); + this.RbCenterline.Name = "RbCenterline"; + this.TT.SetToolTip(this.RbCenterline, resources.GetString("RbCenterline.ToolTip")); + this.RbCenterline.UseVisualStyleBackColor = true; + this.RbCenterline.CheckedChanged += new System.EventHandler(this.RbCenterline_CheckedChanged); + this.RbCenterline.Click += new System.EventHandler(this.RbCenterline_Click); + // + // RbDithering + // + resources.ApplyResources(this.RbDithering, "RbDithering"); + this.RbDithering.Name = "RbDithering"; + this.TT.SetToolTip(this.RbDithering, resources.GetString("RbDithering.ToolTip")); + this.RbDithering.UseVisualStyleBackColor = true; + this.RbDithering.CheckedChanged += new System.EventHandler(this.RbDithering_CheckedChanged); + // + // RbVectorize + // + resources.ApplyResources(this.RbVectorize, "RbVectorize"); + this.RbVectorize.Name = "RbVectorize"; + this.TT.SetToolTip(this.RbVectorize, resources.GetString("RbVectorize.ToolTip")); + this.RbVectorize.UseVisualStyleBackColor = true; + this.RbVectorize.CheckedChanged += new System.EventHandler(this.RbVectorize_CheckedChanged); + // + // RbLineToLineTracing + // + resources.ApplyResources(this.RbLineToLineTracing, "RbLineToLineTracing"); + this.RbLineToLineTracing.Checked = true; + this.RbLineToLineTracing.Name = "RbLineToLineTracing"; + this.RbLineToLineTracing.TabStop = true; + this.TT.SetToolTip(this.RbLineToLineTracing, resources.GetString("RbLineToLineTracing.ToolTip")); + this.RbLineToLineTracing.UseVisualStyleBackColor = true; + this.RbLineToLineTracing.CheckedChanged += new System.EventHandler(this.RbLineToLineTracing_CheckedChanged); + this.RbLineToLineTracing.Click += new System.EventHandler(this.RbLineToLineTracing_Click); + // + // tableLayoutPanel1 + // + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); + this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 1, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + // + // BtnCancel + // + resources.ApplyResources(this.BtnCancel, "BtnCancel"); + this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.BtnCancel.Name = "BtnCancel"; + this.BtnCancel.UseVisualStyleBackColor = true; + this.BtnCancel.Click += new System.EventHandler(this.BtnCancelClick); + // + // BtnCreate + // + resources.ApplyResources(this.BtnCreate, "BtnCreate"); + this.BtnCreate.Name = "BtnCreate"; + this.BtnCreate.UseVisualStyleBackColor = true; + this.BtnCreate.Click += new System.EventHandler(this.BtnCreateClick); + // + // WT + // + this.WT.Interval = 50; + this.WT.Tick += new System.EventHandler(this.WTTick); + // + // RasterToLaserForm + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.BtnCancel; + this.Controls.Add(this.TlpMain); + this.MinimizeBox = false; + this.Name = "RasterToLaserForm"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RasterToLaserFormFormClosing); + this.Load += new System.EventHandler(this.RasterToLaserForm_Load); + this.TlpMain.ResumeLayout(false); + this.TlpMain.PerformLayout(); + this.TCOriginalPreview.ResumeLayout(false); + this.TpPreview.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.PbConverted)).EndInit(); + this.TpOriginal.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.PbOriginal)).EndInit(); + this.FlipControl.ResumeLayout(false); + this.TlpLeft.ResumeLayout(false); + this.TlpLeft.PerformLayout(); + this.GbPassthrough.ResumeLayout(false); + this.GbPassthrough.PerformLayout(); + this.GbParameters.ResumeLayout(false); + this.GbParameters.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + this.GbCenterlineOptions.ResumeLayout(false); + this.GbCenterlineOptions.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + this.GbVectorizeOptions.ResumeLayout(false); + this.GbVectorizeOptions.PerformLayout(); + this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel5.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.UDSpotRemoval)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDOptimize)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDSmoothing)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDFillingQuality)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.UDDownSample)).EndInit(); + this.GbLineToLineOptions.ResumeLayout(false); + this.GbLineToLineOptions.PerformLayout(); + this.TLP.ResumeLayout(false); + this.TLP.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.UDQuality)).EndInit(); + this.GbConversionTool.ResumeLayout(false); + this.GbConversionTool.PerformLayout(); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/LaserGRBL/RasterConverter/RasterToLaserForm.resx b/LaserGRBL/RasterConverter/RasterToLaserForm.resx index 95af11a5..462e7a67 100644 --- a/LaserGRBL/RasterConverter/RasterToLaserForm.resx +++ b/LaserGRBL/RasterConverter/RasterToLaserForm.resx @@ -139,7 +139,7 @@ WB - LaserGRBL.UserControls.WaitingProgressBar, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.WaitingProgressBar, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null TpPreview @@ -333,9 +333,9 @@ 9 - + 84, 8 - + Outline image @@ -343,7 +343,7 @@ BtnOutliner - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -381,7 +381,7 @@ BtnFill - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -441,7 +441,7 @@ BtFlipV - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -500,7 +500,7 @@ BtFlipH - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -555,7 +555,7 @@ BtRotateCW - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -611,7 +611,7 @@ BtRotateCCW - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -662,7 +662,7 @@ BtnRevert - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -710,7 +710,7 @@ BtnCrop - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -794,7 +794,7 @@ BtnReverse - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -848,7 +848,7 @@ BtnAutoTrim - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null FlipControl @@ -998,7 +998,7 @@ CbResize - LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1061,7 +1061,7 @@ CbMode - LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1091,7 +1091,7 @@ TBRed - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1262,7 +1262,7 @@ TBGreen - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1289,7 +1289,7 @@ TbBright - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1319,7 +1319,7 @@ TBBlue - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1346,7 +1346,7 @@ TbContrast - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1481,7 +1481,7 @@ TbThreshold - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1508,7 +1508,7 @@ TBWhiteClip - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1712,7 +1712,7 @@ TBLineThreshold - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -1745,7 +1745,7 @@ TBCornerThreshold - LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ColorSlider, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -1925,7 +1925,7 @@ BtnAdaptiveQualityInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel5 @@ -2351,7 +2351,7 @@ CbFillingDirection - LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel5 @@ -2624,7 +2624,7 @@ BtnFillingQualityInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel5 @@ -2759,7 +2759,7 @@ CbDirections - LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.EnumComboBox, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null TLP @@ -3020,7 +3020,7 @@ BtnQualityInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null TLP @@ -3499,15 +3499,15 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="TCOriginalPreview" Row="0" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="FlipControl" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="TlpLeft" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0" /><Rows Styles="Percent,100,AutoSize,0" /></TableLayoutSettings> - + 15, 8 - - + + True - - + + 33 - + 6, 13 diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs index ef4042b8..8f5a6014 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs @@ -332,6 +332,7 @@ private void InitializeComponent() // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.BtnCancel; this.Controls.Add(this.tableLayoutPanel9); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "SvgToGCodeForm"; diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx index c3d4f4cb..d525be77 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx @@ -229,7 +229,7 @@ IIBorderTracing - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -277,7 +277,7 @@ BtnPSHelper - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -394,7 +394,7 @@ Click for more information... BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -451,7 +451,7 @@ Click for more information... IIMinPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -530,7 +530,7 @@ Click for more information... BtnOnOffInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -611,7 +611,7 @@ Click for more information... IIMaxPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -952,7 +952,7 @@ Click for more information... BtnColorFilter - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 diff --git a/setup.iss b/setup.iss index 415ea336..f7ae393c 100644 --- a/setup.iss +++ b/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "LaserGRBL" -#define MyAppVersion "6.1.1" +#define MyAppVersion "6.2.0" #define MyAppVersionName "Rhydon" #define MyAppPublisher "LaserGRBL" #define MyAppURL "https://lasergrbl.com"