From bb3a3ddcad088ecaff2ba2100f053634fa43dfc4 Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期二, 28 十月 2025 17:26:39 +0800
Subject: [PATCH] update
---
ErrorAnalysis.UI/ErrorAnalysis.UI.csproj | 2
ErrorAnalysis.UI/FrmMain.resx | 4 +-
ErrorAnalysis.UI/FrmMain.cs | 9 ++--
ErrorAnalysis.UI/FrmMain.Designer.cs | 56 +++++++++++-----------------
4 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/ErrorAnalysis.UI/ErrorAnalysis.UI.csproj b/ErrorAnalysis.UI/ErrorAnalysis.UI.csproj
index dd2cca1..6d0659d 100644
--- a/ErrorAnalysis.UI/ErrorAnalysis.UI.csproj
+++ b/ErrorAnalysis.UI/ErrorAnalysis.UI.csproj
@@ -10,7 +10,7 @@
<Authors>Casing Research Insitute</Authors>
<Product>JobPlanner</Product>
<Copyright>COSL</Copyright>
- <Version>1.2.0</Version>
+ <Version>1.3.0</Version>
</PropertyGroup>
<ItemGroup>
diff --git a/ErrorAnalysis.UI/FrmMain.Designer.cs b/ErrorAnalysis.UI/FrmMain.Designer.cs
index 9000c8c..c6be3c7 100644
--- a/ErrorAnalysis.UI/FrmMain.Designer.cs
+++ b/ErrorAnalysis.UI/FrmMain.Designer.cs
@@ -49,8 +49,8 @@
rdoLockSpeed = new RadioButton();
rdoLockPass = new RadioButton();
gbResult = new GroupBox();
- txtAnalysisResult = new RichTextBox();
tableLayoutPanel1 = new TableLayoutPanel();
+ txtAnalysisResult = new RichTextBox();
pnlCOPic = new Panel();
pnlErrorRatioPic = new Panel();
btnReport = new Button();
@@ -133,7 +133,6 @@
label53 = new Label();
label52 = new Label();
pbLoadDB = new ProgressBar();
- chkProcessing = new CheckBox();
((System.ComponentModel.ISupportInitialize)nudSoPrecisionRequired).BeginInit();
pnlLockPass.SuspendLayout();
((System.ComponentModel.ISupportInitialize)nudPass).BeginInit();
@@ -350,7 +349,6 @@
// gbResult
//
gbResult.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
- gbResult.Controls.Add(txtAnalysisResult);
gbResult.Controls.Add(tableLayoutPanel1);
gbResult.Location = new Point(17, 364);
gbResult.Name = "gbResult";
@@ -359,47 +357,49 @@
gbResult.TabStop = false;
gbResult.Text = "Result";
//
- // txtAnalysisResult
- //
- txtAnalysisResult.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Right;
- txtAnalysisResult.BackColor = SystemColors.Control;
- txtAnalysisResult.BorderStyle = BorderStyle.FixedSingle;
- txtAnalysisResult.Location = new Point(526, 22);
- txtAnalysisResult.Name = "txtAnalysisResult";
- txtAnalysisResult.ReadOnly = true;
- txtAnalysisResult.Size = new Size(324, 182);
- txtAnalysisResult.TabIndex = 3;
- txtAnalysisResult.Text = "";
- //
// tableLayoutPanel1
//
tableLayoutPanel1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
- tableLayoutPanel1.ColumnCount = 2;
+ tableLayoutPanel1.ColumnCount = 3;
tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
+ tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 300F));
+ tableLayoutPanel1.Controls.Add(txtAnalysisResult, 2, 0);
tableLayoutPanel1.Controls.Add(pnlCOPic, 0, 0);
tableLayoutPanel1.Controls.Add(pnlErrorRatioPic, 1, 0);
tableLayoutPanel1.Location = new Point(4, 22);
tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.RowCount = 1;
- tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
- tableLayoutPanel1.Size = new Size(519, 182);
+ tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+ tableLayoutPanel1.Size = new Size(841, 182);
tableLayoutPanel1.TabIndex = 2;
+ //
+ // txtAnalysisResult
+ //
+ txtAnalysisResult.BackColor = SystemColors.Control;
+ txtAnalysisResult.BorderStyle = BorderStyle.FixedSingle;
+ txtAnalysisResult.Dock = DockStyle.Fill;
+ txtAnalysisResult.Location = new Point(543, 3);
+ txtAnalysisResult.Name = "txtAnalysisResult";
+ txtAnalysisResult.ReadOnly = true;
+ txtAnalysisResult.Size = new Size(295, 176);
+ txtAnalysisResult.TabIndex = 3;
+ txtAnalysisResult.Text = "";
//
// pnlCOPic
//
pnlCOPic.Dock = DockStyle.Fill;
pnlCOPic.Location = new Point(3, 3);
pnlCOPic.Name = "pnlCOPic";
- pnlCOPic.Size = new Size(253, 176);
+ pnlCOPic.Size = new Size(264, 176);
pnlCOPic.TabIndex = 2;
//
// pnlErrorRatioPic
//
pnlErrorRatioPic.Dock = DockStyle.Fill;
- pnlErrorRatioPic.Location = new Point(262, 3);
+ pnlErrorRatioPic.Location = new Point(273, 3);
pnlErrorRatioPic.Name = "pnlErrorRatioPic";
- pnlErrorRatioPic.Size = new Size(254, 176);
+ pnlErrorRatioPic.Size = new Size(264, 176);
pnlErrorRatioPic.TabIndex = 3;
//
// btnReport
@@ -1187,6 +1187,7 @@
nudDepth.Name = "nudDepth";
nudDepth.Size = new Size(54, 23);
nudDepth.TabIndex = 26;
+ nudDepth.Value = new decimal(new int[] { 11, 0, 0, 0 });
//
// nudTargetLoggingInterval
//
@@ -1241,23 +1242,11 @@
pbLoadDB.TabIndex = 8;
pbLoadDB.Visible = false;
//
- // chkProcessing
- //
- chkProcessing.AutoSize = true;
- chkProcessing.CheckAlign = ContentAlignment.MiddleRight;
- chkProcessing.Location = new Point(581, 582);
- chkProcessing.Name = "chkProcessing";
- chkProcessing.Size = new Size(129, 21);
- chkProcessing.TabIndex = 39;
- chkProcessing.Text = "Check Processing";
- chkProcessing.UseVisualStyleBackColor = true;
- //
// FrmMain
//
AutoScaleDimensions = new SizeF(7F, 17F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(884, 611);
- Controls.Add(chkProcessing);
Controls.Add(pbLoadDB);
Controls.Add(tabEditInfo);
Controls.Add(btnSelectDataSource);
@@ -1418,6 +1407,5 @@
private RichTextBox txtAnalysisResult;
private Label label7;
private NumericUpDown nudYieldCounting;
- private CheckBox chkProcessing;
}
}
diff --git a/ErrorAnalysis.UI/FrmMain.cs b/ErrorAnalysis.UI/FrmMain.cs
index ce31e28..a80f1ac 100644
--- a/ErrorAnalysis.UI/FrmMain.cs
+++ b/ErrorAnalysis.UI/FrmMain.cs
@@ -9,6 +9,7 @@
using OxyPlot.Series;
using OxyPlot.WindowsForms;
using System.ComponentModel.DataAnnotations;
+using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Menu;
@@ -17,12 +18,14 @@
{
public partial class FrmMain : Form
{
+ [DllImport("user32.dll")]
+ private static extern short GetAsyncKeyState(Keys vKey);
+
private string? _connectionString;
private List<COModelTable> _models;
private Dictionary<string, string> _filters;
private COModelTable _model;
private ReportModel _reportModel;
-
public FrmMain()
{
InitializeComponent();
@@ -215,10 +218,8 @@
_reportModel = CreateReportModel(totalTime.ToString(), result.ErrorRatios.Count.ToString(), speedFr.ToString(), errorRate.ToString());
}
- if (chkProcessing.Checked)
+ if ((Control.ModifierKeys & Keys.Control) == Keys.Control && (GetAsyncKeyState(Keys.D) & 0x8000) != 0)
new ProcessingData(processingData).Show();
-
-
}
private void btnReport_Click(object sender, EventArgs e)
{
diff --git a/ErrorAnalysis.UI/FrmMain.resx b/ErrorAnalysis.UI/FrmMain.resx
index 0808268..4253ee1 100644
--- a/ErrorAnalysis.UI/FrmMain.resx
+++ b/ErrorAnalysis.UI/FrmMain.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
--
Gitblit v1.9.3