diff --git a/GRBL-Plotter/GUI/AboutForm.resx b/GRBL-Plotter/GUI/AboutForm.resx
index cb4b2a8de..9f5599312 100644
--- a/GRBL-Plotter/GUI/AboutForm.resx
+++ b/GRBL-Plotter/GUI/AboutForm.resx
@@ -184,7 +184,7 @@
2
- © 2015-2023 svenhb@web.de
+ © 2015-2024 svenhb@web.de
TopCenter
@@ -216,6 +216,9 @@
Visit GRBL-Plotter on GitHub
+
+ 17, 17
+
Open brower and visit 'https://github.com/svenhb/GRBL-Plotter'
@@ -390,6 +393,9 @@
0
+
+ True
+
6, 13
@@ -3426,10 +3432,4 @@
System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
-
- True
-
\ No newline at end of file
diff --git a/GRBL-Plotter/GUI/MainForm.Designer.cs b/GRBL-Plotter/GUI/MainForm.Designer.cs
index 63553c5f7..e7f6ada4e 100644
--- a/GRBL-Plotter/GUI/MainForm.Designer.cs
+++ b/GRBL-Plotter/GUI/MainForm.Designer.cs
@@ -1538,7 +1538,9 @@ private void InitializeComponent()
// rBOrigin7
//
resources.ApplyResources(this.rBOrigin7, "rBOrigin7");
+ this.rBOrigin7.Checked = true;
this.rBOrigin7.Name = "rBOrigin7";
+ this.rBOrigin7.TabStop = true;
this.rBOrigin7.UseVisualStyleBackColor = true;
//
// rBOrigin6
@@ -1550,9 +1552,7 @@ private void InitializeComponent()
// rBOrigin5
//
resources.ApplyResources(this.rBOrigin5, "rBOrigin5");
- this.rBOrigin5.Checked = true;
this.rBOrigin5.Name = "rBOrigin5";
- this.rBOrigin5.TabStop = true;
this.rBOrigin5.UseVisualStyleBackColor = true;
//
// rBOrigin4
diff --git a/GRBL-Plotter/GUI/MainForm.resx b/GRBL-Plotter/GUI/MainForm.resx
index d80f42c9b..836345db7 100644
--- a/GRBL-Plotter/GUI/MainForm.resx
+++ b/GRBL-Plotter/GUI/MainForm.resx
@@ -133,7 +133,7 @@
1
- 191, 12
+ 214, 12
123, 56
@@ -4906,7 +4906,7 @@ to how much it lost (this is the problem with steppers in general). Otherwise, G
Copy 2D-View image to clipboard
- 237, 518
+ 237, 496
cmsPictureBox
diff --git a/GRBL-Plotter/GUI/MainFormObjects.cs b/GRBL-Plotter/GUI/MainFormObjects.cs
index cfc5cb756..750b4a1d5 100644
--- a/GRBL-Plotter/GUI/MainFormObjects.cs
+++ b/GRBL-Plotter/GUI/MainFormObjects.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 @@ You should have received a copy of the GNU General Public License
* 2022-11-24 line 99 InsertVariable check length
* 2023-03-04 l:68 f:Datapath add path for "data"
* 2023-03-04 l:68 f:Datapath add path for "filter"
+ * 2024-01-20 l:484 f: struct ImgPoint change from float to double
*/
using GrblPlotter.Resources;
@@ -50,7 +51,7 @@ public enum LogEnables { None = 0, Level1 = 1, Level2 = 2, Level3 = 4, Level4 =
public static class MyApplication
{
- private static readonly string VersionAddOn = ".c";
+ private static readonly string VersionAddOn = "";
public static string GetVersion()
{ return System.Windows.Forms.Application.ProductVersion.ToString() + VersionAddOn; }
@@ -483,10 +484,10 @@ public static explicit operator XyArcPoint(XyPoint tmp)
internal struct ImgPoint
{
- public float X;
- public float Y;
+ public double X;
+ public double Y;
public int brightnes;
- public ImgPoint(float x, float y, int z)
+ public ImgPoint(double x, double y, int z)
{ X = x; Y = y; brightnes = z; }
// public ImgPoint(float x, float y)
// { X = x; Y = y; brightnes = -1; }
diff --git a/GRBL-Plotter/GUI/MainFormOtherForms.cs b/GRBL-Plotter/GUI/MainFormOtherForms.cs
index e80afd675..61c26a8a8 100644
--- a/GRBL-Plotter/GUI/MainFormOtherForms.cs
+++ b/GRBL-Plotter/GUI/MainFormOtherForms.cs
@@ -419,6 +419,8 @@ private void Laseropen(object sender, EventArgs e)
_laser_form = new ControlLaser();
_laser_form.FormClosed += FormClosed_LaserForm;
_laser_form.RaiseCmdEvent += OnRaiseLaserEvent;
+ _laser_form.BtnMaterialTest.Click += GetGCodeFromLaser; // assign btn-click event
+ _laser_form.BtnMaterialSingleTest.Click += GetGCodeFromLaser; // assign btn-click event
EventCollector.SetOpenForm("Flas");
}
else
@@ -442,6 +444,20 @@ private void OnRaiseLaserEvent(object sender, CmdEventArgs e)
Properties.Settings.Default.counterUseLaserSetup += 1;
}
+ private void GetGCodeFromLaser(object sender, EventArgs e)
+ {
+ if (!isStreaming)
+ {
+ ClearWorkspace();
+ NewCodeStart(false);
+ SetFctbCodeText(_laser_form.LaserGCode);
+ NewCodeEnd();
+ FoldBlocks1();
+ foldLevelSelected = 1;
+ }
+ else
+ MessageBox.Show(Localization.GetString("mainStreamingActive"));
+ }
/********************************************************************
* Edge finder