From ceac663ed1d634c26ee5a67699b5623f04711ec5 Mon Sep 17 00:00:00 2001 From: Sven Date: Sun, 4 Feb 2024 16:29:40 +0100 Subject: [PATCH] Version 1.7.2.0 --- GRBL-Plotter/Properties/AssemblyInfo.cs | 4 +- GRBL-Plotter/Properties/Settings.Designer.cs | 102 ++++++++++++++----- GRBL-Plotter/Properties/Settings.settings | 12 +++ 3 files changed, 89 insertions(+), 29 deletions(-) diff --git a/GRBL-Plotter/Properties/AssemblyInfo.cs b/GRBL-Plotter/Properties/AssemblyInfo.cs index cf2d545c..d630536f 100644 --- a/GRBL-Plotter/Properties/AssemblyInfo.cs +++ b/GRBL-Plotter/Properties/AssemblyInfo.cs @@ -32,7 +32,7 @@ // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.1.1")] -[assembly: AssemblyFileVersion("1.7.1.1")] +[assembly: AssemblyVersion("1.7.2.0")] +[assembly: AssemblyFileVersion("1.7.2.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/GRBL-Plotter/Properties/Settings.Designer.cs b/GRBL-Plotter/Properties/Settings.Designer.cs index 45d3171c..de9e25fb 100644 --- a/GRBL-Plotter/Properties/Settings.Designer.cs +++ b/GRBL-Plotter/Properties/Settings.Designer.cs @@ -6700,6 +6700,54 @@ public bool importImageColorMode { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal importImageEngravingAngle { + get { + return ((decimal)(this["importImageEngravingAngle"])); + } + set { + this["importImageEngravingAngle"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importImageEngravingCross { + get { + return ((bool)(this["importImageEngravingCross"])); + } + set { + this["importImageEngravingCross"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool importImageEngravingOneDirection { + get { + return ((bool)(this["importImageEngravingOneDirection"])); + } + set { + this["importImageEngravingOneDirection"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool importImageEngravingTopDown { + get { + return ((bool)(this["importImageEngravingTopDown"])); + } + set { + this["importImageEngravingTopDown"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -6808,6 +6856,18 @@ public bool importImageSLasermodeStart { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importImageSLaserOnly { + get { + return ((bool)(this["importImageSLaserOnly"])); + } + set { + this["importImageSLaserOnly"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("100")] @@ -9234,61 +9294,49 @@ public string useCaseLastLoaded { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public decimal importImageEngravingAngle { + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importGraphicNoiseEnable { get { - return ((decimal)(this["importImageEngravingAngle"])); + return ((bool)(this["importGraphicNoiseEnable"])); } set { - this["importImageEngravingAngle"] = value; + this["importGraphicNoiseEnable"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool importImageEngravingOneDirection { + [global::System.Configuration.DefaultSettingValueAttribute("1")] + public decimal importGraphicNoiseAmplitude { get { - return ((bool)(this["importImageEngravingOneDirection"])); + return ((decimal)(this["importGraphicNoiseAmplitude"])); } set { - this["importImageEngravingOneDirection"] = value; + this["importGraphicNoiseAmplitude"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool importImageSLaserOnly { + [global::System.Configuration.DefaultSettingValueAttribute("1")] + public decimal importGraphicNoiseDensity { get { - return ((bool)(this["importImageSLaserOnly"])); + return ((decimal)(this["importGraphicNoiseDensity"])); } set { - this["importImageSLaserOnly"] = value; + this["importGraphicNoiseDensity"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool importImageEngravingCross { - get { - return ((bool)(this["importImageEngravingCross"])); - } - set { - this["importImageEngravingCross"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool importImageEngravingTopDown { + public bool importGraphicHatchFillNoise { get { - return ((bool)(this["importImageEngravingTopDown"])); + return ((bool)(this["importGraphicHatchFillNoise"])); } set { - this["importImageEngravingTopDown"] = value; + this["importGraphicHatchFillNoise"] = value; } } } diff --git a/GRBL-Plotter/Properties/Settings.settings b/GRBL-Plotter/Properties/Settings.settings index 116c09ff..58cf1455 100644 --- a/GRBL-Plotter/Properties/Settings.settings +++ b/GRBL-Plotter/Properties/Settings.settings @@ -1565,6 +1565,9 @@ False + + False + True @@ -1595,6 +1598,15 @@ False + + 1 + + + 1 + + + False + True