From ae55eaad446041c05c8a6a91ef481de7946b4d93 Mon Sep 17 00:00:00 2001 From: biss Date: Mon, 15 Jun 2026 08:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AA=97=E4=BD=93=E8=AE=BE=E8=AE=A120260615?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Forms/DataInputForm.Designer.cs | 1 + Forms/FileInputForm.Designer.cs | 2 +- Forms/FileInputForm.cs | 7 ++----- Forms/MainForm.Designer.cs | 1 + Forms/ManualInputForm.Designer.cs | 2 ++ Forms/ManualInputForm.cs | 10 ++++++++++ 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Forms/DataInputForm.Designer.cs b/Forms/DataInputForm.Designer.cs index 20d10a9..053c6bc 100644 --- a/Forms/DataInputForm.Designer.cs +++ b/Forms/DataInputForm.Designer.cs @@ -59,6 +59,7 @@ ClientSize = new Size(288, 218); Controls.Add(button2); Controls.Add(DataFromFiles); + FormBorderStyle = FormBorderStyle.Fixed3D; MaximizeBox = false; Name = "DataInputForm"; Text = "数据输入"; diff --git a/Forms/FileInputForm.Designer.cs b/Forms/FileInputForm.Designer.cs index 5ce4d8b..272fc87 100644 --- a/Forms/FileInputForm.Designer.cs +++ b/Forms/FileInputForm.Designer.cs @@ -64,7 +64,6 @@ // // btnSubmitData // - btnSubmitData.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; btnSubmitData.Location = new Point(641, 38); btnSubmitData.Name = "btnSubmitData"; btnSubmitData.Size = new Size(106, 83); @@ -170,6 +169,7 @@ Controls.Add(btnSubmitData); Controls.Add(KonwnSFile); Controls.Add(KnownPointFile); + FormBorderStyle = FormBorderStyle.Fixed3D; MaximizeBox = false; Name = "FileInputForm"; Text = "文件读取"; diff --git a/Forms/FileInputForm.cs b/Forms/FileInputForm.cs index 6938bc3..10bd683 100644 --- a/Forms/FileInputForm.cs +++ b/Forms/FileInputForm.cs @@ -80,7 +80,7 @@ namespace kcsj.Forms } } - // 按空格、Tab、英文逗号、中文逗号分割每一行 + // 按空格、Tab、英文逗号、中文逗号分割 private string[] SplitLine(string line) { return line.Split(new char[] { ' ', '\t', ',', ',' }, @@ -150,9 +150,6 @@ namespace kcsj.Forms if (string.IsNullOrWhiteSpace(line)) continue; - if (line.StartsWith("#") || line.StartsWith("//")) - continue; - string[] parts = SplitLine(line); if (parts.Length != 4) @@ -194,7 +191,7 @@ namespace kcsj.Forms return result; } - // 设置表格中文表头 + // 设置表格表头 private void SetGridHeader() { if (dgvKnownPoints.Columns.Count > 0) diff --git a/Forms/MainForm.Designer.cs b/Forms/MainForm.Designer.cs index 2bdfe67..62adaff 100644 --- a/Forms/MainForm.Designer.cs +++ b/Forms/MainForm.Designer.cs @@ -232,6 +232,7 @@ Controls.Add(btnDataInput); Controls.Add(MainTitle); Controls.Add(menuStrip1); + FormBorderStyle = FormBorderStyle.Fixed3D; Icon = (Icon)resources.GetObject("$this.Icon"); MainMenuStrip = menuStrip1; MaximizeBox = false; diff --git a/Forms/ManualInputForm.Designer.cs b/Forms/ManualInputForm.Designer.cs index 1bfbdf9..7c1d829 100644 --- a/Forms/ManualInputForm.Designer.cs +++ b/Forms/ManualInputForm.Designer.cs @@ -148,6 +148,7 @@ btnOK.Text = "提交"; btnOK.UseVisualStyleBackColor = true; btnOK.UseWaitCursor = true; + btnOK.Click += btnOK_Click; // // btnCancel // @@ -157,6 +158,7 @@ btnCancel.TabIndex = 4; btnCancel.Text = "取消"; btnCancel.UseVisualStyleBackColor = true; + btnCancel.Click += btnCancel_Click; // // ManualInputForm // diff --git a/Forms/ManualInputForm.cs b/Forms/ManualInputForm.cs index 20e198b..7666a64 100644 --- a/Forms/ManualInputForm.cs +++ b/Forms/ManualInputForm.cs @@ -16,5 +16,15 @@ namespace kcsj.Forms { InitializeComponent(); } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + + } } }