Version 1.7.1.1

svenhb · Jan 24, 2024 · 94bd0a0 · 94bd0a0
1 parent dc47a8f
commit 94bd0a0
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 16 deletions.
diff --git a/GRBL-Plotter/GUI/AboutForm.resx b/GRBL-Plotter/GUI/AboutForm.resx
@@ -184,7 +184,7 @@
     <value>2</value>
   </data>
   <data name="label1.Text" xml:space="preserve">
-    <value>© 2015-2023 [email protected]</value>
+    <value>© 2015-2024 [email protected]</value>
   </data>
   <data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>TopCenter</value>
@@ -216,6 +216,9 @@
   <data name="linkLabel1.Text" xml:space="preserve">
     <value>Visit GRBL-Plotter on GitHub</value>
   </data>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="linkLabel1.ToolTip" xml:space="preserve">
     <value>Open brower and visit 'https://github.com/svenhb/GRBL-Plotter'</value>
   </data>
@@ -390,6 +393,9 @@
   <data name="&gt;&gt;linkLabel3.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
@@ -3426,10 +3432,4 @@
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
     <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
diff --git a/GRBL-Plotter/GUI/MainForm.Designer.cs b/GRBL-Plotter/GUI/MainForm.Designer.cs
diff --git a/GRBL-Plotter/GUI/MainForm.resx b/GRBL-Plotter/GUI/MainForm.resx
@@ -133,7 +133,7 @@
     <value>1</value>
   </data>
   <data name="fCTBCode.AutoScrollMinSize" type="System.Drawing.Size, System.Drawing">
-    <value>191, 12</value>
+    <value>214, 12</value>
   </data>
   <metadata name="cmsFCTB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>123, 56</value>
@@ -4906,7 +4906,7 @@ to how much it lost (this is the problem with steppers in general). Otherwise, G
     <value>Copy 2D-View image to clipboard</value>
   </data>
   <data name="cmsPictureBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 518</value>
+    <value>237, 496</value>
   </data>
   <data name="&gt;&gt;cmsPictureBox.Name" xml:space="preserve">
     <value>cmsPictureBox</value>

diff --git 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: [email protected]
+    Copyright (C) 2015-2024 Sven Hasemann contact: [email protected]
 
     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
@@ -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