From ebb35cd1d31c34a4e99e1a8524009c1088358603 Mon Sep 17 00:00:00 2001 From: Sven Date: Sun, 18 Aug 2024 20:36:56 +0200 Subject: [PATCH] Version 1.7.4.0 --- GRBL-Plotter/Properties/AssemblyInfo.cs | 4 +- GRBL-Plotter/Properties/Settings.Designer.cs | 338 ++++++++++++++++++- GRBL-Plotter/Properties/Settings.settings | 94 +++++- 3 files changed, 413 insertions(+), 23 deletions(-) diff --git a/GRBL-Plotter/Properties/AssemblyInfo.cs b/GRBL-Plotter/Properties/AssemblyInfo.cs index d8e53919..b2e0e971 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.3.2")] -[assembly: AssemblyFileVersion("1.7.3.2")] +[assembly: AssemblyVersion("1.7.4.0")] +[assembly: AssemblyFileVersion("1.7.4.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/GRBL-Plotter/Properties/Settings.Designer.cs b/GRBL-Plotter/Properties/Settings.Designer.cs index e266e1a4..2f160212 100644 --- a/GRBL-Plotter/Properties/Settings.Designer.cs +++ b/GRBL-Plotter/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GrblPlotter.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -911,6 +911,18 @@ public uint counterImportImage { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public uint counterImportPDNJson { + get { + return ((uint)(this["counterImportPDNJson"])); + } + set { + this["counterImportPDNJson"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0")] @@ -4025,6 +4037,18 @@ public string guiSpindleSpeed { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int guiToolSelection { + get { + return ((int)(this["guiToolSelection"])); + } + set { + this["guiToolSelection"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("50")] @@ -5371,7 +5395,7 @@ public bool importGCSDirM3 { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] + [global::System.Configuration.DefaultSettingValueAttribute("0.5")] public decimal importGCSegment { get { return ((decimal)(this["importGCSegment"])); @@ -5549,6 +5573,30 @@ public bool importGCTangentialRange { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1")] + public decimal importGCTangentialShortening { + get { + return ((decimal)(this["importGCTangentialShortening"])); + } + set { + this["importGCTangentialShortening"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importGCTangentialShorteningEnable { + get { + return ((bool)(this["importGCTangentialShorteningEnable"])); + } + set { + this["importGCTangentialShorteningEnable"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("360")] @@ -6413,6 +6461,30 @@ public bool importGraphicHatchFillNoise { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0.3")] + public decimal importGraphicHatchFillOffset { + get { + return ((decimal)(this["importGraphicHatchFillOffset"])); + } + set { + this["importGraphicHatchFillOffset"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importGraphicHatchFillOffsetInc { + get { + return ((bool)(this["importGraphicHatchFillOffsetInc"])); + } + set { + this["importGraphicHatchFillOffsetInc"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -6569,6 +6641,30 @@ public bool importGraphicNoiseEnable { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool importGraphicOffsetLargestLast { + get { + return ((bool)(this["importGraphicOffsetLargestLast"])); + } + set { + this["importGraphicOffsetLargestLast"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importGraphicOffsetLargestRemove { + get { + return ((bool)(this["importGraphicOffsetLargestRemove"])); + } + set { + this["importGraphicOffsetLargestRemove"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -6641,6 +6737,18 @@ public bool importGraphicSortDistanceAllowRotate { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int importGraphicSortDistanceStart { + get { + return ((int)(this["importGraphicSortDistanceStart"])); + } + set { + this["importGraphicSortDistanceStart"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0")] @@ -7169,6 +7277,42 @@ public bool importPausePenDown { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("96")] + public decimal importPDNDpi { + get { + return ((decimal)(this["importPDNDpi"])); + } + set { + this["importPDNDpi"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool importPDNLayerVisible { + get { + return ((bool)(this["importPDNLayerVisible"])); + } + set { + this["importPDNLayerVisible"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3")] + public decimal importPDNSmoothCycles { + get { + return ((decimal)(this["importPDNSmoothCycles"])); + } + set { + this["importPDNSmoothCycles"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -7445,6 +7589,18 @@ public bool importSVGPathExtend { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool importSVGPathNewFigure { + get { + return ((bool)(this["importSVGPathNewFigure"])); + } + set { + this["importSVGPathNewFigure"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -7865,6 +8021,18 @@ public decimal laserScanZRange { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point locationWireCutterForm { + get { + return ((global::System.Drawing.Point)(this["locationWireCutterForm"])); + } + set { + this["locationWireCutterForm"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -9571,37 +9739,181 @@ public string useCaseLastLoaded { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool importGCTangentialShorteningEnable { + [global::System.Configuration.DefaultSettingValueAttribute("3")] + public decimal wirecutterArrayX { get { - return ((bool)(this["importGCTangentialShorteningEnable"])); + return ((decimal)(this["wirecutterArrayX"])); } set { - this["importGCTangentialShorteningEnable"] = value; + this["wirecutterArrayX"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1")] - public decimal importGCTangentialShortening { + [global::System.Configuration.DefaultSettingValueAttribute("3")] + public decimal wirecutterArrayY { get { - return ((decimal)(this["importGCTangentialShortening"])); + return ((decimal)(this["wirecutterArrayY"])); } set { - this["importGCTangentialShortening"] = value; + this["wirecutterArrayY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("2")] + public decimal wirecutterGapX { + get { + return ((decimal)(this["wirecutterGapX"])); + } + set { + this["wirecutterGapX"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("2")] + public decimal wirecutterGapY { + get { + return ((decimal)(this["wirecutterGapY"])); + } + set { + this["wirecutterGapY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("20")] + public decimal wirecutterRingDiameterIn { + get { + return ((decimal)(this["wirecutterRingDiameterIn"])); + } + set { + this["wirecutterRingDiameterIn"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("50")] + public decimal wirecutterRingDiameterOut { + get { + return ((decimal)(this["wirecutterRingDiameterOut"])); + } + set { + this["wirecutterRingDiameterOut"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("2")] + public decimal wirecutterRingSections { + get { + return ((decimal)(this["wirecutterRingSections"])); + } + set { + this["wirecutterRingSections"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("2")] + public decimal wirecutterToolDiameter { + get { + return ((decimal)(this["wirecutterToolDiameter"])); + } + set { + this["wirecutterToolDiameter"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0")] - public int guiToolSelection { + public decimal mainFormMovoToX { get { - return ((int)(this["guiToolSelection"])); + return ((decimal)(this["mainFormMovoToX"])); } set { - this["guiToolSelection"] = value; + this["mainFormMovoToX"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal mainFormMovoToY { + get { + return ((decimal)(this["mainFormMovoToY"])); + } + set { + this["mainFormMovoToY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal mainFormMovoToZ { + get { + return ((decimal)(this["mainFormMovoToZ"])); + } + set { + this["mainFormMovoToZ"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal mainFormSetCoordX { + get { + return ((decimal)(this["mainFormSetCoordX"])); + } + set { + this["mainFormSetCoordX"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal mainFormSetCoordY { + get { + return ((decimal)(this["mainFormSetCoordY"])); + } + set { + this["mainFormSetCoordY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal mainFormSetCoordA { + get { + return ((decimal)(this["mainFormSetCoordA"])); + } + set { + this["mainFormSetCoordA"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public decimal mainFormSetCoordZ { + get { + return ((decimal)(this["mainFormSetCoordZ"])); + } + set { + this["mainFormSetCoordZ"] = value; } } } diff --git a/GRBL-Plotter/Properties/Settings.settings b/GRBL-Plotter/Properties/Settings.settings index bd34faed..9b3aed4e 100644 --- a/GRBL-Plotter/Properties/Settings.settings +++ b/GRBL-Plotter/Properties/Settings.settings @@ -1,4 +1,4 @@ - + @@ -224,6 +224,9 @@ 0 + + 0 + 0 @@ -1001,6 +1004,9 @@ 1000 + + 0 + 50 @@ -1338,7 +1344,7 @@ True - 0 + 0.5 True @@ -1382,6 +1388,12 @@ False + + 1 + + + False + 360 @@ -1598,6 +1610,12 @@ False + + 0.3 + + + False + True @@ -1637,6 +1655,12 @@ False + + True + + + False + True @@ -1655,6 +1679,9 @@ True + + 0 + 0 @@ -1787,6 +1814,15 @@ False + + 96 + + + True + + + 3 + False @@ -1856,6 +1892,9 @@ False + + False + False @@ -1961,6 +2000,9 @@ -30, 0 + + 0, 0 + False @@ -1988,6 +2030,27 @@ False + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + 900, 680 @@ -2387,14 +2450,29 @@ ? - - False + + 3 - - 1 + + 3 - - 0 + + 2 + + + 2 + + + 20 + + + 50 + + + 2 + + + 2 \ No newline at end of file