From d1808a9edb5fa1f001992f0e72c21300d637e59f Mon Sep 17 00:00:00 2001 From: Sven Date: Mon, 14 Aug 2023 17:12:55 +0200 Subject: [PATCH] Version 1.7.0.1 --- GRBL-Plotter/Properties/AssemblyInfo.cs | 4 +- GRBL-Plotter/Properties/Settings.Designer.cs | 128 ++++++++++++++++--- GRBL-Plotter/Properties/Settings.settings | 52 ++++++-- 3 files changed, 152 insertions(+), 32 deletions(-) diff --git a/GRBL-Plotter/Properties/AssemblyInfo.cs b/GRBL-Plotter/Properties/AssemblyInfo.cs index 8b5c55a0..651b70ae 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.0.0")] -[assembly: AssemblyFileVersion("1.7.0.0")] +[assembly: AssemblyVersion("1.7.0.1")] +[assembly: AssemblyFileVersion("1.7.0.1")] [assembly: NeutralResourcesLanguage("en")] diff --git a/GRBL-Plotter/Properties/Settings.Designer.cs b/GRBL-Plotter/Properties/Settings.Designer.cs index c65ee2cd..5a5959b2 100644 --- a/GRBL-Plotter/Properties/Settings.Designer.cs +++ b/GRBL-Plotter/Properties/Settings.Designer.cs @@ -4348,6 +4348,30 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("data\\scripts\\script_stamp_refresh.nc")] + public string importCircleToDotScript { + get { + return ((string)(this["importCircleToDotScript"])); + } + set { + this["importCircleToDotScript"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal importCircleToDotScriptCount { + get { + return ((decimal)(this["importCircleToDotScriptCount"])); + } + set { + this["importCircleToDotScriptCount"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -5226,7 +5250,7 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1")] + [global::System.Configuration.DefaultSettingValueAttribute("0")] public decimal importGCSegment { get { return ((decimal)(this["importGCSegment"])); @@ -6184,6 +6208,18 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importGraphicHatchFillDeletePath { + get { + return ((bool)(this["importGraphicHatchFillDeletePath"])); + } + set { + this["importGraphicHatchFillDeletePath"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("1")] @@ -6232,6 +6268,18 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importGraphicHatchFillInsetEnable2 { + get { + return ((bool)(this["importGraphicHatchFillInsetEnable2"])); + } + set { + this["importGraphicHatchFillInsetEnable2"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("5")] @@ -6808,6 +6856,18 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("6")] + public decimal importMessageDelay { + get { + return ((decimal)(this["importMessageDelay"])); + } + set { + this["importMessageDelay"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -6832,6 +6892,18 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importPWMFromWidth { + get { + return ((bool)(this["importPWMFromWidth"])); + } + set { + this["importPWMFromWidth"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -6952,6 +7024,18 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importSVGCircleToDotS { + get { + return ((bool)(this["importSVGCircleToDotS"])); + } + set { + this["importSVGCircleToDotS"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -7000,6 +7084,18 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importSVGMetaData { + get { + return ((bool)(this["importSVGMetaData"])); + } + set { + this["importSVGMetaData"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -8863,48 +8959,48 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool importPWMFromWidth { + public bool importGraphicSortDimension { get { - return ((bool)(this["importPWMFromWidth"])); + return ((bool)(this["importGraphicSortDimension"])); } set { - this["importPWMFromWidth"] = value; + this["importGraphicSortDimension"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool importSVGMetaData { + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool importGraphicLargestLast { get { - return ((bool)(this["importSVGMetaData"])); + return ((bool)(this["importGraphicLargestLast"])); } set { - this["importSVGMetaData"] = value; + this["importGraphicLargestLast"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("6")] - public decimal importMessageDelay { + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal importGraphicOffsetOriginX { get { - return ((decimal)(this["importMessageDelay"])); + return ((decimal)(this["importGraphicOffsetOriginX"])); } set { - this["importMessageDelay"] = value; + this["importGraphicOffsetOriginX"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool importSVGCircleToDotS { + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal importGraphicOffsetOriginY { get { - return ((bool)(this["importSVGCircleToDotS"])); + return ((decimal)(this["importGraphicOffsetOriginY"])); } set { - this["importSVGCircleToDotS"] = value; + this["importGraphicOffsetOriginY"] = value; } } } diff --git a/GRBL-Plotter/Properties/Settings.settings b/GRBL-Plotter/Properties/Settings.settings index ca957aa9..b01ae06e 100644 --- a/GRBL-Plotter/Properties/Settings.settings +++ b/GRBL-Plotter/Properties/Settings.settings @@ -1,4 +1,4 @@ - + @@ -1082,6 +1082,12 @@ 12 + + data\scripts\script_stamp_refresh.nc + + + 0 + True @@ -1302,7 +1308,7 @@ True - 1 + 0 True @@ -1541,6 +1547,9 @@ False + + False + 1 @@ -1553,6 +1562,12 @@ True + + False + + + True + 5 @@ -1583,6 +1598,15 @@ True + + 0 + + + 0 + + + False + True @@ -1697,12 +1721,18 @@ 0 + + 6 + False False + + False + True @@ -1733,6 +1763,9 @@ False + + False + False @@ -1745,6 +1778,9 @@ 100 + + False + False @@ -2210,17 +2246,5 @@ ? - - False - - - False - - - 6 - - - False - \ No newline at end of file