diff --git a/LaserGRBL/AssemblyInfo.cs b/LaserGRBL/AssemblyInfo.cs index 8113271c..4cd2c6f8 100644 --- a/LaserGRBL/AssemblyInfo.cs +++ b/LaserGRBL/AssemblyInfo.cs @@ -31,5 +31,5 @@ // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // utilizzando l'asterisco (*) come descritto di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("7.6.0")] +[assembly: AssemblyVersion ("7.6.1")] [assembly: NeutralResourcesLanguage("en")] diff --git a/LaserGRBL/UserControls/GrblPanel3D.Designer.cs b/LaserGRBL/UserControls/GrblPanel3D.Designer.cs index 7fce3f08..70708640 100644 --- a/LaserGRBL/UserControls/GrblPanel3D.Designer.cs +++ b/LaserGRBL/UserControls/GrblPanel3D.Designer.cs @@ -16,6 +16,7 @@ partial class GrblPanel3D private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GrblPanel3D)); this.TimDetectIssue = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); // @@ -29,8 +30,11 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; + this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.DoubleBuffered = true; this.Name = "GrblPanel3D"; - this.Size = new System.Drawing.Size(1170, 856); + this.Size = new System.Drawing.Size(834, 460); this.Load += new System.EventHandler(this.GrblPanel3D_Load); this.ResumeLayout(false); diff --git a/LaserGRBL/UserControls/GrblPanel3D.cs b/LaserGRBL/UserControls/GrblPanel3D.cs index d720df02..c32eac0d 100644 --- a/LaserGRBL/UserControls/GrblPanel3D.cs +++ b/LaserGRBL/UserControls/GrblPanel3D.cs @@ -138,7 +138,7 @@ public GrblPanel3D() mLastControlSize = new PointF(Width, Height); mGrid = new Grid3D(); - TH = new Tools.ThreadObject(DrawScene, 10, true, "OpenGL", InitializeOpenGL, ThreadPriority.Lowest, ApartmentState.STA); + TH = new Tools.ThreadObject(DrawScene, 10, true, "OpenGL", InitializeOpenGL, ThreadPriority.Normal, ApartmentState.STA); TH.Start(); } @@ -553,7 +553,7 @@ protected override void OnPaint(PaintEventArgs e) else if (OpCounter == 4) DrawException(e, "4.Draw Begin"); else if (mBmp == null) - DrawException(e, "nothing to draw"); + ; } private void DrawException(PaintEventArgs e, string text) diff --git a/LaserGRBL/UserControls/GrblPanel3D.resx b/LaserGRBL/UserControls/GrblPanel3D.resx index e9f77f8f..c902815f 100644 --- a/LaserGRBL/UserControls/GrblPanel3D.resx +++ b/LaserGRBL/UserControls/GrblPanel3D.resx @@ -123,4 +123,105 @@ 53 + + + + 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 + + \ No newline at end of file diff --git a/setup.iss b/setup.iss index f67c84f4..6a838785 100644 --- a/setup.iss +++ b/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "LaserGRBL" -#define MyAppVersion "7.6.0" +#define MyAppVersion "7.6.1" #define MyAppVersionName "Rhydon" #define MyAppPublisher "LaserGRBL" #define MyAppURL "https://lasergrbl.com"