From edb3ad63c3c5f8099d225f0e7e6c13de39c0a5b5 Mon Sep 17 00:00:00 2001 From: n3040 Date: Thu, 29 Feb 2024 16:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8E=92=E4=BD=8D?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PutTowerPosition/Gui.Designer.cs | 1 + PutTowerPosition/Gui.cs | 8 +- .../Properties/Settings.Designer.cs | 10 +- PutTowerPosition/PutTowerPosition.csproj | 72 ++++++-- PutTowerPosition/PutTowerPosition.csproj.user | 13 +- PutTowerPosition/cmd.cs | 156 +++++++++++++++--- Test/App.config | 6 + Test/Program.cs | 19 +++ Test/Test.csproj | 59 +++++++ 9 files changed, 300 insertions(+), 44 deletions(-) create mode 100644 Test/App.config create mode 100644 Test/Program.cs create mode 100644 Test/Test.csproj diff --git a/PutTowerPosition/Gui.Designer.cs b/PutTowerPosition/Gui.Designer.cs index 86fe3c6..710c24b 100644 --- a/PutTowerPosition/Gui.Designer.cs +++ b/PutTowerPosition/Gui.Designer.cs @@ -81,6 +81,7 @@ this.Controls.Add(this.LB_SFilePath); this.Name = "Gui"; this.Text = "Gui"; + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Gui_FormClosed); this.ResumeLayout(false); this.PerformLayout(); diff --git a/PutTowerPosition/Gui.cs b/PutTowerPosition/Gui.cs index 24545cc..9ee1885 100644 --- a/PutTowerPosition/Gui.cs +++ b/PutTowerPosition/Gui.cs @@ -19,7 +19,7 @@ namespace PutTowerPosition private void BT_SelectSFile_Click(object sender, EventArgs e) { OpenFileDialog openFileDialog = new OpenFileDialog(); - openFileDialog.Filter = "S files (*.dat)|*.dat"; + openFileDialog.Filter = "S or cadd files (*.dat;*.cadd)|*.dat;*.cadd"; openFileDialog.Multiselect = false; openFileDialog.RestoreDirectory = true; if (openFileDialog.ShowDialog() == DialogResult.OK) @@ -36,5 +36,11 @@ namespace PutTowerPosition } } + + private void Gui_FormClosed(object sender, FormClosedEventArgs e) + { + PutTowerPosition.Cmd.releaseLatestTowerList(); + Application.Exit(); + } } } diff --git a/PutTowerPosition/Properties/Settings.Designer.cs b/PutTowerPosition/Properties/Settings.Designer.cs index dca8ba8..ecc0e3f 100644 --- a/PutTowerPosition/Properties/Settings.Designer.cs +++ b/PutTowerPosition/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:2.0.50727.8689 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace PutTowerPosition.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PutTowerPosition/PutTowerPosition.csproj b/PutTowerPosition/PutTowerPosition.csproj index bdad8f1..aac68b5 100644 --- a/PutTowerPosition/PutTowerPosition.csproj +++ b/PutTowerPosition/PutTowerPosition.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,29 @@ Properties PutTowerPosition PutTowerPostion - v3.5 + v4.7.2 512 + + + + + 3.5 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + true @@ -23,6 +44,9 @@ 4 Program C:\Program Files\AutoCAD 2010\acad.exe + AllRules.ruleset + x64 + false full @@ -32,26 +56,29 @@ prompt 4 true + AllRules.ruleset + false - - False - C:\Program Files\AutoCAD 2010\acdbmgd.dll + + ..\..\..\Program Files\Cad2022\AutoCAD 2022\accoremgd.dll False - - False - C:\Program Files\AutoCAD 2010\acmgd.dll + + ..\..\..\Program Files\Cad2022\AutoCAD 2022\acdbmgd.dll + False + + + ..\..\..\Program Files\Cad2022\AutoCAD 2022\acmgd.dll False False C:\Program Files (x86)\Microsoft Office\root\Office16\ADDINS\Microsoft Power Query for Excel Integrated\bin\Microsoft.Office.Interop.Excel.dll + False - - False - Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -85,6 +112,7 @@ + SettingsSingleFileGenerator Settings.Designer.cs @@ -95,6 +123,26 @@ Gui.cs + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + +