From 900114112d5984be2a9915f660a0f5ec0ffd2b05 Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 24 Jan 2024 21:06:02 +0100 Subject: [PATCH] Version 1.7.1.1 --- .../MachineControl/ControlLaser.Designer.cs | 621 ++++- .../MachineControl/ControlLaser.ar.resx | 123 + GRBL-Plotter/MachineControl/ControlLaser.cs | 198 +- .../MachineControl/ControlLaser.cs.resx | 123 + .../MachineControl/ControlLaser.de-DE.resx | 123 + .../MachineControl/ControlLaser.es.resx | 123 + .../MachineControl/ControlLaser.fr.resx | 123 + .../MachineControl/ControlLaser.it.resx | 123 + .../MachineControl/ControlLaser.ja.resx | 123 + .../MachineControl/ControlLaser.pl.resx | 123 + .../MachineControl/ControlLaser.pt.resx | 123 + GRBL-Plotter/MachineControl/ControlLaser.resx | 1161 ++++++++- .../MachineControl/ControlLaser.ru.resx | 123 + .../MachineControl/ControlLaser.tr.resx | 123 + .../MachineControl/ControlLaser.zh-CN.resx | 123 + .../MachineControl/ControlProbing.Designer.cs | 88 +- .../MachineControl/ControlProbing.ar.resx | 12 - .../MachineControl/ControlProbing.cs.resx | 12 - .../MachineControl/ControlProbing.de-DE.resx | 20 +- .../MachineControl/ControlProbing.es.resx | 12 - .../MachineControl/ControlProbing.fr.resx | 12 - .../MachineControl/ControlProbing.it.resx | 12 - .../MachineControl/ControlProbing.ja.resx | 12 - .../MachineControl/ControlProbing.pl.resx | 44 +- .../MachineControl/ControlProbing.pt.resx | 12 - .../MachineControl/ControlProbing.resx | 2258 ++++++++--------- .../MachineControl/ControlProbing.ru.resx | 12 - .../MachineControl/ControlProbing.tr.resx | 12 - .../MachineControl/ControlProbing.zh-CN.resx | 12 - .../MachineControl/GCode2DViewpaths.cs | 66 +- GRBL-Plotter/MachineControl/GCodeSimulate.cs | 7 +- .../MachineControl/GCodeVisuAndTransform.cs | 22 +- 32 files changed, 4655 insertions(+), 1426 deletions(-) diff --git a/GRBL-Plotter/MachineControl/ControlLaser.Designer.cs b/GRBL-Plotter/MachineControl/ControlLaser.Designer.cs index 055385adb..fc869a27f 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.Designer.cs +++ b/GRBL-Plotter/MachineControl/ControlLaser.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlLaser)); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.nUDMotionDelayPower = new System.Windows.Forms.NumericUpDown(); @@ -77,6 +78,46 @@ private void InitializeComponent() this.lblToolProp = new System.Windows.Forms.Label(); this.btnScanTool = new System.Windows.Forms.Button(); this.cBTool = new System.Windows.Forms.ComboBox(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.CbPatternSendM5 = new System.Windows.Forms.CheckBox(); + this.LblPatternInfo = new System.Windows.Forms.Label(); + this.groupBox10 = new System.Windows.Forms.GroupBox(); + this.TbPatternHeadline = new System.Windows.Forms.TextBox(); + this.CbPatternLabelFirst = new System.Windows.Forms.CheckBox(); + this.label28 = new System.Windows.Forms.Label(); + this.NudPatternLabelSpeed = new System.Windows.Forms.NumericUpDown(); + this.NudPatternLabelPower = new System.Windows.Forms.NumericUpDown(); + this.label27 = new System.Windows.Forms.Label(); + this.groupBox9 = new System.Windows.Forms.GroupBox(); + this.BtnMaterialSingleTest = new System.Windows.Forms.Button(); + this.NudPatternGap = new System.Windows.Forms.NumericUpDown(); + this.NudPatternYSize = new System.Windows.Forms.NumericUpDown(); + this.label26 = new System.Windows.Forms.Label(); + this.NudPatternInterval = new System.Windows.Forms.NumericUpDown(); + this.label25 = new System.Windows.Forms.Label(); + this.label24 = new System.Windows.Forms.Label(); + this.NudPatternXSize = new System.Windows.Forms.NumericUpDown(); + this.label23 = new System.Windows.Forms.Label(); + this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.CbPatternYLabel = new System.Windows.Forms.CheckBox(); + this.NudPatternYMax = new System.Windows.Forms.NumericUpDown(); + this.label20 = new System.Windows.Forms.Label(); + this.NudPatternYMin = new System.Windows.Forms.NumericUpDown(); + this.label21 = new System.Windows.Forms.Label(); + this.NudPatternYNumber = new System.Windows.Forms.NumericUpDown(); + this.label22 = new System.Windows.Forms.Label(); + this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.CbPatternXLabel = new System.Windows.Forms.CheckBox(); + this.NudPatternXMax = new System.Windows.Forms.NumericUpDown(); + this.label19 = new System.Windows.Forms.Label(); + this.NudPatternXMin = new System.Windows.Forms.NumericUpDown(); + this.label18 = new System.Windows.Forms.Label(); + this.NudPatternXNumber = new System.Windows.Forms.NumericUpDown(); + this.label17 = new System.Windows.Forms.Label(); + this.BtnMaterialTest = new System.Windows.Forms.Button(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDMotionDelayPower)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDMotionDelay)).BeginInit(); @@ -98,10 +139,30 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.nUDPowerMin)).BeginInit(); this.groupBox5.SuspendLayout(); this.groupBox6.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.groupBox10.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternLabelSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternLabelPower)).BeginInit(); + this.groupBox9.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternGap)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYSize)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternInterval)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXSize)).BeginInit(); + this.groupBox8.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYMax)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYMin)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYNumber)).BeginInit(); + this.groupBox7.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXMax)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXMin)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXNumber)).BeginInit(); + this.tabPage1.SuspendLayout(); this.SuspendLayout(); // // groupBox1 // + this.groupBox1.BackColor = System.Drawing.Color.WhiteSmoke; this.groupBox1.Controls.Add(this.nUDMotionDelayPower); this.groupBox1.Controls.Add(this.nUDMotionDelay); this.groupBox1.Controls.Add(this.nUDMotionY); @@ -199,6 +260,7 @@ private void InitializeComponent() // // groupBox2 // + this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke; this.groupBox2.Controls.Add(this.nUDMotionSpeed); this.groupBox2.Controls.Add(this.btnScanZ); this.groupBox2.Controls.Add(this.nUDMotionZ); @@ -296,6 +358,7 @@ private void InitializeComponent() // // groupBox3 // + this.groupBox3.BackColor = System.Drawing.Color.WhiteSmoke; this.groupBox3.Controls.Add(this.nUDSpeedStep); this.groupBox3.Controls.Add(this.btnScanSpeed); this.groupBox3.Controls.Add(this.nUDSpeedPower); @@ -421,6 +484,7 @@ private void InitializeComponent() // // groupBox4 // + this.groupBox4.BackColor = System.Drawing.Color.WhiteSmoke; this.groupBox4.Controls.Add(this.nUDPowerStep); this.groupBox4.Controls.Add(this.btnScanPower); this.groupBox4.Controls.Add(this.nUDPowerSpeed); @@ -537,6 +601,7 @@ private void InitializeComponent() // // groupBox5 // + this.groupBox5.BackColor = System.Drawing.Color.WhiteSmoke; this.groupBox5.Controls.Add(this.rBM3); this.groupBox5.Controls.Add(this.nUDLaserPower); this.groupBox5.Controls.Add(this.cBLaserMode); @@ -546,6 +611,7 @@ private void InitializeComponent() // // groupBox6 // + this.groupBox6.BackColor = System.Drawing.Color.WhiteSmoke; this.groupBox6.Controls.Add(this.btnToolUpdate); this.groupBox6.Controls.Add(this.lblToolProp); this.groupBox6.Controls.Add(this.btnScanTool); @@ -580,18 +646,491 @@ private void InitializeComponent() this.cBTool.Name = "cBTool"; this.cBTool.SelectedIndexChanged += new System.EventHandler(this.CbTool_SelectedIndexChanged); // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage1); + resources.ApplyResources(this.tabControl1, "tabControl1"); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.CbPatternSendM5); + this.tabPage2.Controls.Add(this.LblPatternInfo); + this.tabPage2.Controls.Add(this.groupBox10); + this.tabPage2.Controls.Add(this.groupBox9); + this.tabPage2.Controls.Add(this.groupBox8); + this.tabPage2.Controls.Add(this.groupBox7); + this.tabPage2.Controls.Add(this.BtnMaterialTest); + resources.ApplyResources(this.tabPage2, "tabPage2"); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // CbPatternSendM5 + // + resources.ApplyResources(this.CbPatternSendM5, "CbPatternSendM5"); + this.CbPatternSendM5.Name = "CbPatternSendM5"; + this.CbPatternSendM5.UseVisualStyleBackColor = true; + // + // LblPatternInfo + // + resources.ApplyResources(this.LblPatternInfo, "LblPatternInfo"); + this.LblPatternInfo.Name = "LblPatternInfo"; + // + // groupBox10 + // + this.groupBox10.BackColor = System.Drawing.Color.WhiteSmoke; + this.groupBox10.Controls.Add(this.TbPatternHeadline); + this.groupBox10.Controls.Add(this.CbPatternLabelFirst); + this.groupBox10.Controls.Add(this.label28); + this.groupBox10.Controls.Add(this.NudPatternLabelSpeed); + this.groupBox10.Controls.Add(this.NudPatternLabelPower); + this.groupBox10.Controls.Add(this.label27); + resources.ApplyResources(this.groupBox10, "groupBox10"); + this.groupBox10.Name = "groupBox10"; + this.groupBox10.TabStop = false; + // + // TbPatternHeadline + // + resources.ApplyResources(this.TbPatternHeadline, "TbPatternHeadline"); + this.TbPatternHeadline.Name = "TbPatternHeadline"; + this.toolTip1.SetToolTip(this.TbPatternHeadline, resources.GetString("TbPatternHeadline.ToolTip")); + // + // CbPatternLabelFirst + // + resources.ApplyResources(this.CbPatternLabelFirst, "CbPatternLabelFirst"); + this.CbPatternLabelFirst.Name = "CbPatternLabelFirst"; + this.toolTip1.SetToolTip(this.CbPatternLabelFirst, resources.GetString("CbPatternLabelFirst.ToolTip")); + this.CbPatternLabelFirst.UseVisualStyleBackColor = true; + // + // label28 + // + resources.ApplyResources(this.label28, "label28"); + this.label28.Name = "label28"; + // + // NudPatternLabelSpeed + // + this.NudPatternLabelSpeed.Increment = new decimal(new int[] { + 50, + 0, + 0, + 0}); + resources.ApplyResources(this.NudPatternLabelSpeed, "NudPatternLabelSpeed"); + this.NudPatternLabelSpeed.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); + this.NudPatternLabelSpeed.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.NudPatternLabelSpeed.Name = "NudPatternLabelSpeed"; + this.toolTip1.SetToolTip(this.NudPatternLabelSpeed, resources.GetString("NudPatternLabelSpeed.ToolTip")); + this.NudPatternLabelSpeed.Value = new decimal(new int[] { + 500, + 0, + 0, + 0}); + // + // NudPatternLabelPower + // + this.NudPatternLabelPower.Increment = new decimal(new int[] { + 5, + 0, + 0, + 0}); + resources.ApplyResources(this.NudPatternLabelPower, "NudPatternLabelPower"); + this.NudPatternLabelPower.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.NudPatternLabelPower.Name = "NudPatternLabelPower"; + this.toolTip1.SetToolTip(this.NudPatternLabelPower, resources.GetString("NudPatternLabelPower.ToolTip")); + this.NudPatternLabelPower.Value = new decimal(new int[] { + 80, + 0, + 0, + 0}); + // + // label27 + // + resources.ApplyResources(this.label27, "label27"); + this.label27.Name = "label27"; + // + // groupBox9 + // + this.groupBox9.BackColor = System.Drawing.Color.WhiteSmoke; + this.groupBox9.Controls.Add(this.BtnMaterialSingleTest); + this.groupBox9.Controls.Add(this.NudPatternGap); + this.groupBox9.Controls.Add(this.NudPatternYSize); + this.groupBox9.Controls.Add(this.label26); + this.groupBox9.Controls.Add(this.NudPatternInterval); + this.groupBox9.Controls.Add(this.label25); + this.groupBox9.Controls.Add(this.label24); + this.groupBox9.Controls.Add(this.NudPatternXSize); + this.groupBox9.Controls.Add(this.label23); + resources.ApplyResources(this.groupBox9, "groupBox9"); + this.groupBox9.Name = "groupBox9"; + this.groupBox9.TabStop = false; + // + // BtnMaterialSingleTest + // + resources.ApplyResources(this.BtnMaterialSingleTest, "BtnMaterialSingleTest"); + this.BtnMaterialSingleTest.Name = "BtnMaterialSingleTest"; + this.toolTip1.SetToolTip(this.BtnMaterialSingleTest, resources.GetString("BtnMaterialSingleTest.ToolTip")); + this.BtnMaterialSingleTest.UseVisualStyleBackColor = true; + this.BtnMaterialSingleTest.Click += new System.EventHandler(this.BtnMaterialSingleTest_Click); + // + // NudPatternGap + // + this.NudPatternGap.DecimalPlaces = 1; + resources.ApplyResources(this.NudPatternGap, "NudPatternGap"); + this.NudPatternGap.Maximum = new decimal(new int[] { + 50, + 0, + 0, + 0}); + this.NudPatternGap.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.NudPatternGap.Name = "NudPatternGap"; + this.toolTip1.SetToolTip(this.NudPatternGap, resources.GetString("NudPatternGap.ToolTip")); + this.NudPatternGap.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // NudPatternYSize + // + this.NudPatternYSize.DecimalPlaces = 1; + resources.ApplyResources(this.NudPatternYSize, "NudPatternYSize"); + this.NudPatternYSize.Maximum = new decimal(new int[] { + 50, + 0, + 0, + 0}); + this.NudPatternYSize.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.NudPatternYSize.Name = "NudPatternYSize"; + this.toolTip1.SetToolTip(this.NudPatternYSize, resources.GetString("NudPatternYSize.ToolTip")); + this.NudPatternYSize.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label26 + // + resources.ApplyResources(this.label26, "label26"); + this.label26.Name = "label26"; + // + // NudPatternInterval + // + this.NudPatternInterval.DecimalPlaces = 2; + this.NudPatternInterval.Increment = new decimal(new int[] { + 5, + 0, + 0, + 131072}); + resources.ApplyResources(this.NudPatternInterval, "NudPatternInterval"); + this.NudPatternInterval.Maximum = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.NudPatternInterval.Minimum = new decimal(new int[] { + 5, + 0, + 0, + 131072}); + this.NudPatternInterval.Name = "NudPatternInterval"; + this.toolTip1.SetToolTip(this.NudPatternInterval, resources.GetString("NudPatternInterval.ToolTip")); + this.NudPatternInterval.Value = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + // + // label25 + // + resources.ApplyResources(this.label25, "label25"); + this.label25.Name = "label25"; + // + // label24 + // + resources.ApplyResources(this.label24, "label24"); + this.label24.Name = "label24"; + // + // NudPatternXSize + // + this.NudPatternXSize.DecimalPlaces = 1; + resources.ApplyResources(this.NudPatternXSize, "NudPatternXSize"); + this.NudPatternXSize.Maximum = new decimal(new int[] { + 50, + 0, + 0, + 0}); + this.NudPatternXSize.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.NudPatternXSize.Name = "NudPatternXSize"; + this.toolTip1.SetToolTip(this.NudPatternXSize, resources.GetString("NudPatternXSize.ToolTip")); + this.NudPatternXSize.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label23 + // + resources.ApplyResources(this.label23, "label23"); + this.label23.Name = "label23"; + // + // groupBox8 + // + this.groupBox8.BackColor = System.Drawing.Color.WhiteSmoke; + this.groupBox8.Controls.Add(this.CbPatternYLabel); + this.groupBox8.Controls.Add(this.NudPatternYMax); + this.groupBox8.Controls.Add(this.label20); + this.groupBox8.Controls.Add(this.NudPatternYMin); + this.groupBox8.Controls.Add(this.label21); + this.groupBox8.Controls.Add(this.NudPatternYNumber); + this.groupBox8.Controls.Add(this.label22); + resources.ApplyResources(this.groupBox8, "groupBox8"); + this.groupBox8.Name = "groupBox8"; + this.groupBox8.TabStop = false; + // + // CbPatternYLabel + // + resources.ApplyResources(this.CbPatternYLabel, "CbPatternYLabel"); + this.CbPatternYLabel.Checked = true; + this.CbPatternYLabel.CheckState = System.Windows.Forms.CheckState.Checked; + this.CbPatternYLabel.Name = "CbPatternYLabel"; + this.toolTip1.SetToolTip(this.CbPatternYLabel, resources.GetString("CbPatternYLabel.ToolTip")); + this.CbPatternYLabel.UseVisualStyleBackColor = true; + // + // NudPatternYMax + // + this.NudPatternYMax.Increment = new decimal(new int[] { + 50, + 0, + 0, + 0}); + resources.ApplyResources(this.NudPatternYMax, "NudPatternYMax"); + this.NudPatternYMax.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); + this.NudPatternYMax.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.NudPatternYMax.Name = "NudPatternYMax"; + this.toolTip1.SetToolTip(this.NudPatternYMax, resources.GetString("NudPatternYMax.ToolTip")); + this.NudPatternYMax.Value = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + // + // label20 + // + resources.ApplyResources(this.label20, "label20"); + this.label20.Name = "label20"; + // + // NudPatternYMin + // + this.NudPatternYMin.Increment = new decimal(new int[] { + 50, + 0, + 0, + 0}); + resources.ApplyResources(this.NudPatternYMin, "NudPatternYMin"); + this.NudPatternYMin.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); + this.NudPatternYMin.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.NudPatternYMin.Name = "NudPatternYMin"; + this.toolTip1.SetToolTip(this.NudPatternYMin, resources.GetString("NudPatternYMin.ToolTip")); + this.NudPatternYMin.Value = new decimal(new int[] { + 600, + 0, + 0, + 0}); + // + // label21 + // + resources.ApplyResources(this.label21, "label21"); + this.label21.Name = "label21"; + // + // NudPatternYNumber + // + resources.ApplyResources(this.NudPatternYNumber, "NudPatternYNumber"); + this.NudPatternYNumber.Maximum = new decimal(new int[] { + 20, + 0, + 0, + 0}); + this.NudPatternYNumber.Minimum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.NudPatternYNumber.Name = "NudPatternYNumber"; + this.toolTip1.SetToolTip(this.NudPatternYNumber, resources.GetString("NudPatternYNumber.ToolTip")); + this.NudPatternYNumber.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label22 + // + resources.ApplyResources(this.label22, "label22"); + this.label22.Name = "label22"; + // + // groupBox7 + // + this.groupBox7.BackColor = System.Drawing.Color.WhiteSmoke; + this.groupBox7.Controls.Add(this.CbPatternXLabel); + this.groupBox7.Controls.Add(this.NudPatternXMax); + this.groupBox7.Controls.Add(this.label19); + this.groupBox7.Controls.Add(this.NudPatternXMin); + this.groupBox7.Controls.Add(this.label18); + this.groupBox7.Controls.Add(this.NudPatternXNumber); + this.groupBox7.Controls.Add(this.label17); + resources.ApplyResources(this.groupBox7, "groupBox7"); + this.groupBox7.Name = "groupBox7"; + this.groupBox7.TabStop = false; + // + // CbPatternXLabel + // + resources.ApplyResources(this.CbPatternXLabel, "CbPatternXLabel"); + this.CbPatternXLabel.Checked = true; + this.CbPatternXLabel.CheckState = System.Windows.Forms.CheckState.Checked; + this.CbPatternXLabel.Name = "CbPatternXLabel"; + this.toolTip1.SetToolTip(this.CbPatternXLabel, resources.GetString("CbPatternXLabel.ToolTip")); + this.CbPatternXLabel.UseVisualStyleBackColor = true; + // + // NudPatternXMax + // + this.NudPatternXMax.Increment = new decimal(new int[] { + 5, + 0, + 0, + 0}); + resources.ApplyResources(this.NudPatternXMax, "NudPatternXMax"); + this.NudPatternXMax.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.NudPatternXMax.Name = "NudPatternXMax"; + this.toolTip1.SetToolTip(this.NudPatternXMax, resources.GetString("NudPatternXMax.ToolTip")); + this.NudPatternXMax.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // label19 + // + resources.ApplyResources(this.label19, "label19"); + this.label19.Name = "label19"; + // + // NudPatternXMin + // + this.NudPatternXMin.Increment = new decimal(new int[] { + 5, + 0, + 0, + 0}); + resources.ApplyResources(this.NudPatternXMin, "NudPatternXMin"); + this.NudPatternXMin.Name = "NudPatternXMin"; + this.toolTip1.SetToolTip(this.NudPatternXMin, resources.GetString("NudPatternXMin.ToolTip")); + this.NudPatternXMin.Value = new decimal(new int[] { + 60, + 0, + 0, + 0}); + // + // label18 + // + resources.ApplyResources(this.label18, "label18"); + this.label18.Name = "label18"; + // + // NudPatternXNumber + // + resources.ApplyResources(this.NudPatternXNumber, "NudPatternXNumber"); + this.NudPatternXNumber.Maximum = new decimal(new int[] { + 20, + 0, + 0, + 0}); + this.NudPatternXNumber.Minimum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.NudPatternXNumber.Name = "NudPatternXNumber"; + this.toolTip1.SetToolTip(this.NudPatternXNumber, resources.GetString("NudPatternXNumber.ToolTip")); + this.NudPatternXNumber.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label17 + // + resources.ApplyResources(this.label17, "label17"); + this.label17.Name = "label17"; + // + // BtnMaterialTest + // + resources.ApplyResources(this.BtnMaterialTest, "BtnMaterialTest"); + this.BtnMaterialTest.Name = "BtnMaterialTest"; + this.BtnMaterialTest.UseVisualStyleBackColor = true; + this.BtnMaterialTest.Click += new System.EventHandler(this.BtnMaterialTest_Click); + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.groupBox5); + this.tabPage1.Controls.Add(this.groupBox6); + this.tabPage1.Controls.Add(this.groupBox1); + this.tabPage1.Controls.Add(this.lblText); + this.tabPage1.Controls.Add(this.lblInfo); + this.tabPage1.Controls.Add(this.groupBox2); + this.tabPage1.Controls.Add(this.groupBox4); + this.tabPage1.Controls.Add(this.groupBox3); + resources.ApplyResources(this.tabPage1, "tabPage1"); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.UseVisualStyleBackColor = true; + // // ControlLaser // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.lblInfo); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.lblText); - this.Controls.Add(this.groupBox1); + this.Controls.Add(this.tabControl1); this.Name = "ControlLaser"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ControlLaser_FormClosing); this.Load += new System.EventHandler(this.ControlLaser_Load); @@ -621,8 +1160,32 @@ private void InitializeComponent() this.groupBox5.PerformLayout(); this.groupBox6.ResumeLayout(false); this.groupBox6.PerformLayout(); + this.tabControl1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.groupBox10.ResumeLayout(false); + this.groupBox10.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternLabelSpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternLabelPower)).EndInit(); + this.groupBox9.ResumeLayout(false); + this.groupBox9.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternGap)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYSize)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternInterval)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXSize)).EndInit(); + this.groupBox8.ResumeLayout(false); + this.groupBox8.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYMax)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYMin)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternYNumber)).EndInit(); + this.groupBox7.ResumeLayout(false); + this.groupBox7.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXMax)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXMin)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NudPatternXNumber)).EndInit(); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -676,5 +1239,45 @@ private void InitializeComponent() private System.Windows.Forms.Label lblToolProp; private System.Windows.Forms.Button btnScanTool; private System.Windows.Forms.Button btnToolUpdate; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + public System.Windows.Forms.Button BtnMaterialTest; + private System.Windows.Forms.GroupBox groupBox7; + private System.Windows.Forms.NumericUpDown NudPatternXNumber; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.GroupBox groupBox8; + private System.Windows.Forms.NumericUpDown NudPatternYMax; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.NumericUpDown NudPatternYMin; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.NumericUpDown NudPatternYNumber; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.NumericUpDown NudPatternXMax; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.NumericUpDown NudPatternXMin; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.GroupBox groupBox9; + private System.Windows.Forms.NumericUpDown NudPatternGap; + private System.Windows.Forms.NumericUpDown NudPatternYSize; + private System.Windows.Forms.Label label26; + private System.Windows.Forms.NumericUpDown NudPatternInterval; + private System.Windows.Forms.Label label25; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.NumericUpDown NudPatternXSize; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.CheckBox CbPatternYLabel; + private System.Windows.Forms.CheckBox CbPatternXLabel; + private System.Windows.Forms.GroupBox groupBox10; + private System.Windows.Forms.NumericUpDown NudPatternLabelPower; + private System.Windows.Forms.Label label27; + private System.Windows.Forms.Label label28; + private System.Windows.Forms.NumericUpDown NudPatternLabelSpeed; + private System.Windows.Forms.CheckBox CbPatternLabelFirst; + private System.Windows.Forms.Label LblPatternInfo; + private System.Windows.Forms.ToolTip toolTip1; + public System.Windows.Forms.Button BtnMaterialSingleTest; + private System.Windows.Forms.TextBox TbPatternHeadline; + private System.Windows.Forms.CheckBox CbPatternSendM5; } } \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.ar.resx b/GRBL-Plotter/MachineControl/ControlLaser.ar.resx index f5d3ae3ce..c6183833a 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.ar.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.ar.resx @@ -207,4 +207,127 @@ وضع الليزر 32 دولار + + العنوان + + + العنوان فوق نمط الاختبار + + + اكتب التسميات أولاً + + + في حالة تمكينه، سيتم نقش الملصقات قبل مناطق الاختبار + + + سرعة + + + معدل التغذية لنقش الملصقات + + + قوة الليزر لنقش الملصقات + + + قوة الليزر + + + نقش التسمية + + + منطقة الاختبار / المستطيل + + + السرعة / معدل التغذية على المحور Y + + + قوة الليزر على المحور X + + + إنشاء نمط الاختبار + + + نمط اختبار المواد + + + محاذاة الليزر + + + إنشاء اختبار واحد + + + قم بإنشاء منطقة اختبار واحدة باستخدام الحد الأدنى من طاقة الليزر والحد الأقصى لمعدل التغذية + + + المسافة بين مناطق الاختبار + + + ارتفاع منطقة الاختبار + + + فجوة + + + المسافة بين الخطوط لملء منطقة الاختبار + + + مسافة الخط / الفاصل الزمني + + + الحجم Y + + + عرض منطقة الاختبار + + + الحجم X + + + إظهار التسمية + + + يُظهر معدلات التغذية المطبقة على يسار مناطق الاختبار + + + سيتم تطبيق الحد الأقصى لمعدل التغذية أولاً (أسفل) + + + الأعلى. + + + سيتم تطبيق الحد الأدنى لمعدل التغذية أخيرًا (أعلى) + + + دقيقة. + + + عدد حقول الاختبار لمعدل التغذية في العمودي (المحور الصادي) + + + رقم + + + إظهار التسمية + + + يُظهر قوى الليزر المطبقة أسفل مناطق الاختبار + + + قوة الليزر للتوقف مع (أقصى اليمين) + + + الأعلى. % + + + قوة الليزر لتبدأ (أقصى اليسار) + + + دقيقة. % + + + عدد مجالات الاختبار لطاقة الليزر في المحور الأفقي (س) + + + رقم + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.cs b/GRBL-Plotter/MachineControl/ControlLaser.cs index 56e272058..f376cd073 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.cs +++ b/GRBL-Plotter/MachineControl/ControlLaser.cs @@ -1,7 +1,7 @@ /* GRBL-Plotter. Another GCode sender for GRBL. This file is part of the GRBL-Plotter application. - Copyright (C) 2015-2021 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 @@ -25,9 +25,14 @@ You should have received a copy of the GNU General Public License * 2021-11-23 set default for tprop * 2021-12-09 line 222 check if (cBTool.Count == 0) * 2021-12-22 check if is connected to grbl before sending code + * 2024-01-14 add material test pattern */ using System; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Text; +using System.Windows; using System.Windows.Forms; namespace GrblPlotter @@ -187,7 +192,12 @@ private void CbLaserMode_CheckedChanged(object sender, EventArgs e) private void RefreshValues() { - lblInfo.Text = string.Format("Max spindle speed: $30={0}; Min spindle speed: $31={1}; Laser Mode: $32={2}", Grbl.GetSetting(30), Grbl.GetSetting(31), Grbl.GetSetting(32)); + lblInfo.Text = LblPatternInfo.Text = string.Format("Max spindle speed: $30={0}; Min spindle speed: $31={1}; Laser Mode: $32={2}", Grbl.GetSetting(30), Grbl.GetSetting(31), Grbl.GetSetting(32)); + if (Grbl.GetSetting(30) != 100) + { lblInfo.BackColor = LblPatternInfo.BackColor = Color.Yellow; } + else + { lblInfo.BackColor = LblPatternInfo.BackColor = Color.Transparent; } + cBLaserMode.CheckedChanged -= CbLaserMode_CheckedChanged; cBLaserMode.Checked = (Grbl.GetSetting(32) > 0); // ? true : false; cBLaserMode.CheckedChanged += CbLaserMode_CheckedChanged; @@ -247,6 +257,190 @@ private void BtnToolUpdate_Click(object sender, EventArgs e) } CbTool_SelectedIndexChanged(sender, e); } + + + + private string lasergcode = ""; + public string LaserGCode + { get { return lasergcode; } } + public GraphicsPath PathBackground = new GraphicsPath(); + // private GraphicsPath path; + + private static readonly StringBuilder gcodeString = new StringBuilder(); + + + private void BtnMaterialTest_Click(object sender, EventArgs e) + { + gcodeString.Clear(); + RefreshValues(); + + int fieldXMax = (int)NudPatternXNumber.Value; + int fieldYMax = (int)NudPatternYNumber.Value; + + double speed, speedInc; + double speedMin = (double)NudPatternYMin.Value; + double speedMax = (double)NudPatternYMax.Value; + + double power, powerInc; + double powerMin = (double)NudPatternXMin.Value; + double powerMax = (double)NudPatternXMax.Value; + + double sizeX = (double)NudPatternXSize.Value; + double sizeY = (double)NudPatternYSize.Value; + double gap = (double)NudPatternGap.Value; + + double interval = (double)NudPatternInterval.Value; + + bool sendM5 = CbPatternSendM5.Checked; + + Rect block = new Rect(0, 0, sizeX, sizeY); + + speedInc = (speedMax - speedMin) / (fieldYMax - 1); + powerInc = (powerMax - powerMin) / (fieldXMax - 1); + + gcodeString.AppendFormat("G90\r\n"); + + if (CbPatternLabelFirst.Checked && (CbPatternXLabel.Checked || CbPatternYLabel.Checked)) + { + WriteLabels(powerInc, speedInc); + } + + int id = 0; + string colorVal; + double colorInc = 255 / (fieldXMax * fieldYMax); + int grey; + for (int fieldY = 0; fieldY < fieldYMax; fieldY++) + { + speed = speedMin + (fieldYMax - fieldY - 1) * speedInc; + for (int fieldX = 0; fieldX < fieldXMax; fieldX++) + { + power = powerMin + fieldX * powerInc; + block.X = fieldX * (sizeX + gap); + block.Y = fieldY * (sizeY + gap); + id++; + grey = 255 - (int)colorInc * (fieldY + 1) * (fieldX + 1); + colorVal = ColorTranslator.ToHtml(Color.FromArgb(255, grey, grey, grey)).Substring(1); + Gcode.Comment(gcodeString, string.Format("{0} Id=\"{1}\" PenColor=\"{2}\" Power=\"{3:0.0}\" Feedrate=\"{4:0}\" PenWidth=\"{5:0.000}\">", XmlMarker.FigureStart, id, colorVal, power, speed, interval)); + GenerateBlock(block, interval, power, speed, sendM5); + Gcode.Comment(gcodeString, string.Format("{0}>", XmlMarker.FigureEnd)); // Graphic2GCode.SetFigureEnd(figureCount)); + } + } + + if (!CbPatternLabelFirst.Checked && (CbPatternXLabel.Checked || CbPatternYLabel.Checked)) + { + WriteLabels(powerInc, speedInc); + } + gcodeString.AppendFormat("M30\r\n"); + + gcodeString.Replace(',', '.'); + lasergcode = gcodeString.ToString(); + } + + private void GenerateBlock(Rect block, double interval, double power, double speed, bool sendM5) + { + double startX = block.X, startY = block.Y; + + gcodeString.AppendFormat("G0 X{0:0.00} Y{1:0.00}\r\n", startX, startY); + gcodeString.AppendFormat("G1 X{0:0.00} Y{1:0.00} M3 S{2:0} F{3:0}\r\n", startX + block.Width, startY, power, speed); + if (sendM5) gcodeString.AppendFormat("M5\r\n"); + + while (startY < (block.Y + block.Height - 2 * interval)) + { + startY += interval; + gcodeString.AppendFormat("G0 X{0:0.00} Y{1:0.00}\r\n", startX + block.Width, startY); + if (sendM5) gcodeString.AppendFormat("M3\r\n"); + gcodeString.AppendFormat("G1 X{0:0.00} Y{1:0.00}\r\n", startX, startY); + if (sendM5) gcodeString.AppendFormat("M5\r\n"); + startY += interval; + gcodeString.AppendFormat("G0 X{0:0.00} Y{1:0.00}\r\n", startX, startY); + if (sendM5) gcodeString.AppendFormat("M3\r\n"); + gcodeString.AppendFormat("G1 X{0:0.00} Y{1:0.00}\r\n", startX + block.Width, startY); + if (sendM5) gcodeString.AppendFormat("M5\r\n"); + } + if (!sendM5) gcodeString.AppendFormat("M5\r\n"); + } + + private void WriteLabels(double powerInc, double speedInc) + { + int fieldXMax = (int)NudPatternXNumber.Value; + int fieldYMax = (int)NudPatternYNumber.Value; + double speedMin = (double)NudPatternYMin.Value; + double powerMin = (double)NudPatternXMin.Value; + double sizeX = (double)NudPatternXSize.Value; + double sizeY = (double)NudPatternYSize.Value; + double gap = (double)NudPatternGap.Value; + double letterHeight = sizeX / 3; + + Gcode.Comment(gcodeString, string.Format("{0} Id=\"{1}\" PenColor=\"{2}\" Power=\"{3:0.0}\" Feedrate=\"{4:0}\" PenWidth=\"{5:0.000}\">", XmlMarker.FigureStart, 999, "black", NudPatternLabelPower.Value, NudPatternLabelSpeed.Value, 0.05)); + GCodeFromFont.Reset(); + GCodeFromFont.GenerateGCodeOnly = true; + GCodeFromFont.GCHeight = letterHeight; + gcodeString.AppendFormat("M3 S{0:0} F{1:0}\r\n", NudPatternLabelPower.Value, NudPatternLabelSpeed.Value); + + if (TbPatternHeadline.Text.Length > 0) + { + GCodeFromFont.GCText = TbPatternHeadline.Text; + GCodeFromFont.GCOffX = sizeX/2; + GCodeFromFont.GCOffY = fieldYMax * (sizeY + gap); + GCodeFromFont.GetCode(0); // no page break + gcodeString.Append(GCodeFromFont.GCode); + GCodeFromFont.GCode.Clear(); + } + + if (CbPatternYLabel.Checked) + { + for (int fieldY = 0; fieldY < fieldYMax; fieldY++) + { + GCodeFromFont.GCText = string.Format("{0:0}", (speedMin + ((fieldYMax - fieldY - 1) * speedInc))); + GCodeFromFont.GCOffX = -sizeX; + GCodeFromFont.GCOffY = fieldY * (sizeY + gap) + (sizeY / 2) - (letterHeight / 2); + GCodeFromFont.GetCode(0); // no page break + gcodeString.Append(GCodeFromFont.GCode); + GCodeFromFont.GCode.Clear(); + } + } + if (CbPatternXLabel.Checked) + { + for (int fieldX = 0; fieldX < fieldXMax; fieldX++) + { + GCodeFromFont.GCText = string.Format("{0:0}%", (powerMin + (fieldX * powerInc))); + GCodeFromFont.GCOffX = fieldX * (sizeX + gap) + gap; + GCodeFromFont.GCOffY = -(sizeY / 2) - gap; + GCodeFromFont.GetCode(0); // no page break + gcodeString.Append(GCodeFromFont.GCode); + GCodeFromFont.GCode.Clear(); + } + } + gcodeString.AppendFormat("M5\r\n"); + Gcode.Comment(gcodeString, string.Format("{0}>", XmlMarker.FigureEnd)); // Graphic2GCode.SetFigureEnd(figureCount)); + } + + private void BtnMaterialSingleTest_Click(object sender, EventArgs e) + { + gcodeString.Clear(); + RefreshValues(); + + double speedMax = (double)NudPatternYMax.Value; + double powerMin = (double)NudPatternXMin.Value; + double sizeX = (double)NudPatternXSize.Value; + double sizeY = (double)NudPatternYSize.Value; + double interval = (double)NudPatternInterval.Value; + Rect block = new Rect(0, 0, sizeX, sizeY); + + gcodeString.AppendFormat("G90\r\n"); + + string colorVal; + int grey = 100; + colorVal = ColorTranslator.ToHtml(Color.FromArgb(255, grey, grey, grey)).Substring(1); + Gcode.Comment(gcodeString, string.Format("{0} Id=\"{1}\" PenColor=\"{2}\" Power=\"{3:0.0}\" Feedrate=\"{4:0}\" PenWidth=\"{5:0.000}\">", XmlMarker.FigureStart, 1, colorVal, powerMin, speedMax, interval)); + GenerateBlock(block, interval, powerMin, speedMax, CbPatternSendM5.Checked); + Gcode.Comment(gcodeString, string.Format("{0}>", XmlMarker.FigureEnd)); // Graphic2GCode.SetFigureEnd(figureCount)); + + gcodeString.AppendFormat("M30\r\n"); + + gcodeString.Replace(',', '.'); + lasergcode = gcodeString.ToString(); + } } } diff --git a/GRBL-Plotter/MachineControl/ControlLaser.cs.resx b/GRBL-Plotter/MachineControl/ControlLaser.cs.resx index 1ec0920a4..a3c909eea 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.cs.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.cs.resx @@ -204,4 +204,127 @@ Laserové vyrovnání + + Titulek + + + Nadpis nad testovacím vzorem + + + Nejprve napište štítky + + + Pokud je povoleno, štítky budou vyryty před testovacími oblastmi + + + Rychlost + + + Rychlost posuvu pro gravírování štítků + + + Výkon laseru pro gravírování štítků + + + Výkon laseru + + + Gravírování štítků + + + Testovací oblast / obdélník + + + Rychlost / rychlost posuvu na ose Y + + + Výkon laseru na ose X + + + Vytvořte testovací vzor + + + Materiál zkušební vzor + + + Laserové vyrovnání + + + Vytvořte jeden test + + + Vytvořte jednu testovací oblast s minimálním výkonem laseru a maximální rychlostí posuvu + + + Vzdálenost mezi testovacími oblastmi + + + Výška testovací oblasti + + + Mezera + + + Vzdálenost mezi čarami k vyplnění testovací oblasti + + + Vzdálenost čáry / Interval + + + Velikost Y + + + Šířka testovací oblasti + + + Velikost X + + + Zobrazit štítek + + + Zobrazuje použité rychlosti posuvu vlevo od testovacích oblastí + + + Maximální rychlost posuvu bude použita jako první (dole) + + + Max. + + + Minimální rychlost posuvu bude použita jako poslední (nahoře) + + + Min. + + + Počet testovacích polí pro rychlost posuvu ve svislém směru (osa y) + + + Číslo + + + Zobrazit štítek + + + Zobrazuje aplikované výkony laseru pod testovacími oblastmi + + + Výkon laseru k zastavení (zcela vpravo) + + + Max. % + + + Výkon laseru pro začátek (zcela vlevo) + + + Min. % + + + Počet testovacích polí pro energii laseru v horizontále (osa x) + + + Číslo + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.de-DE.resx b/GRBL-Plotter/MachineControl/ControlLaser.de-DE.resx index 2f04aabd6..a3d3ae744 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.de-DE.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.de-DE.resx @@ -205,4 +205,127 @@ Laserjustage + + Überschrift + + + Überschrift über dem Testmuster + + + Schreiben Sie zuerst Etiketten + + + Wenn aktiviert, werden die Etiketten vor den Testbereichen graviert + + + Geschwindigkeit + + + Vorschubgeschwindigkeit zum Gravieren der Etiketten + + + Laserleistung zum Gravieren der Etiketten + + + Laserleistung + + + Etikettengravur + + + Testfläche/Rechteck + + + Geschwindigkeit/Vorschub auf der Y-Achse + + + Laserleistung auf der X-Achse + + + Testmuster erstellen + + + Materialtestmuster + + + Laserausrichtung + + + Einzeltest erstellen + + + Erstellen Sie einen einzelnen Testbereich mit minimaler Laserleistung und maximaler Vorschubgeschwindigkeit + + + Abstand zwischen Testbereichen + + + Höhe des Testbereichs + + + Lücke + + + Abstand zwischen Linien zum Ausfüllen des Testbereichs + + + Linienabstand / Intervall + + + Größe Y + + + Breite des Testbereichs + + + Größe X + + + Etikett anzeigen + + + Zeigt die angewendeten Vorschubraten links von den Testbereichen an + + + Der maximale Vorschub wird zuerst angewendet (unten). + + + Max. + + + Der Mindestvorschub wird zuletzt angewendet (oben) + + + Mindest. + + + Anzahl der Testfelder für den Vorschub in der Vertikalen (y-Achse) + + + Nummer + + + Etikett anzeigen + + + Zeigt die angewandten Laserleistungen unterhalb der Testbereiche an + + + Laserleistung zum Anhalten (ganz rechts) + + + Max. % + + + Laserleistung zu Beginn (ganz links) + + + Mindest. % + + + Anzahl der Testfelder für die Laserenergie in der Horizontalen (x-Achse) + + + Nummer + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.es.resx b/GRBL-Plotter/MachineControl/ControlLaser.es.resx index aa1ec2eca..9815e48a7 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.es.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.es.resx @@ -204,4 +204,127 @@ Alineación láser + + Titular + + + Título encima del patrón de prueba + + + Escribe las etiquetas primero + + + Si está habilitado, las etiquetas se grabarán antes de las áreas de prueba. + + + Velocidad + + + Velocidad de avance para grabar las etiquetas. + + + Potencia del láser para grabar las etiquetas. + + + potencia del láser + + + Grabado de etiquetas + + + Área de prueba/rectángulo + + + Velocidad / Avance en el eje Y + + + Potencia del láser en el eje X. + + + Crear patrón de prueba + + + Patrón de prueba de materiales + + + Alineación láser + + + Crear prueba única + + + Cree un área de prueba única utilizando una potencia láser mínima y una velocidad de alimentación máxima + + + Distancia entre áreas de prueba + + + Altura del área de prueba. + + + Brecha + + + Distancia entre líneas para llenar el área de prueba. + + + Distancia de línea / Intervalo + + + Talla Y + + + Ancho del área de prueba + + + Talla X + + + Mostrar etiqueta + + + Muestra las velocidades de avance aplicadas a la izquierda de las áreas de prueba. + + + La velocidad de alimentación máxima se aplicará primero (abajo) + + + Máx. + + + La tasa de alimentación mínima se aplicará al final (arriba) + + + Mín. + + + Número de campos de prueba para el avance en vertical (eje y) + + + Número + + + Mostrar etiqueta + + + Muestra las potencias del láser aplicadas debajo de las áreas de prueba. + + + Potencia del láser para detenerse (extremo derecho) + + + Máx. % + + + Potencia del láser para empezar (extremo izquierdo) + + + Mín. % + + + Número de campos de prueba para la energía láser en horizontal (eje x) + + + Número + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.fr.resx b/GRBL-Plotter/MachineControl/ControlLaser.fr.resx index 29164dcea..fa7d2fb8c 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.fr.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.fr.resx @@ -204,4 +204,127 @@ Alignement laser + + Gros titre + + + Titre au-dessus de la mire de test + + + Écrivez d'abord les étiquettes + + + Si activé, les étiquettes seront gravées avant les zones de test + + + Vitesse + + + Avance pour graver les étiquettes + + + Puissance laser pour graver les étiquettes + + + Puissance laser + + + Gravure d'étiquettes + + + Zone de test / rectangle + + + Vitesse / Avance sur l'axe Y + + + Puissance laser sur l'axe X + + + Créer un modèle de test + + + Modèle de test de matériau + + + Alignement laser + + + Créer un seul test + + + Créez une zone de test unique en utilisant une puissance laser minimale et une vitesse d'avance maximale + + + Distance entre les zones de test + + + Hauteur de la zone de test + + + Écart + + + Distance entre les lignes pour remplir la zone de test + + + Distance de ligne / Intervalle + + + Taille Y + + + Largeur de la zone de test + + + Taille X + + + Afficher l'étiquette + + + Affiche les vitesses d'avance appliquées à gauche des zones de test + + + La vitesse d'avance maximale sera appliquée en premier (en bas) + + + Max. + + + L'avance minimale sera appliquée en dernier (en haut) + + + Min. + + + Nombre de champs de test pour l'avance dans la verticale (axe y) + + + Nombre + + + Afficher l'étiquette + + + Affiche les puissances laser appliquées sous les zones de test + + + Puissance laser pour s'arrêter (à l'extrême droite) + + + Max. % + + + La puissance du laser pour commencer (à l'extrême gauche) + + + Min. % + + + Nombre de champs de test pour l'énergie laser dans l'horizontale (axe x) + + + Nombre + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.it.resx b/GRBL-Plotter/MachineControl/ControlLaser.it.resx index 4213eca08..741922d34 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.it.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.it.resx @@ -210,4 +210,127 @@ Allineamento laser + + Titolo + + + Titolo sopra il modello di prova + + + Scrivi prima le etichette + + + Se abilitato, le etichette verranno incise prima delle aree di prova + + + Velocità + + + Velocità di avanzamento per incidere le etichette + + + Potenza laser per incidere le etichette + + + Potenza del laser + + + Incisione di etichette + + + Area/rettangolo di prova + + + Velocità/avanzamento sull'asse Y + + + Potenza laser sull'asse X + + + Crea modello di prova + + + Modello di prova del materiale + + + Allineamento laser + + + Crea test singolo + + + Crea un'area di prova singola utilizzando la potenza laser minima e la velocità di avanzamento massima + + + Distanza tra le aree di prova + + + Altezza dell'area di prova + + + Spacco + + + Distanza tra le linee per riempire l'area di prova + + + Distanza linea/Intervallo + + + Taglia Y + + + Larghezza dell'area di prova + + + Taglia X + + + Mostra etichetta + + + Mostra le velocità di avanzamento applicate a sinistra delle aree di prova + + + La velocità di avanzamento massima verrà applicata per prima (in basso) + + + Massimo. + + + La velocità di avanzamento minima verrà applicata per ultima (in alto) + + + minimo + + + Numero di campi di prova per l'avanzamento in verticale (asse y) + + + Numero + + + Mostra etichetta + + + Mostra le potenze laser applicate sotto le aree di prova + + + Potenza del laser con cui fermarsi (estrema destra) + + + Massimo. % + + + Potenza del laser per iniziare (estrema sinistra) + + + minimo % + + + Numero di campi di prova per l'energia laser in orizzontale (asse x) + + + Numero + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.ja.resx b/GRBL-Plotter/MachineControl/ControlLaser.ja.resx index e33c15295..3fc709b3f 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.ja.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.ja.resx @@ -207,4 +207,127 @@ レーザーモード32ドル + + 見出し + + + テストパターンの上の見出し + + + 最初にラベルを書く + + + 有効にすると、テスト領域の前にラベルが彫刻されます。 + + + スピード + + + ラベルを彫刻するための送り速度 + + + ラベルを彫刻するためのレーザー出力 + + + レーザー出力 + + + ラベル彫刻 + + + テストエリア/長方形 + + + Y軸の速度/送り速度 + + + X 軸のレーザー出力 + + + テストパターンの作成 + + + 材料テストパターン + + + レーザーアライメント + + + 単一のテストを作成する + + + 最小のレーザー出力と最大の送り速度を使用して単一のテスト領域を作成します + + + テストエリア間の距離 + + + テストエリアの高さ + + + ギャップ + + + テスト領域を満たすための線間の距離 + + + ラインの距離・間隔 + + + サイズY + + + テストエリアの幅 + + + サイズX + + + ラベルを表示 + + + テスト領域の左側に適用された送り速度を表示します + + + 最大送り速度が最初に適用されます (下) + + + 最大。 + + + 最小送り速度は最後 (上) に適用されます。 + + + 分。 + + + 垂直方向 (y 軸) の送り速度のテスト フィールドの数 + + + 番号 + + + ラベルを表示 + + + テスト領域の下に適用されたレーザー出力を表示します + + + 停止するレーザー出力 (右端) + + + 最大。 % + + + 開始時のレーザー出力 (左端) + + + 分。 % + + + 水平方向 (x 軸) のレーザー エネルギーのテスト フィールドの数 + + + 番号 + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.pl.resx b/GRBL-Plotter/MachineControl/ControlLaser.pl.resx index 69e149ece..b033364a3 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.pl.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.pl.resx @@ -207,4 +207,127 @@ Kalibracja lasera + + Nagłówek + + + Nagłówek nad wzorem testowym + + + Najpierw napisz etykiety + + + Jeśli ta opcja jest włączona, etykiety zostaną wygrawerowane przed obszarami testowymi + + + Prędkość + + + Szybkość posuwu do grawerowania etykiet + + + Moc lasera do grawerowania etykiet + + + Moc lasera + + + Grawerowanie etykiet + + + Obszar testowy / prostokąt + + + Prędkość/posuw na osi Y + + + Moc lasera na osi X + + + Utwórz wzór testowy + + + Wzór testu materiału + + + Wyrównanie laserowe + + + Utwórz pojedynczy test + + + Utwórz pojedynczy obszar testowy przy minimalnej mocy lasera i maksymalnej prędkości posuwu + + + Odległość między obszarami testowymi + + + Wysokość obszaru testowego + + + Luka + + + Odległość między liniami wypełniająca obszar testowy + + + Odległość linii / odstęp + + + Rozmiar Y + + + Szerokość obszaru testowego + + + Rozmiar X + + + Pokaż etykietę + + + Pokazuje zastosowane szybkości posuwu na lewo od obszarów testowych + + + Najpierw zostanie zastosowany maksymalny posuw (na dole) + + + Maks. + + + Minimalny posuw zostanie zastosowany jako ostatni (na górze) + + + Min. + + + Liczba pól testowych dla posuwu w pionie (oś y) + + + Numer + + + Pokaż etykietę + + + Pokazuje zastosowaną moc lasera poniżej obszarów testowych + + + Moc lasera do zatrzymania (z prawej strony) + + + Maks. % + + + Moc lasera na początek (z lewej strony) + + + Min. % + + + Liczba pól testowych dla energii lasera w poziomie (oś x) + + + Numer + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.pt.resx b/GRBL-Plotter/MachineControl/ControlLaser.pt.resx index 90da174bc..07e122ad2 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.pt.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.pt.resx @@ -204,4 +204,127 @@ degrau + + Título + + + Título acima do padrão de teste + + + Escreva os rótulos primeiro + + + Se ativado, os rótulos serão gravados antes das áreas de teste + + + Velocidade + + + Taxa de avanço para gravar as etiquetas + + + Potência laser para gravar as etiquetas + + + Potência laser + + + Gravação de etiqueta + + + Área de teste/retângulo + + + Velocidade / Avanço no eixo Y + + + Potência do laser no eixo X + + + Criar padrão de teste + + + Padrão de teste de material + + + Alinhamento a laser + + + Criar teste único + + + Crie uma área de teste única usando potência mínima do laser e taxa de avanço máxima + + + Distância entre áreas de teste + + + Altura da área de teste + + + Brecha + + + Distância entre linhas para preencher a área de teste + + + Distância/intervalo da linha + + + Tamanho Y + + + Largura da área de teste + + + Tamanho X + + + Mostrar rótulo + + + Mostra as taxas de avanço aplicadas à esquerda das áreas de teste + + + A taxa de avanço máxima será aplicada primeiro (parte inferior) + + + Máx. + + + A taxa de avanço mínima será aplicada por último (superior) + + + Min. + + + Número de campos de teste para o avanço na vertical (eixo y) + + + Número + + + Mostrar rótulo + + + Mostra as potências do laser aplicadas abaixo das áreas de teste + + + Potência do laser para parar (extrema direita) + + + Máx. % + + + Potência do laser para começar (extrema esquerda) + + + Min. % + + + Número de campos de teste para a energia do laser na horizontal (eixo x) + + + Número + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.resx b/GRBL-Plotter/MachineControl/ControlLaser.resx index db0737abd..c532f772f 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.resx @@ -349,7 +349,7 @@ 7 - 6, 99 + 6, 103 532, 43 @@ -367,10 +367,10 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 - 7 + 2 True @@ -379,7 +379,7 @@ NoControl - 3, 9 + 3, 13 377, 13 @@ -397,10 +397,10 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 - 6 + 3 228, 14 @@ -604,7 +604,7 @@ 6 - 6, 148 + 6, 152 532, 43 @@ -622,7 +622,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 5 @@ -976,7 +976,7 @@ 8 - 6, 197 + 6, 201 532, 43 @@ -994,10 +994,10 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 - 4 + 7 228, 14 @@ -1261,7 +1261,7 @@ 8 - 6, 246 + 6, 250 532, 43 @@ -1279,10 +1279,10 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 - 3 + 6 True @@ -1291,7 +1291,7 @@ NoControl - 3, 30 + 3, 34 25, 13 @@ -1309,16 +1309,16 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 - 2 + 4 - 6, 50 + 6, 54 - 441, 43 + 532, 43 10 @@ -1333,10 +1333,10 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 - 1 + 0 NoControl @@ -1444,7 +1444,7 @@ 3 - 6, 295 + 6, 299 532, 43 @@ -1462,33 +1462,1116 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + tabPage1 - 0 + 1 - - 6, 13 + + True - - 544, 343 + + 338, 275 - - 560, 382 + + 115, 17 - - 560, 382 + + 12 - - Laser alignment + + Switch laser on/off - - ControlLaser + + CbPatternSendM5 - - System.Windows.Forms.Form, 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 - + + tabPage2 + + + 0 + + True + + + 9, 6 + + + 25, 13 + + + 11 + + + Info + + + LblPatternInfo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 1 + + + 8, 114 + + + 312, 20 + + + 14 + + + Headline + + + 17, 17 + + Headline above test pattern + + + TbPatternHeadline + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 0 + + + True + + + 6, 74 + + + 100, 17 + + + 13 + + + Write labels first + + + If enabled, the labels will be engraved before the test areas + + + CbPatternLabelFirst + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 1 + + + True + + + NoControl + + + 67, 47 + + + 38, 13 + + + 12 + + + Speed + + + label28 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 2 + + + 6, 45 + + + 55, 20 + + + 11 + + + Right + + + Feed rate to engrave the labels + + + NudPatternLabelSpeed + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 3 + + + 6, 19 + + + 55, 20 + + + 10 + + + Right + + + Laser power to engrave the labels + + + NudPatternLabelPower + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 4 + + + True + + + NoControl + + + 67, 21 + + + 65, 13 + + + 9 + + + Laser power + + + label27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 5 + + + 6, 186 + + + 326, 158 + + + 10 + + + Label engraving + + + groupBox10 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 2 + + + 6, 123 + + + 188, 23 + + + 17 + + + Create single test + + + Create single test area using minimum laser power and maximum feed rate + + + BtnMaterialSingleTest + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 0 + + + 6, 71 + + + 55, 20 + + + 16 + + + Right + + + Distance between test areas + + + NudPatternGap + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 1 + + + 6, 45 + + + 55, 20 + + + 15 + + + Right + + + Height of the test area + + + NudPatternYSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 2 + + + True + + + NoControl + + + 67, 73 + + + 27, 13 + + + 14 + + + Gap + + + label26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 3 + + + 6, 97 + + + 55, 20 + + + 13 + + + Right + + + Distance between lines to fill the test area + + + NudPatternInterval + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 4 + + + NoControl + + + 67, 99 + + + 127, 34 + + + 12 + + + Line distance / Interval + + + label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 5 + + + True + + + NoControl + + + 67, 47 + + + 37, 13 + + + 10 + + + Size Y + + + label24 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 6 + + + 6, 19 + + + 55, 20 + + + 9 + + + Right + + + Width of the test area + + + NudPatternXSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 7 + + + True + + + NoControl + + + 67, 21 + + + 37, 13 + + + 8 + + + Size X + + + label23 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 8 + + + 338, 25 + + + 200, 155 + + + 9 + + + Test area / rectangle + + + groupBox9 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 3 + + + True + + + NoControl + + + 6, 97 + + + 78, 17 + + + 9 + + + Show label + + + Shows applied feed rates left of test areas + + + CbPatternYLabel + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 0 + + + 6, 71 + + + 55, 20 + + + 7 + + + Right + + + Maximum feed rate will be applied first (bottom) + + + NudPatternYMax + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 1 + + + True + + + NoControl + + + 67, 73 + + + 30, 13 + + + 6 + + + Max. + + + label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 2 + + + 6, 45 + + + 55, 20 + + + 5 + + + Right + + + Minimum feed rate will be applied last (top) + + + NudPatternYMin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 3 + + + True + + + NoControl + + + 67, 47 + + + 27, 13 + + + 4 + + + Min. + + + label21 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 4 + + + 6, 19 + + + 55, 20 + + + 3 + + + Right + + + Number of test fields for the feedrate in the vertical (y axis) + + + NudPatternYNumber + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 5 + + + True + + + NoControl + + + 67, 21 + + + 44, 13 + + + 2 + + + Number + + + label22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 6 + + + 172, 25 + + + 160, 155 + + + 8 + + + Speed / Feedrate on Y axis + + + groupBox8 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 4 + + + True + + + 6, 97 + + + 78, 17 + + + 8 + + + Show label + + + Shows applied laser powers below test areas + + + CbPatternXLabel + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 0 + + + 6, 71 + + + 55, 20 + + + 7 + + + Right + + + Laser power to stop with (far rightt) + + + NudPatternXMax + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 1 + + + True + + + NoControl + + + 67, 73 + + + 41, 13 + + + 6 + + + Max. % + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 2 + + + 6, 45 + + + 55, 20 + + + 5 + + + Right + + + Laser power to start with (far left) + + + NudPatternXMin + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 3 + + + True + + + NoControl + + + 67, 47 + + + 38, 13 + + + 4 + + + Min. % + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 4 + + + 6, 19 + + + 55, 20 + + + 3 + + + Right + + + Number of test fields for the laser energy in the horizontal (x axis) + + + NudPatternXNumber + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 5 + + + True + + + 67, 21 + + + 44, 13 + + + 2 + + + Number + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 6 + + + 6, 25 + + + 160, 155 + + + 3 + + + Laser power on X axis + + + groupBox7 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 5 + + + 338, 324 + + + 203, 23 + + + 0 + + + Create test pattern + + + BtnMaterialTest + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 6 + + + 4, 22 + + + 3, 3, 3, 3 + + + 547, 353 + + + 1 + + + Material test pattern + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 547, 353 + + + 0 + + + Laser alignment + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 + + + 3, 3 + + + 555, 379 + + + 13 + + + tabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 564, 381 + + + 580, 420 + + + 580, 420 + + + Laser alignment + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ControlLaser + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.ru.resx b/GRBL-Plotter/MachineControl/ControlLaser.ru.resx index 2c4700a8a..9d342d998 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.ru.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.ru.resx @@ -204,4 +204,127 @@ Лазерное выравнивание + + Заголовок + + + Заголовок над тестовым шаблоном + + + Сначала напишите ярлыки + + + Если эта опция включена, метки будут выгравированы перед тестовыми областями. + + + Скорость + + + Скорость подачи для гравировки этикеток + + + Мощность лазера для гравировки этикеток + + + Мощность лазера + + + Гравировка этикетки + + + Тестовая область/прямоугольник + + + Скорость/подача по оси Y + + + Мощность лазера по оси X + + + Создать тестовый шаблон + + + Тестовый образец материала + + + Лазерное выравнивание + + + Создать одиночный тест + + + Создайте единую испытательную зону, используя минимальную мощность лазера и максимальную скорость подачи. + + + Расстояние между испытательными площадками + + + Высота испытательной площадки + + + Зазор + + + Расстояние между линиями для заполнения тестовой области + + + Расстояние между строками/интервал + + + Размер Y + + + Ширина испытательной зоны + + + Размер Х + + + Показать ярлык + + + Показывает применяемую скорость подачи слева от тестовых участков. + + + Сначала будет применена максимальная скорость подачи (внизу). + + + Макс. + + + Минимальная скорость подачи будет применяться последней (вверху) + + + Мин. + + + Количество тестовых полей для скорости подачи по вертикали (ось Y) + + + Число + + + Показать ярлык + + + Показывает приложенную мощность лазера под тестовыми зонами. + + + Сила лазера, чтобы остановиться (крайний справа) + + + Макс. % + + + Мощность лазера для начала (крайний слева) + + + Мин. % + + + Количество тестовых полей для энергии лазера по горизонтали (ось x) + + + Число + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.tr.resx b/GRBL-Plotter/MachineControl/ControlLaser.tr.resx index 9ef084b72..46ecc0210 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.tr.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.tr.resx @@ -210,4 +210,127 @@ Allineamento laser + + Başlık + + + Test modelinin üzerindeki başlık + + + Önce etiketleri yazın + + + Etkinleştirilirse etiketler test alanlarından önce kazınacaktır + + + Hız + + + Etiketleri kazımak için ilerleme hızı + + + Etiketleri kazımak için lazer gücü + + + Lazer gücü + + + Etiket gravürü + + + Test alanı / dikdörtgen + + + Y ekseninde Hız / İlerleme Hızı + + + X ekseninde lazer gücü + + + Test deseni oluştur + + + Malzeme test modeli + + + Lazer hizalama + + + Tek test oluştur + + + Minimum lazer gücü ve maksimum ilerleme hızını kullanarak tek test alanı oluşturun + + + Test alanları arasındaki mesafe + + + Test alanının yüksekliği + + + Açıklık + + + Test alanını doldurmak için çizgiler arasındaki mesafe + + + Hat mesafesi / Aralık + + + Boyut Y + + + Test alanının genişliği + + + Boyut X + + + Etiketi göster + + + Test alanlarının solunda uygulanan ilerleme hızlarını gösterir + + + İlk önce maksimum ilerleme hızı uygulanacaktır (altta) + + + Maks. + + + Minimum ilerleme hızı en son (üst) uygulanacaktır + + + Min. + + + Dikey (y ekseni) ilerleme hızı için test alanı sayısı + + + Sayı + + + Etiketi göster + + + Test alanlarının altında uygulanan lazer güçlerini gösterir + + + Durdurulacak lazer gücü (en sağda) + + + Maks. % + + + Başlangıç ​​olarak lazer gücü (en solda) + + + Min. % + + + Yatayda (x ekseni) lazer enerjisi için test alanı sayısı + + + Sayı + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlLaser.zh-CN.resx b/GRBL-Plotter/MachineControl/ControlLaser.zh-CN.resx index 33d12c2e0..a9cc3e0d4 100644 --- a/GRBL-Plotter/MachineControl/ControlLaser.zh-CN.resx +++ b/GRBL-Plotter/MachineControl/ControlLaser.zh-CN.resx @@ -204,4 +204,127 @@ 激光对准 + + 标题 + + + 测试模式上方的标题 + + + 先写标签 + + + 如果启用，标签将刻在测试区域之前 + + + 速度 + + + 雕刻标签的进给速率 + + + 雕刻标签的激光功率 + + + 激光功率 + + + 标签雕刻 + + + 测试区域/矩形 + + + Y 轴速度/进给率 + + + X轴激光功率 + + + 创建测试模式 + + + 材料测试图 + + + 激光对准 + + + 创建单个测试 + + + 使用最小激光功率和最大进给速率创建单个测试区域 + + + 测试区域之间的距离 + + + 测试区域高度 + + + 差距 + + + 填充测试区域的线之间的距离 + + + 线路距离/间隔 + + + 尺寸 Y + + + 测试区域宽度 + + + 尺码 X + + + 显示标签 + + + 显示测试区域左侧应用的进给速率 + + + 首先应用最大进给率（底部） + + + 最大限度。 + + + 最小进给率将最后应用（顶部） + + + 分钟。 + + + 垂直（y 轴）进给率测试字段数 + + + 数字 + + + 显示标签 + + + 显示测试区域下方应用的激光功率 + + + 停止时的激光功率（最右边） + + + 最大限度。 % + + + 起始激光功率（最左边） + + + 分钟。 % + + + 水平（x 轴）激光能量测试场数 + + + 数字 + \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlProbing.Designer.cs b/GRBL-Plotter/MachineControl/ControlProbing.Designer.cs index e9db6dee1..3e27711fe 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.Designer.cs +++ b/GRBL-Plotter/MachineControl/ControlProbing.Designer.cs @@ -77,6 +77,10 @@ private void InitializeComponent() this.BtnMoveLeft = new System.Windows.Forms.Button(); this.BtnMoveRight = new System.Windows.Forms.Button(); this.CbProbe2ndChance = new System.Windows.Forms.CheckBox(); + this.BtnHelp_ImportParameter = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); this.gBMovement = new System.Windows.Forms.GroupBox(); this.nUDProbeFeedZ = new System.Windows.Forms.NumericUpDown(); this.label8 = new System.Windows.Forms.Label(); @@ -141,10 +145,6 @@ private void InitializeComponent() this.rBProbeCoord1 = new System.Windows.Forms.RadioButton(); this.label11 = new System.Windows.Forms.Label(); this.timerFlowControl = new System.Windows.Forms.Timer(this.components); - this.BtnHelp_ImportParameter = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); this.gBHardware.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDProbeDiameter)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDOffsetX)).BeginInit(); @@ -616,6 +616,46 @@ private void InitializeComponent() this.toolTip1.SetToolTip(this.CbProbe2ndChance, resources.GetString("CbProbe2ndChance.ToolTip")); this.CbProbe2ndChance.UseVisualStyleBackColor = true; // + // BtnHelp_ImportParameter + // + this.BtnHelp_ImportParameter.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.BtnHelp_ImportParameter, "BtnHelp_ImportParameter"); + this.BtnHelp_ImportParameter.Name = "BtnHelp_ImportParameter"; + this.BtnHelp_ImportParameter.Tag = "id=form-probe#edgefinder"; + this.toolTip1.SetToolTip(this.BtnHelp_ImportParameter, resources.GetString("BtnHelp_ImportParameter.ToolTip")); + this.BtnHelp_ImportParameter.UseVisualStyleBackColor = false; + this.BtnHelp_ImportParameter.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); + // + // button1 + // + this.button1.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.button1, "button1"); + this.button1.Name = "button1"; + this.button1.Tag = "id=form-probe#centerfinder"; + this.toolTip1.SetToolTip(this.button1, resources.GetString("button1.ToolTip")); + this.button1.UseVisualStyleBackColor = false; + this.button1.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); + // + // button2 + // + this.button2.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.button2, "button2"); + this.button2.Name = "button2"; + this.button2.Tag = "id=form-probe#toollength"; + this.toolTip1.SetToolTip(this.button2, resources.GetString("button2.ToolTip")); + this.button2.UseVisualStyleBackColor = false; + this.button2.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); + // + // button3 + // + this.button3.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.button3, "button3"); + this.button3.Name = "button3"; + this.button3.Tag = "id=form-probe#fiducial"; + this.toolTip1.SetToolTip(this.button3, resources.GetString("button3.ToolTip")); + this.button3.UseVisualStyleBackColor = false; + this.button3.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); + // // gBMovement // this.gBMovement.Controls.Add(this.nUDProbeFeedZ); @@ -1172,46 +1212,6 @@ private void InitializeComponent() this.timerFlowControl.Interval = 500; this.timerFlowControl.Tick += new System.EventHandler(this.TimerFlowControl_Tick); // - // BtnHelp_ImportParameter - // - this.BtnHelp_ImportParameter.BackColor = System.Drawing.Color.SkyBlue; - resources.ApplyResources(this.BtnHelp_ImportParameter, "BtnHelp_ImportParameter"); - this.BtnHelp_ImportParameter.Name = "BtnHelp_ImportParameter"; - this.BtnHelp_ImportParameter.Tag = "id=form-probe#edgefinder"; - this.toolTip1.SetToolTip(this.BtnHelp_ImportParameter, resources.GetString("BtnHelp_ImportParameter.ToolTip")); - this.BtnHelp_ImportParameter.UseVisualStyleBackColor = false; - this.BtnHelp_ImportParameter.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); - // - // button1 - // - this.button1.BackColor = System.Drawing.Color.SkyBlue; - resources.ApplyResources(this.button1, "button1"); - this.button1.Name = "button1"; - this.button1.Tag = "id=form-probe#centerfinder"; - this.toolTip1.SetToolTip(this.button1, resources.GetString("button1.ToolTip")); - this.button1.UseVisualStyleBackColor = false; - this.button1.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); - // - // button2 - // - this.button2.BackColor = System.Drawing.Color.SkyBlue; - resources.ApplyResources(this.button2, "button2"); - this.button2.Name = "button2"; - this.button2.Tag = "id=form-probe#toollength"; - this.toolTip1.SetToolTip(this.button2, resources.GetString("button2.ToolTip")); - this.button2.UseVisualStyleBackColor = false; - this.button2.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); - // - // button3 - // - this.button3.BackColor = System.Drawing.Color.SkyBlue; - resources.ApplyResources(this.button3, "button3"); - this.button3.Name = "button3"; - this.button3.Tag = "id=form-probe#fiducial"; - this.toolTip1.SetToolTip(this.button3, resources.GetString("button3.ToolTip")); - this.button3.UseVisualStyleBackColor = false; - this.button3.Click += new System.EventHandler(this.BtnHelp_ImportParameter_Click); - // // ControlProbing // resources.ApplyResources(this, "$this"); diff --git a/GRBL-Plotter/MachineControl/ControlProbing.ar.resx b/GRBL-Plotter/MachineControl/ControlProbing.ar.resx index aef9a7aab..fbae71a1e 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.ar.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.ar.resx @@ -362,18 +362,6 @@ Z up = Z start + Z probing تخطي الخطوة الأولى عند جهة الاتصال - - بداية - - - بداية - - - إلغاء - - - بداية - ينتقل التخطي إلى الرقم الائتماني الأول إذا تم تشغيل المسبار بالفعل. الافتراض: تم نقل المسبار بالفعل فوق الاعتماد الأول. diff --git a/GRBL-Plotter/MachineControl/ControlProbing.cs.resx b/GRBL-Plotter/MachineControl/ControlProbing.cs.resx index d257add7d..c36b04b11 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.cs.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.cs.resx @@ -359,18 +359,6 @@ Z se vrátí zpět do výchozí polohy Výchozí souřadnice: Budou použity pouze 1. a 2. souřadnice. Získejte souřadnice referenčních značek z importované grafiky. - - Start - - - Start - - - zrušení - - - Start - Přeskočte 1. tah při kontaktu diff --git a/GRBL-Plotter/MachineControl/ControlProbing.de-DE.resx b/GRBL-Plotter/MachineControl/ControlProbing.de-DE.resx index 3af44c909..517b9b826 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.de-DE.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.de-DE.resx @@ -151,13 +151,13 @@ Hardware Abmessungen - Offset to probed zero position, caused by touch plate, gage block or aluminum foil + Versatz zur angetasteten Nullposition, verursacht durch Endmaß oder Aluminiumfolie - Offset to probed zero position, caused by touch plate, gage block or aluminum foil + Versatz zur angetasteten Nullposition, verursacht durch Endmaß oder Aluminiumfolie - Offset to probed zero position, caused by touch plate, gage block or aluminum foil + Versatz zur angetasteten Nullposition, verursacht durch Endmaß oder Aluminiumfolie Sicherheitsabstand @@ -367,7 +367,7 @@ Erhalten Sie Bezugskoordinaten aus importierten Grafiken. Annahme: Sonde wurde bereits über den 1. Referenzpunkt bewegt. - Holen Sie sich Pos. + Pos. übernehmen Aktuelle Position übernehmen @@ -390,18 +390,6 @@ Annahme: Sonde wurde bereits über den 1. Referenzpunkt bewegt. Wenn der Taster nach der Bewegung zur zweiten Bezugsmarke nicht ausgelöst wird, geben Sie dem Benutzer die Möglichkeit, ihn manuell zu bewegen. - - Start - - - Start - - - Abbruch - - - Start - Onlinehilfe diff --git a/GRBL-Plotter/MachineControl/ControlProbing.es.resx b/GRBL-Plotter/MachineControl/ControlProbing.es.resx index 349470c06..0baebe6c0 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.es.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.es.resx @@ -358,18 +358,6 @@ Por lo general, el borde de la herramienta (sonda / cortador) se utiliza para de Coordenadas fiduciales: Sólo se utilizarán la 1ª y 2ª. Obtenga coordenadas fiduciales a partir de gráficos importados. - - comienzo - - - comienzo - - - Cancelar - - - comienzo - Saltar el primer movimiento al contacto diff --git a/GRBL-Plotter/MachineControl/ControlProbing.fr.resx b/GRBL-Plotter/MachineControl/ControlProbing.fr.resx index 83bf9cc2b..8fb34e996 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.fr.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.fr.resx @@ -358,18 +358,6 @@ Habituellement, la bordure de l'outil (palpeur / couteau) est utilisée pour dé Coordonnées de repère : seuls le 1er et le 2e seront utilisés. Obtenez les coordonnées des repères à partir du graphique importé. - - Début - - - Début - - - Annuler - - - Début - Sauter le 1er mouvement au contact diff --git a/GRBL-Plotter/MachineControl/ControlProbing.it.resx b/GRBL-Plotter/MachineControl/ControlProbing.it.resx index 79a9ff823..86dffa402 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.it.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.it.resx @@ -357,18 +357,6 @@ Oppure abilitare 'Inizia dal centro' e posizionare la sonda centrata sopra il pe Coordinate fiduciarie: verranno utilizzate solo la 1a e la 2a. Ottieni le coordinate fiduciarie dal grafico importato. - - Inizio - - - Inizio - - - Annulla - - - Inizio - Salta la prima mossa al contatto diff --git a/GRBL-Plotter/MachineControl/ControlProbing.ja.resx b/GRBL-Plotter/MachineControl/ControlProbing.ja.resx index 39dfe1ec7..c1c4ef755 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.ja.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.ja.resx @@ -359,18 +359,6 @@ Zは開始位置に戻ります 基準座標: 1 番目と 2 番目のみが使用されます。 インポートされたグラフィックから基準座標を取得します。 - - 開始 - - - 開始 - - - キャンセル - - - 開始 - 接触時に最初の移動をスキップ diff --git a/GRBL-Plotter/MachineControl/ControlProbing.pl.resx b/GRBL-Plotter/MachineControl/ControlProbing.pl.resx index 1528b0e2f..185cc4d62 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.pl.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.pl.resx @@ -202,12 +202,12 @@ Maksymalna odległość do pokonania, aby znaleźć krawędź - Znajdź środek i ustaw 0;0 -Z w górę = Z start + Z sondowanie + Znajdź środek i ustaw 0;0 +Z w górę = Z start + Z sondowanie Ostatecznie przejdź do środka - Znajdź środek i ustaw 0;0 + Znajdź środek i ustaw 0;0 Ostatecznie przejdź do środka @@ -235,7 +235,7 @@ Ostatecznie przejdź do środka Ustaw środek narzędzia jako zero - Jeśli opcja jest zaznaczona, środek narzędzia (sondy/frezu) definiuje pozycję zerową. + Jeśli opcja jest zaznaczona, środek narzędzia (sondy/frezu) definiuje pozycję zerową. Zazwyczaj granica narzędzia (sondy/frezu) jest używana do zdefiniowania zera. @@ -266,10 +266,10 @@ Zazwyczaj granica narzędzia (sondy/frezu) jest używana do zdefiniowania zera.< Średnica przedmiotu obrabianego (WpD) - Kontur wewnętrzny: -Umieść sondę wewn. otworu obiektu, prawie na środku. Z nie przesunie się. - -Kontur zewnętrzny: + Kontur wewnętrzny: +Umieść sondę wewn. otworu obiektu, prawie na środku. Z nie przesunie się. + +Kontur zewnętrzny: Umieść sondę po lewej stronie obiektu, tak jak w przypadku wykr. krawędzi lub włącz opcję "Rozpocznij od środka" i umieść sondę centralnie nad obiektem. @@ -282,9 +282,9 @@ Umieść sondę po lewej stronie obiektu, tak jak w przypadku wykr. krawędzi lu Zmierzony kąt korekcji - Wybierz krawędź lub narożnik. -Umieść końcówkę narzędzia przed krawędzią. -Dla narożników najp. zostanie sprawdzony X, później Y. Z będzie badane jako ostatnie. + Wybierz krawędź lub narożnik. +Umieść końcówkę narzędzia przed krawędzią. +Dla narożników najp. zostanie sprawdzony X, później Y. Z będzie badane jako ostatnie. Zbadaj krawędź po raz drugi w innej pozycji, aby uzyskać kąt. @@ -304,11 +304,11 @@ innej pozycji, aby uzyskać kąt. Wyczyść offset długości narzędzia - 1. Uzyskaj długość narzędzia dla 1. narzędzia -2. Użyj G92, aby ustawić zero Z -3. Po zmianie narzędzia wystarczy ponownie zmierzyć długość narzędzia, a współrzędna Z zostanie skorygowana. - -Po pomiarze długości narzędzia: + 1. Uzyskaj długość narzędzia dla 1. narzędzia +2. Użyj G92, aby ustawić zero Z +3. Po zmianie narzędzia wystarczy ponownie zmierzyć długość narzędzia, a współrzędna Z zostanie skorygowana. + +Po pomiarze długości narzędzia: Z powróci do pozycji początkowej @@ -357,18 +357,6 @@ Z powróci do pozycji początkowej Współrzędne odniesienia: użyte zostaną tylko 1. i 2. współrzędne. Uzyskaj współrzędne odniesienia z importowanej grafiki. - - Start - - - Start - - - Anuluj - - - Start - Pomiń pierwszy ruch przy kontakcie diff --git a/GRBL-Plotter/MachineControl/ControlProbing.pt.resx b/GRBL-Plotter/MachineControl/ControlProbing.pt.resx index 0e2ccb805..990ddef5b 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.pt.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.pt.resx @@ -364,18 +364,6 @@ Z voltará à posição inicial Coordenadas fiduciais: Somente a 1ª e a 2ª serão utilizadas. Obtenha coordenadas fiduciais do gráfico importado. - - Começar - - - Começar - - - Cancelar - - - Começar - Pular o primeiro movimento no contato diff --git a/GRBL-Plotter/MachineControl/ControlProbing.resx b/GRBL-Plotter/MachineControl/ControlProbing.resx index cfdb4dfd3..b49101c30 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.resx @@ -138,6 +138,9 @@ Probe / cutter diameter (PD) + + 17, 17 + Diameter of probing tip or cutter head to calculate zero position @@ -282,126 +285,6 @@ 21 - - LblProbeContact - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 0 - - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 1 - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 2 - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 3 - - - nUDProbeDiameter - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 4 - - - nUDOffsetX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 5 - - - nUDOffsetY - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 6 - - - nUDOffsetZ - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gBHardware - - - 7 - - - 3, 3 - - - 304, 79 - - - 22 - - - Hardware dimensions - - - gBHardware - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - True @@ -420,6 +303,18 @@ Probe contact + + LblProbeContact + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 0 + True @@ -438,6 +333,18 @@ Z + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 1 + True @@ -456,6 +363,18 @@ Y + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 2 + True @@ -474,6 +393,18 @@ X + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 3 + 150, 14 @@ -489,6 +420,18 @@ Diameter of probing tip or cutter head to calculate zero position + + nUDProbeDiameter + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 4 + 150, 51 @@ -504,6 +447,18 @@ Offset to probed zero position, caused by gage block or aluminum foil + + nUDOffsetX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 5 + 200, 51 @@ -519,6 +474,18 @@ Offset to probed zero position, caused by gage block or aluminum foil + + nUDOffsetY + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 6 + 250, 51 @@ -534,6 +501,42 @@ Offset to probed zero position, caused by gage block or aluminum foil + + nUDOffsetZ + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBHardware + + + 7 + + + 3, 3 + + + 304, 79 + + + 22 + + + Hardware dimensions + + + gBHardware + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + True @@ -1234,7 +1237,7 @@ Usually the border of the tool (probe / cutter) is used to define zero. 6, 245 - 108, 17 + 121, 17 3 @@ -1330,7 +1333,7 @@ Assumption: probe was already moved above 1st fiducial. False - 85, 16 + 85, 30 77, 22 @@ -1360,7 +1363,7 @@ Assumption: probe was already moved above 1st fiducial. NoControl - 100, 37 + 100, 51 22, 22 @@ -1390,7 +1393,7 @@ Assumption: probe was already moved above 1st fiducial. NoControl - 128, 37 + 128, 51 22, 22 @@ -1449,113 +1452,125 @@ Assumption: probe was already moved above 1st fiducial. 2 - - nUDProbeFeedZ + + NoControl - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 343, 1 - - gBMovement + + 23, 23 - - 0 + + 28 - - label8 + + ? - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Online help - - gBMovement + + BtnHelp_ImportParameter - - 7 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label9 + + tabPage1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - gBMovement + + NoControl - - 9 + + 343, 1 - - label10 + + 23, 23 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 49 - - gBMovement + + ? - - 10 + + Online help - - nUDProbeFeedXY + + button1 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gBMovement + + tabPage2 - - 12 + + 0 - - label13 + + NoControl - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 343, 1 - - gBMovement + + 23, 23 - - 18 + + 46 - - label15 + + ? - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Online help - - gBMovement + + button2 - - 19 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 88 + + tabPage3 - - 304, 120 + + 0 - - 23 + + NoControl - - Probe movement + + 343, 1 - - gBMovement + + 23, 23 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 44 - - $this + + ? - - 2 + + Online help + + + button3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage4 + + + 0 248, 14 @@ -1569,6 +1584,18 @@ Assumption: probe was already moved above 1st fiducial. Right + + nUDProbeFeedZ + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBMovement + + + 0 + True @@ -1587,6 +1614,18 @@ Assumption: probe was already moved above 1st fiducial. Z + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBMovement + + + 7 + True @@ -1605,6 +1644,18 @@ Assumption: probe was already moved above 1st fiducial. Y + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBMovement + + + 9 + True @@ -1623,6 +1674,18 @@ Assumption: probe was already moved above 1st fiducial. X + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBMovement + + + 10 + 176, 14 @@ -1635,6 +1698,18 @@ Assumption: probe was already moved above 1st fiducial. Right + + nUDProbeFeedXY + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBMovement + + + 12 + True @@ -1650,6 +1725,18 @@ Assumption: probe was already moved above 1st fiducial. Z + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBMovement + + + 18 + True @@ -1668,42 +1755,119 @@ Assumption: probe was already moved above 1st fiducial. XY - - BtnHelp_ImportParameter + + label15 - - System.Windows.Forms.Button, 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 - - tabPage1 + + gBMovement - - 0 + + 19 - - label20 + + 3, 88 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 304, 120 - - tabPage1 + + 23 - - 4 + + Probe movement - - lblEFStatus + + gBMovement - - System.Windows.Forms.Label, 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 - + + $this + + + 2 + + + True + + + NoControl + + + 48, 217 + + + 133, 13 + + + 35 + + + Measured correction angle + + + label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 4 + + + True + + + NoControl + + + 196, 214 + + + 0, 13 + + + 34 + + + lblEFStatus + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage1 5 + + NoControl + + + 196, 29 + + + 168, 141 + + + 33 + + + Select egde or corner to detect. +Place tool tip in front of edge. +On corners, X will be probed first, then Y. +Z will be probed last. + +Probe edge a 2nd time on another position to get angle. + label19 @@ -1716,6 +1880,24 @@ Assumption: probe was already moved above 1st fiducial. 6 + + True + + + NoControl + + + 196, 170 + + + 48, 13 + + + 29 + + + Progress + lblEFProgressInfo @@ -1728,6 +1910,24 @@ Assumption: probe was already moved above 1st fiducial. 7 + + False + + + NoControl + + + 196, 236 + + + 75, 23 + + + 1 + + + Start + BtnStartEF @@ -1740,6 +1940,21 @@ Assumption: probe was already moved above 1st fiducial. 8 + + True + + + NoControl + + + 210, 191 + + + 0, 13 + + + 28 + lblEFProgress @@ -1752,6 +1967,27 @@ Assumption: probe was already moved above 1st fiducial. 9 + + Button + + + Flat + + + NoControl + + + 126, 149 + + + 60, 60 + + + 10 + + + TopLeft + rB9 @@ -1764,6 +2000,18 @@ Assumption: probe was already moved above 1st fiducial. 10 + + NoControl + + + 196, 186 + + + 166, 23 + + + 27 + progressBarEF @@ -1776,6 +2024,21 @@ Assumption: probe was already moved above 1st fiducial. 11 + + NoControl + + + 287, 236 + + + 75, 23 + + + 2 + + + Cancel + btnCancelEF @@ -1788,6 +2051,27 @@ Assumption: probe was already moved above 1st fiducial. 12 + + Button + + + Flat + + + NoControl + + + 66, 149 + + + 60, 60 + + + 9 + + + TopCenter + rB8 @@ -1800,6 +2084,27 @@ Assumption: probe was already moved above 1st fiducial. 13 + + Button + + + Flat + + + NoControl + + + 6, 149 + + + 60, 60 + + + 8 + + + TopRight + rB7 @@ -1812,6 +2117,24 @@ Assumption: probe was already moved above 1st fiducial. 14 + + Button + + + Flat + + + NoControl + + + 126, 89 + + + 60, 60 + + + 7 + rB6 @@ -1824,20 +2147,65 @@ Assumption: probe was already moved above 1st fiducial. 15 - - rB5 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Button - - tabPage1 + + Flat - - 16 + + NoControl - - rB4 + + 66, 89 + + + 60, 60 + + + 6 + + + Only Z + + + MiddleCenter + + + rB5 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 16 + + + Button + + + Flat + + + NoControl + + + 6, 89 + + + 60, 60 + + + 5 + + + MiddleRight + + + rB4 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1848,6 +2216,27 @@ Assumption: probe was already moved above 1st fiducial. 17 + + Button + + + Flat + + + NoControl + + + 126, 29 + + + 60, 60 + + + 4 + + + BottomLeft + rB3 @@ -1860,6 +2249,27 @@ Assumption: probe was already moved above 1st fiducial. 18 + + Button + + + Flat + + + NoControl + + + 66, 29 + + + 60, 60 + + + 3 + + + BottomCenter + rB2 @@ -1872,6 +2282,27 @@ Assumption: probe was already moved above 1st fiducial. 19 + + Button + + + Flat + + + NoControl + + + 6, 29 + + + 60, 60 + + + 2 + + + BottomRight + rB1 @@ -1911,17 +2342,17 @@ Assumption: probe was already moved above 1st fiducial. 0 - - button1 + + 3, 191 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 129, 46 - - tabPage2 + + 45 - - 0 + + Rotate probing pattern by lblCFAngle @@ -1935,6 +2366,21 @@ Assumption: probe was already moved above 1st fiducial. 5 + + True + + + NoControl + + + 196, 214 + + + 0, 13 + + + 42 + lblCFStatus @@ -1947,6 +2393,24 @@ Assumption: probe was already moved above 1st fiducial. 8 + + True + + + NoControl + + + 196, 170 + + + 48, 13 + + + 40 + + + Progress + lblCFProgressInfo @@ -1959,6 +2423,24 @@ Assumption: probe was already moved above 1st fiducial. 9 + + False + + + NoControl + + + 196, 236 + + + 75, 23 + + + 1 + + + Start + BtnStartCF @@ -1971,6 +2453,21 @@ Assumption: probe was already moved above 1st fiducial. 10 + + True + + + NoControl + + + 210, 191 + + + 0, 13 + + + 39 + lblCFProgress @@ -1983,6 +2480,18 @@ Assumption: probe was already moved above 1st fiducial. 11 + + NoControl + + + 196, 186 + + + 166, 23 + + + 38 + progressBarCF @@ -1995,6 +2504,21 @@ Assumption: probe was already moved above 1st fiducial. 12 + + NoControl + + + 287, 236 + + + 75, 23 + + + 2 + + + Cancel + BtnCancelCF @@ -2007,6 +2531,21 @@ Assumption: probe was already moved above 1st fiducial. 13 + + NoControl + + + 6, 6 + + + 114, 28 + + + 43 + + + Workpiece diameter (WpD) + label22 @@ -2019,23 +2558,45 @@ Assumption: probe was already moved above 1st fiducial. 16 - - label21 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - tabPage2 + + 196, 12 - - 17 + + 168, 158 - - 4, 22 + + 41 - - 3, 3, 3, 3 + + Inner contour: +Place probe inside hole of work piece, almost centered. +Z will not moved. + +Outside contour: +Place probe on left side of work piece, as for edge detection. +Or enable 'Start from center' and place probe centered above workpiece. + + + + label21 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 17 + + + 4, 22 + + + 3, 3, 3, 3 367, 265 @@ -2058,17 +2619,17 @@ Assumption: probe was already moved above 1st fiducial. 1 - - button2 + + 6, 236 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 144, 23 - - tabPage3 + + 3 - - 0 + + Clear tool length offset btnClearTL @@ -2082,6 +2643,15 @@ Assumption: probe was already moved above 1st fiducial. 2 + + 50, 7 + + + 100, 100 + + + 42 + pBTL @@ -2094,6 +2664,21 @@ Assumption: probe was already moved above 1st fiducial. 3 + + True + + + NoControl + + + 196, 214 + + + 0, 13 + + + 41 + lblTLStatus @@ -2106,6 +2691,26 @@ Assumption: probe was already moved above 1st fiducial. 4 + + NoControl + + + 196, 12 + + + 168, 134 + + + 40 + + + 1. Get tool length for 1st tool +2. Use G92 to set Z zero +3. After tool change, just measure tool length again, Z coordinate will then corrected. + +After tool length probing: +Z will move back to start position + label12 @@ -2118,6 +2723,24 @@ Assumption: probe was already moved above 1st fiducial. 5 + + True + + + NoControl + + + 196, 170 + + + 48, 13 + + + 39 + + + Progress + lblTLProgressInfo @@ -2130,6 +2753,21 @@ Assumption: probe was already moved above 1st fiducial. 6 + + NoControl + + + 196, 236 + + + 75, 23 + + + 1 + + + Start + BtnStartTL @@ -2142,6 +2780,21 @@ Assumption: probe was already moved above 1st fiducial. 7 + + True + + + NoControl + + + 210, 191 + + + 0, 13 + + + 38 + lblTLProgress @@ -2154,6 +2807,18 @@ Assumption: probe was already moved above 1st fiducial. 8 + + NoControl + + + 196, 186 + + + 166, 23 + + + 37 + progressBarTL @@ -2166,6 +2831,21 @@ Assumption: probe was already moved above 1st fiducial. 9 + + NoControl + + + 287, 236 + + + 75, 23 + + + 2 + + + Cancel + btnCancelTL @@ -2205,35 +2885,17 @@ Assumption: probe was already moved above 1st fiducial. 2 - - NoControl - - - 343, 1 - - - 23, 23 - - - 44 - - - ? - - - Online help - - - button3 + + 17, 30 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 60, 20 - - tabPage4 + + 37 - - 0 + + Right NudProbeFiducialOffsetX @@ -2247,6 +2909,18 @@ Assumption: probe was already moved above 1st fiducial. 2 + + 17, 51 + + + 60, 20 + + + 38 + + + Right + NudProbeFiducialOffsetY @@ -2259,6 +2933,24 @@ Assumption: probe was already moved above 1st fiducial. 3 + + True + + + NoControl + + + 3, 32 + + + 14, 13 + + + 27 + + + X + label16 @@ -2271,6 +2963,24 @@ Assumption: probe was already moved above 1st fiducial. 5 + + True + + + NoControl + + + 3, 53 + + + 14, 13 + + + 27 + + + Y + label17 @@ -2287,7 +2997,7 @@ Assumption: probe was already moved above 1st fiducial. 6, 72 - 168, 62 + 168, 79 42 @@ -2364,833 +3074,111 @@ Assumption: probe was already moved above 1st fiducial. 6 - - NoControl - - - 287, 236 - - - 75, 23 - - - 2 - - - Cancel - - - BtnCancelFiducial - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage4 - - - 7 - - - 180, 12 - - - 181, 150 - - - 30 - - - Fiducial correction: -Use an inductive proximity switch to find and center metal registration marks (coins). - -See [Setup - Program behavior - Camera - Fiducials] for further settings. - - - LblFiducial - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage4 - - - 8 - - - 4, 22 - - - 3, 3, 3, 3 - - - 367, 265 - - - 3 - - - Fiducial correction - - - tabPage4 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 3 - - - 310, 3 - - - 375, 291 - - - 26 - - - tabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - True - - - NoControl - - - 48, 217 - - - 133, 13 - - - 35 - - - Measured correction angle - - - True - - - NoControl - - - 196, 214 - - - 0, 13 - - - 34 - - - NoControl - - - 196, 29 - - - 168, 141 - - - 33 - - - Select egde or corner to detect. -Place tool tip in front of edge. -On corners, X will be probed first, then Y. -Z will be probed last. - -Probe edge a 2nd time on another position to get angle. - - - True - - - NoControl - - - 196, 170 - - - 48, 13 - - - 29 - - - Progress - - - False - - - NoControl - - - 196, 236 - - - 75, 23 - - - 1 - - - Start - - - True - - - NoControl - - - 210, 191 - - - 0, 13 - - - 28 - - - Button - - - Flat - - - NoControl - - - 126, 149 - - - 60, 60 - - - 10 - - - TopLeft - - - NoControl - - - 196, 186 - - - 166, 23 - - - 27 - - - NoControl - - - 287, 236 - - - 75, 23 - - - 2 - - - Cancel - - - Button - - - Flat - - - NoControl - - - 66, 149 - - - 60, 60 - - - 9 - - - TopCenter - - - Button - - - Flat - - - NoControl - - - 6, 149 - - - 60, 60 - - - 8 - - - TopRight - - - Button - - - Flat - - - NoControl - - - 126, 89 - - - 60, 60 - - - 7 - - - Button - - - Flat - - - NoControl - - - 66, 89 - - - 60, 60 - - - 6 - - - Only Z - - - MiddleCenter - - - Button - - - Flat - - - NoControl - - - 6, 89 - - - 60, 60 - - - 5 - - - MiddleRight - - - Button - - - Flat - - - NoControl - - - 126, 29 - - - 60, 60 - - - 4 - - - BottomLeft - - - Button - - - Flat - - - NoControl - - - 66, 29 - - - 60, 60 - - - 3 - - - BottomCenter - - - Button - - - Flat - - - NoControl - - - 6, 29 - - - 60, 60 - - - 2 - - - BottomRight - - - 3, 191 - - - 129, 46 - - - 45 - - - Rotate probing pattern by - - - True - - - NoControl - - - 196, 214 - - - 0, 13 - - - 42 - - - True - - - NoControl - - - 196, 170 - - - 48, 13 - - - 40 - - - Progress - - - False - - - NoControl - - - 196, 236 - - - 75, 23 - - - 1 - - - Start - - - True - - - NoControl - - - 210, 191 - - - 0, 13 - - - 39 - - - NoControl - - - 196, 186 - - - 166, 23 - - - 38 - - - NoControl - - - 287, 236 - - - 75, 23 - - - 2 - - - Cancel - - - NoControl - - - 6, 6 - - - 114, 28 - - - 43 - - - Workpiece diameter (WpD) - - - NoControl - - - 196, 12 - - - 168, 158 - - - 41 - - - Inner contour: -Place probe inside hole of work piece, almost centered. -Z will not moved. - -Outside contour: -Place probe on left side of work piece, as for edge detection. -Or enable 'Start from center' and place probe centered above workpiece. - - - - 6, 236 - - - 144, 23 - - - 3 - - - Clear tool length offset - - - 50, 7 - - - 100, 100 - - - 42 - - - True - - - NoControl - - - 196, 214 - - - 0, 13 - - - 41 - - - NoControl - - - 196, 12 - - - 168, 134 - - - 40 - - - 1. Get tool length for 1st tool -2. Use G92 to set Z zero -3. After tool change, just measure tool length again, Z coordinate will then corrected. - -After tool length probing: -Z will move back to start position - - - True - - - NoControl - - - 196, 170 - - - 48, 13 - - - 39 - - - Progress - - - NoControl - - - 196, 236 - - - 75, 23 - - - 1 - - - Start - - - True - - - NoControl - - - 210, 191 - - - 0, 13 - - - 38 - - - NoControl - - - 196, 186 - - - 166, 23 - - - 37 - - - NoControl - - - 287, 236 - - - 75, 23 - - - 2 - - - Cancel - - - 17, 16 - - - 60, 20 - - - 37 - - - Right - - - 17, 37 - - - 60, 20 - - - 38 - - - Right - - - True - - + NoControl - - 3, 18 - - - 14, 13 + + 287, 236 - - 27 + + 75, 23 - - X + + 2 - - True + + Cancel - - NoControl + + BtnCancelFiducial - - 3, 39 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 14, 13 + + tabPage4 - - 27 + + 7 - - Y + + 180, 12 - - btnProbeCoordClear + + 181, 150 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 30 - - gBCoordinates + + Fiducial correction: +Use an inductive proximity switch to find and center metal registration marks (coins). + +See [Setup - Program behavior - Camera - Fiducials] for further settings. - - 0 + + LblFiducial - - rBProbeCoord2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage4 - - gBCoordinates + + 8 - - 1 + + 4, 22 - - rBProbeCoord1 + + 3, 3, 3, 3 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 367, 265 - - gBCoordinates + + 3 - - 2 + + Fiducial correction - - label11 + + tabPage4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gBCoordinates + + tabControl1 - + 3 - - 3, 214 - - - 304, 76 + + 310, 3 - - 27 + + 375, 291 - - Coordinates + + 26 - - gBCoordinates + + tabControl1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 0 + + 1 + + 114, 17 + 226, 33 @@ -3203,6 +3191,18 @@ Z will move back to start position Clear G92 + + btnProbeCoordClear + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBCoordinates + + + 0 + True @@ -3218,6 +3218,18 @@ Z will move back to start position Use G92 + + rBProbeCoord2 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBCoordinates + + + 1 + True @@ -3233,6 +3245,18 @@ Z will move back to start position Use G10 L2 P0 - Set coord. (G54-G59) + + rBProbeCoord1 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gBCoordinates + + + 2 + True @@ -3248,60 +3272,48 @@ Z will move back to start position ____________________________ - - NoControl - - - 343, 1 - - - 23, 23 - - - 28 - - - ? - - - Online help - - - NoControl + + label11 - - 343, 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 23, 23 + + gBCoordinates - - 49 + + 3 - - ? + + 3, 214 - - Online help + + 304, 76 - - NoControl + + 27 - - 343, 1 + + Coordinates - - 23, 23 + + gBCoordinates - - 46 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ? + + $this - - Online help + + 0 + + 202, 17 + + + True + 6, 13 @@ -3341,16 +3353,4 @@ Z will move back to start position System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - 114, 17 - - - 202, 17 - - - True - \ No newline at end of file diff --git a/GRBL-Plotter/MachineControl/ControlProbing.ru.resx b/GRBL-Plotter/MachineControl/ControlProbing.ru.resx index 728826fd8..0f8bef5a0 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.ru.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.ru.resx @@ -358,18 +358,6 @@ Z вернется в исходное положение Реперные координаты: будут использоваться только 1-я и 2-я. Получите координаты реперных точек из импортированной графики. - - Начало - - - Начало - - - Отмена - - - Начало - Пропустить первый ход при контакте diff --git a/GRBL-Plotter/MachineControl/ControlProbing.tr.resx b/GRBL-Plotter/MachineControl/ControlProbing.tr.resx index 85bafaaae..e50096f90 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.tr.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.tr.resx @@ -360,18 +360,6 @@ Z, başlangıç ​​konumuna geri döner Referans koordinatları: Yalnızca 1. ve 2. kullanılacaktır. İçe aktarılan grafikten referans koordinatlarını alın. - - Başlangıç - - - Başlangıç - - - İptal etmek - - - Başlangıç - Temas halinde 1. hamleyi atla diff --git a/GRBL-Plotter/MachineControl/ControlProbing.zh-CN.resx b/GRBL-Plotter/MachineControl/ControlProbing.zh-CN.resx index bcd706cd7..9b8e919e8 100644 --- a/GRBL-Plotter/MachineControl/ControlProbing.zh-CN.resx +++ b/GRBL-Plotter/MachineControl/ControlProbing.zh-CN.resx @@ -358,18 +358,6 @@ Z将移回起始位置 基准坐标：仅使用第一个和第二个基准坐标。 从导入的图形中获取基准坐标。 - - 开始 - - - 开始 - - - 取消 - - - 开始 - 接触时跳过第一步 diff --git a/GRBL-Plotter/MachineControl/GCode2DViewpaths.cs b/GRBL-Plotter/MachineControl/GCode2DViewpaths.cs index 2e9973d8a..9986f582e 100644 --- a/GRBL-Plotter/MachineControl/GCode2DViewpaths.cs +++ b/GRBL-Plotter/MachineControl/GCode2DViewpaths.cs @@ -1,7 +1,7 @@ /* GRBL-Plotter. Another GCode sender for GRBL. This file is part of the GRBL-Plotter application. - Copyright (C) 2015-2023 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 @@ -30,6 +30,7 @@ Fill GraphicPaths * 2023-04-11 l:683 f:CreateRuler lock object to avoid 'object is currently in use elsewhere' * 2023-09-01 new l:700 f:SetRulerDimension / l:380 f:DrawMachineLimit update grid * 2023-09-14 l:400 f:DrawMachineLimit() add toolTableOffsetX to show tool positions; issue #361 + * 2024-01-13 l:675 f:CreateMarkerArrow add try/catch */ using System; @@ -576,7 +577,8 @@ private static void AddBackgroundText(GraphicsPath path, PointF pos, float emSiz myFont.Dispose(); sFormat.Dispose(); } - catch (Exception err) { Logger.Error(err, "AddBackgroundText "); } + catch (Exception err) + { Logger.Error(err, "AddBackgroundText failed {0} ", txt); } } @@ -670,33 +672,39 @@ private static void CreateMarkerArrow(GraphicsPath path, float msize, XyPoint po float pointToY3 = (float)(pos.Y + msize * Math.Sin(angle + 3 * aoff)); float pointToX4 = (float)(pos.X + msize * Math.Cos(angle + 4 * aoff)); float pointToY4 = (float)(pos.Y + msize * Math.Sin(angle + 4 * aoff)); - path.Reset(); - // draw outline - path.StartFigure(); - path.AddLine(pointToX, pointToY, pointToX1, pointToY1); - path.AddLine(pointToX1, pointToY1, pointToX2, pointToY2); - path.AddLine(pointToX2, pointToY2, pointToX3, pointToY3); - if (type > 0) - { - path.AddLine(pointToX3, pointToY3, pointToX4, pointToY4); - path.AddLine(pointToX4, pointToY4, pointToX, pointToY); // square - } - else - path.AddLine(pointToX3, pointToY3, pointToX, pointToY); // rhombus - path.CloseFigure(); - // draw diagonal cross in center - float ssize = msize / 2; - if (type > 0) - { - path.StartFigure(); path.AddLine((float)pos.X - ssize, (float)pos.Y, (float)pos.X + ssize, (float)pos.Y); - path.StartFigure(); path.AddLine((float)pos.X, (float)pos.Y + ssize, (float)pos.X, (float)pos.Y - ssize); - } - else - { - ssize = msize / 3; - path.StartFigure(); path.AddLine((float)pos.X - ssize, (float)pos.Y - ssize, (float)pos.X + ssize, (float)pos.Y + ssize); - path.StartFigure(); path.AddLine((float)pos.X - ssize, (float)pos.Y + ssize, (float)pos.X + ssize, (float)pos.Y - ssize); - } + + try + { + path.Reset(); + // draw outline + path.StartFigure(); + path.AddLine(pointToX, pointToY, pointToX1, pointToY1); + path.AddLine(pointToX1, pointToY1, pointToX2, pointToY2); + path.AddLine(pointToX2, pointToY2, pointToX3, pointToY3); + if (type > 0) + { + path.AddLine(pointToX3, pointToY3, pointToX4, pointToY4); + path.AddLine(pointToX4, pointToY4, pointToX, pointToY); // square + } + else + path.AddLine(pointToX3, pointToY3, pointToX, pointToY); // rhombus + path.CloseFigure(); + // draw diagonal cross in center + float ssize = msize / 2; + if (type > 0) + { + path.StartFigure(); path.AddLine((float)pos.X - ssize, (float)pos.Y, (float)pos.X + ssize, (float)pos.Y); + path.StartFigure(); path.AddLine((float)pos.X, (float)pos.Y + ssize, (float)pos.X, (float)pos.Y - ssize); + } + else + { + ssize = msize / 3; + path.StartFigure(); path.AddLine((float)pos.X - ssize, (float)pos.Y - ssize, (float)pos.X + ssize, (float)pos.Y + ssize); + path.StartFigure(); path.AddLine((float)pos.X - ssize, (float)pos.Y + ssize, (float)pos.X + ssize, (float)pos.Y - ssize); + } + } + catch (Exception err) + { Logger.Error(err, "CreateMarkerArrow failed "); } } diff --git a/GRBL-Plotter/MachineControl/GCodeSimulate.cs b/GRBL-Plotter/MachineControl/GCodeSimulate.cs index 48fe308dc..612d56cdb 100644 --- a/GRBL-Plotter/MachineControl/GCodeSimulate.cs +++ b/GRBL-Plotter/MachineControl/GCodeSimulate.cs @@ -1,7 +1,7 @@ /* GRBL-Plotter. Another GCode sender for GRBL. This file is part of the GRBL-Plotter application. - Copyright (C) 2015-2021 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 @@ -25,6 +25,7 @@ You should have received a copy of the GNU General Public License * 2021-09-07 take care of tile-offset in ProcessedPathDraw * 2021-10-09 improove processedPath (remove glitches) * 2021-10-29 add option to shift processed tile path to work area - importGraphicClipShowOrigPositionShiftTileProcessed + * 2024-01-22 l:535 f:ProcessedPathDraw check index before use */ using System; @@ -532,7 +533,9 @@ internal static void ProcessedPathDraw(XyzPoint newPos) // called by OnRaisePo } // no match found, try new start-pos if (!onTrack) - { lastGCodePos = new XyzPoint(simuList[indexLastSucess].actualPos.X, simuList[indexLastSucess].actualPos.Y, simuList[indexLastSucess].actualPos.Z); } + { if ((indexLastSucess > 0) && (indexLastSucess < simuList.Count)) + { lastGCodePos = new XyzPoint(simuList[indexLastSucess].actualPos.X, simuList[indexLastSucess].actualPos.Y, simuList[indexLastSucess].actualPos.Z); } + } } private static PointF ToPointF(XyzPoint tmp) { return new PointF((float)tmp.X, (float)tmp.Y); } diff --git a/GRBL-Plotter/MachineControl/GCodeVisuAndTransform.cs b/GRBL-Plotter/MachineControl/GCodeVisuAndTransform.cs index 4512ce084..0c92cf204 100644 --- a/GRBL-Plotter/MachineControl/GCodeVisuAndTransform.cs +++ b/GRBL-Plotter/MachineControl/GCodeVisuAndTransform.cs @@ -1,7 +1,7 @@ /* GRBL-Plotter. Another GCode sender for GRBL. This file is part of the GRBL-Plotter application. - Copyright (C) 2015-2023 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 @@ -50,6 +50,7 @@ You should have received a copy of the GNU General Public License * 2021-07-27 code clean up / code quality * split code to GCodeAnalyze.cs, GCode2DViewPaths.cs * 2022-03-01 MarkSelectedGroup line 368 add try/catch for AddPath + * 2024-01-03 l:575 f:MarkSelectedCollection check if path has points before copying */ using System; @@ -112,7 +113,7 @@ public static bool ContainsTangential() /// public static void SetPosMarkerLine(int line, bool markFigure) { - if (logDetailed) + if (logDetailed) Logger.Trace(" SetPosMarkerLine line:{0} markFigure:{1}", line, markFigure); if (line < 0) return; @@ -557,7 +558,8 @@ public static void MarkSelectedCollection(int start) Logger.Info("MarkSelectedCollection start:{0} {1}", start, gcodeList[start].codeLine); int line; - for ( line = start + 1; line < gcodeList.Count; line++) // go through tile code lines + int numPoints = 0; + for (line = start + 1; line < gcodeList.Count; line++) // go through tile code lines { if (gcodeList[line].codeLine.Contains(XmlMarker.CollectionEnd)) break; @@ -568,9 +570,13 @@ public static void MarkSelectedCollection(int start) figures.Add(figNr); // collect figure nr. myPathIterator.Rewind(); for (int i = 1; i <= figNr; i++) - myPathIterator.NextMarker(tmpPath); // find figure path - pathMarkSelection.AddPath(tmpPath, false); // add figure path - lastFigureNumbers.Add(figNr); + numPoints = myPathIterator.NextMarker(tmpPath); // find figure path + + if (numPoints > 0) + { + pathMarkSelection.AddPath(tmpPath, false); // add figure path + lastFigureNumbers.Add(figNr); + } } } @@ -595,7 +601,7 @@ internal static bool GetPathCordinates(List posList, float maxDistance { } ImgPoint actualPos, lastPos; double dist; - float dX, dY; + double dX, dY; int steps, i; bool lastWasG0 = true; lastPos = new ImgPoint(); @@ -605,7 +611,7 @@ internal static bool GetPathCordinates(List posList, float maxDistance { foreach (GcodeByLine gcline in gcodeList) { - actualPos = new ImgPoint((float)(gcline.actualPos.X - offX), (float)(gcline.actualPos.Y - offY), gcline.motionMode); + actualPos = new ImgPoint((gcline.actualPos.X - offX), (gcline.actualPos.Y - offY), gcline.motionMode); if (gcline.motionMode > 0) { if (lastWasG0)