diff --git a/GRBL-Plotter/MachineControl/ControlProjector.Designer.cs b/GRBL-Plotter/MachineControl/ControlProjector.Designer.cs
index 8b8496b5..64c20ec2 100644
--- a/GRBL-Plotter/MachineControl/ControlProjector.Designer.cs
+++ b/GRBL-Plotter/MachineControl/ControlProjector.Designer.cs
@@ -53,14 +53,22 @@ private void InitializeComponent()
this.btnColorDimension = new System.Windows.Forms.Button();
this.btnColorBackground = new System.Windows.Forms.Button();
this.SetupPanel = new System.Windows.Forms.Panel();
+ this.CbProjectorScaleEnable = new System.Windows.Forms.CheckBox();
+ this.GbProjectorScale = new System.Windows.Forms.GroupBox();
+ this.GbProjectorCalc = new System.Windows.Forms.GroupBox();
+ this.label71 = new System.Windows.Forms.Label();
+ this.label70 = new System.Windows.Forms.Label();
+ this.BtnProjectorCalc = new System.Windows.Forms.Button();
+ this.NudProjectorSet = new System.Windows.Forms.NumericUpDown();
+ this.NudProjectorReal = new System.Windows.Forms.NumericUpDown();
+ this.NudScaling = new System.Windows.Forms.NumericUpDown();
+ this.NudOffsetX = new System.Windows.Forms.NumericUpDown();
+ this.NudOffsetY = new System.Windows.Forms.NumericUpDown();
this.label69 = new System.Windows.Forms.Label();
this.numericUpDown15 = new System.Windows.Forms.NumericUpDown();
this.BtnMaximize = new System.Windows.Forms.Button();
this.BtnMinimize = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox();
- this.NudOffsetY = new System.Windows.Forms.NumericUpDown();
- this.NudOffsetX = new System.Windows.Forms.NumericUpDown();
- this.NudScaling = new System.Windows.Forms.NumericUpDown();
this.CbMarker = new System.Windows.Forms.CheckBox();
this.CbTool = new System.Windows.Forms.CheckBox();
this.CbPenUp = new System.Windows.Forms.CheckBox();
@@ -73,29 +81,21 @@ private void InitializeComponent()
this.NudPenDown = new System.Windows.Forms.NumericUpDown();
this.NudTool = new System.Windows.Forms.NumericUpDown();
this.label6 = new System.Windows.Forms.Label();
- this.GbProjectorScale = new System.Windows.Forms.GroupBox();
- this.CbProjectorScaleEnable = new System.Windows.Forms.CheckBox();
- this.GbProjectorCalc = new System.Windows.Forms.GroupBox();
- this.label71 = new System.Windows.Forms.Label();
- this.label70 = new System.Windows.Forms.Label();
- this.BtnProjectorCalc = new System.Windows.Forms.Button();
- this.NudProjectorSet = new System.Windows.Forms.NumericUpDown();
- this.NudProjectorReal = new System.Windows.Forms.NumericUpDown();
this.SetupPanel.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.NudOffsetY)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.NudOffsetX)).BeginInit();
+ this.GbProjectorScale.SuspendLayout();
+ this.GbProjectorCalc.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.NudProjectorSet)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NudProjectorReal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NudScaling)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NudOffsetX)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NudOffsetY)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NudDImension)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NudRuler)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NudPenUp)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NudMarker)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NudPenDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NudTool)).BeginInit();
- this.GbProjectorScale.SuspendLayout();
- this.GbProjectorCalc.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.NudProjectorSet)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.NudProjectorReal)).BeginInit();
this.SuspendLayout();
//
// label5
@@ -216,69 +216,119 @@ private void InitializeComponent()
this.SetupPanel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.SetupPanel_MouseDown);
this.SetupPanel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.SetupPanel_MouseMove);
//
- // label69
+ // CbProjectorScaleEnable
//
- resources.ApplyResources(this.label69, "label69");
- this.label69.Name = "label69";
+ resources.ApplyResources(this.CbProjectorScaleEnable, "CbProjectorScaleEnable");
+ this.CbProjectorScaleEnable.Name = "CbProjectorScaleEnable";
+ this.CbProjectorScaleEnable.UseVisualStyleBackColor = true;
+ this.CbProjectorScaleEnable.CheckedChanged += new System.EventHandler(this.CbProjectorScaleEnable_CheckedChanged);
//
- // numericUpDown15
+ // GbProjectorScale
//
- this.numericUpDown15.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "projectorMonitorIndex", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- resources.ApplyResources(this.numericUpDown15, "numericUpDown15");
- this.numericUpDown15.Maximum = new decimal(new int[] {
- 5,
+ this.GbProjectorScale.Controls.Add(this.GbProjectorCalc);
+ this.GbProjectorScale.Controls.Add(this.NudScaling);
+ this.GbProjectorScale.Controls.Add(this.label3);
+ this.GbProjectorScale.Controls.Add(this.NudOffsetX);
+ this.GbProjectorScale.Controls.Add(this.NudOffsetY);
+ this.GbProjectorScale.Controls.Add(this.label4);
+ this.GbProjectorScale.Controls.Add(this.label5);
+ resources.ApplyResources(this.GbProjectorScale, "GbProjectorScale");
+ this.GbProjectorScale.Name = "GbProjectorScale";
+ this.GbProjectorScale.TabStop = false;
+ //
+ // GbProjectorCalc
+ //
+ this.GbProjectorCalc.Controls.Add(this.label71);
+ this.GbProjectorCalc.Controls.Add(this.label70);
+ this.GbProjectorCalc.Controls.Add(this.BtnProjectorCalc);
+ this.GbProjectorCalc.Controls.Add(this.NudProjectorSet);
+ this.GbProjectorCalc.Controls.Add(this.NudProjectorReal);
+ resources.ApplyResources(this.GbProjectorCalc, "GbProjectorCalc");
+ this.GbProjectorCalc.Name = "GbProjectorCalc";
+ this.GbProjectorCalc.TabStop = false;
+ //
+ // label71
+ //
+ resources.ApplyResources(this.label71, "label71");
+ this.label71.Name = "label71";
+ //
+ // label70
+ //
+ resources.ApplyResources(this.label70, "label70");
+ this.label70.Name = "label70";
+ //
+ // BtnProjectorCalc
+ //
+ resources.ApplyResources(this.BtnProjectorCalc, "BtnProjectorCalc");
+ this.BtnProjectorCalc.Name = "BtnProjectorCalc";
+ this.BtnProjectorCalc.UseVisualStyleBackColor = true;
+ this.BtnProjectorCalc.Click += new System.EventHandler(this.BtnProjectorCalc_Click);
+ //
+ // NudProjectorSet
+ //
+ this.NudProjectorSet.DecimalPlaces = 2;
+ resources.ApplyResources(this.NudProjectorSet, "NudProjectorSet");
+ this.NudProjectorSet.Maximum = new decimal(new int[] {
+ 10000,
0,
0,
0});
- this.numericUpDown15.Minimum = new decimal(new int[] {
+ this.NudProjectorSet.Minimum = new decimal(new int[] {
1,
0,
0,
0});
- this.numericUpDown15.Name = "numericUpDown15";
- this.numericUpDown15.Value = global::GrblPlotter.Properties.Settings.Default.projectorMonitorIndex;
- //
- // BtnMaximize
- //
- resources.ApplyResources(this.BtnMaximize, "BtnMaximize");
- this.BtnMaximize.Name = "BtnMaximize";
- this.BtnMaximize.UseVisualStyleBackColor = true;
- this.BtnMaximize.Click += new System.EventHandler(this.BtnMaximize_Click);
- //
- // BtnMinimize
- //
- resources.ApplyResources(this.BtnMinimize, "BtnMinimize");
- this.BtnMinimize.Name = "BtnMinimize";
- this.BtnMinimize.UseVisualStyleBackColor = true;
- this.BtnMinimize.Click += new System.EventHandler(this.BtnMinimize_Click);
+ this.NudProjectorSet.Name = "NudProjectorSet";
+ this.NudProjectorSet.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
//
- // checkBox1
+ // NudProjectorReal
//
- resources.ApplyResources(this.checkBox1, "checkBox1");
- this.checkBox1.Checked = global::GrblPlotter.Properties.Settings.Default.projectorShowSetup;
- this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBox1.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::GrblPlotter.Properties.Settings.Default, "projectorShowSetup", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.checkBox1.Name = "checkBox1";
- this.checkBox1.UseVisualStyleBackColor = true;
+ this.NudProjectorReal.DecimalPlaces = 2;
+ resources.ApplyResources(this.NudProjectorReal, "NudProjectorReal");
+ this.NudProjectorReal.Maximum = new decimal(new int[] {
+ 10000,
+ 0,
+ 0,
+ 0});
+ this.NudProjectorReal.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.NudProjectorReal.Name = "NudProjectorReal";
+ this.NudProjectorReal.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
//
- // NudOffsetY
+ // NudScaling
//
- this.NudOffsetY.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "projectorDisplayOffsetY", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.NudOffsetY.DecimalPlaces = 2;
- resources.ApplyResources(this.NudOffsetY, "NudOffsetY");
- this.NudOffsetY.Maximum = new decimal(new int[] {
+ this.NudScaling.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "projectorDisplayScale", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+ this.NudScaling.DecimalPlaces = 2;
+ this.NudScaling.Increment = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 131072});
+ resources.ApplyResources(this.NudScaling, "NudScaling");
+ this.NudScaling.Maximum = new decimal(new int[] {
10000,
0,
0,
0});
- this.NudOffsetY.Minimum = new decimal(new int[] {
- 10000,
+ this.NudScaling.Minimum = new decimal(new int[] {
+ 1,
0,
0,
- -2147483648});
- this.NudOffsetY.Name = "NudOffsetY";
- this.NudOffsetY.Value = global::GrblPlotter.Properties.Settings.Default.projectorDisplayOffsetY;
- this.NudOffsetY.ValueChanged += new System.EventHandler(this.CbShow_CheckedChanged);
+ 262144});
+ this.NudScaling.Name = "NudScaling";
+ this.NudScaling.Value = global::GrblPlotter.Properties.Settings.Default.projectorDisplayScale;
+ this.NudScaling.ValueChanged += new System.EventHandler(this.CbShow_CheckedChanged);
//
// NudOffsetX
//
@@ -299,29 +349,69 @@ private void InitializeComponent()
this.NudOffsetX.Value = global::GrblPlotter.Properties.Settings.Default.projectorDisplayOffsetX;
this.NudOffsetX.ValueChanged += new System.EventHandler(this.CbShow_CheckedChanged);
//
- // NudScaling
+ // NudOffsetY
//
- this.NudScaling.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "projectorDisplayScale", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.NudScaling.DecimalPlaces = 2;
- this.NudScaling.Increment = new decimal(new int[] {
- 1,
+ this.NudOffsetY.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "projectorDisplayOffsetY", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+ this.NudOffsetY.DecimalPlaces = 2;
+ resources.ApplyResources(this.NudOffsetY, "NudOffsetY");
+ this.NudOffsetY.Maximum = new decimal(new int[] {
+ 10000,
0,
0,
- 131072});
- resources.ApplyResources(this.NudScaling, "NudScaling");
- this.NudScaling.Maximum = new decimal(new int[] {
+ 0});
+ this.NudOffsetY.Minimum = new decimal(new int[] {
10000,
0,
0,
+ -2147483648});
+ this.NudOffsetY.Name = "NudOffsetY";
+ this.NudOffsetY.Value = global::GrblPlotter.Properties.Settings.Default.projectorDisplayOffsetY;
+ this.NudOffsetY.ValueChanged += new System.EventHandler(this.CbShow_CheckedChanged);
+ //
+ // label69
+ //
+ resources.ApplyResources(this.label69, "label69");
+ this.label69.Name = "label69";
+ //
+ // numericUpDown15
+ //
+ this.numericUpDown15.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "projectorMonitorIndex", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+ resources.ApplyResources(this.numericUpDown15, "numericUpDown15");
+ this.numericUpDown15.Maximum = new decimal(new int[] {
+ 5,
+ 0,
+ 0,
0});
- this.NudScaling.Minimum = new decimal(new int[] {
+ this.numericUpDown15.Minimum = new decimal(new int[] {
1,
0,
0,
- 131072});
- this.NudScaling.Name = "NudScaling";
- this.NudScaling.Value = global::GrblPlotter.Properties.Settings.Default.projectorDisplayScale;
- this.NudScaling.ValueChanged += new System.EventHandler(this.CbShow_CheckedChanged);
+ 0});
+ this.numericUpDown15.Name = "numericUpDown15";
+ this.numericUpDown15.Value = global::GrblPlotter.Properties.Settings.Default.projectorMonitorIndex;
+ //
+ // BtnMaximize
+ //
+ resources.ApplyResources(this.BtnMaximize, "BtnMaximize");
+ this.BtnMaximize.Name = "BtnMaximize";
+ this.BtnMaximize.UseVisualStyleBackColor = true;
+ this.BtnMaximize.Click += new System.EventHandler(this.BtnMaximize_Click);
+ //
+ // BtnMinimize
+ //
+ resources.ApplyResources(this.BtnMinimize, "BtnMinimize");
+ this.BtnMinimize.Name = "BtnMinimize";
+ this.BtnMinimize.UseVisualStyleBackColor = true;
+ this.BtnMinimize.Click += new System.EventHandler(this.BtnMinimize_Click);
+ //
+ // checkBox1
+ //
+ resources.ApplyResources(this.checkBox1, "checkBox1");
+ this.checkBox1.Checked = global::GrblPlotter.Properties.Settings.Default.projectorShowSetup;
+ this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.checkBox1.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::GrblPlotter.Properties.Settings.Default, "projectorShowSetup", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+ this.checkBox1.Name = "checkBox1";
+ this.checkBox1.UseVisualStyleBackColor = true;
//
// CbMarker
//
@@ -512,96 +602,6 @@ private void InitializeComponent()
resources.ApplyResources(this.label6, "label6");
this.label6.Name = "label6";
//
- // GbProjectorScale
- //
- this.GbProjectorScale.Controls.Add(this.GbProjectorCalc);
- this.GbProjectorScale.Controls.Add(this.NudScaling);
- this.GbProjectorScale.Controls.Add(this.label3);
- this.GbProjectorScale.Controls.Add(this.NudOffsetX);
- this.GbProjectorScale.Controls.Add(this.NudOffsetY);
- this.GbProjectorScale.Controls.Add(this.label4);
- this.GbProjectorScale.Controls.Add(this.label5);
- resources.ApplyResources(this.GbProjectorScale, "GbProjectorScale");
- this.GbProjectorScale.Name = "GbProjectorScale";
- this.GbProjectorScale.TabStop = false;
- //
- // CbProjectorScaleEnable
- //
- resources.ApplyResources(this.CbProjectorScaleEnable, "CbProjectorScaleEnable");
- this.CbProjectorScaleEnable.Name = "CbProjectorScaleEnable";
- this.CbProjectorScaleEnable.UseVisualStyleBackColor = true;
- this.CbProjectorScaleEnable.CheckedChanged += new System.EventHandler(this.CbProjectorScaleEnable_CheckedChanged);
- //
- // GbProjectorCalc
- //
- this.GbProjectorCalc.Controls.Add(this.label71);
- this.GbProjectorCalc.Controls.Add(this.label70);
- this.GbProjectorCalc.Controls.Add(this.BtnProjectorCalc);
- this.GbProjectorCalc.Controls.Add(this.NudProjectorSet);
- this.GbProjectorCalc.Controls.Add(this.NudProjectorReal);
- resources.ApplyResources(this.GbProjectorCalc, "GbProjectorCalc");
- this.GbProjectorCalc.Name = "GbProjectorCalc";
- this.GbProjectorCalc.TabStop = false;
- //
- // label71
- //
- resources.ApplyResources(this.label71, "label71");
- this.label71.Name = "label71";
- //
- // label70
- //
- resources.ApplyResources(this.label70, "label70");
- this.label70.Name = "label70";
- //
- // BtnProjectorCalc
- //
- resources.ApplyResources(this.BtnProjectorCalc, "BtnProjectorCalc");
- this.BtnProjectorCalc.Name = "BtnProjectorCalc";
- this.BtnProjectorCalc.UseVisualStyleBackColor = true;
- this.BtnProjectorCalc.Click += new System.EventHandler(this.BtnProjectorCalc_Click);
- //
- // NudProjectorSet
- //
- this.NudProjectorSet.DecimalPlaces = 2;
- resources.ApplyResources(this.NudProjectorSet, "NudProjectorSet");
- this.NudProjectorSet.Maximum = new decimal(new int[] {
- 10000,
- 0,
- 0,
- 0});
- this.NudProjectorSet.Minimum = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- this.NudProjectorSet.Name = "NudProjectorSet";
- this.NudProjectorSet.Value = new decimal(new int[] {
- 100,
- 0,
- 0,
- 0});
- //
- // NudProjectorReal
- //
- this.NudProjectorReal.DecimalPlaces = 2;
- resources.ApplyResources(this.NudProjectorReal, "NudProjectorReal");
- this.NudProjectorReal.Maximum = new decimal(new int[] {
- 10000,
- 0,
- 0,
- 0});
- this.NudProjectorReal.Minimum = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- this.NudProjectorReal.Name = "NudProjectorReal";
- this.NudProjectorReal.Value = new decimal(new int[] {
- 100,
- 0,
- 0,
- 0});
- //
// ControlProjector
//
resources.ApplyResources(this, "$this");
@@ -616,22 +616,22 @@ private void InitializeComponent()
this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ControlProjector_MouseUp);
this.SetupPanel.ResumeLayout(false);
this.SetupPanel.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.NudOffsetY)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.NudOffsetX)).EndInit();
+ this.GbProjectorScale.ResumeLayout(false);
+ this.GbProjectorScale.PerformLayout();
+ this.GbProjectorCalc.ResumeLayout(false);
+ this.GbProjectorCalc.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.NudProjectorSet)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NudProjectorReal)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NudScaling)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NudOffsetX)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NudOffsetY)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NudDImension)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NudRuler)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NudPenUp)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NudMarker)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NudPenDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NudTool)).EndInit();
- this.GbProjectorScale.ResumeLayout(false);
- this.GbProjectorScale.PerformLayout();
- this.GbProjectorCalc.ResumeLayout(false);
- this.GbProjectorCalc.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.NudProjectorSet)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.NudProjectorReal)).EndInit();
this.ResumeLayout(false);
}
diff --git a/GRBL-Plotter/MachineControl/ControlProjector.cs b/GRBL-Plotter/MachineControl/ControlProjector.cs
index aed57aa4..30ab3125 100644
--- a/GRBL-Plotter/MachineControl/ControlProjector.cs
+++ b/GRBL-Plotter/MachineControl/ControlProjector.cs
@@ -1,7 +1,7 @@
/* GRBL-Plotter. Another GCode sender for GRBL.
This file is part of the GRBL-Plotter application.
- Copyright (C) 2015-2022 Sven Hasemann contact: svenhb@web.de
+ Copyright (C) 2015-2024 Sven Hasemann contact: svenhb@web.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License
/*
* 2022-03-25 New form to be displayed with a projector on the work-piece
* 2022-04-06 Add buttons to minimize / maximize windows, monitor selection
+ * 2024-05-02 l:230 f:BtnProjectorCalc_Click check min/max before setting new NudScaling.Value
*/
@@ -226,8 +227,12 @@ private void BtnMaximize_Click(object sender, EventArgs e)
private void BtnProjectorCalc_Click(object sender, EventArgs e)
{
decimal scaling = NudProjectorSet.Value / NudProjectorReal.Value;
- NudScaling.Value *= scaling;
- NudProjectorReal.Value = NudProjectorSet.Value;
+ decimal newScaling = NudScaling.Value * scaling;
+ if ((newScaling >= NudScaling.Minimum) && (newScaling <= NudScaling.Maximum))
+ {
+ NudScaling.Value = newScaling;
+ NudProjectorReal.Value = NudProjectorSet.Value;
+ }
}
private void CbProjectorScaleEnable_CheckedChanged(object sender, EventArgs e)
diff --git a/GRBL-Plotter/MachineControl/ControlProjector.resx b/GRBL-Plotter/MachineControl/ControlProjector.resx
index e96c885b..66fdb273 100644
--- a/GRBL-Plotter/MachineControl/ControlProjector.resx
+++ b/GRBL-Plotter/MachineControl/ControlProjector.resx
@@ -474,6 +474,153 @@
0
+
+ True
+
+
+ NoControl
+
+
+ 87, 45
+
+
+ 106, 13
+
+
+ 54
+
+
+ Real measured width
+
+
+ label71
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ GbProjectorCalc
+
+
+ 0
+
+
+ True
+
+
+ NoControl
+
+
+ 87, 21
+
+
+ 72, 13
+
+
+ 53
+
+
+ Graphic width
+
+
+ label70
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ GbProjectorCalc
+
+
+ 1
+
+
+ NoControl
+
+
+ 6, 69
+
+
+ 206, 23
+
+
+ 52
+
+
+ Calculate scaling
+
+
+ BtnProjectorCalc
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ GbProjectorCalc
+
+
+ 2
+
+
+ 6, 19
+
+
+ 75, 20
+
+
+ 50
+
+
+ Right
+
+
+ NudProjectorSet
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ GbProjectorCalc
+
+
+ 3
+
+
+ 6, 43
+
+
+ 75, 20
+
+
+ 51
+
+
+ Right
+
+
+ NudProjectorReal
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ GbProjectorCalc
+
+
+ 4
+
+
+ 247, 12
+
+
+ 218, 99
+
+
+ 53
+
+
+ Calculate scaling
+
GbProjectorCalc
@@ -486,6 +633,18 @@
0
+
+ 6, 33
+
+
+ 62, 20
+
+
+ 22
+
+
+ Right
+
NudScaling
@@ -498,6 +657,18 @@
1
+
+ 6, 55
+
+
+ 62, 20
+
+
+ 24
+
+
+ Right
+
NudOffsetX
@@ -510,6 +681,18 @@
3
+
+ 6, 77
+
+
+ 62, 20
+
+
+ 25
+
+
+ Right
+
NudOffsetY
@@ -1002,189 +1185,9 @@
0
-
- 6, 77
-
-
- 62, 20
-
-
- 25
-
-
- Right
-
-
- 6, 55
-
-
- 62, 20
-
-
- 24
-
-
- Right
-
-
- 6, 33
-
-
- 62, 20
-
-
- 22
-
-
- Right
-
-
- label71
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GbProjectorCalc
-
-
- 0
-
-
- label70
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GbProjectorCalc
-
-
- 1
-
-
- BtnProjectorCalc
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GbProjectorCalc
-
-
- 2
-
-
- NudProjectorSet
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GbProjectorCalc
-
-
- 3
-
-
- NudProjectorReal
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GbProjectorCalc
-
-
- 4
-
-
- 247, 12
-
-
- 218, 99
-
-
- 53
-
-
- Calculate scaling
-
-
- True
-
-
- NoControl
-
-
- 87, 45
-
-
- 106, 13
-
-
- 54
-
-
- Real measured width
-
-
+
True
-
-
- NoControl
-
-
- 87, 21
-
-
- 72, 13
-
-
- 53
-
-
- Graphic width
-
-
- NoControl
-
-
- 6, 69
-
-
- 206, 23
-
-
- 52
-
-
- Calculate scaling
-
-
- 6, 19
-
-
- 75, 20
-
-
- 50
-
-
- Right
-
-
- 6, 43
-
-
- 75, 20
-
-
- 51
-
-
- Right
-
+
6, 13
@@ -1200,7 +1203,4 @@
System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- True
-
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSerialForm.Designer.cs b/GRBL-Plotter/MachineControl/ControlSerialForm.Designer.cs
index c4726762..bcedceae 100644
--- a/GRBL-Plotter/MachineControl/ControlSerialForm.Designer.cs
+++ b/GRBL-Plotter/MachineControl/ControlSerialForm.Designer.cs
@@ -463,6 +463,7 @@ private void InitializeComponent()
// ControlSerialForm
//
resources.ApplyResources(this, "$this");
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ContextMenuStrip = this.contextMenuStrip1;
this.Controls.Add(this.TbEthernetPort);
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.Designer.cs b/GRBL-Plotter/MachineControl/ControlSetupForm.Designer.cs
index 67eac9a4..a179dd3c 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.Designer.cs
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.Designer.cs
@@ -48,25 +48,25 @@ private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlSetupForm));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
this.tabControl_Level1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.tabControl1_Level2 = new System.Windows.Forms.TabControl();
@@ -275,6 +275,8 @@ private void InitializeComponent()
this.lblHatchFill1 = new System.Windows.Forms.Label();
this.cBImportGraphicHatchFill = new System.Windows.Forms.CheckBox();
this.tab1_3gB5 = new System.Windows.Forms.GroupBox();
+ this.nUDImportGCTangentialShorting = new System.Windows.Forms.NumericUpDown();
+ this.cBImportGCTangentialShortingEnable = new System.Windows.Forms.CheckBox();
this.nUDImportGCTangentialUnits = new System.Windows.Forms.NumericUpDown();
this.nUDImportGCTangentialSwivel2 = new System.Windows.Forms.NumericUpDown();
this.nUDImportGCTangentialSwivel = new System.Windows.Forms.NumericUpDown();
@@ -1285,6 +1287,7 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.nUDHatchFillAngle)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDHatchFillDist)).BeginInit();
this.tab1_3gB5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialShorting)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialUnits)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialSwivel2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialSwivel)).BeginInit();
@@ -3631,6 +3634,8 @@ private void InitializeComponent()
// tab1_3gB5
//
this.tab1_3gB5.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.tab1_3gB5.Controls.Add(this.nUDImportGCTangentialShorting);
+ this.tab1_3gB5.Controls.Add(this.cBImportGCTangentialShortingEnable);
this.tab1_3gB5.Controls.Add(this.nUDImportGCTangentialUnits);
this.tab1_3gB5.Controls.Add(this.nUDImportGCTangentialSwivel2);
this.tab1_3gB5.Controls.Add(this.nUDImportGCTangentialSwivel);
@@ -3645,6 +3650,24 @@ private void InitializeComponent()
this.tab1_3gB5.Name = "tab1_3gB5";
this.tab1_3gB5.TabStop = false;
//
+ // nUDImportGCTangentialShorting
+ //
+ this.nUDImportGCTangentialShorting.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "importGCTangentialShortening", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+ this.nUDImportGCTangentialShorting.DecimalPlaces = 1;
+ resources.ApplyResources(this.nUDImportGCTangentialShorting, "nUDImportGCTangentialShorting");
+ this.nUDImportGCTangentialShorting.Name = "nUDImportGCTangentialShorting";
+ this.toolTip1.SetToolTip(this.nUDImportGCTangentialShorting, resources.GetString("nUDImportGCTangentialShorting.ToolTip"));
+ this.nUDImportGCTangentialShorting.Value = global::GrblPlotter.Properties.Settings.Default.importGCTangentialShortening;
+ //
+ // cBImportGCTangentialShortingEnable
+ //
+ resources.ApplyResources(this.cBImportGCTangentialShortingEnable, "cBImportGCTangentialShortingEnable");
+ this.cBImportGCTangentialShortingEnable.Checked = global::GrblPlotter.Properties.Settings.Default.importGCTangentialShorteningEnable;
+ this.cBImportGCTangentialShortingEnable.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::GrblPlotter.Properties.Settings.Default, "importGCTangentialShorteningEnable", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+ this.cBImportGCTangentialShortingEnable.Name = "cBImportGCTangentialShortingEnable";
+ this.toolTip1.SetToolTip(this.cBImportGCTangentialShortingEnable, resources.GetString("cBImportGCTangentialShortingEnable.ToolTip"));
+ this.cBImportGCTangentialShortingEnable.UseVisualStyleBackColor = true;
+ //
// nUDImportGCTangentialUnits
//
this.nUDImportGCTangentialUnits.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "importGCTangentialTurn", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
@@ -6939,155 +6962,155 @@ private void InitializeComponent()
//
// Column1
//
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.Format = "N0";
- dataGridViewCellStyle1.NullValue = "2";
- this.Column1.DefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle20.Format = "N0";
+ dataGridViewCellStyle20.NullValue = "2";
+ this.Column1.DefaultCellStyle = dataGridViewCellStyle20;
resources.ApplyResources(this.Column1, "Column1");
this.Column1.MaxInputLength = 3;
this.Column1.Name = "Column1";
//
// Column2
//
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle2.NullValue = "FFFFFF";
- this.Column2.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle21.NullValue = "FFFFFF";
+ this.Column2.DefaultCellStyle = dataGridViewCellStyle21;
resources.ApplyResources(this.Column2, "Column2");
this.Column2.MaxInputLength = 6;
this.Column2.Name = "Column2";
//
// Column3
//
- dataGridViewCellStyle3.NullValue = "edit to add new entry";
- this.Column3.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle22.NullValue = "edit to add new entry";
+ this.Column3.DefaultCellStyle = dataGridViewCellStyle22;
resources.ApplyResources(this.Column3, "Column3");
this.Column3.MaxInputLength = 20;
this.Column3.Name = "Column3";
//
// Column4
//
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle4.Format = "N2";
- dataGridViewCellStyle4.NullValue = "0";
- this.Column4.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle23.Format = "N2";
+ dataGridViewCellStyle23.NullValue = "0";
+ this.Column4.DefaultCellStyle = dataGridViewCellStyle23;
resources.ApplyResources(this.Column4, "Column4");
this.Column4.MaxInputLength = 8;
this.Column4.Name = "Column4";
//
// Column5
//
- dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle5.Format = "N2";
- dataGridViewCellStyle5.NullValue = "0";
- this.Column5.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle24.Format = "N2";
+ dataGridViewCellStyle24.NullValue = "0";
+ this.Column5.DefaultCellStyle = dataGridViewCellStyle24;
resources.ApplyResources(this.Column5, "Column5");
this.Column5.MaxInputLength = 8;
this.Column5.Name = "Column5";
//
// Column6
//
- dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle6.Format = "N2";
- dataGridViewCellStyle6.NullValue = "0";
- this.Column6.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle25.Format = "N2";
+ dataGridViewCellStyle25.NullValue = "0";
+ this.Column6.DefaultCellStyle = dataGridViewCellStyle25;
resources.ApplyResources(this.Column6, "Column6");
this.Column6.MaxInputLength = 8;
this.Column6.Name = "Column6";
//
// Column16
//
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle7.Format = "N2";
- dataGridViewCellStyle7.NullValue = "0";
- this.Column16.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle26.Format = "N2";
+ dataGridViewCellStyle26.NullValue = "0";
+ this.Column16.DefaultCellStyle = dataGridViewCellStyle26;
resources.ApplyResources(this.Column16, "Column16");
this.Column16.MaxInputLength = 8;
this.Column16.Name = "Column16";
//
// Column7
//
- dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle8.Format = "N2";
- dataGridViewCellStyle8.NullValue = "3,0";
- this.Column7.DefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle27.Format = "N2";
+ dataGridViewCellStyle27.NullValue = "3,0";
+ this.Column7.DefaultCellStyle = dataGridViewCellStyle27;
resources.ApplyResources(this.Column7, "Column7");
this.Column7.MaxInputLength = 8;
this.Column7.Name = "Column7";
//
// Column8
//
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle9.Format = "N0";
- dataGridViewCellStyle9.NullValue = "800";
- this.Column8.DefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle28.Format = "N0";
+ dataGridViewCellStyle28.NullValue = "800";
+ this.Column8.DefaultCellStyle = dataGridViewCellStyle28;
resources.ApplyResources(this.Column8, "Column8");
this.Column8.MaxInputLength = 6;
this.Column8.Name = "Column8";
//
// Column10
//
- dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle10.Format = "N0";
- dataGridViewCellStyle10.NullValue = "500";
- this.Column10.DefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle29.Format = "N0";
+ dataGridViewCellStyle29.NullValue = "500";
+ this.Column10.DefaultCellStyle = dataGridViewCellStyle29;
resources.ApplyResources(this.Column10, "Column10");
this.Column10.MaxInputLength = 6;
this.Column10.Name = "Column10";
//
// Column15
//
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle11.Format = "N2";
- dataGridViewCellStyle11.NullValue = "2";
- this.Column15.DefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle30.Format = "N2";
+ dataGridViewCellStyle30.NullValue = "2";
+ this.Column15.DefaultCellStyle = dataGridViewCellStyle30;
resources.ApplyResources(this.Column15, "Column15");
this.Column15.MaxInputLength = 8;
this.Column15.Name = "Column15";
//
// Column9
//
- dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle12.Format = "N2";
- dataGridViewCellStyle12.NullValue = "-3";
- this.Column9.DefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle31.Format = "N2";
+ dataGridViewCellStyle31.NullValue = "-3";
+ this.Column9.DefaultCellStyle = dataGridViewCellStyle31;
resources.ApplyResources(this.Column9, "Column9");
this.Column9.MaxInputLength = 8;
this.Column9.Name = "Column9";
//
// Column13
//
- dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle13.Format = "N2";
- dataGridViewCellStyle13.NullValue = "1";
- this.Column13.DefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle32.Format = "N2";
+ dataGridViewCellStyle32.NullValue = "1";
+ this.Column13.DefaultCellStyle = dataGridViewCellStyle32;
resources.ApplyResources(this.Column13, "Column13");
this.Column13.MaxInputLength = 8;
this.Column13.Name = "Column13";
//
// Column11
//
- dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle14.Format = "N0";
- dataGridViewCellStyle14.NullValue = "10000";
- this.Column11.DefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle33.Format = "N0";
+ dataGridViewCellStyle33.NullValue = "10000";
+ this.Column11.DefaultCellStyle = dataGridViewCellStyle33;
resources.ApplyResources(this.Column11, "Column11");
this.Column11.MaxInputLength = 8;
this.Column11.Name = "Column11";
//
// Column12
//
- dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle15.Format = "N0";
- dataGridViewCellStyle15.NullValue = "100";
- this.Column12.DefaultCellStyle = dataGridViewCellStyle15;
+ dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle34.Format = "N0";
+ dataGridViewCellStyle34.NullValue = "100";
+ this.Column12.DefaultCellStyle = dataGridViewCellStyle34;
resources.ApplyResources(this.Column12, "Column12");
this.Column12.MaxInputLength = 6;
this.Column12.Name = "Column12";
//
// Column14
//
- dataGridViewCellStyle16.NullValue = " ";
- this.Column14.DefaultCellStyle = dataGridViewCellStyle16;
+ dataGridViewCellStyle35.NullValue = " ";
+ this.Column14.DefaultCellStyle = dataGridViewCellStyle35;
resources.ApplyResources(this.Column14, "Column14");
this.Column14.MaxInputLength = 32;
this.Column14.Name = "Column14";
@@ -9655,8 +9678,8 @@ private void InitializeComponent()
//
// Column20
//
- dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- this.Column20.DefaultCellStyle = dataGridViewCellStyle17;
+ dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ this.Column20.DefaultCellStyle = dataGridViewCellStyle36;
resources.ApplyResources(this.Column20, "Column20");
this.Column20.MaxInputLength = 2;
this.Column20.Name = "Column20";
@@ -9666,8 +9689,8 @@ private void InitializeComponent()
//
// Column21
//
- dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.Column21.DefaultCellStyle = dataGridViewCellStyle18;
+ dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.Column21.DefaultCellStyle = dataGridViewCellStyle37;
resources.ApplyResources(this.Column21, "Column21");
this.Column21.MaxInputLength = 100;
this.Column21.Name = "Column21";
@@ -9676,8 +9699,8 @@ private void InitializeComponent()
//
// Column22
//
- dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- this.Column22.DefaultCellStyle = dataGridViewCellStyle19;
+ dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ this.Column22.DefaultCellStyle = dataGridViewCellStyle38;
resources.ApplyResources(this.Column22, "Column22");
this.Column22.MaxInputLength = 300;
this.Column22.Name = "Column22";
@@ -12763,7 +12786,6 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.nUDimportGraphicAddFramePenWidth)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDimportGraphicAddFrameDistance)).EndInit();
this.pathImport4.ResumeLayout(false);
- this.pathImport4.PerformLayout();
this.gBNoise.ResumeLayout(false);
this.gBNoise.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.NudNoiseDensity)).EndInit();
@@ -12779,6 +12801,7 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.nUDHatchFillDist)).EndInit();
this.tab1_3gB5.ResumeLayout(false);
this.tab1_3gB5.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialShorting)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialUnits)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialSwivel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDImportGCTangentialSwivel)).EndInit();
@@ -14287,5 +14310,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label label106;
private System.Windows.Forms.NumericUpDown NudConvertToPolar;
private System.Windows.Forms.Label LblPolar;
+ private System.Windows.Forms.NumericUpDown nUDImportGCTangentialShorting;
+ private System.Windows.Forms.CheckBox cBImportGCTangentialShortingEnable;
}
}
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.ar.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.ar.resx
index 007741bf..bb80657e 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.ar.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.ar.resx
@@ -2535,7 +2535,7 @@ M4 وضع الطاقة ليزر ديناميكي
ok
- المخطر
+ إشعار
ok
@@ -2617,7 +2617,7 @@ Pushbullet: لأسباب تتعلق بالسلامة ، يجب عليك استخ
ok
- الوظائف الإضافية للمسار
+ تحميل الملف
ok
@@ -3832,4 +3832,13 @@ Pushbullet: لأسباب تتعلق بالسلامة ، يجب عليك استخ
تحويل XY إلى الإحداثيات القطبية
+
+ يبدأ مسار الأشكال لاحقًا وينهيه مبكرًا (للقاطع الدوار).
+
+
+ تمكين تقصير المسار عن طريق...
+
+
+ يبدأ مسار الأشكال لاحقًا وينهيه مبكرًا (للقاطع الدوار).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.cs b/GRBL-Plotter/MachineControl/ControlSetupForm.cs
index f6939ffd..d8c22389 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.cs
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.cs
@@ -1678,6 +1678,8 @@ private void CbImportGCTangential_CheckStateChanged(object sender, EventArgs e)
nUDImportGCTangentialSwivel2.Enabled = enable;
nUDImportGCTangentialUnits.Enabled = enable;
cBImportGCTangentialRange.Enabled = enable;
+ cBImportGCTangentialShortingEnable.Enabled = enable;
+ nUDImportGCTangentialShorting.Enabled = enable;
if (cBImportGCTangentialRange.Checked && enable)
{ cBImportGCNoArcs.Checked = true; }
HighlightPenOptions_Click(sender, e);
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.cs.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.cs.resx
index 94af339e..706ceafd 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.cs.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.cs.resx
@@ -606,7 +606,7 @@ Objekty se stejnou počáteční a koncovou souřadnicí budou sloučeny dohroma
ok
- Doplňky cesty
+ Načítání souboru
ok
@@ -3855,4 +3855,13 @@ Převod je také možný přes Menu - GCode Transform - 'Převést na polární
Převeďte XY na polární souřadnice
+
+ Zahájí dráhu figurek později a ukončí ji dříve (pro rotační řezačku).
+
+
+ Povolit zkrácení cesty o...
+
+
+ Zahájí dráhu figurek později a ukončí ji dříve (pro rotační řezačku).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.de-DE.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.de-DE.resx
index 6e7d2ded..7e09cc16 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.de-DE.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.de-DE.resx
@@ -2259,7 +2259,7 @@ Hinweis: "Aus E-Mail" muss häufig mit SMTP-Postfach-E-Mail identisch sein.ok
- Notifier
+ Benachrichtigung
ok
@@ -2341,7 +2341,7 @@ Pushbullet: Aus Sicherheitsgründen sollten Sie ein "Papierkorb" -Konto verwende
ok
- Pfad-Add-Ons
+ Datei laden
ok
@@ -3510,4 +3510,13 @@ Die Konvertierung ist auch über Menü – GCode-Transformation – „In Polark
Konvertiert XY in Polarkoordinaten
+
+ Beginnt einen Figurenpfad später und beendet ihn früher (für Rollschneider).
+
+
+ Pfadverkürzung aktivieren durch...
+
+
+ Beginnt einen Figurenpfad später und beendet ihn früher (für Rollschneider).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.es.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.es.resx
index 2d803d86..23f5ce27 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.es.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.es.resx
@@ -2394,7 +2394,7 @@ Pushbullet: por razones de seguridad, debe utilizar una cuenta "basura", el toke
ok
- Complementos de ruta
+ Carga de archivos
ok
@@ -3570,4 +3570,13 @@ La conversión también es posible a través del Menú - Transformación GCode -
Convertir XY a coordenadas polares
+
+ Comienza un recorrido de figuras más tarde y lo finaliza antes (para cortador giratorio).
+
+
+ Habilite el acortamiento de ruta mediante...
+
+
+ Comienza un recorrido de figuras más tarde y lo finaliza antes (para cortador rotativo).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.fr.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.fr.resx
index 03eb900b..c11f639f 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.fr.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.fr.resx
@@ -2312,7 +2312,7 @@ Remarque: souvent «à partir de l'e-mail» doit être identique à l'e-mail de
ok
- Notifier
+ Notification
ok
@@ -2394,7 +2394,7 @@ Pushbullet: pour des raisons de sécurité, vous devez utiliser un compte 'corbe
ok
- Modules complémentaires de chemin
+ Chargement de fichiers
ok
@@ -3569,4 +3569,13 @@ La conversion est également possible via Menu - GCode Transform - 'Convertir en
Convertir XY en coordonnées polaires
+
+ Commence un chemin de figures plus tard et le termine plus tôt (pour le cutter rotatif).
+
+
+ Activer le raccourcissement du chemin en...
+
+
+ Commence un chemin de figures plus tard et le termine plus tôt (pour le cutter rotatif).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.it.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.it.resx
index 77ca3c45..8ea32189 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.it.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.it.resx
@@ -384,7 +384,7 @@
ok
- Add-on di percorso
+ Caricamento file
ok
@@ -1568,7 +1568,7 @@
ok
- nr.
+ Notifica
ok
@@ -3900,4 +3900,13 @@ La conversione è possibile anche tramite Menu - Trasformazione GCode - 'Convert
Converti XY in coordinate polari
+
+ Inizia un percorso di figure più tardi e lo termina prima (per taglierina rotativa).
+
+
+ Abilita l'accorciamento del percorso tramite...
+
+
+ Inizia un percorso di figure più tardi e lo termina prima (per taglierina rotativa).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.ja.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.ja.resx
index 617a2621..a3e1a7d0 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.ja.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.ja.resx
@@ -2536,7 +2536,7 @@ G2 / 3では機能しません-「G2 / 3コマンドを回避する」を有効
ok
- 通知機能
+ 通知
ok
@@ -2618,7 +2618,7 @@ Pushbullet:安全上の理由から、「ゴミ箱」アカウントを使用
ok
- パスアドオン
+ ファイルの読み込み
ok
@@ -3856,4 +3856,13 @@ X は半径値を取得し、Y は角度値を取得します。
XY を極座標に変換する
+
+ 図形パスを後で開始し、より早く終了します (ロータリー カッターの場合)。
+
+
+ パス短縮を有効にする...
+
+
+ 図形パスを後で開始し、より早く終了します (ロータリー カッターの場合)。
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.pl.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.pl.resx
index 365981c5..22a5a994 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.pl.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.pl.resx
@@ -3739,4 +3739,13 @@ Konwersja jest również możliwa poprzez Menu - Transformacja GCode - 'Konwertu
Konwertuj XY na współrzędne biegunowe
+
+ Rozpoczyna później ścieżkę figur i kończy ją wcześniej (w przypadku noża rotacyjnego).
+
+
+ Włącz skracanie ścieżki przez...
+
+
+ Rozpoczyna później ścieżkę figur i kończy ją wcześniej (w przypadku noża rotacyjnego).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.pt.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.pt.resx
index 030586c6..679bb53e 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.pt.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.pt.resx
@@ -2403,7 +2403,7 @@ Pushbullet: por razões de segurança, você deve usar uma conta 'lixo', o token
ok
- Complementos de caminho
+ Carregando arquivo
ok
@@ -3578,4 +3578,13 @@ A conversão também é possível através do Menu - GCode Transform - 'Converte
Converter XY em coordenadas polares
+
+ Inicia um caminho de figuras mais tarde e termina-o mais cedo (para cortador rotativo).
+
+
+ Habilite o encurtamento de caminho...
+
+
+ Inicia um caminho de figuras mais tarde e termina-o mais cedo (para cortador rotativo).
+
\ No newline at end of file
diff --git a/GRBL-Plotter/MachineControl/ControlSetupForm.resx b/GRBL-Plotter/MachineControl/ControlSetupForm.resx
index d2a7db9a..13a06195 100644
--- a/GRBL-Plotter/MachineControl/ControlSetupForm.resx
+++ b/GRBL-Plotter/MachineControl/ControlSetupForm.resx
@@ -117,30 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- NoControl
-
-
-
- 792, 6
-
-
- 23, 23
-
-
-
- 49
-
-
- 💾
-
-
- 17, 17
-
-
- Save settings of this tabs as INI file
-
BtnSaveIni_SvgDxfCsv
@@ -153,24 +129,6 @@
0
-
- NoControl
-
-
- 369, 6
-
-
- 23, 23
-
-
- 48
-
-
- 💾
-
-
- Save settings of this tabs as INI file
-
BtnSaveIni_ImportParameter
@@ -183,24 +141,6 @@
1
-
- NoControl
-
-
- 397, 6
-
-
- 23, 23
-
-
- 25
-
-
- ?
-
-
- Online help
-
BtnHelp_ImportParameter
@@ -213,24 +153,6 @@
2
-
- NoControl
-
-
- 820, 6
-
-
- 23, 23
-
-
- 29
-
-
- ?
-
-
- Online help
-
BtnHelp_SvgDxfCsv
@@ -243,23903 +165,25689 @@
3
-
- 71, 161
+
+ tabControlImport
-
- 59, 20
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 28
+
+ pathImport1
-
- Right
+
+ 4
-
- Origin for the Y axis
-
+
+ tabControlFormat
-
- NudImportGraphicOffsetOriginY
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ pathImport1
-
- tab1_1gB1
+
+ 5
-
- 0
+
+
+ 4, 22
-
- True
+
+
+ 3, 3, 3, 3
-
- NoControl
+
+ 849, 290
-
- 6, 70
+
+
+ 0
-
- 372, 17
+
+ General options
-
- 8
+
+ pathImport1
-
- Avoid G2/3 (Arc Move) commands, draw arcs / circles with line segments
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Convert circles and arcs into line segments - needed if different X and Y scale is needed.
-If step width is > half of radius, it will be decreased automatically
+
+ TabControl3
-
- cBImportGCNoArcs
+
+ 0
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ groupBox9
-
- tab1_1gB1
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 1
+
+ pathImport2
-
- True
+
+ 0
-
- NoControl
+
+ 4, 22
-
- 160, 231
+
+ 3, 3, 3, 3
-
- 230, 17
+
+ 849, 290
-
- 25
+
+ 1
-
- Sorts the objects by size, largest comes last
+
+ Path interpretation
-
- Objects will be sort by size, from smallest to largest and from the innermost to the outermost.
-E.g. for laser cutting
+
+ pathImport2
-
- cBImportGraphicSortDimension
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ TabControl3
-
- tab1_1gB1
+
+ 1
-
- 2
+
+ BtnHelp_Pathaddons
-
- True
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- NoControl
+
+ pathImport3
-
- 6, 231
+
+ 0
-
- 112, 17
+
+ gBPathAddOn3
-
- 26
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Largest object last
+
+ pathImport3
-
- Process largest object last, e.g. cutout path for laser engraving / cutting
+
+ 1
-
- cBImportGraphicLargestLast
+
+ groupBox5
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ pathImport3
-
- 3
+
+ 2
-
- 6, 161
+
+ groupBox4
-
- 59, 20
-
-
- 27
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Right
+
+ pathImport3
-
- Origin for the X axis
+
+ 3
-
- NudImportGraphicOffsetOriginX
+
+ gBPathAddOn2
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ pathImport3
-
+
4
-
- True
+
+ gBPathAddOn1
-
- NoControl
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 30, 208
+
+ pathImport3
-
- 192, 17
+
+ 5
-
- 24
+
+ 4, 22
-
- Allow new start point in closed path
+
+ 3, 3, 3, 3
-
- cBImportGraphicSortDistanceRotatePath
+
+ 849, 290
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 5
-
- tab1_1gB1
+
+ Path add ons
-
- 5
+
+ pathImport3
-
- True
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- NoControl
+
+ TabControl3
-
- 60, 91
+
+ 2
-
- 209, 13
+
+ LblNoise2
-
- 23
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Step width on circumfence of arcs / circles
+
+ gBNoise
-
- label15
+
+ 0
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ LblNoise1
-
- tab1_1gB1
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 6
+
+ gBNoise
-
- 6, 89
+
+ 1
-
- 48, 20
+
+ NudNoiseDensity
-
- 9
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Right
+
+ gBNoise
-
- Step width on circumference of Arc.
-If value is > arc-radius, value will be decreased automatically.
+
+ 2
-
- nUDImportGCSegment
+
+ NudNoiseAmplitude
-
+
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ gBNoise
-
- 7
+
+ 3
-
- 6, 135
+
+ cBImportGraphicNoise
-
- 75, 20
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 5
+
+ gBNoise
-
- Right
+
+ 4
-
- numericUpDown13
+
+ 279, 206
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 270, 72
-
- tab1_1gB1
+
+ 30
-
- 8
+
+ Noise
-
- 6, 113
+
+ gBNoise
-
- 48, 20
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 4
+
+ pathImport4
-
- Right
+
+ 0
-
- This option skips moves smaller than the given value, to minimize gcode size.
+
+ NoControl
-
- nUDImportReduce
+
+ 823, 3
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 23, 23
-
- tab1_1gB1
+
+ 29
-
- 9
+
+ ?
-
- 6, 44
+
+ Online help
-
- 48, 20
+
+ BtnHelp_Pathmodification2
-
- 3
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Right
+
+ pathImport4
-
- Curves will be drawn by line segments. As more segments as more prezice the curve is.
+
+ 1
-
- nUDImportSVGSegemnts
+
+ nUDPathOverlapValue
-
+
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ tab1_3gB8
-
- 10
+
+ 0
-
- True
+
+ cBPathOverlapEnable
-
- NoControl
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 89, 137
+
+ tab1_3gB8
-
- 164, 13
+
+ 1
-
- 22
+
+ 3, 206
-
- Distance to be assumed as equal
+
+ 270, 72
-
- Little gaps will be closed
+
+ 28
-
- tab1_1_2lbl2
+
+ Closed path overlap
+ ok
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tab1_3gB8
-
- tab1_1gB1
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 11
+
+ pathImport4
-
- True
+
+ 2
-
+
NoControl
-
- 136, 162
+
+ 3, 170
-
- 200, 17
+
+ 270, 33
-
- 6
+
+ 27
-
- Offset graphics origin to given values
+
+ Any of this modifiactions will enable "Avoid G2/G3 commands"
+ ok
-
- Set lower left edge of imported graphic to xy-coordinate given by the values
+
+ lblPathModification
-
- cBImportGraphicOffsetOrigin
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ pathImport4
-
- tab1_1gB1
+
+ 3
-
- 12
+
+ CbImportGraphicHatchFillNoise
-
- True
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- NoControl
+
+ gBHatchFill
-
- 6, 188
+
+ 0
-
- 250, 17
+
+ cBImportGraphicHatchFillInset2
-
- 7
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Sort objects by shortest connections and merge
+
+ gBHatchFill
-
- Objects will be sort by closesed distance between start and end coordinates, if usefull path of objects will be reversed.
-Objects with same start and end coordinate will be merged together.
+
+ 1
-
- cBImportGraphicSortDistance
+
+ CbImportGraphicHatchFillDeletePath
-
+
System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ gBHatchFill
-
- 13
+
+ 2
-
- True
+
+ cBImportGraphicHatchFillDash
-
- NoControl
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 238, 16
+
+ gBHatchFill
-
- 150, 17
+
+ 3
-
- 2
+
+ nUDHatchFillInset
-
- Add G20 (inch)/ G21 (mm)
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Add G20 / G21 command in GCode. G21 is default.
+
+ gBHatchFill
-
- cBImportUnitGCode
+
+ 4
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ nUDHatchFillAngle2
-
- tab1_1gB1
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 14
+
+ gBHatchFill
-
- True
+
+ 5
-
- NoControl
+
+ nUDHatchFillAngle
-
- 189, 16
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 45, 17
+
+ gBHatchFill
-
- 1
+
+ 6
-
- inch
+
+ nUDHatchFillDist
-
- G20 command
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- rBImportUnitInch
+
+ gBHatchFill
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 7
-
- tab1_1gB1
+
+ cBImportGraphicHatchFillInset
-
- 15
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- True
+
+ gBHatchFill
-
- NoControl
+
+ 8
-
- 4, 16
+
+ cBImportGraphicHatchFillChangeAngle
-
- 119, 13
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 13
+
+ gBHatchFill
-
- Target units and display
+
+ 9
-
- If any unit is given inside import file, try to convert into target units
+
+ cBImportGraphicHatchFillCross
-
- tab1_1lbl1
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ gBHatchFill
-
- tab1_1gB1
+
+ 10
-
- 16
+
+ lblHatchFill2
-
- True
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- NoControl
+
+ gBHatchFill
-
- 146, 16
+
+ 11
-
- 41, 17
+
+ lblHatchFill1
-
- 0
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- mm
+
+ gBHatchFill
-
- G21 command
+
+ 12
-
- rBImportUnitmm
+
+ cBImportGraphicHatchFill
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ gBHatchFill
-
- 17
+
+ 13
-
- True
+
+ 555, 3
-
- NoControl
+
+ 270, 275
-
- 63, 114
+
+ 26
-
- 158, 17
+
+ Fill closed paths
+ ok
-
+
+ gBHatchFill
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ pathImport4
+
+
4
-
- Remove very short moves <
+
+ 216, 165
-
- This option skips moves smaller than the given value, to minimize gcode size.
+
+ 48, 20
-
- cBImportSVGReduce
+
+ 46
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Right
-
- tab1_1gB1
+
+ Starts a figures path later and ends it earlier (for rotary cutter).
-
- 18
+
+ nUDImportGCTangentialShorting
-
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tab1_3gB5
+
+
+ 0
+
+
True
-
+
NoControl
-
- 60, 46
+
+ 6, 166
-
- 207, 13
+
+ 158, 17
-
- 0
+
+ 45
-
- Number of line segments in curves, splines
+
+ Enable path shortening by...
-
- Bezier-curves and arcs will be drawn by line segments.
-As more segments as more prezice the curve is.
+
+ Starts a figures path later and ends it earlier (for rotary cutter).
-
- tab1_1lbl2
+
+ cBImportGCTangentialShortingEnable
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ tab1_3gB5
-
- 19
+
+ 1
-
- Fill
+
+ 216, 111
-
- 3, 3
+
+ 48, 20
-
- 400, 252
+
+ 10
-
- 9
+
+ nUDImportGCTangentialUnits
-
- Graphics import general
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_1gB1
+
+ tab1_3gB5
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 2
-
- Import_Parameter
+
+ 229, 85
-
- 0
+
+ 35, 20
-
- 4, 22
+
+ 9
-
- 3, 3, 3, 3
+
+ Right
-
- 406, 258
+
+ Change in angle before the knife is raised, turned and lowered
+ ok
-
- 0
+
+ nUDImportGCTangentialSwivel2
-
- Import Parameter
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Import_Parameter
+
+ tab1_3gB5
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 3
-
- tabControlImport
+
+ 229, 62
-
- 0
+
+ 35, 20
-
- 215, 40
+
+ 8
-
- 49, 20
+
+ Right
-
- 1
+
+ Change in angle before the knife is raised, turned and lowered
+ ok
-
- Center
+
+ nUDImportGCTangentialSwivel
-
- tBLineEndText
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tab1_3gB5
-
- tab1_3gB6
+
+ 4
-
- 0
+
+ A
-
- True
+
+ B
-
- NoControl
+
+ C
-
- 6, 42
+
+ Z
-
- 124, 17
+
+ 229, 38
-
- 0
+
+ 35, 21
-
- Apply text at line end
+
+ 7
-
- cBLineEndEnable
+
+ cBoxImportGCTangentialName
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tab1_3gB6
+
+ tab1_3gB5
-
- 1
+
+ 5
-
+
True
-
+
NoControl
-
- 6, 19
-
-
- 107, 17
-
-
- 0
-
-
- Add line numbers
-
-
- cBCodeCreationLineNumbers
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tab1_3gB6
-
-
- 2
+
+ 6, 87
-
- 3, 3
+
+ 166, 13
-
- 394, 67
+
+ 44
-
- 25
+
+ Correct start angle if deviation is >
+ ok
-
- G-Code creation
+
+ If change in angle is greater than this angle, a single turn command will be inserted
+ ok
-
- tab1_3gB6
+
+ lblDImportGCTangential4
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Import_Output
+
+ tab1_3gB5
-
- 0
+
+ 6
-
+