From 247699faf68609a77bade4fe646971792ebfbf9c Mon Sep 17 00:00:00 2001 From: "HM-CN\\zhengxuan.zhang" Date: Wed, 6 Aug 2025 15:38:06 +0800 Subject: [PATCH] =?UTF-8?q?#004=20=E5=A2=9E=E5=8A=A0=E5=88=86=E5=8F=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Analysis/AboutSoftwareInfo.designer.cs | 354 ------------------ Analysis/BaseUnit/FileSorter.cs | 124 ++++-- Analysis/{ => BaseUnit}/ZSFDEMO.cs | 0 Analysis/{ => BaseUnit}/ZSFDEMO.designer.cs | 0 Analysis/{ => BaseUnit}/ZSFDEMO.resx | 0 Analysis/{ => CjlrForm}/AboutSoftwareInfo.cs | 0 .../CjlrForm/AboutSoftwareInfo.designer.cs | 285 ++++++++++++++ .../{ => CjlrForm}/AboutSoftwareInfo.resx | 0 .../{Tolerance => CjlrForm}/FAddTolerance.cs | 4 +- .../FAddTolerance.designer.cs | 2 +- .../FAddTolerance.resx | 0 .../{Tolerance => CjlrForm}/FEditTolerance.cs | 41 +- .../FEditTolerance.designer.cs | 36 +- .../FEditTolerance.resx | 0 Analysis/{ => CjlrForm}/FSoftwareSetup.cs | 0 .../{ => CjlrForm}/FSoftwareSetup.designer.cs | 28 +- Analysis/{ => CjlrForm}/FSoftwareSetup.resx | 0 .../FToleranceSetup.cs | 2 +- .../FToleranceSetup.designer.cs | 0 .../FToleranceSetup.resx | 0 .../LabPictureControl.cs | 0 .../LabPictureControl.designer.cs | 0 .../LabPictureControl.resx | 0 Analysis/DAL/SQLHelper.cs | 2 +- Analysis/DAL/TMeasureMSSQLDAL.cs | 21 +- Analysis/Define/Define.cs | 122 +----- Analysis/FormMain.cs | 75 +--- Analysis/FormMain.designer.cs | 42 +-- Analysis/FormMain.resx | 121 +++--- Analysis/NXSAnalysis.csproj | 47 +-- Analysis/Program.cs | 5 +- Analysis/Properties/Resources.Designer.cs | 10 + Analysis/Properties/Resources.resx | 125 ++++--- .../Hexagon_logo_horz_Chinese_black.png | Bin 0 -> 31271 bytes Analysis/Tolerance/LabPictureControl.cs | 82 ---- .../UserControl/LabPictureControl.designer.cs | 84 ----- Analysis/UserControl/LabPictureControl.resx | 120 ------ Analysis/bin/x64/Debug/DAL.dll.config | 23 -- Analysis/bin/x64/Debug/DAL.pdb | Bin 58880 -> 0 bytes Analysis/bin/x64/Debug/Debug.txt | 27 +- .../bin/x64/Debug/File/AnalysisConfig.ini | 19 - Analysis/bin/x64/Debug/NSAnalysis.exe | Bin 1788416 -> 1805824 bytes Analysis/bin/x64/Debug/NSAnalysis.pdb | Bin 343552 -> 341504 bytes 43 files changed, 664 insertions(+), 1137 deletions(-) delete mode 100644 Analysis/AboutSoftwareInfo.designer.cs rename Analysis/{ => BaseUnit}/ZSFDEMO.cs (100%) rename Analysis/{ => BaseUnit}/ZSFDEMO.designer.cs (100%) rename Analysis/{ => BaseUnit}/ZSFDEMO.resx (100%) rename Analysis/{ => CjlrForm}/AboutSoftwareInfo.cs (100%) create mode 100644 Analysis/CjlrForm/AboutSoftwareInfo.designer.cs rename Analysis/{ => CjlrForm}/AboutSoftwareInfo.resx (100%) rename Analysis/{Tolerance => CjlrForm}/FAddTolerance.cs (98%) rename Analysis/{Tolerance => CjlrForm}/FAddTolerance.designer.cs (99%) rename Analysis/{Tolerance => CjlrForm}/FAddTolerance.resx (100%) rename Analysis/{Tolerance => CjlrForm}/FEditTolerance.cs (81%) rename Analysis/{Tolerance => CjlrForm}/FEditTolerance.designer.cs (97%) rename Analysis/{Tolerance => CjlrForm}/FEditTolerance.resx (100%) rename Analysis/{ => CjlrForm}/FSoftwareSetup.cs (100%) rename Analysis/{ => CjlrForm}/FSoftwareSetup.designer.cs (97%) rename Analysis/{ => CjlrForm}/FSoftwareSetup.resx (100%) rename Analysis/{Tolerance => CjlrForm}/FToleranceSetup.cs (99%) rename Analysis/{Tolerance => CjlrForm}/FToleranceSetup.designer.cs (100%) rename Analysis/{Tolerance => CjlrForm}/FToleranceSetup.resx (100%) rename Analysis/{UserControl => CjlrForm}/LabPictureControl.cs (100%) rename Analysis/{Tolerance => CjlrForm}/LabPictureControl.designer.cs (100%) rename Analysis/{Tolerance => CjlrForm}/LabPictureControl.resx (100%) create mode 100644 Analysis/Resources/Hexagon_logo_horz_Chinese_black.png delete mode 100644 Analysis/Tolerance/LabPictureControl.cs delete mode 100644 Analysis/UserControl/LabPictureControl.designer.cs delete mode 100644 Analysis/UserControl/LabPictureControl.resx delete mode 100644 Analysis/bin/x64/Debug/DAL.dll.config delete mode 100644 Analysis/bin/x64/Debug/DAL.pdb diff --git a/Analysis/AboutSoftwareInfo.designer.cs b/Analysis/AboutSoftwareInfo.designer.cs deleted file mode 100644 index 7dc31db..0000000 --- a/Analysis/AboutSoftwareInfo.designer.cs +++ /dev/null @@ -1,354 +0,0 @@ -namespace NSAnalysis -{ - partial class AboutSoftwareInfo - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutSoftwareInfo)); - this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar(); - this.label2 = new System.Windows.Forms.Label(); - this.labTitle = new System.Windows.Forms.Label(); - this.gpBoxLicenceInfo = new Telerik.WinControls.UI.RadGroupBox(); - this.labLicenseInfo = new System.Windows.Forms.Label(); - this.rbtnCreateRequest = new Telerik.WinControls.UI.RadButton(); - this.labelExpiryDateValue = new System.Windows.Forms.Label(); - this.labelExpiryDate = new System.Windows.Forms.Label(); - this.gpBoxGeneralInfo = new Telerik.WinControls.UI.RadGroupBox(); - this.label4 = new System.Windows.Forms.Label(); - this.labCopyRight = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.labVersion = new System.Windows.Forms.Label(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.label_Version = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit(); - this.radTitleBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gpBoxLicenceInfo)).BeginInit(); - this.gpBoxLicenceInfo.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.rbtnCreateRequest)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).BeginInit(); - this.gpBoxGeneralInfo.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.SuspendLayout(); - // - // radTitleBar1 - // - this.radTitleBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.radTitleBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - this.radTitleBar1.Controls.Add(this.label2); - this.radTitleBar1.Controls.Add(this.labTitle); - this.radTitleBar1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.radTitleBar1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - this.radTitleBar1.Location = new System.Drawing.Point(1, 1); - this.radTitleBar1.Name = "radTitleBar1"; - // - // - // - this.radTitleBar1.RootElement.ApplyShapeToControl = true; - this.radTitleBar1.RootElement.BorderHighlightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - this.radTitleBar1.Size = new System.Drawing.Size(836, 40); - this.radTitleBar1.TabIndex = 0; - this.radTitleBar1.TabStop = false; - this.radTitleBar1.Text = "DEMO12"; - ((Telerik.WinControls.UI.RadTitleBarElement)(this.radTitleBar1.GetChildAt(0))).Text = "DEMO12"; - ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None; - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).LeftColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).TopColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).RightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default; - // - // label2 - // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.label2.AutoSize = true; - this.label2.Image = ((System.Drawing.Image)(resources.GetObject("label2.Image"))); - this.label2.Location = new System.Drawing.Point(334, -5); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(20, 15, 20, 15); - this.label2.Size = new System.Drawing.Size(40, 52); - this.label2.TabIndex = 1; - // - // labTitle - // - this.labTitle.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.labTitle.AutoSize = true; - this.labTitle.Font = new System.Drawing.Font("微软雅黑", 14F); - this.labTitle.ForeColor = System.Drawing.Color.White; - this.labTitle.Location = new System.Drawing.Point(370, 8); - this.labTitle.Name = "labTitle"; - this.labTitle.Size = new System.Drawing.Size(88, 25); - this.labTitle.TabIndex = 0; - this.labTitle.Text = "关于软件"; - // - // gpBoxLicenceInfo - // - this.gpBoxLicenceInfo.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping; - this.gpBoxLicenceInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.gpBoxLicenceInfo.Controls.Add(this.labLicenseInfo); - this.gpBoxLicenceInfo.Controls.Add(this.rbtnCreateRequest); - this.gpBoxLicenceInfo.Controls.Add(this.labelExpiryDateValue); - this.gpBoxLicenceInfo.Controls.Add(this.labelExpiryDate); - this.gpBoxLicenceInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gpBoxLicenceInfo.ForeColor = System.Drawing.Color.White; - this.gpBoxLicenceInfo.HeaderText = "授权信息"; - this.gpBoxLicenceInfo.Location = new System.Drawing.Point(22, 264); - this.gpBoxLicenceInfo.Name = "gpBoxLicenceInfo"; - this.gpBoxLicenceInfo.Size = new System.Drawing.Size(790, 234); - this.gpBoxLicenceInfo.TabIndex = 38; - this.gpBoxLicenceInfo.Text = "授权信息"; - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).ForeColor = System.Drawing.Color.White; - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(81)))), ((int)(((byte)(95))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).ForeColor = System.Drawing.Color.White; - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Text = "授权信息"; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).LineLimit = false; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).ForeColor = System.Drawing.Color.White; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Font = new System.Drawing.Font("Segoe UI", 11F); - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Alignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // labLicenseInfo - // - this.labLicenseInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labLicenseInfo.Location = new System.Drawing.Point(26, 99); - this.labLicenseInfo.Name = "labLicenseInfo"; - this.labLicenseInfo.Size = new System.Drawing.Size(503, 21); - this.labLicenseInfo.TabIndex = 9; - this.labLicenseInfo.Text = "请将请求授权文件发送给海克斯康制造智能技术（青岛）有限公司"; - // - // rbtnCreateRequest - // - this.rbtnCreateRequest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - this.rbtnCreateRequest.Font = new System.Drawing.Font("Segoe UI", 12F); - this.rbtnCreateRequest.ForeColor = System.Drawing.Color.White; - this.rbtnCreateRequest.Location = new System.Drawing.Point(33, 151); - this.rbtnCreateRequest.Name = "rbtnCreateRequest"; - this.rbtnCreateRequest.Size = new System.Drawing.Size(170, 55); - this.rbtnCreateRequest.TabIndex = 13; - this.rbtnCreateRequest.Text = "创建请求授权文件"; - this.rbtnCreateRequest.Click += new System.EventHandler(this.rbtnCreateRequest_Click); - this.rbtnCreateRequest.MouseLeave += new System.EventHandler(this.btn_MouseLeave); - this.rbtnCreateRequest.MouseHover += new System.EventHandler(this.btn_MouseHover); - ((Telerik.WinControls.UI.RadButtonElement)(this.rbtnCreateRequest.GetChildAt(0))).Text = "创建请求授权文件"; - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.rbtnCreateRequest.GetChildAt(0).GetChildAt(2))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.rbtnCreateRequest.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - // - // labelExpiryDateValue - // - this.labelExpiryDateValue.AutoSize = true; - this.labelExpiryDateValue.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelExpiryDateValue.Location = new System.Drawing.Point(112, 49); - this.labelExpiryDateValue.Name = "labelExpiryDateValue"; - this.labelExpiryDateValue.Size = new System.Drawing.Size(88, 21); - this.labelExpiryDateValue.TabIndex = 0; - this.labelExpiryDateValue.Text = "2017.04.20"; - // - // labelExpiryDate - // - this.labelExpiryDate.AutoSize = true; - this.labelExpiryDate.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelExpiryDate.Location = new System.Drawing.Point(26, 50); - this.labelExpiryDate.Name = "labelExpiryDate"; - this.labelExpiryDate.Size = new System.Drawing.Size(95, 21); - this.labelExpiryDate.TabIndex = 0; - this.labelExpiryDate.Text = "到期时间："; - // - // gpBoxGeneralInfo - // - this.gpBoxGeneralInfo.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping; - this.gpBoxGeneralInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.gpBoxGeneralInfo.Controls.Add(this.label4); - this.gpBoxGeneralInfo.Controls.Add(this.labCopyRight); - this.gpBoxGeneralInfo.Controls.Add(this.label5); - this.gpBoxGeneralInfo.Controls.Add(this.labVersion); - this.gpBoxGeneralInfo.Controls.Add(this.pictureBox2); - this.gpBoxGeneralInfo.Controls.Add(this.label_Version); - this.gpBoxGeneralInfo.Controls.Add(this.label3); - this.gpBoxGeneralInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gpBoxGeneralInfo.ForeColor = System.Drawing.Color.White; - this.gpBoxGeneralInfo.HeaderText = "基本信息"; - this.gpBoxGeneralInfo.Location = new System.Drawing.Point(22, 54); - this.gpBoxGeneralInfo.Name = "gpBoxGeneralInfo"; - this.gpBoxGeneralInfo.Size = new System.Drawing.Size(790, 202); - this.gpBoxGeneralInfo.TabIndex = 37; - this.gpBoxGeneralInfo.Text = "基本信息"; - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).ForeColor = System.Drawing.Color.White; - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(81)))), ((int)(((byte)(95))))); - ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).ForeColor = System.Drawing.Color.White; - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Text = "基本信息"; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).LineLimit = false; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).ForeColor = System.Drawing.Color.White; - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Font = new System.Drawing.Font("Segoe UI", 11F); - ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Alignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // label4 - // - this.label4.Font = new System.Drawing.Font("Segoe UI", 12F); - this.label4.Location = new System.Drawing.Point(112, 43); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(316, 21); - this.label4.TabIndex = 31; - this.label4.Text = "海克斯康间隙面差分析系统"; - // - // labCopyRight - // - this.labCopyRight.Font = new System.Drawing.Font("Segoe UI", 12F); - this.labCopyRight.Location = new System.Drawing.Point(112, 150); - this.labCopyRight.Name = "labCopyRight"; - this.labCopyRight.Size = new System.Drawing.Size(316, 21); - this.labCopyRight.TabIndex = 0; - this.labCopyRight.Text = "海克斯康制造智能技术（青岛）有限公司"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Segoe UI", 12F); - this.label5.Location = new System.Drawing.Point(25, 43); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(95, 21); - this.label5.TabIndex = 32; - this.label5.Text = "软件名称："; - // - // labVersion - // - this.labVersion.AutoSize = true; - this.labVersion.Font = new System.Drawing.Font("Segoe UI", 12F); - this.labVersion.Location = new System.Drawing.Point(112, 96); - this.labVersion.Name = "labVersion"; - this.labVersion.Size = new System.Drawing.Size(65, 21); - this.labVersion.TabIndex = 30; - this.labVersion.Text = "V1.0.0.0"; - // - // pictureBox2 - // - this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox2.Image = global::NSAnalysis.Properties.Resources.hexagonlogotransparent; - this.pictureBox2.Location = new System.Drawing.Point(464, 31); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(304, 100); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox2.TabIndex = 29; - this.pictureBox2.TabStop = false; - // - // label_Version - // - this.label_Version.AutoSize = true; - this.label_Version.Font = new System.Drawing.Font("Segoe UI", 12F); - this.label_Version.Location = new System.Drawing.Point(25, 95); - this.label_Version.Name = "label_Version"; - this.label_Version.Size = new System.Drawing.Size(95, 21); - this.label_Version.TabIndex = 0; - this.label_Version.Text = "软件版本："; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Segoe UI", 12F); - this.label3.Location = new System.Drawing.Point(25, 150); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(95, 21); - this.label3.TabIndex = 0; - this.label3.Text = "版权所有："; - // - // AboutSoftwareInfo - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - this.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); - this.BorderWidth = 0; - this.ClientSize = new System.Drawing.Size(838, 517); - this.Controls.Add(this.gpBoxLicenceInfo); - this.Controls.Add(this.gpBoxGeneralInfo); - this.Controls.Add(this.radTitleBar1); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F); - this.ForeColor = System.Drawing.Color.White; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.Name = "AboutSoftwareInfo"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "DEMO12"; - this.Load += new System.EventHandler(this.AboutSoftwareInfo_Load); - ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit(); - this.radTitleBar1.ResumeLayout(false); - this.radTitleBar1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gpBoxLicenceInfo)).EndInit(); - this.gpBoxLicenceInfo.ResumeLayout(false); - this.gpBoxLicenceInfo.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.rbtnCreateRequest)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).EndInit(); - this.gpBoxGeneralInfo.ResumeLayout(false); - this.gpBoxGeneralInfo.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private Telerik.WinControls.UI.RadTitleBar radTitleBar1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label labTitle; - private Telerik.WinControls.UI.RadGroupBox gpBoxLicenceInfo; - private System.Windows.Forms.Label labelExpiryDate; - private System.Windows.Forms.Label labLicenseInfo; - private System.Windows.Forms.Label labelExpiryDateValue; - private Telerik.WinControls.UI.RadGroupBox gpBoxGeneralInfo; - private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.Label label_Version; - private System.Windows.Forms.Label labCopyRight; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label labVersion; - private Telerik.WinControls.UI.RadButton rbtnCreateRequest; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - } -} diff --git a/Analysis/BaseUnit/FileSorter.cs b/Analysis/BaseUnit/FileSorter.cs index 45a172b..46a7876 100644 --- a/Analysis/BaseUnit/FileSorter.cs +++ b/Analysis/BaseUnit/FileSorter.cs @@ -1,18 +1,23 @@ -using System; - +using BaseFunction; +using NSAnalysis.DAL; +using System; using System.Data; using System.Data.SqlClient; using System.IO; namespace NSAnalysis.BaseUnit { - internal class FileSorter + public class FileSorter { - private readonly string _connectionString; + public TMeasureMSSQLDAL tmdal = new TMeasureMSSQLDAL(); - public FileSorter(string connectionString) + //定义读取的位置 + public int readRowIndex = 2; // 默认读取第3行（从0开始计数） + + public int readColIndex = 1; // 默认读取第2列（从0开始计数） + + public FileSorter() { - _connectionString = connectionString; } public void ProcessFiles() @@ -23,64 +28,129 @@ namespace NSAnalysis.BaseUnit string sourceDir = task["sourceFile"].ToString(); string targetDir = task["targetFile"].ToString(); string modelCode = task["modelsCode"].ToString(); + string position = task["position"].ToString(); + string matchStr = $"{modelCode}_{position}"; + // 打印信息 + MyBase.TraceWriteLine($"Processing Task - Source: {sourceDir}, Target: {targetDir}, ModelCode: {modelCode} Position: {position} matchStr: {matchStr} "); if (Directory.Exists(sourceDir)) { - ProcessDirectory(sourceDir, targetDir, modelCode); + + + ProcessDirectory(sourceDir, targetDir, matchStr); } + else + { + MyBase.TraceWriteLine($"Source directory does not exist: {sourceDir}"); + } + } } private DataTable GetTaskRecords() { - using (var connection = new SqlConnection(_connectionString)) - { - var command = new SqlCommand( - "SELECT modelsCode, sourceFile, targetFile FROM CJLR_TASK_RELEASE WHERE status = 'start'", - connection); + SQLHelper.connStr = DatabaseDfn.SqlConnectStr(); + DataTable dt = tmdal.SelectTaskByCondition("", "", "start"); - var adapter = new SqlDataAdapter(command); - var dt = new DataTable(); - adapter.Fill(dt); - return dt; + //打印 dt + PrintDataTable(dt); + if (dt == null || dt.Rows.Count == 0) + { + MyBase.TraceWriteLine("No tasks found."); + return null; } + return dt; } private void ProcessDirectory(string sourceDir, string targetDir, string modelCode) { + // 确保目标目录存在 if (!Directory.Exists(targetDir)) { Directory.CreateDirectory(targetDir); + MyBase.TraceWriteLine($"Created target directory: {targetDir}"); } foreach (string file in Directory.GetFiles(sourceDir, "*.csv")) { - if (FileContainsModelCode(file, modelCode)) + // 打印正在处理的文件 + MyBase.TraceWriteLine($"Processing file: {file}"); + if (MatchCsvValue(file, modelCode, readRowIndex, readColIndex)) { string destFile = Path.Combine(targetDir, Path.GetFileName(file)); File.Move(file, destFile); - Console.WriteLine($"Moved: {file} -> {destFile}"); + MyBase.TraceWriteLine($"Moved: {file} -> {destFile}"); + } + + else + { + MyBase.TraceWriteLine($"No match for file: {file}"); } } } - private bool FileContainsModelCode(string filePath, string modelCode) + /// + /// 检查CSV文件中指定行列的字符串是否匹配目标值 + /// + /// CSV文件路径 + /// 要匹配的目标字符串 + /// 行索引(从0开始) + /// 列索引(从0开始) + /// 匹配成功返回true，否则false + public static bool MatchCsvValue(string filePath, string targetValue, int rowIndex, int colIndex) { try { - string content = File.ReadAllText(filePath); - return content.Contains(modelCode); + string[] lines = File.ReadAllLines(filePath); + + // 检查行索引是否有效 + if (rowIndex < 0 || rowIndex >= lines.Length) + return false; + + string[] columns = lines[rowIndex].Split(','); + + // 检查列索引是否有效 + if (colIndex < 0 || colIndex >= columns.Length) + return false; + + return columns[colIndex].Trim().Equals(targetValue); } - catch + catch (Exception ex) { + MyBase.TraceWriteLine($"处理CSV文件时出错: {ex.Message}"); return false; } } - //private static void Main(string[] args) - //{ - // var sorter = new FileSorter("Your_Connection_String"); - // sorter.ProcessFiles(); - //} + public void test() + { + //SQLHelper.connStr = DatabaseDfn.SqlConnectStr(); + //string testPath = @"D:\CJLR\DATA\Input\LLL\K0902906.csv"; + //bool result = MatchCsvValue(testPath, "X540_L", 3, 1); + //MyBase.TraceWriteLine($"匹配结果: {result}"); + } + + // 编写一个打印 DataTable 对象的方法，输入是对象 + public static void PrintDataTable(DataTable dt) + { + if (dt == null || dt.Rows.Count == 0) + { + MyBase.TraceWriteLine("DataTable is empty or null."); + return; + } + foreach (DataColumn column in dt.Columns) + { + Console.Write($"{column.ColumnName}\t"); + } + MyBase.TraceWriteLine(""); + foreach (DataRow row in dt.Rows) + { + foreach (var item in row.ItemArray) + { + Console.Write($"{item}\t"); + } + MyBase.TraceWriteLine(""); + } + } } } \ No newline at end of file diff --git a/Analysis/ZSFDEMO.cs b/Analysis/BaseUnit/ZSFDEMO.cs similarity index 100% rename from Analysis/ZSFDEMO.cs rename to Analysis/BaseUnit/ZSFDEMO.cs diff --git a/Analysis/ZSFDEMO.designer.cs b/Analysis/BaseUnit/ZSFDEMO.designer.cs similarity index 100% rename from Analysis/ZSFDEMO.designer.cs rename to Analysis/BaseUnit/ZSFDEMO.designer.cs diff --git a/Analysis/ZSFDEMO.resx b/Analysis/BaseUnit/ZSFDEMO.resx similarity index 100% rename from Analysis/ZSFDEMO.resx rename to Analysis/BaseUnit/ZSFDEMO.resx diff --git a/Analysis/AboutSoftwareInfo.cs b/Analysis/CjlrForm/AboutSoftwareInfo.cs similarity index 100% rename from Analysis/AboutSoftwareInfo.cs rename to Analysis/CjlrForm/AboutSoftwareInfo.cs diff --git a/Analysis/CjlrForm/AboutSoftwareInfo.designer.cs b/Analysis/CjlrForm/AboutSoftwareInfo.designer.cs new file mode 100644 index 0000000..d1036ee --- /dev/null +++ b/Analysis/CjlrForm/AboutSoftwareInfo.designer.cs @@ -0,0 +1,285 @@ +namespace NSAnalysis +{ + partial class AboutSoftwareInfo + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutSoftwareInfo)); + this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar(); + this.labTitle = new System.Windows.Forms.Label(); + this.labelExpiryDateValue = new System.Windows.Forms.Label(); + this.labelExpiryDate = new System.Windows.Forms.Label(); + this.gpBoxGeneralInfo = new Telerik.WinControls.UI.RadGroupBox(); + this.label4 = new System.Windows.Forms.Label(); + this.labCopyRight = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.labVersion = new System.Windows.Forms.Label(); + this.label_Version = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.label2 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit(); + this.radTitleBar1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).BeginInit(); + this.gpBoxGeneralInfo.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.SuspendLayout(); + // + // radTitleBar1 + // + this.radTitleBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.radTitleBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + this.radTitleBar1.Controls.Add(this.label2); + this.radTitleBar1.Controls.Add(this.labTitle); + this.radTitleBar1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radTitleBar1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + this.radTitleBar1.Location = new System.Drawing.Point(1, 1); + this.radTitleBar1.Name = "radTitleBar1"; + // + // + // + this.radTitleBar1.RootElement.ApplyShapeToControl = true; + this.radTitleBar1.RootElement.BorderHighlightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + this.radTitleBar1.Size = new System.Drawing.Size(779, 40); + this.radTitleBar1.TabIndex = 0; + this.radTitleBar1.TabStop = false; + this.radTitleBar1.Text = "DEMO12"; + ((Telerik.WinControls.UI.RadTitleBarElement)(this.radTitleBar1.GetChildAt(0))).Text = "DEMO12"; + ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None; + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).LeftColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).TopColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).RightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default; + // + // labTitle + // + this.labTitle.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.labTitle.AutoSize = true; + this.labTitle.Font = new System.Drawing.Font("微软雅黑", 14F); + this.labTitle.ForeColor = System.Drawing.Color.White; + this.labTitle.Location = new System.Drawing.Point(341, 8); + this.labTitle.Name = "labTitle"; + this.labTitle.Size = new System.Drawing.Size(88, 25); + this.labTitle.TabIndex = 0; + this.labTitle.Text = "关于软件"; + // + // labelExpiryDateValue + // + this.labelExpiryDateValue.AutoSize = true; + this.labelExpiryDateValue.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelExpiryDateValue.Location = new System.Drawing.Point(112, 152); + this.labelExpiryDateValue.Name = "labelExpiryDateValue"; + this.labelExpiryDateValue.Size = new System.Drawing.Size(88, 21); + this.labelExpiryDateValue.TabIndex = 0; + this.labelExpiryDateValue.Text = "2017.04.20"; + // + // labelExpiryDate + // + this.labelExpiryDate.AutoSize = true; + this.labelExpiryDate.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelExpiryDate.Location = new System.Drawing.Point(26, 153); + this.labelExpiryDate.Name = "labelExpiryDate"; + this.labelExpiryDate.Size = new System.Drawing.Size(95, 21); + this.labelExpiryDate.TabIndex = 0; + this.labelExpiryDate.Text = "到期时间："; + // + // gpBoxGeneralInfo + // + this.gpBoxGeneralInfo.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping; + this.gpBoxGeneralInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.gpBoxGeneralInfo.Controls.Add(this.labelExpiryDateValue); + this.gpBoxGeneralInfo.Controls.Add(this.labelExpiryDate); + this.gpBoxGeneralInfo.Controls.Add(this.label4); + this.gpBoxGeneralInfo.Controls.Add(this.labCopyRight); + this.gpBoxGeneralInfo.Controls.Add(this.label5); + this.gpBoxGeneralInfo.Controls.Add(this.labVersion); + this.gpBoxGeneralInfo.Controls.Add(this.pictureBox2); + this.gpBoxGeneralInfo.Controls.Add(this.label_Version); + this.gpBoxGeneralInfo.Controls.Add(this.label3); + this.gpBoxGeneralInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.gpBoxGeneralInfo.ForeColor = System.Drawing.Color.White; + this.gpBoxGeneralInfo.HeaderText = "基本信息"; + this.gpBoxGeneralInfo.Location = new System.Drawing.Point(22, 54); + this.gpBoxGeneralInfo.Name = "gpBoxGeneralInfo"; + this.gpBoxGeneralInfo.Size = new System.Drawing.Size(738, 321); + this.gpBoxGeneralInfo.TabIndex = 37; + this.gpBoxGeneralInfo.Text = "基本信息"; + ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).ForeColor = System.Drawing.Color.White; + ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(81)))), ((int)(((byte)(95))))); + ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).ForeColor = System.Drawing.Color.White; + ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None; + ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Text = "基本信息"; + ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).LineLimit = false; + ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).ForeColor = System.Drawing.Color.White; + ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Font = new System.Drawing.Font("Segoe UI", 11F); + ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Alignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("Segoe UI", 12F); + this.label4.Location = new System.Drawing.Point(112, 43); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(214, 21); + this.label4.TabIndex = 31; + this.label4.Text = "海克斯康间隙面差分析系统"; + // + // labCopyRight + // + this.labCopyRight.Font = new System.Drawing.Font("Segoe UI", 12F); + this.labCopyRight.Location = new System.Drawing.Point(112, 210); + this.labCopyRight.Name = "labCopyRight"; + this.labCopyRight.Size = new System.Drawing.Size(316, 21); + this.labCopyRight.TabIndex = 0; + this.labCopyRight.Text = "海克斯康制造智能技术（青岛）有限公司"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Segoe UI", 12F); + this.label5.Location = new System.Drawing.Point(26, 43); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(95, 21); + this.label5.TabIndex = 32; + this.label5.Text = "软件名称："; + // + // labVersion + // + this.labVersion.AutoSize = true; + this.labVersion.Font = new System.Drawing.Font("Segoe UI", 12F); + this.labVersion.Location = new System.Drawing.Point(112, 96); + this.labVersion.Name = "labVersion"; + this.labVersion.Size = new System.Drawing.Size(65, 21); + this.labVersion.TabIndex = 30; + this.labVersion.Text = "V1.0.0.0"; + // + // label_Version + // + this.label_Version.AutoSize = true; + this.label_Version.Font = new System.Drawing.Font("Segoe UI", 12F); + this.label_Version.Location = new System.Drawing.Point(26, 95); + this.label_Version.Name = "label_Version"; + this.label_Version.Size = new System.Drawing.Size(95, 21); + this.label_Version.TabIndex = 0; + this.label_Version.Text = "软件版本："; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Segoe UI", 12F); + this.label3.Location = new System.Drawing.Point(26, 210); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(95, 21); + this.label3.TabIndex = 0; + this.label3.Text = "版权所有："; + // + // pictureBox2 + // + this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBox2.BackColor = System.Drawing.Color.White; + this.pictureBox2.Image = global::NSAnalysis.Properties.Resources.Hexagon_logo_horz_Chinese_black; + this.pictureBox2.Location = new System.Drawing.Point(365, 31); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(304, 100); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox2.TabIndex = 29; + this.pictureBox2.TabStop = false; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.label2.AutoSize = true; + this.label2.Image = ((System.Drawing.Image)(resources.GetObject("label2.Image"))); + this.label2.Location = new System.Drawing.Point(305, -5); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(20, 15, 20, 15); + this.label2.Size = new System.Drawing.Size(40, 52); + this.label2.TabIndex = 1; + // + // AboutSoftwareInfo + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + this.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); + this.BorderWidth = 0; + this.ClientSize = new System.Drawing.Size(781, 400); + this.Controls.Add(this.gpBoxGeneralInfo); + this.Controls.Add(this.radTitleBar1); + this.Font = new System.Drawing.Font("Segoe UI", 8.25F); + this.ForeColor = System.Drawing.Color.White; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.Name = "AboutSoftwareInfo"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "DEMO12"; + this.Load += new System.EventHandler(this.AboutSoftwareInfo_Load); + ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit(); + this.radTitleBar1.ResumeLayout(false); + this.radTitleBar1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).EndInit(); + this.gpBoxGeneralInfo.ResumeLayout(false); + this.gpBoxGeneralInfo.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Telerik.WinControls.UI.RadTitleBar radTitleBar1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label labTitle; + private System.Windows.Forms.Label labelExpiryDate; + private System.Windows.Forms.Label labelExpiryDateValue; + private Telerik.WinControls.UI.RadGroupBox gpBoxGeneralInfo; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.Label label_Version; + private System.Windows.Forms.Label labCopyRight; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label labVersion; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + } +} diff --git a/Analysis/AboutSoftwareInfo.resx b/Analysis/CjlrForm/AboutSoftwareInfo.resx similarity index 100% rename from Analysis/AboutSoftwareInfo.resx rename to Analysis/CjlrForm/AboutSoftwareInfo.resx diff --git a/Analysis/Tolerance/FAddTolerance.cs b/Analysis/CjlrForm/FAddTolerance.cs similarity index 98% rename from Analysis/Tolerance/FAddTolerance.cs rename to Analysis/CjlrForm/FAddTolerance.cs index 648955c..6f6da0d 100644 --- a/Analysis/Tolerance/FAddTolerance.cs +++ b/Analysis/CjlrForm/FAddTolerance.cs @@ -1,5 +1,5 @@ using BaseFunction; -using DAL; +using NSAnalysis.DAL; using NSAnalysis.Model; using System; using System.Drawing; @@ -40,7 +40,7 @@ namespace NSAnalysis gFTS = fts; } - private void SFAddCNC_Load(object sender, EventArgs e) + private void FAddTolerance_Load(object sender, EventArgs e) { rddl_ReadType.SelectedIndex = 0; rddl_Position.SelectedIndex = 0; diff --git a/Analysis/Tolerance/FAddTolerance.designer.cs b/Analysis/CjlrForm/FAddTolerance.designer.cs similarity index 99% rename from Analysis/Tolerance/FAddTolerance.designer.cs rename to Analysis/CjlrForm/FAddTolerance.designer.cs index 0a15a94..12d9886 100644 --- a/Analysis/Tolerance/FAddTolerance.designer.cs +++ b/Analysis/CjlrForm/FAddTolerance.designer.cs @@ -499,7 +499,7 @@ this.Name = "FAddTolerance"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "添加公差带"; - this.Load += new System.EventHandler(this.SFAddCNC_Load); + this.Load += new System.EventHandler(this.FAddTolerance_Load); ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit(); this.radTitleBar1.ResumeLayout(false); this.radTitleBar1.PerformLayout(); diff --git a/Analysis/Tolerance/FAddTolerance.resx b/Analysis/CjlrForm/FAddTolerance.resx similarity index 100% rename from Analysis/Tolerance/FAddTolerance.resx rename to Analysis/CjlrForm/FAddTolerance.resx diff --git a/Analysis/Tolerance/FEditTolerance.cs b/Analysis/CjlrForm/FEditTolerance.cs similarity index 81% rename from Analysis/Tolerance/FEditTolerance.cs rename to Analysis/CjlrForm/FEditTolerance.cs index e13ee3c..c890eb1 100644 --- a/Analysis/Tolerance/FEditTolerance.cs +++ b/Analysis/CjlrForm/FEditTolerance.cs @@ -1,4 +1,4 @@ -using DAL; +using NSAnalysis.DAL; using NSAnalysis.Model; using System; using System.Drawing; @@ -174,5 +174,44 @@ namespace NSAnalysis { this.Close(); } + + private void btn_sourceFile_Click(object sender, EventArgs e) + { + // 文件路径对话框 + FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog + { + Description = "请选择源文件所在的文件夹", + ShowNewFolderButton = true + }; + if (folderBrowserDialog.ShowDialog() == DialogResult.OK) + { + rtb_sourceFilePath.Text = folderBrowserDialog.SelectedPath; // 设置源文件路径 + } + + else + { + // 显示未选择文件夹的提示信息 + MessageBox.Show("未选择源文件夹", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + } + + private void btn_targetFile_Click(object sender, EventArgs e) + { + FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog + { + Description = "请选择目标文件所在的文件夹", + ShowNewFolderButton = true + }; + if (folderBrowserDialog.ShowDialog() == DialogResult.OK) + { + rtb_targetFilePath.Text = folderBrowserDialog.SelectedPath; // 设置目标文件路径 + } + else + { + // 显示未选择文件夹的提示信息 + MessageBox.Show("未选择目标文件夹", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } } } \ No newline at end of file diff --git a/Analysis/Tolerance/FEditTolerance.designer.cs b/Analysis/CjlrForm/FEditTolerance.designer.cs similarity index 97% rename from Analysis/Tolerance/FEditTolerance.designer.cs rename to Analysis/CjlrForm/FEditTolerance.designer.cs index e4e2e0f..e1f430f 100644 --- a/Analysis/Tolerance/FEditTolerance.designer.cs +++ b/Analysis/CjlrForm/FEditTolerance.designer.cs @@ -29,11 +29,11 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FEditTolerance)); + Telerik.WinControls.UI.RadListDataItem radListDataItem6 = new Telerik.WinControls.UI.RadListDataItem(); + Telerik.WinControls.UI.RadListDataItem radListDataItem7 = new Telerik.WinControls.UI.RadListDataItem(); Telerik.WinControls.UI.RadListDataItem radListDataItem1 = new Telerik.WinControls.UI.RadListDataItem(); Telerik.WinControls.UI.RadListDataItem radListDataItem2 = new Telerik.WinControls.UI.RadListDataItem(); Telerik.WinControls.UI.RadListDataItem radListDataItem3 = new Telerik.WinControls.UI.RadListDataItem(); - Telerik.WinControls.UI.RadListDataItem radListDataItem4 = new Telerik.WinControls.UI.RadListDataItem(); - Telerik.WinControls.UI.RadListDataItem radListDataItem5 = new Telerik.WinControls.UI.RadListDataItem(); this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar(); this.label2 = new System.Windows.Forms.Label(); this.labTitle = new System.Windows.Forms.Label(); @@ -190,6 +190,7 @@ this.btn_targetFile.Size = new System.Drawing.Size(50, 30); this.btn_targetFile.TabIndex = 92; this.btn_targetFile.Text = "浏览"; + this.btn_targetFile.Click += new System.EventHandler(this.btn_targetFile_Click); ((Telerik.WinControls.UI.RadButtonElement)(this.btn_targetFile.GetChildAt(0))).Text = "浏览"; ((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_targetFile.GetChildAt(0).GetChildAt(2))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); ((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_targetFile.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); @@ -205,6 +206,7 @@ this.btn_sourceFile.Size = new System.Drawing.Size(50, 30); this.btn_sourceFile.TabIndex = 91; this.btn_sourceFile.Text = "浏览"; + this.btn_sourceFile.Click += new System.EventHandler(this.btn_sourceFile_Click); ((Telerik.WinControls.UI.RadButtonElement)(this.btn_sourceFile.GetChildAt(0))).Text = "浏览"; ((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_sourceFile.GetChildAt(0).GetChildAt(2))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); ((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_sourceFile.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); @@ -257,12 +259,12 @@ this.rddl_Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; this.rddl_Status.Font = new System.Drawing.Font("微软雅黑", 11F); this.rddl_Status.ForeColor = System.Drawing.Color.White; - radListDataItem1.Tag = "start"; - radListDataItem1.Text = "启动"; - radListDataItem2.Tag = "stop"; - radListDataItem2.Text = "暂停"; - this.rddl_Status.Items.Add(radListDataItem1); - this.rddl_Status.Items.Add(radListDataItem2); + radListDataItem6.Tag = "start"; + radListDataItem6.Text = "启动"; + radListDataItem7.Tag = "stop"; + radListDataItem7.Text = "暂停"; + this.rddl_Status.Items.Add(radListDataItem6); + this.rddl_Status.Items.Add(radListDataItem7); this.rddl_Status.Location = new System.Drawing.Point(185, 366); this.rddl_Status.Name = "rddl_Status"; this.rddl_Status.Size = new System.Drawing.Size(384, 25); @@ -293,12 +295,12 @@ this.rddl_Position.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; this.rddl_Position.Font = new System.Drawing.Font("微软雅黑", 11F); this.rddl_Position.ForeColor = System.Drawing.Color.White; - radListDataItem3.Tag = "L"; - radListDataItem3.Text = "左侧"; - radListDataItem4.Tag = "R"; - radListDataItem4.Text = "右侧"; - this.rddl_Position.Items.Add(radListDataItem3); - this.rddl_Position.Items.Add(radListDataItem4); + radListDataItem1.Tag = "L"; + radListDataItem1.Text = "左侧"; + radListDataItem2.Tag = "R"; + radListDataItem2.Text = "右侧"; + this.rddl_Position.Items.Add(radListDataItem1); + this.rddl_Position.Items.Add(radListDataItem2); this.rddl_Position.Location = new System.Drawing.Point(185, 319); this.rddl_Position.Name = "rddl_Position"; this.rddl_Position.Size = new System.Drawing.Size(384, 25); @@ -329,9 +331,9 @@ this.rddl_ReadType.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; this.rddl_ReadType.Font = new System.Drawing.Font("微软雅黑", 11F); this.rddl_ReadType.ForeColor = System.Drawing.Color.White; - radListDataItem5.Tag = "2"; - radListDataItem5.Text = "文件内容"; - this.rddl_ReadType.Items.Add(radListDataItem5); + radListDataItem3.Tag = "2"; + radListDataItem3.Text = "文件内容"; + this.rddl_ReadType.Items.Add(radListDataItem3); this.rddl_ReadType.Location = new System.Drawing.Point(185, 272); this.rddl_ReadType.Name = "rddl_ReadType"; this.rddl_ReadType.Size = new System.Drawing.Size(384, 25); diff --git a/Analysis/Tolerance/FEditTolerance.resx b/Analysis/CjlrForm/FEditTolerance.resx similarity index 100% rename from Analysis/Tolerance/FEditTolerance.resx rename to Analysis/CjlrForm/FEditTolerance.resx diff --git a/Analysis/FSoftwareSetup.cs b/Analysis/CjlrForm/FSoftwareSetup.cs similarity index 100% rename from Analysis/FSoftwareSetup.cs rename to Analysis/CjlrForm/FSoftwareSetup.cs diff --git a/Analysis/FSoftwareSetup.designer.cs b/Analysis/CjlrForm/FSoftwareSetup.designer.cs similarity index 97% rename from Analysis/FSoftwareSetup.designer.cs rename to Analysis/CjlrForm/FSoftwareSetup.designer.cs index 4686761..c1988be 100644 --- a/Analysis/FSoftwareSetup.designer.cs +++ b/Analysis/CjlrForm/FSoftwareSetup.designer.cs @@ -119,7 +119,7 @@ this.cbStartIOT.AutoSize = true; this.cbStartIOT.Font = new System.Drawing.Font("Segoe UI", 12F); this.cbStartIOT.ForeColor = System.Drawing.Color.White; - this.cbStartIOT.Location = new System.Drawing.Point(274, 75); + this.cbStartIOT.Location = new System.Drawing.Point(268, 75); this.cbStartIOT.Name = "cbStartIOT"; this.cbStartIOT.Size = new System.Drawing.Size(63, 25); this.cbStartIOT.TabIndex = 489; @@ -131,7 +131,7 @@ // this.label20.Font = new System.Drawing.Font("Segoe UI", 12F); this.label20.ForeColor = System.Drawing.Color.White; - this.label20.Location = new System.Drawing.Point(29, 76); + this.label20.Location = new System.Drawing.Point(28, 76); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(234, 21); this.label20.TabIndex = 488; @@ -143,7 +143,7 @@ this.rtbIOTAddress.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); this.rtbIOTAddress.Font = new System.Drawing.Font("Segoe UI", 12F); this.rtbIOTAddress.ForeColor = System.Drawing.Color.White; - this.rtbIOTAddress.Location = new System.Drawing.Point(270, 109); + this.rtbIOTAddress.Location = new System.Drawing.Point(268, 116); this.rtbIOTAddress.Name = "rtbIOTAddress"; this.rtbIOTAddress.Size = new System.Drawing.Size(565, 27); this.rtbIOTAddress.TabIndex = 487; @@ -154,7 +154,7 @@ // this.label19.Font = new System.Drawing.Font("Segoe UI", 12F); this.label19.ForeColor = System.Drawing.Color.White; - this.label19.Location = new System.Drawing.Point(65, 113); + this.label19.Location = new System.Drawing.Point(62, 119); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(200, 21); this.label19.TabIndex = 486; @@ -167,7 +167,7 @@ this.rtbnSaveSetup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); this.rtbnSaveSetup.Font = new System.Drawing.Font("Segoe UI", 12F); this.rtbnSaveSetup.ForeColor = System.Drawing.Color.White; - this.rtbnSaveSetup.Location = new System.Drawing.Point(592, 442); + this.rtbnSaveSetup.Location = new System.Drawing.Point(592, 598); this.rtbnSaveSetup.Name = "rtbnSaveSetup"; this.rtbnSaveSetup.Size = new System.Drawing.Size(138, 47); this.rtbnSaveSetup.TabIndex = 476; @@ -200,7 +200,7 @@ this.rbtnCancel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); this.rbtnCancel.Font = new System.Drawing.Font("Segoe UI", 12F); this.rbtnCancel.ForeColor = System.Drawing.Color.White; - this.rbtnCancel.Location = new System.Drawing.Point(770, 443); + this.rbtnCancel.Location = new System.Drawing.Point(770, 599); this.rbtnCancel.Name = "rbtnCancel"; this.rbtnCancel.Size = new System.Drawing.Size(138, 47); this.rbtnCancel.TabIndex = 477; @@ -232,7 +232,7 @@ this.cbAnalysisCSV.AutoSize = true; this.cbAnalysisCSV.Font = new System.Drawing.Font("Segoe UI", 12F); this.cbAnalysisCSV.ForeColor = System.Drawing.Color.White; - this.cbAnalysisCSV.Location = new System.Drawing.Point(268, 193); + this.cbAnalysisCSV.Location = new System.Drawing.Point(268, 202); this.cbAnalysisCSV.Name = "cbAnalysisCSV"; this.cbAnalysisCSV.Size = new System.Drawing.Size(63, 25); this.cbAnalysisCSV.TabIndex = 513; @@ -243,7 +243,7 @@ // this.label14.Font = new System.Drawing.Font("Segoe UI", 12F); this.label14.ForeColor = System.Drawing.Color.White; - this.label14.Location = new System.Drawing.Point(25, 193); + this.label14.Location = new System.Drawing.Point(25, 205); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(237, 21); this.label14.TabIndex = 512; @@ -255,7 +255,7 @@ this.rtbCarTypebyVIN.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); this.rtbCarTypebyVIN.Font = new System.Drawing.Font("Segoe UI", 12F); this.rtbCarTypebyVIN.ForeColor = System.Drawing.Color.White; - this.rtbCarTypebyVIN.Location = new System.Drawing.Point(268, 147); + this.rtbCarTypebyVIN.Location = new System.Drawing.Point(268, 159); this.rtbCarTypebyVIN.Name = "rtbCarTypebyVIN"; this.rtbCarTypebyVIN.Size = new System.Drawing.Size(567, 27); this.rtbCarTypebyVIN.TabIndex = 515; @@ -266,7 +266,7 @@ // this.label10.Font = new System.Drawing.Font("Segoe UI", 12F); this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(63, 151); + this.label10.Location = new System.Drawing.Point(62, 162); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(200, 21); this.label10.TabIndex = 514; @@ -278,7 +278,7 @@ this.rtbReportPath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); this.rtbReportPath.Font = new System.Drawing.Font("Segoe UI", 12F); this.rtbReportPath.ForeColor = System.Drawing.Color.White; - this.rtbReportPath.Location = new System.Drawing.Point(268, 224); + this.rtbReportPath.Location = new System.Drawing.Point(268, 243); this.rtbReportPath.Name = "rtbReportPath"; this.rtbReportPath.Size = new System.Drawing.Size(567, 27); this.rtbReportPath.TabIndex = 516; @@ -289,7 +289,7 @@ // this.label1.Font = new System.Drawing.Font("Segoe UI", 12F); this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(26, 224); + this.label1.Location = new System.Drawing.Point(25, 248); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(237, 21); this.label1.TabIndex = 517; @@ -302,7 +302,7 @@ this.radButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); this.radButton1.Font = new System.Drawing.Font("Segoe UI", 12F); this.radButton1.ForeColor = System.Drawing.Color.White; - this.radButton1.Location = new System.Drawing.Point(853, 222); + this.radButton1.Location = new System.Drawing.Point(853, 244); this.radButton1.Name = "radButton1"; this.radButton1.Size = new System.Drawing.Size(55, 31); this.radButton1.TabIndex = 518; @@ -333,7 +333,7 @@ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); this.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124))))); this.BorderWidth = 0; - this.ClientSize = new System.Drawing.Size(935, 516); + this.ClientSize = new System.Drawing.Size(935, 672); this.Controls.Add(this.radButton1); this.Controls.Add(this.label1); this.Controls.Add(this.rtbReportPath); diff --git a/Analysis/FSoftwareSetup.resx b/Analysis/CjlrForm/FSoftwareSetup.resx similarity index 100% rename from Analysis/FSoftwareSetup.resx rename to Analysis/CjlrForm/FSoftwareSetup.resx diff --git a/Analysis/Tolerance/FToleranceSetup.cs b/Analysis/CjlrForm/FToleranceSetup.cs similarity index 99% rename from Analysis/Tolerance/FToleranceSetup.cs rename to Analysis/CjlrForm/FToleranceSetup.cs index 2dcc696..44abae0 100644 --- a/Analysis/Tolerance/FToleranceSetup.cs +++ b/Analysis/CjlrForm/FToleranceSetup.cs @@ -1,4 +1,4 @@ -using DAL; +using NSAnalysis.DAL; using System; using System.Collections.Generic; using System.Data; diff --git a/Analysis/Tolerance/FToleranceSetup.designer.cs b/Analysis/CjlrForm/FToleranceSetup.designer.cs similarity index 100% rename from Analysis/Tolerance/FToleranceSetup.designer.cs rename to Analysis/CjlrForm/FToleranceSetup.designer.cs diff --git a/Analysis/Tolerance/FToleranceSetup.resx b/Analysis/CjlrForm/FToleranceSetup.resx similarity index 100% rename from Analysis/Tolerance/FToleranceSetup.resx rename to Analysis/CjlrForm/FToleranceSetup.resx diff --git a/Analysis/UserControl/LabPictureControl.cs b/Analysis/CjlrForm/LabPictureControl.cs similarity index 100% rename from Analysis/UserControl/LabPictureControl.cs rename to Analysis/CjlrForm/LabPictureControl.cs diff --git a/Analysis/Tolerance/LabPictureControl.designer.cs b/Analysis/CjlrForm/LabPictureControl.designer.cs similarity index 100% rename from Analysis/Tolerance/LabPictureControl.designer.cs rename to Analysis/CjlrForm/LabPictureControl.designer.cs diff --git a/Analysis/Tolerance/LabPictureControl.resx b/Analysis/CjlrForm/LabPictureControl.resx similarity index 100% rename from Analysis/Tolerance/LabPictureControl.resx rename to Analysis/CjlrForm/LabPictureControl.resx diff --git a/Analysis/DAL/SQLHelper.cs b/Analysis/DAL/SQLHelper.cs index 651a621..0978e04 100644 --- a/Analysis/DAL/SQLHelper.cs +++ b/Analysis/DAL/SQLHelper.cs @@ -3,7 +3,7 @@ using System.Data; using System.Data.SqlClient; using System.Windows.Forms; -namespace DAL +namespace NSAnalysis.DAL { public class SQLHelper { diff --git a/Analysis/DAL/TMeasureMSSQLDAL.cs b/Analysis/DAL/TMeasureMSSQLDAL.cs index b3e7fc7..e697c2a 100644 --- a/Analysis/DAL/TMeasureMSSQLDAL.cs +++ b/Analysis/DAL/TMeasureMSSQLDAL.cs @@ -5,7 +5,7 @@ using System.Data; using System.Data.SqlClient; using System.Text; -namespace DAL +namespace NSAnalysis.DAL { public class TMeasureMSSQLDAL { @@ -18,12 +18,7 @@ namespace DAL return int.Parse(dt.Rows[0][0].ToString()); } - public string SelectNo6MeasureResult() - { - string strSql = "select top 6 CarID from TMeasureResult order by MeasureDate desc"; - DataTable dt = SQLHelper.ExecuteQuery(strSql, CommandType.Text); - return dt.Rows[5][0].ToString(); - } + public DataTable SelectNewestTMeasureResult() { @@ -194,6 +189,11 @@ namespace DAL return dt.Rows.Count > 0; // 任务存在返回 true，否则返回 false } + + + + + #endregion #region Insert Function @@ -337,6 +337,7 @@ namespace DAL #region Delete Function + // 删除指定车型的分发配置 public int DeleteOneTolerance(string modelsCode) { // 使用参数化查询以防止 SQL 注入 @@ -344,9 +345,9 @@ namespace DAL // 创建一个 SqlParameter 来替代直接拼接字符串 SqlParameter[] parameters = new SqlParameter[] - { - new SqlParameter("@modelsCode", modelsCode), - }; + { + new SqlParameter("@modelsCode", modelsCode), + }; // 执行非查询操作 return SQLHelper.ExecuteNonQuery(strOle, parameters, CommandType.Text); diff --git a/Analysis/Define/Define.cs b/Analysis/Define/Define.cs index ec4066a..3e7d29e 100644 --- a/Analysis/Define/Define.cs +++ b/Analysis/Define/Define.cs @@ -135,23 +135,8 @@ namespace NSAnalysis strNextSenseCSVEH3Path = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "NextsenseCSVEH3Path"); strNextSenseCSVEHYPath = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "NextsenseCSVEHYPath"); strNextSenseSelfMeasurePath = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "NextseneSelfMeasurePath"); - dFPY = double.Parse(FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "FPY")); - dFPY2 = double.Parse(FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "FPY2")); - strCarModel = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "CarModel"); - strEquipNo = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "EquipmentNo"); - strEquipName = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "EquipmentName"); - iStartIOTFlag = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "StartIOTFlag"); - strIOTAddress = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "IOTAddress"); - strIOTCarTypeAddress = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "IOTCarTypeAddr"); - iShowCarDataFlag = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "ShowDataFlag"); - strShowCarLR = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "ShowData"); - dTolerancePer = FileIni.ReadDouble(ConfigDfn.strConfigFile, strSection, "TolerancePercentage"); - dExceptionTolerancePer = FileIni.ReadDouble(strConfigFile, strSection, "ExceptionPercentage"); strPwd = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "Password"); - strCOMPort = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "COMPort"); - iCreateReportFlag = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "CreateReportFlag"); - strStationName = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "StationName"); strUploadPath = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "tavascanUploadPath"); strUploadPath2 = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "blacklabelUploadPath"); dLevel2 = double.Parse(FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "Level2Times")); @@ -162,25 +147,8 @@ namespace NSAnalysis iRecordEncoderFlag = FileIni.ReadInt(strConfigFile, strSection, "RecordEncoderFlag"); iIncludeRangeFlag = FileIni.ReadInt(strConfigFile, strSection, "IncludeRangeFlag"); iMeasureItemsCount = FileIni.ReadInt(strConfigFile, strSection, "MeasureCarItemsCount"); - iFailedCarCount = FileIni.ReadInt(strConfigFile, strSection, "ContinuousCarCount"); #endregion 读取系统配置参数 - - #region 读[PLC] 参数 - - strSection = "PLC"; - strPLCIP = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "ModbusTcp_IP"); - - #endregion 读[PLC] 参数 - - #region 读[Timer] 参数 - - strSection = "Timer"; - gtm1_60 = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "TimerFixedStorage") * 1000; - gtmRMIDMode = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "TimerRefreshMIDMode") * 1000; - gtmRCMMStatus = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "TimerRefreshCMMStatus") * 1000; - - #endregion 读[Timer] 参数 } public static void LoadConfigFile() @@ -189,10 +157,7 @@ namespace NSAnalysis { #region 检查DLL是否存在 - //if (!File.Exists(Application.StartupPath + "\\Fwlib32.dll")) - // MyBase.TraceWriteLine("错误：Fwlib32.dll 文件丢失，程序将不能正确运行！"); - //else - // MyBase.TraceWriteLine("Fwlib32.dll 文件存在！"); + #endregion 检查DLL是否存在 @@ -233,90 +198,7 @@ namespace NSAnalysis } } - public class PLCDfn - { - /// - /// 上料完成状态 10=OK,其他=false - /// - public static int CmmPartOk = -1; - - /// - /// 清除测量结果标志位 - /// - public static int CMMResultClear = -1; - - /// - /// PLC心跳状态: 0 1 定时闪烁 - /// - public static bool bPlcLiveHeart = false; - - /// - /// CMM外部急停（PLC给出） - /// - public static bool bCMMEmengency = false; - - /// - /// PLC当前模式10：手动；20：自动；30：联机自动；40：脱机运行 - /// - public static int bPLCMode; - - /// - /// PLC自动运行 - /// - public static bool bAllowHome = false; - - /// - /// 托盘到位状态：10：托盘到位；0 ：默认 - /// - public static int TrayStatus; - - /// - /// 允许启动指令：0=禁止启动, 1611或10 = 允许启动, -1= 未知（PLC未连接） - /// - public static int StartCmd = -1; - - /// - /// 启动测量：10：开始测量；0 ：默认 - /// - public static int NSStartMeasure; - - public static int CarPassFlag; - - /// - /// 读码完成：10：默认为；0 ：默认 - /// - public static int ReadVINFinishFlag; - - /// - /// 从工位1流向工位2：10：station1->2；0 ：默认 - /// - public static int Station1To2; - - /// - /// 从工位2流向工位3：10：station1->2；0 ：默认 - /// - public static int Station2To3; - - /// - /// 工件ID - /// - public static string PartID = ""; - - /// - /// 1：EH3；2：EHY - /// - public static int CarType; - - /// - /// PLC心跳状态: 0 1 定时闪烁 - /// - public static bool bPlcLiveTick = false; - } - - public class HYPLCDfn - { - public static int testValue = 1; - } + public class DatabaseDfn { diff --git a/Analysis/FormMain.cs b/Analysis/FormMain.cs index 892893b..d1d4995 100644 --- a/Analysis/FormMain.cs +++ b/Analysis/FormMain.cs @@ -9,11 +9,9 @@ using System.Collections.Generic; using System.Data; using System.Drawing; using System.IO; -using System.IO.Ports; using System.Linq; using System.Net; using System.Text; -using System.Threading; using System.Windows.Forms; using Telerik.WinControls; using Telerik.WinControls.UI; @@ -36,22 +34,6 @@ namespace NSAnalysis private int iCurrentMeasureItemsFailedCount = 0; #region PLC相关变量 - private bool bStopPlcNormal = false; - private static int HeartBeatCount = 0; - private bool bPlcLiveTickLast = false; - - private Thread m_ThreadReconnectPLC = null; - private int m_ReConnectNum = 0; - private bool bTickt = true; - private int iLastNSStartMeasure = 0; - private int iLastCarPassFlag = 0; - private int iLastStation1To2 = 0; - private int iLastStation2To3 = 0; - private int iLastReadVINFinishFlag = 0; - - private SerialPort serialTestPort = null; - - private SerialPort serialPort = null; private int iLastMesureCount = 0; #endregion PLC相关变量 @@ -109,34 +91,12 @@ namespace NSAnalysis rdtpEndTime.Text = DateTime.Now.ToString("yyyy-MM-dd"); #endregion 初始化全局变量 - //需要显示车身数据 不分析csv文件 - if (ConfigDfn.iShowCarDataFlag == 1) - { - MyBase.TraceWriteLine(" 进入显示车身模式！显示车身界面。"); - lpcShowCarData_Click(null, null); - //serialPort = new SerialPort(ConfigDfn.strCOMPort, 115200, Parity.None, 8, StopBits.One); // 设置串口参数 - //serialPort.DataReceived += new SerialDataReceivedEventHandler(DataAutoReceivedHandler); // 注册数据接收事件处理方法 - //serialPort.Open(); // 打开串口 - //if (serialPort.IsOpen) - //{ - // MyBase.TraceWriteLine(ConfigDfn.strCOMPort + "打开成功O(∩_∩)O"); - //} - //else - //{ - // MyBase.TraceWriteLine(ConfigDfn.strCOMPort + "打开失败！"); - // MessageBox.Show(ConfigDfn.strCOMPort + "打开失败！请检查扫抢串口设置是否正确。", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); - //} - } - else - { - MyBase.TraceWriteLine(" 进入不显示车身模式！"); - } + if (ConfigDfn.iAnalysisCSVFlag == 1) { MyBase.TraceWriteLine(" 进入解析CSV文件模式，开始解析扫码CSV文件！"); tmReadNextsenseCSV.Interval = 500; tmReadNextsenseCSV.Start(); - //tmdal.updateMaintenceInfoEmpty(); } else { @@ -184,7 +144,17 @@ namespace NSAnalysis // MyBase.TraceWriteLine(strTip + " ；点击了否按钮，不创建目录！"); //} } - initLPCControl(); + lpcSoftwareSetup.labPicture.Click += new EventHandler(lpcSoftwareSetup_Click); + lpcSoftwareSetup.labText.Click += new EventHandler(lpcSoftwareSetup_Click); + + lpcToleranceSetup.labPicture.Click += new EventHandler(lpcToleranceSetup_Click); + lpcToleranceSetup.labText.Click += new EventHandler(lpcToleranceSetup_Click); + + lpcAboutSoftware.labPicture.Click += new EventHandler(lpcAboutSoftware_Click); + lpcAboutSoftware.labText.Click += new EventHandler(lpcAboutSoftware_Click); + + lpcShowLog.labPicture.Click += new EventHandler(lpcShowLog_Click); + lpcShowLog.labText.Click += new EventHandler(lpcShowLog_Click); //tmdal.updateMaintenceInfoEmpty(); //iLastMesureCount = tmdal.SelectTMeasureResultCount(); @@ -293,26 +263,7 @@ namespace NSAnalysis #endregion 分页相关 } - private void initLPCControl() - { - lpcSoftwareSetup.labPicture.Click += new EventHandler(lpcSoftwareSetup_Click); - lpcSoftwareSetup.labText.Click += new EventHandler(lpcSoftwareSetup_Click); - lpcToleranceSetup.labPicture.Click += new EventHandler(lpcToleranceSetup_Click); - lpcToleranceSetup.labText.Click += new EventHandler(lpcToleranceSetup_Click); - - lpcAboutSoftware.labPicture.Click += new EventHandler(lpcAboutSoftware_Click); - lpcAboutSoftware.labText.Click += new EventHandler(lpcAboutSoftware_Click); - - lpcUploadIOTTest.labPicture.Click += new EventHandler(lpcUploadIOTTest_Click); - lpcUploadIOTTest.labText.Click += new EventHandler(lpcUploadIOTTest_Click); - - lpcTestGetCarTye.labPicture.Click += new EventHandler(lpcTestGetCarTye_Click); - lpcTestGetCarTye.labText.Click += new EventHandler(lpcTestGetCarTye_Click); - - lpcShowLog.labPicture.Click += new EventHandler(lpcShowLog_Click); - lpcShowLog.labText.Click += new EventHandler(lpcShowLog_Click); - } private void FormMain_FormClosing(object sender, FormClosingEventArgs e) { @@ -1802,6 +1753,8 @@ namespace NSAnalysis private void lpcShowCarData_Load(object sender, EventArgs e) { } + + } #endregion diff --git a/Analysis/FormMain.designer.cs b/Analysis/FormMain.designer.cs index 3dec989..4f6f2bb 100644 --- a/Analysis/FormMain.designer.cs +++ b/Analysis/FormMain.designer.cs @@ -143,10 +143,8 @@ namespace NSAnalysis this.SMResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.rpvpSetup = new Telerik.WinControls.UI.RadPageViewPage(); this.lpcToleranceSetup = new UserControlClass.LabPictureControl(); - this.lpcTestGetCarTye = new UserControlClass.LabPictureControl(); this.lpcShowLog = new UserControlClass.LabPictureControl(); this.lpcSoftwareSetup = new UserControlClass.LabPictureControl(); - this.lpcUploadIOTTest = new UserControlClass.LabPictureControl(); this.lpcAboutSoftware = new UserControlClass.LabPictureControl(); this.tmSystem = new System.Windows.Forms.Timer(this.components); this.tmReadNextsenseCSV = new System.Windows.Forms.Timer(this.components); @@ -1813,10 +1811,8 @@ namespace NSAnalysis // rpvpSetup // this.rpvpSetup.Controls.Add(this.lpcToleranceSetup); - this.rpvpSetup.Controls.Add(this.lpcTestGetCarTye); this.rpvpSetup.Controls.Add(this.lpcShowLog); this.rpvpSetup.Controls.Add(this.lpcSoftwareSetup); - this.rpvpSetup.Controls.Add(this.lpcUploadIOTTest); this.rpvpSetup.Controls.Add(this.lpcAboutSoftware); this.rpvpSetup.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rpvpSetup.Image = ((System.Drawing.Image)(resources.GetObject("rpvpSetup.Image"))); @@ -1834,27 +1830,12 @@ namespace NSAnalysis this.lpcToleranceSetup.LabelPoint = new System.Drawing.Point(3, 59); this.lpcToleranceSetup.LabelText = "数据分发"; this.lpcToleranceSetup.LabelTopImage = global::NSAnalysis.Properties.Resources.Config; - this.lpcToleranceSetup.Location = new System.Drawing.Point(168, 37); + this.lpcToleranceSetup.Location = new System.Drawing.Point(166, 37); this.lpcToleranceSetup.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lpcToleranceSetup.Name = "lpcToleranceSetup"; this.lpcToleranceSetup.Size = new System.Drawing.Size(113, 85); this.lpcToleranceSetup.TabIndex = 458; // - // lpcTestGetCarTye - // - this.lpcTestGetCarTye.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - this.lpcTestGetCarTye.Font = new System.Drawing.Font("Segoe UI", 9.75F); - this.lpcTestGetCarTye.ForeColor = System.Drawing.Color.White; - this.lpcTestGetCarTye.LabelPoint = new System.Drawing.Point(3, 59); - this.lpcTestGetCarTye.LabelText = "获取车型测试"; - this.lpcTestGetCarTye.LabelTopImage = global::NSAnalysis.Properties.Resources.downloadCarType; - this.lpcTestGetCarTye.Location = new System.Drawing.Point(484, 37); - this.lpcTestGetCarTye.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.lpcTestGetCarTye.Name = "lpcTestGetCarTye"; - this.lpcTestGetCarTye.Size = new System.Drawing.Size(113, 85); - this.lpcTestGetCarTye.TabIndex = 457; - this.lpcTestGetCarTye.Click += new System.EventHandler(this.lpcTestGetCarTye_Click); - // // lpcShowLog // this.lpcShowLog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); @@ -1863,7 +1844,7 @@ namespace NSAnalysis this.lpcShowLog.LabelPoint = new System.Drawing.Point(2, 59); this.lpcShowLog.LabelText = "显示LOG"; this.lpcShowLog.LabelTopImage = global::NSAnalysis.Properties.Resources.LOG; - this.lpcShowLog.Location = new System.Drawing.Point(662, 37); + this.lpcShowLog.Location = new System.Drawing.Point(322, 37); this.lpcShowLog.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lpcShowLog.Name = "lpcShowLog"; this.lpcShowLog.Size = new System.Drawing.Size(86, 85); @@ -1885,21 +1866,6 @@ namespace NSAnalysis this.lpcSoftwareSetup.TabIndex = 453; this.lpcSoftwareSetup.Click += new System.EventHandler(this.lpcSoftwareSetup_Click); // - // lpcUploadIOTTest - // - this.lpcUploadIOTTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - this.lpcUploadIOTTest.Font = new System.Drawing.Font("Segoe UI", 9.75F); - this.lpcUploadIOTTest.ForeColor = System.Drawing.Color.White; - this.lpcUploadIOTTest.LabelPoint = new System.Drawing.Point(3, 59); - this.lpcUploadIOTTest.LabelText = "上传IOT测试"; - this.lpcUploadIOTTest.LabelTopImage = global::NSAnalysis.Properties.Resources.upload; - this.lpcUploadIOTTest.Location = new System.Drawing.Point(326, 37); - this.lpcUploadIOTTest.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.lpcUploadIOTTest.Name = "lpcUploadIOTTest"; - this.lpcUploadIOTTest.Size = new System.Drawing.Size(113, 85); - this.lpcUploadIOTTest.TabIndex = 451; - this.lpcUploadIOTTest.Click += new System.EventHandler(this.lpcUploadIOTTest_Click); - // // lpcAboutSoftware // this.lpcAboutSoftware.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); @@ -1908,7 +1874,7 @@ namespace NSAnalysis this.lpcAboutSoftware.LabelPoint = new System.Drawing.Point(2, 59); this.lpcAboutSoftware.LabelText = "关于软件"; this.lpcAboutSoftware.LabelTopImage = global::NSAnalysis.Properties.Resources.About32; - this.lpcAboutSoftware.Location = new System.Drawing.Point(791, 37); + this.lpcAboutSoftware.Location = new System.Drawing.Point(451, 37); this.lpcAboutSoftware.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lpcAboutSoftware.Name = "lpcAboutSoftware"; this.lpcAboutSoftware.Size = new System.Drawing.Size(86, 85); @@ -2077,7 +2043,6 @@ namespace NSAnalysis private Telerik.WinControls.UI.CommandBarSeparator commandBarSeparator4; private Telerik.WinControls.UI.RadLabelElement radLabelElement2; private Telerik.WinControls.UI.RadLabelElement rleReadCSVStatus; - private LabPictureControl lpcUploadIOTTest; private System.Windows.Forms.Label labCarType; private System.Windows.Forms.Label label24; private LabPictureControl lpcShowLog; @@ -2099,7 +2064,6 @@ namespace NSAnalysis private System.Windows.Forms.DataGridViewTextBoxColumn MeasureValue; private System.Windows.Forms.DataGridViewTextBoxColumn MDate; private System.Windows.Forms.DataGridViewTextBoxColumn MResult; - private LabPictureControl lpcTestGetCarTye; private LabPictureControl lpcSoftwareSetup; private LabPictureControl lpcToleranceSetup; } diff --git a/Analysis/FormMain.resx b/Analysis/FormMain.resx index a80429b..00efa1b 100644 --- a/Analysis/FormMain.resx +++ b/Analysis/FormMain.resx @@ -150,65 +150,6 @@ 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 - aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU - WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+ - 613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e - Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT - 4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3 - z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr - Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj - uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ - dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH - qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm - fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0 - E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf - d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm - okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau - DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8 - LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV - bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl - 8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi - n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx - f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/ - ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg== @@ -235,11 +176,21 @@ True - + - iVBORw0KGgoAAAANSUhEUgAAAAUAAAAECAYAAABGM/VAAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAACFJREFUGFdjEHXq/o+OGf4DAbIACDCAAEwCLgADCAEGBgDP4STWpID5ywAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AkVCAAngM/SOwAAAoNJREFU + SEu1lsvLTWEUh7cIJQbEwIRipoSRiRiIAf4AxcB1YGJgIkWhFBHKyOQrA5JigmKipIQJGZCJWwauySWX + iOf5etfu/XbrHMftV0/tvd61fr/O2e9+z2kG1GRYAUfgGjyFtwWvrblmj71/rSmwGa7Ce/jxC+yx1xln + f1ujYDlo8h26AbdhS8Hr7rozzuqh10AaC9vgNXQN5Q0shpDX1rJePfTSs69s2A1fIDOS+zANQlPBWtYr + X0HPvuFbIUJvwTG4At9KTd7BKgh5bS3W7XXGWT2s6al3Kr+yF2DjdZgByl16DsJYHsK+gtf1mr2xs/XQ + y7reS2CEJsEliOG9UGsjxFoXN5LPODbhBqilV/SaYVar1eCziIaTMAZC+yHWupyA+XC53Nsb0kOv6DXD + rGFNgIsQi/IRNFgK2+EV1OuBz24lqONgzV5nnNVDr3rGLDObRdDL+HNSq3kEM8Gv72apBb1mzTKz2VUK + f8J5GA0LoNe7nGFmc6Eq+CoMcjQGO0F5RGbrgZ71K2lm+/J72G+ChbAHPkA0ZnyCZaCGIOvRQy899TbD + upnN83Kzw5sid+MZqE26PIDp4I/BnVLrokf9dphh3cz22azxptJRqE0Cd7KGsZvnwkvIevWoZYZ1M5sn + 5eYseO6qOXAXapPgIIyHkNeHIOvVQy+ltxnWzWzPU08ejzcPhHul1uUxzIKurLmWzeilp95xuvnq9dwY + GQ6MOPKKJsINyGYyzGzWQ31c9sNPNRu66veJu5i1DoaH3KFZU4bPeByEvD4AWW+GWe3jOgxZU4ZH4SlY + C+7S06WW9WaY1WoePIOs8V9ihlmt/EPm3xP/SXja/A/0NoOspvkJxD7h7QqkS00AAAAASUVORK5CYII= @@ -300,6 +251,48 @@ True + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AEGATc06Xu77gAAAihJREFU + WEft1j1rFUEUgOH1IwYLCzEKSSAQVLBRkkZ/gEYs468w1iJoY6ud2gqKIfEXWAh2GhNrP8DYRcEETaNi + YSHq+152YLKe3J1ELiLcAw8sO2fO7MfM7Fb96Mf/GIPYj0MYrXnsOdt6EgdwGlcwjwW8wErNY8/ZZo65 + 9vnrGMclLOIzfhUy1z72tcaWYx8uwDv7iWiQEva1hrWsWRSHMYfviIomX7FW8zjKSaxlTWt3jUk8RVQk + ccDbOIcjNY89Z1vUJ7H2BMI4jueIOiYvcRY7sAvOfnls2GZO1Dd5hmPYEMN4hKhD4t05gOFd3MNy7S58 + eoY5bU/iIRyzEwO4jrbJdgs7YVxEc468wkkY5uZtTY51A3tQnccnRInJF5xBir24hm/I8+5jN8y1T97W + 5JiO3VmvUUJuFc5g372PbgRHcQc/kPLe4CBc+/bJa0Qcu1rKTmzGYhZ1d3uCD3iPj8hfnRfgpCy9AFdF + 8Stwe3W+uN1GOZpF6StYxzQ6E8EJ0TYJb8I4hddotnvONsPcZntuwyQ0fK8ujSg5cWlNwXDJufTe1vJl + aM6WlmEKNwc3iahD4iaTLiLaiGxr24iceH9sRClO4DGijomTy3Xe3Io91zbxrO0YXWMMTqaSj5EDquRj + ZE1rF4Wfzhn4ONsmZzf2tYa1ij/HebieL2O7PyT23dYPSTOG4D5wFQ/g75d39q7msedsM8dc+/Qk/slP + aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU + WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+ + 613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e + Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT + 4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3 + z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr + Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj + uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ + dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH + qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm + fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0 + E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf + d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm + okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau + DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8 + LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV + bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl + 8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi + n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx + f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/ + ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg== + + 17, 17 @@ -310,7 +303,7 @@ 310, 14 - 61 + 65 diff --git a/Analysis/NXSAnalysis.csproj b/Analysis/NXSAnalysis.csproj index 7764831..61f80b6 100644 --- a/Analysis/NXSAnalysis.csproj +++ b/Analysis/NXSAnalysis.csproj @@ -69,7 +69,8 @@ true - HexagonTransparent.ico + + @@ -114,10 +115,10 @@ - + Form - + AboutSoftwareInfo.cs @@ -133,53 +134,53 @@ FormMain.cs - + UserControl - + LabPictureControl.cs - + Form - + FAddTolerance.cs - + Form - + FEditTolerance.cs - + Form - + FSoftwareSetup.cs - + Form - + FToleranceSetup.cs - + Form - + ZSFDEMO.cs - + AboutSoftwareInfo.cs FormMain.cs - + LabPictureControl.cs @@ -195,19 +196,19 @@ Resources.resx True - + FAddTolerance.cs - + FEditTolerance.cs - + FSoftwareSetup.cs - + FToleranceSetup.cs - + ZSFDEMO.cs @@ -229,7 +230,6 @@ - @@ -242,6 +242,7 @@ + diff --git a/Analysis/Program.cs b/Analysis/Program.cs index 18a9f9d..988f811 100644 --- a/Analysis/Program.cs +++ b/Analysis/Program.cs @@ -1,5 +1,6 @@ using BaseFunction; using Microsoft.Win32; +using NSAnalysis.BaseUnit; using System; using System.Diagnostics; using System.Runtime.InteropServices; @@ -82,7 +83,9 @@ namespace NSAnalysis #endregion 创建Log文件 - Application.Run(new FToleranceSetup()); + Application.Run(new FormMain()); + //FileSorter fileSorter = new FileSorter(); + //fileSorter.ProcessFiles(); //if (gAuthorizationMode == 1) // { diff --git a/Analysis/Properties/Resources.Designer.cs b/Analysis/Properties/Resources.Designer.cs index 7437a20..7f55ec1 100644 --- a/Analysis/Properties/Resources.Designer.cs +++ b/Analysis/Properties/Resources.Designer.cs @@ -200,6 +200,16 @@ namespace NSAnalysis.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap Hexagon_logo_horz_Chinese_black { + get { + object obj = ResourceManager.GetObject("Hexagon_logo_horz_Chinese_black", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/Analysis/Properties/Resources.resx b/Analysis/Properties/Resources.resx index 78176e0..43adb8e 100644 --- a/Analysis/Properties/Resources.resx +++ b/Analysis/Properties/Resources.resx @@ -118,23 +118,56 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\images\cncmachine32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\dashboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\eyes32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\search32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\EHYL.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\add_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Waiting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\EH3R.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ResultNG.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\cncmachine32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\showcardata.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Range.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ResultOK.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\setup32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\wnull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\EH3L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\NG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\EHYR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,29 +175,32 @@ ..\Resources\Forbid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Waiting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\firstpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\NG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Refresh128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\OK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\wnull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ResultNG.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\eyes32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ResultOK.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\plctest32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lastpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\plcaddress32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plctest32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\nextpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\LOG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\search16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -172,17 +208,11 @@ ..\Resources\hexagonlogotransparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\about32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\firstpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\lastpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\nextpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\setupgreen32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\prevpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,40 +220,13 @@ ..\Resources\Refresh64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\showcardata.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Refresh128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\HConfig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\setupgreen32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\add_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\LOG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\downloadCarType.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\EHYL.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\EHYR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\EH3L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\EH3R.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Range.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Hexagon_logo_horz_Chinese_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Analysis/Resources/Hexagon_logo_horz_Chinese_black.png b/Analysis/Resources/Hexagon_logo_horz_Chinese_black.png new file mode 100644 index 0000000000000000000000000000000000000000..1d330d9b29c53dab1b1a581dae7df118d8519cbe GIT binary patch literal 31271 zcmdSBWn3FU7w{Xblmf+}cnR(f#VOX}6bNo5SkVH7;MNu?6e;cniUkc$g0@gxiUoJK z;4U}M^IrSi_kMftm-`{v{mt&o&YU@OX3l@kZj_GJ8^UKa&j0`bq3T;DT>t>P8vww7 zK7E4z4-o#dgua0H@vX5Z06<0ZpC3j)+o>D?@DiY^^jhC1YkvXdH31**I8NWXTO{Lp zsV`p=qKPAq^X1u7it5tkaP$FyJ^_@3=wPVgoVFP8zUT>NF|Faby_I0!@_@89cq6&v z3KM?WvB|4FrXm1FvRXncJ*wgBulnNY*r|W4u_$_E*}RQSBGDUPP$_$ z%QAzM#(nj@v4qkaI`ImR-++zcwnfvSIdocV!sCDN!q2~%B!V2F5q93Ro=Y5tNr~k< zV^8T~B>P@9FN2R%4Zb5*DR9-v>8=bjSS&okI^XDMrj%XePw|-6c-OpeFf&hc*P+uoERxGb z-iqv91w}#OF5H=sW{n3`7U3zEM|oS*Te7xic}$9{(9~+C&L*fyp#M@sLlN>K8Mb%5 zE2cPi>vwTJFc|A^ajCAv&>Xz9$GXF9IPUKyIuTKMxjI)ReTIP21~k)|&Xw#|p2-g1 z*w$XK()qWv!G}<>n!$DS?JJ&p<#`HSaOc=I#977r-6|5*IhH&qLjU$~+>jZ`aKl6| zm^!zl8slLLwp$DaTHmJ5`|rP6KL>hHc+CHC!ixKMOLdYF5B77tZC!zRj*QIhwO%DP z9>DT$U2kaV5)((WHs@;2?TOs(jt6otc>nYZDb@|_vl%%Q)OOZA&(btGDh%U*A zf_RG@r8{TOvZpmiGH0}u7`$8d*ODk+PYl?4A&Ojzn#}mnN*mc*7`Z>_OnU?$0eaZj zWhyD}$v(s<4yKOO2M#{yg#Sz%G|z1a~ct))!uh9DZj?!3cH zqSGrcFkYWn1&Vr>_ME(0R36=soK$7=c>F~(DoQT>w&`ScylBf@ht7Og>(MU*bl%Px zhh#ZREA_lv!kx1CeDimgOLRtgW99okf2*ofsu8O5GL2LFu;`h!j+sm73~^qtZr`i; zltq7%=46c4TbCZEYn0gEhs;=toB7C*e@ZsU3kEVeH@)lHKlU6zcBWf3zh>!e=py)$ zv^X|#_JZnGcgm|-!+j>kw>j$*Y0J$cqDKoHBtIG09L#vJ^rGPVr#z_XrG?lHBx%fm zi+)oOXZ(ZAJ1UsI*Z zmkQj$THSRomysugpI=B!tt>@cChZ1J@u$|fxk(GvChDhdO49m#$k}K4<0p74`hPbs z?mw6${%^MDJM3+220`EdBlZ8XNUlE;%Y_`Uxs%RV^d_mY%-)KHwaDiDNOWn<&$ZF} zuBIT7pKX(6<{&J|rZ-uzTbMvb;8ma{1o611Oep?O`nE@3Aqi8MqY$WdWh_#slZ=c= z1{U6yVp1E>DLA8lU_MFvEUG;TpG}102pOw91}>S`k$zs<`h3CAT<%NJR$0~FjnnkQ zX}kwrkbK*M3%#wQxzF#dK>daVpQIT?%cX_Xx`%|r&C57sojHw{T*Yl|UX|NyQA2PQ zQK!9MNxaaR%a&3Vcfz23K4lSY{w;L&Ek#+2YF_6Fh z!=<~PF^z?%-u+_(@@(=Vi1kuhChf?r=&-$laLIk~9roFB&m#EUbRR45l5+K?;<3_xrru{NI63fBE6OeTpsg_} zZ||HDw}maLGcc82&(1sJqsfRlG>~yZ_H%A>k3UtD13aMnPI_>^+>I6_Q+03j;HwSm z7isu>2Y&lHBkb@?4x!JG;pArib&3Rw1x>z_ED{6Z&vXmgg2zHOJb!yrdo@eb%{NYQ z2poPpcy}Kv5yVh0)JlVB|5qxj$e&qyEyg&JHQQUC8sK|G#*w4$)vhgfG(Hrk4ojz1wGRS%GMd7S0 zUbv0z=#777V)rUXi8|hRh40E1L(XxfQG>HL?{h(x_I9bz8_T)20DnqH!X85zRB4~$ z4CI)Q@_;4N$(gd`{7~2C3d&r6ARaiUFHM28pd32~wTm>mY&EyfRgQGM*=KUEqWYNs z)yFc}${|(nz^msFhN_YK*J6P@H|jkFH&#XGXirU1if!ud&b@B?bm#$@H=u23*;Kl4 zc|Qk(3@hT~+O*9*?<07+z}`LJ_ncgQAKaV?+SZ)r6zK8 z`;6lPWBT3MWco7rQlqqMt}Xc<>DGe+yqWn9SdVef^e^^4U0PJ)(%J7l`10I-O8XNP z$VA$H+I*m52Td$Ld0Z5?4!#gSR~54z%{cKemdS~{6RKTH>U>N>mDQjW6%U0kALp3l za{8tWpm$u0CcGQs7lO0U8~sq9d!bD;Q~80Gkz)@tzP(2oI&p_!y=)sJe!F&+|6>jF zKbw;RK}z}KCKF5!1`6ts)prRP|1T$tKyD%W>MP6;58iyBUgI)9#fxgKcT|XUU8I?e zzFh~LoGhVqw~}cWE--R_1>ixJGuKQAvtSy98!OvD{U(XM0$Fx3M_K)qR3>n&%KMmw zKnr3@=13)TKzIfVka-s~UbiN)oN4!_{;VY0OzdS`pDXXsz7G_vsSM&TZ3($!bK2K# zhHoeNk-9@xDY3Kz%cpN6%}EU7NL(~`p58`*Qey8dzx8J33@v8P_LvzL@1hwYu$vtF$m3Ju&jGfK)U;i_Vii&KZrs<1ltAw{gbH37* zHN>G5Eu@lFxrB1dPO~PoQXZ8qP;X|0T|$ z=>K}VH#cJY3w*!r^YABfX(>_S(L1psUq5g>*|Z7;Jn53T8y$4jW0<>Ca>FYP{@Sny za^nRnISMz`ON-W;_a29*l$M%7Z;X|4E?vYo(-bdd*c9|9DFgbnU zIR@ZF|21VRX_+(R0Aa~^2pKn8G-K0_L_c>!-A5SI1cmkx9^gajyf*%wV@3NaL*AJ$ z@He(6rXaDG!k=@_jY|C(1uHu|Yrd4}lOE zlqlER#f+Js+Y4J$l4q1b{n#j@9>?pLs#E$jG6yqL~jC6*@PyJ^E`4zrp zIk=i5gbQx+tVha@jWF17&nSLZ*2rW7>cjI=&t z0_a>xsm)8;O*fiO`f^S`RODhieI`1Eaob)vdU4LUrm|l{DJR1?MdW*VV+y$8at1j; zLEW12URQ-%Q5GSX3tHETRE=c?#trQk)eNaflUYylA2&keV1stDLYHj(N)IAet|uu^ zIlUItVl{ud%vGk)`Jwo`1@)fF7?=W`>q+r#?Y2DOYw4QGY$w`{b&pw>QPhF||q z6z@Ry@0)^`eA}jOubFmlHD2kiELOOEQM*@Dk`<9YpWQkS+|*4Uf&!&V0$#;!W@)xy zTHfZTb!=~zY&1t``ug)V?z;a8qKTOMq{KjTf;>&Xo3S5XOCDJ+T5E1_s1u}TIWsaz zACyyS0d5dFDTrT!Z_R_}K@1f;0(RcxCyF0vTs`?uUR*IF zs470yfdZXpdYE(j@2hj$Jm6bPw{+@~vz7BOZ}T3S-^u)HN#b43+(IN=wS^y-77A|G zn36S?cnt=wkEbAy^#X8uS}eIL{Xxi{SP94o8~#rE_wdy#9QGLDimtD3>Me^Q>}b zJ^DhJ`oE`)dP^uZ^F#aC%Xc=)Y-8r>-O%1T-^CJ+adILGUA&|tFe7y0(x9wYi#BJe zki(FGHyM^Xv1ACNNRM2abQ_e-ypSo}#S4Db>BK&MQC*SlvT$nZp6rGvcM&g?Lj3)S zip}NVd0o=-$pDayibCU!Hyhd(?UfqwIZ zA}Y>$Emg+$7ZKIr<*RC`7rBhy8>m-rBors$>%pI-A*j}2W7GcEZ`_Ppxr4=x-@kEC z?LHpr%}w^hF;_2sbpY+qE4GN_;Q*FF14=5m#{ovM$_6%oDOoN^MgNZNjw$1l2a z&g#XNPc#Nu*ZE^S6^)+jOYyGi(YFHJ*i>}spV#D_z`YMF#3lN%fASc+vV+dwDg_}K z*-tQu9Z%F^y!iown%+{rX~5!(BTkAJA%Z^)tqJwkBO~uT4lEE8J-F4*s&4GfUfA&_ zHE+u;LYsS?U=(Rk3wm8;v)_Cncp77D4M+WZy`bqTE}~ppuIJT~wf)olgo#3!*P5hJ zyazptV!vOizYj^y6zX0@PmqQA(7EvbJ@s!SPa=$^cY{kW{?#pvw$BEM^Ul!|U1?-o zcrqN_l%)h_eMw=hj``gFCw48%mu}B9riO^a^vC7AUH@EPE>PEb?uAUnpR^gR`eX1j zNygcrr*_`dI$4Iial!bU>WT4;yYJ_iw&Kb@w)?t1%+v2hq!U(_fX=_BUMXY%} z*~kU+&sJ$16+SaTzQ5dRz2??XRXlykuI9+;Vq;-4(oEI=)7IYNi`5kH_cm7A+Bk_u zC+!?-!7U<18%9at-!El_oyu8mh9hFoPoY(q{`|mV;7OsqWngZo zHjY0p1J$<#iWwfNb*Aq8Fz>41?jV$1k!CIox+nrtqbEEhGG)lsb;6!JYCd@WxV>%k z;f^4y;aS6n!Ya?k_R|Jr>F&P{&c)yXg1LJ3z3ePc5fudT*C7pqQ}hp-xnPCh5DXVL zL*_=ro|OG;j$2uWr0ZunZ(fjtT`IlpG5jkbkG7be_BS8*tB6Bn{GeJU6|=AAMzYo% zQ5BPD!GW026y&sSMR4h&;_pEKQm&#kB0A@C!l*NICVd2^v|g~~-FD+Tz%KrQ)y{6N z|8a_{Gdl*F)5O?U+y4i`cLVR&FQ44ruGm*k^`V6kEP)ROK0wKD`+wFieYxDjY>;vC zGXs5&Gxa?vKm5g(n*;YY^%Xup&V-jP^ob0p3?%z9lk&1_NM1~utoWQ+=ZMNMm~h_c zE4lQ1TVF_{iYvti547s^+T?vu-xP>GvLnrqqCEA7>c7%d?7kW9BZBp>FipWE{of!y z1soP|b*9yvX&LyJ>QCw#u<$lZQz`zwlF*qn@7VkoKF;F76*TnhwZwbeK*h|#{UTeD z&ate4Cc2@&D9&>?q~S1mwA8gY6*v5Ak%si%5=$(G3*&35h*&1o^MhEd0r!t?BzDIR z2%4j{mgm#n9$@ahN|Y)n&a+A*rGgYa@JsUrAuVIvRmzS7^ktD5WK*Nw=Q=9C=w2Zj z*cJG(8MZ#8JgZ&v@0Vqhgk(M;fEy2nP?!rZ#Lad}tvqFz zSY-c?=OfQ=(ad{^h9&78gK4K9y$>OqY85SSzN!3kI*`-V5bD5pN zd4{{1AaYA2jBs&mdhSq{Q(kMk3aNWY}%s8V`}x-r+ZvA*?i+#k73$qn39JWa>%AKh;kL|jfnb`rrL zS=u<4zk{6y$w0ySX}bo{WclaLNuD9)l_QMjrC*?oLEC#hE#Bq*us1{k5Uf_z{ZC9i!j?-C zVaZ4dMde;6>zL$onVd2Kgl<@l0g4A+6n)5D+ygls<5Gv7yD*;IUj+pz#!>&-2MUtp z!&n_@4W=#^yp@1U;JUplhN}0728aD+(~h5e!+i`g{bzlbMtH&M?JVQvRke;}W!J(L zl`3X=)H5Q=Oy6D9b8_?_*}bIn#>w9%aD8EvO_cfj%AnuMs!M~pV5ot#OtVbNrc-B7 zsfTwqUSh}pa_&-+NHf_94BYDdwj#okLFZY{d1&XcAc(%%6IvF55=y~3_9go3P1ECE z6gj5YgEFW&3M91X`P2cUl#3qVp}okwSVL45itHCSyOxX;os5c28coc?yq%;j?PjVi zm6_$#L~NC78q~`8d|6Y3CEVGf5&)zb{+ZJs4T+dH$7-+b!^@YIpp?OD4@xwEGV<619q8lpfN zlF9W@3(>o3zM`wwqMGwaF|dQng^otaO?qPh(RnD6DngFi;az5m=fT9iOwNrN4;Lv} zy6nbp%_~m3x=l=4?DiSlp61uMqOvrI*0s;YI{5F{hhLLs`d)joSB^Lr-3v%<$>OGS9(|Km z3c=cg6@IT~>yr;i?)vXl6CStQ#ts`!dbF-%CrL@x?~qAaf+F3(%L;I!->uHMca3b1 z{{8(HpMPqeEzeGCU%SM&2(}RXnK*ano9B;80-pM}fg*%|<&=^cH&DR-;KOGQWKJXn z3Bj?+hS}U}t#dto%HhW8e}IjpA`4F#HQK~f`Wh1p&{L}-&PU1GXXUc1%OgYu3^n5S zkJuZTF%3MYVutE%*#yepl;iwFrWyl9$=X&USkrcWc*=P3s?w=!B3(XE9DJj5Wp^8@ zU>+T-ZkMC37MjHcV=_y*Cl_^-|)L###%Ir?iBJCy0Jn%NXz3QgIz1~CiPX2i# zPrK6k?$LUd6u&fZ1@a?E+RekRp$z*uuwJaDsB1rI!&nJDx$(m*cUcWA2#1w_ErPE> zHo?H;v!GpycdWkyjGMnP=Cq}IcGp`Ib-QT}{GFT!o9Jdvw-Tv?AcPdtdq0AXa4%55 ze@FCu^JnxjG3FjKv18->dMleV_3-%q;E}4ckj@;@UOPJ;v7%p9{8rOMiG{7^QHM5M zO5Z>7TL!S0U#i_gB6XsT+-S;PZz+cWbUWM@dFO92wb*m3icgg=Fid?#EOB^Fbcycl~r^f%ZTa!gB3JbR|x?( z=7qfIY8oYio`9inl7uRT%*FJXcmK^uVXBGQ4n5?Gx-<`+R%SiUkw?p)rG7d^5F|sA z;D+8g5viR^+Ca<3p{67SX0m5!`0}Dn>>NAv1-eu6xBqh=WkPOF=J*W`0AN?#lmgrB zDjTDZ4E%Lo<_z^SO}BxhBBTL;Uq9_q5CpHyh^IEua?=2%l!~<43y;&;s;YuUl-3n{ z*r@CpvWr9j0F8oe*Zz!g)+g5LR02J;06?_9nYe9471S>oLA+fA&78f-!L|m3fJ}7- z*nlVf^>tP%`sau(I=3n!i6Eed%)4U%dB+Am3M%eNA1sx6A>eelc~-mSkM4YzLm}qx zg&Q&VuwPlwF^|8Pn?6qFD;=!+a%D2o(OIyR8d0@tnL>^T6p9 z2ZWXpSwr8L@y4lYDmeEsOCfmPf$YE@LEKWDa^2Hn0?v`_cu(J95>54TUOElHnPBQW^=c@H&kFugJ!4j3aNi6h zH*nu}=mwRH4k-B1#0Wzvhf_SC+9-&eU*}Vz6&?@Cg5yFR72yP1No8y&?3TQLgZPH_ zrT@0kT*!zRHIpTf<#NVIZ}K?%FZ?`RKAL5!N(`(TR<*pBI71`7(H61Vp%CQrb2X4< zaz=adA0X+~o~6$lV!?Af>h2`GJE$Kg&`nzG-oehEvwyiCMn-zY&i|$ZX9G>tbLQ-X zUy@vxx|M;JyD!zDu6>_LsPhaNaO3K(zglo;MHtvSluLJq6-;1_k^t9g1vcdNH zNAJ67*1>j$F23EO#mTw%4afgSEI_H3!WV372y9o|a5w^k-*?$BmTjYwH?uU(G(-6b z7}rG(T90c3g;!u(np5j-nsZ``2I>qORd^-h2U4?3O`u5s`a`mVn+ z^i;0MVc{bRAsM_9XL8?wzhJ*yzb<+4^dvSsLTm)gAlHEmWezX|zmouKnjQAG`Ud}9 zf0D#uby%QWiNb4wcQn#ISkMbL-c^4NvDvXq?l^*7vEInNn@oI)vB4wTnDv1xD(+rK z+H_mU;x?z^08VTDj~9%4=(@fbbC|A@p`id8aaxE&n=R1_OC$W$q=#vU|K+U&QPwTj z%-wrli)&|n7ZT6*Q^uTIM$rQ$tLWaHG_WS;QJ`}P`4CPqd}M9JYd_HR9Ke zZXmFz%|~;Oinx1pW>Z`ce}(yH&<#m^*?QnHk6hjAJ+%2e;j9;VS&H`3}2ha56fAf)L}PP8owY3 z$3yElzpW?Wu>}vRi)KmVNvNTF7rpkVoKXJPx9JWUbW1H2%cbO)Z$iWQ9@m(+LXwg; zuiDtuvmi)AR6-8$#NqHe6DM(ugzH0Ik%Vho5yK>omC0@jMs&;E5+}l#)Jyw;`Ipm& z=gccl7Q4*W`5@0i32_rQ$unoRLKjk^vvBM1I*q<&p5$>tRu|~F7yxU{m9nUm>`{q6 z-A}dHn;&G-IX>J+(N50vAaD#paaggrrf)Cj$Q#;dH!~I;I;>KcoIVhsr_r6a(l$@| zbY4O9Hs&TFkP>`Me&9QVvDsb-lINECDrT2p=i$sa{{zp`T}Ru?lflanvW3ABnABMg z1}CNBsYJAbz?3xxGcSgI(^4gJ-VAv1&oNpu!a@l+MZtMeo4@0qOWC9!cZej?1b$qd zbwMVER;agCM1IE3abmhQRc+eQ|7LvS_zW9NKWn$m_7ba~^eQvZ(av5|`-_Fr-{+WI zwl>C=m1b50tC{2&>4&LH$2mg;<@KiikPY52?)Pi1D?{;49E~+(o<^U zBhjf_-N{;v(CPiKT!|D;+%Q3+skYuL?I|a$O;r#CcrppO9gS94z8JwZ`w}?tAa+d7 zWg!jcc4PV2|GmE>tSlbcjC6f6{41DdtbVu13eQBh?4->*v`VV7rTFJY=_cJ-Q_c0T zXX9IJa87w(!ZDHJp3IR3`=}uVSIk0_p23;{2S#HGkg;p zI-{D7j)MuzDLZHD&}e3-kvrAEYr}dldwZ|Rv>KyD?J2@zDbqo!fU%PGqrQx6qwnCn zzna*`mtw-V77EL0n4QxAUUv1q=oqYSsZT3ct|&fz#EYJWqwWO6ruIo+J1O2i4K4E# z=8ovi_~5WTaZ5lHeRbN*RBM%40VPTSk+xN|UPGiTAV#cb2{>I*S@MOf{3_X(+T?IP zt&}zKuvDk_mS5`UrmUgA??wn+^(;b^A13gnmJUE(_I9*L z-OcmsxC0aV--EJcj=j=O?19XBwCJ#`gSD@bW_?HJiYTRZ>FP33$<+0BnY(t{s7K?w zt=2OC%vUeklc^_g?7Rnc6atAA1MGN$64VL?b@k(BYGh_n|?0j*6eN}xX5{iR zKmv;-N_IipUw%!d*G6dBeA_wB-YA4hEseCVAZDL1M583JK=+G6eJ*EbITGBJw&g6Y zz-j-25CyDgR+gi^pc#(b4XH}c7;^l{qwJQt6da#SmHAlE>}Bp89bb8X{d-`LJ#w|3 z=8s$zcOG9x=3slhwVv@eCu;7fOw`7rpDFx@@?X$-kw?S~MP#;t$q;&4;%_Ls!Aicg z=(ipLT*y+IQRT_k#c2L40QEXmrs5ac6DunXZ>5g6;tvzFJg*OtR>SSBq7FMJj+sMkvh~EBMo;KFjZUlz z)=^$0r!mPL7q!RY+3_R#=Tpy&fB#-sm_V6j#AFN?U^nDW-g0>gE;DU@wc2h|YttFj zklB8=c}sti-Mw~eEOyTE_SBJC7MW*_u1WdE^OaEOtXc3C2CsA#?`aLQp2M@Zf$a#4 z&*BZFE2~&M-Q)$6BukN~t@aS`zS__^bEw?sWynCOMawi&O+sqHgn+Od}`Flh{!;<-=Rdz$HnsK-1FR zZ`&rC>)?aOT*QdmmPemtv(m$jY}-u>rBQ8)M5&!SbF??JtBn?IgYT?IjOLhl0`Wo; zb^1(EA?lugqIqUUsXHht#0@!F7CSW0iQ=wH%^lFgP$^I<)QpP7hkiQ`s)v*+R1 zlMps$%*`sO#iaTDW&;N{IKBCwtf7aTzzr12IJD0*1-mH%mvDHmws1DzwF{F-Bw`n^ zB~Vsy+GhA?;F{Eb5348>*DAMGds)ImMg`A4`g_T~r?DP1aa-aTk>*7C4;`LCub|Ff9K zU%Ow0KkzbI%|ZO!66ENGX^)AVbf}SZDXqUg7Oq#HYCl_aIl9owU z9N1G;>0gt?48`O3y8bEv4GLQ!kk~QX0V%4gys*_Bxq|0 zuu=LSNu6k)TV4el{J(x7A;b7k2whA$X@xcVkWL)=pT{VmVFVx^??0}+JR91@{{Pp7 zuR4>SpoL97G(CxYGsFX-9(@fOQC@G~1=|&+e?v1QV7{_*k^Z?6NYn9kn*X7YVgkCI zHt3lYF#kXF3!Io(+K&kUjO8giqme>?eV7-{do)O4av;gX0LhRg5H$~=}Z z5Y>yC-$2XAcT_Yz3c46+N$j27#DVtf$T0uIhzbX={3mL6sKhn9`2tJPPkR1IQ%eaX zj$So^$EAd&)XeAr00As)>nNPfP#Lk>%rE~TP{ImG8wKc%`CV8wzOY`H001!cRh|a} zv;dc`W|zsdK%l+;*DwH}V{lZI`rTWGv`D(l8JGWZB?)HY=q|8v{%1YmIaa>s000NT zJdwF{ci7W7Uy)(jHOv|fpD;&(V)4+N=-yz4%m)Es${lo%UlK>+=>BIDd8heW@uUM? zRa!V3R+F?q?#ulNFGbQX=zIp))(raRwe}3tZ~k*f2tS-ns$@4kGT>B8c#+S^>YabXESF=(az5ht1Jyv1z3mnpU#QhaMmrpvD|uE5@N1 zS35ul7Y`RPS%UqbxF|mq?v7z(8NHEhdcW+9?kA2&C_~w& z102C^IYVok7fO|7B`ZC2YnVt_O7&eV*3!w~0o_G?9i<>i0`9!%`Uam;dtp0f;GRjR z>kq1D>K6i5bGWWibu9CQkq}}wpf*|Z8c%mn@kb+&qEcI5^~>_Z(8#+_6>9b*7gU3U zI&d$P(_7-H_0Rs=b8l~HcUAE!;yfF=@5CkDt98%$K+CIedCxjhnZC5WYqoLsXv2V)Y``(^P;GZ) zv<&EeKjYU_-}TVOM+ zI%%Oy*0%Sgd3gDjXAFobxCLK;9oh5!0%`vBgZEuNf`ZSD!9q;so+*& zN|lh>OrYKaa0{cBK^=DWuT@UY!H6|>!rJ(t4I@+KQa#U)=P{c4y z@X3d|`k?kHbDM%kW?NGyj%ru$c)B(AJb|fJPTT?1Tl~KE>F?)eyS)>3=hR77f}v^S zX^<7l)W7nTbKUGqD--o$8&}6zK%li9g#Sb)k} zXDNxa!-v8@c3aa4wTM*`_}F9@HGBWsQ6>fdf*R(PNj6c&$5*znc!skQj}6guEszr} z1Y63~diA^_O+YEe7C;e91@JfC?(GKy)O4pgHgb_RQp;XoY28UOkI(n$;pxes{)hfB z{+oA&8CmPd!b%nO^UfaZXMOhw;>U!TD*bcmYEcNEXL!`xdEX9wuS5q>q&AktI2@`# zc1h2GSZ1wD=CTp8AfXnCLWLr~Q2~RO5~UU^u!mLAF-+7d6~SaQ@+~|SPA38$&{9+2 z9GygANsRRg-fsrdFYkw+U`H=f9gK1U*={Pj%GdH)stgGU$h9Mer5x-U6;oQMo66LC+p*1G)NMh zhpRthQ_Yaqc0@e+rVXy^$9V##!aBJMlP!C3Uc9$}NBGy{6Pc|2W>`=(L0480t2P6S zZK|DXfb?9maohMD$PgOhc)=PLu%Lnq+?0p2DI2MFn$Y^c0a9D|Kb|c&U->FON zT8cF+H0>0=(Qj5=J|wobD9MpF+1^y)9o}KFK-?wCo^agvAPxq5~9O7^mHUh`j zYm|*Xz1$S>ChRhr{Y9QEUERhs6(JqP>0uJ0O1S;Exm1SyhqLTP)_V){LaePD+FI9* zPBE*wUs$we_|sxzhYBXXY5D<6V=aB=krE~WFE=x?GY?h52XA$g`fHThe62F^zTvEs z*WCRpP;9hZUI;jm`14$)oaRRWi~ZNjlHY}k*jgWDeIVj*w1)7q?}PVuaiZ(4i~3HMiFU$sr7?+wk8cN#p$#!E%*Wu=|`_Q>fY{EKk>rZ5(sX z9T;QI?NMo6PED;hvG^0Cz1V(`_o8YN+nS!@U!yAik4R`vGoak<)p;D#=>`Bl(Pn)) z$=rzqo>r9R;7wNTD_C2N+g4?sZ#}5Gjf!gS=1OUrvPsqZuw7s<=~5aRm5J&l(j_%?+X(d1&Q5Cb?Lvj#aIBlpW_1h-ULwRVD`-JXJ@dB&e|gARjC>lJR$k&%lkXxKO}F=v&})_N zOW^Bi|C5doJNnuRq8a3`aWbW>(s_ix$MVTXMGL(!%|lF)-i&B5D+!n~Q5rrBErUzWV6>2ByHFSjh8)BIk6E;cBcU*Pp}l*&SI8)*emqJ@Gi>Z!|hR|E&+;e8=uXOJaIa@BY#I+OKYQE51kerz(wxlILBpA=l$--?;nUL60fFS@Q@ ze(*z!9*@uF60(varpV%D2YMtzt7KwLGlKHed3_zs5*s(BqcaZe-+MRXzZBZPoT&cR z4J{WV-fPn1aoJqr=K~=6&53_n*<)EGI^TCNw4rlt1mjH6f6~rJhR`Oxae97YNE<2f zU9;rtAWNW8io^N+o;z`p9OsiJ}ea zq6}5P5~mba%+(jo>)%jxK`=AcS+}>BEaJhZB4w0?OsyhNct0f)gli2v7!WRR9icJ8 zLjD%v%9CEzCzTD@I(?QQDtDAmU2~wD%9~Lzvyg=r?~(88S}LVlD4w~L*}#4O723N< zxQiu`{no4b`@ScKTDI%MUvLjO_}3W=nL@;;&ukWsef}7qNb(-K{PFf|Z+L;F?4CIk zn1VAStP?_JzFzFu`EWIfbk{IezZTy2KdeCC#YS?Vi(2t~@$k9LdLO>bUr>8)#+PU2 zq*_BT7CY}s=<6L>sGsZxyrQ|H4Xr9LPPyN|;egFPr)*_yBDNRj8&Yw|pWQ83Slmlq ze2_LN9_NWHi2BkOa~IF&1dO<@jHitf{@B)9Z_W-(R{$JJ`E;W;1#JppNeR4onx9ku zPUAQu@Md7Nq6~Lb`ZwN)5Eu1l0*L~(w0MJ5X5%Msu&o~*V`h<(Kd_8|sZPl@G~w8Z z6%6~N2aSh=5XF%XK?(-+93MnBH9HzIm25fGdcKLdFpx`k`VnKoo>A3{FOb~C>SGE7 zGwErWy`5J0+m=`nexeo6*j%pN>ml6gD;N4Xdvm`2f(TM^+= zb!w&3seH6iZ5&~oOqw613*g_^m_=w2*B1@s@k@^*kvZiAFr>Sv5{yqvOboQa{y3$d zi6PF}U6=G+`Q=o{;IK(f#(%OUV6#0wlz7WE??@_;&e+pRD{qcd+{#)7mwx`@(iP~- zp4*efRrnQhGpJFN)7)zwBEdxLglt;x>8f?WitMP@@r6W)uu?`W_VsM*rY~d4X7rp9 z%!MpmYyA_{9}HM>>1gOH0&~EMH%B+(WH4cr^q#xxSwnOk0!+O6=6ihM^L=vB0ulOn zr<~?qGSqNMRcPiyhctBYi?=YoW2^cLfv+(d+2cR-h&-vR_?~vbMRPcu-ZEgP0M9OG zMPWN3Qr9okIfk;ex%J)x;&<)DZLk-`I*$vA8=A5j<5`RCgpdBdG>+O?EoS2ms}A@3DTezjeFDj-bzZ!x1c0qFHy{Z{)hNHG`m>W?7G%&g77W%1=NEo=cRFFv^uy zSPC!8biZh=$hACaL8`4HO4idhTg~WlnHwbY?Al^?-YQ~L8Zp|jtnfSRfCzeHy?yIZ z(b8$Y=&2bmUYiYl_<^@+n#qkRNJL-O6HJj{$m#)l?}`HN^sw5v-l+a))#h^8WUuI+A^UVBoos*-3Rdn&~7w2X%BP+gb_C4yWT^ zzb#33a!QNb_s@A!cf|X|Jn?~s+p(y&gXX)jiv98uUv+>uM&=UXhZ%-ZUWy;(2MB%L z-FF}DG3E}X8>l694~wOUBu_X0gFxC5(KqpwDaC)jiC=kH-Y%v>UG>lZwidrOFZXmI zEc4Ao0Gf#-eRoSr(uXnANW^~(-U6jPB=UcD{AS0H`}k64?A^!EX7kp9%lQX|sl#&r z@mhmTZE9JnnW{?4R=z_oaMy%T@FggYok;)%F_W|qDD5KAcRF?HU(Dlso5&+^2EqPT7`yz+XRU`&GqBeE!MmNbJ45 zXxMvAJnkecHSlTQ$a;}wh#_@;A zeqvxp)t6iveWt=8B4A^83Dl;pZo1FyJ>q<+kR40Mxi>U8Y?~XL0{7YndRa--e<6E0 z@;r1}-nGeNJZ=E;zz85IaU4y;;xr{t;d>TD@i8m2W3B7xALI|yo=wIK1Sy%qr4w`z zmTaDXFD_JTN_8cZa)mMT<}#-t;ZllMRm)j62wQQwpS6eMDB_CsipuoC(Ab>A0fv>9Evw zhnYu%Lv0%W)-%xF)|EL{@4$C4nY+nANO0~JvCr3SAIrv*OBuopXUfwz(bI438a_~0 zoa-4ykOK1Ec_R>m-I1=PDEy#alIQ~W?>xE2MHqk%KZ+&bl$hXZ*K9_N+*^4}*N}qr z7B@75Q9whbI_;QO_)xfd{K&bI-9sBXzDo|yHtwXhjs}h|i8I4`fbD1^^i>VNOD%i; zAQY-%scUQ7!k&l?_(`t35!u|gprve+iQtjRfHSwNw(Rg6b_JjGNSq!t1h#%T9|r(R zxX}RST6n3S%~MdaS#<5NBCr@b_g4K~0KcySGQ_yBJ#FTf)9$rHns_B7%p56m|MTLA z-@q!ZD&-nOyVwF~KeW5_dhXY-EBUoyu8Up^!=I*PnjkT0FY!sgpPo8qFAXq}9>}u^ zsq|nc3n6+rID9PVOE&uDB!Md2_dsBr3ExF_lf2bV1}5`m(|JsP%P;kMCzPnC;QsL3W``oLyE$xy>o)#0P zG;d-rN0Z~14~@nXxhdIAMwE!wKLwemrBl}An4o}lP&97Iyj}zVDxP+c3e`3w{Ag$A zeftFJw~3ix_zPSLD}A17x(rW~z_bLcT@2K?NLkmcg0HN1NlMbOvZwjG9kS>IBFMfaj_s`qsbKmFHCY#-} zXLe@JIdfez!7Nk;e%rQ=P-=tMjj)b>CrhxHcGb@qalH}0^5`SjE$O1dx_|t^eYNEh z{<{Byk~?lcRiAYv=nRxr#B(X^#|ng9A+vA5`?%)S6+#s5(}ge~FxzJ_@%2>>WcDnz z{If-vmcgb7#h4q6mw+SgM!p+*9ePNQ{o1RL3o2NzVJL z_M{4l_iEKvcL+y^!`5T&E$lx=d%u&gunZStAdAt9_du$fs?gy2D5R? znlc^oHpLq5;+@{-s72&kb#YfJKbz1qmBMyHWg73){Twq>Dt*@57bD{cz#k;dLoJYVVCogJ4aMkze8Q2lXTaHeK2g5F@z>Y(}G6~G!+IpIr3UK z&V>y#6f1*0a|TIUJZe^!RW-|AG*KU!pLw^GUis4)ae!J3vkT!Ts3jCUWg|#wlp!@3 zviNPAw@LbZ>*&cEkl5j7w<+>IzDzg|N3A>q=JVund~4d=f`i*$4&M4#GpE*1lV!^W z-#G2`so}CZXRZ^<_-fq4#$;{7B*FRs?`}aLySp5s_O7H6UJV5}m1;)yA(y(74hdJe z(XBB<0Qqev>DMsampUCXrIgHXf@V1>az+#}T^1>|XS&*`38^$5VcLD^VicHb@k1HJmI!kKPhMQV14L)kkKZM*oxa||%15mLmiAo_Hfqee zN7{em&KnN1FX3vP;z%mW-80hoaujPy1WNrR!_}6iMqJc91KWlm+RxVVjSwI%r5DN# z>rY-Bn|E04jr&)f%Z7htk1KnO3b(Shh8nOG`?8WulUu(1%0xFHRqVhRtfT)F zVWZ>WlAP6sEnj)G0B1jQIAGMj*R}pTPY6fJ>GP=5?lAa75gj+`_`}Bw%dql-!Se+u z7lhcpsYRymPiE{=Q>fb$FDHwokOt2Xrq7ncrdaPin%#IvG(4m|$w}h9R#mc3D*4Th z%H?7PS)13r#!y=-+9MTjG?DwnR2b=~S21X)F*-4Nxmph^h{ zzr$`gzf9oZ-Tc2Ny&wRlmSt%iRFfv86~&^0}M;V@SWR=eDX!LKw_g zL~_^}Cwx$C_Ly;nN7_U64w&#=*Lrcuc|EutyEE#!8Nn}be3BN;o2-pk#P(~ z?tWusKY;+?N}S5RI8+cU>EJaZ{!p;yy_^&2?JY%%NvUeN&g#prZhX%hz(*sSN3jY& z5)}7|qA}{*?6le3qi}dxT(gA9KsB)WJ96jlJc=`(fF-Ky#V-gR9%PS5yihSz;cjRj zIdO&rilq@quf=m%Pv%MV!UPW}DULVta?n@`P@40QMS;TSy@QChDP>DGwaqhbZW~Uy`1SH>!!3as=LM zP`nS`&)!Y@iP-kqi!0htd4IC~avFuKz@`N96mE&}|48UTs`&rDdiD^&!}>noGPeK!=Y;$%G7Ag{XhBM2;`jbLn#|Jz zMseFp3lnLcsgLs%{3>!dp4K3?9`rozfy0+w<=HIrf zb~o^R>0BE26)YXB8%WOnQyYPNEkXq#-FjB^bN2uqhMB?U#1X)ZfmX>S6q&~sQQaXm z5TMUAYx?iYGMpImbV*>$j}l%bc$}-8#+X7G_W;TT(8xm-`H`_Ox_&8|U2xZ8K=Rds zsp$Xpb6+9AeC<4Y)4BUv5UN%m1Im zf^Y$eC238@gc~X?I0EVUMv8Ov|9aEEN8KGCJ%}exnczv{>C4Sv^FLVy@!OKi>GII* zYRl)y&oTe+!Jmpzck?MT)9f0`)5*{6)d9l5(Afq4yA|jrSBtR2P-Nzfe2xNuK!h7+ z%!-U(|94Joj13O}b5s7#ni>esEBvqbAW`b>(br%NOKDO4GDlzyNib{kc~NnJ_1{G@ zeAL~4!eBXr0s59@j+OM)P#Q`-3&eL-I4Lo3BxI|pzd|Wj>g_6jBCeB70V@`mo?x<%tWE~AI6bt|~~&#EmI@@KFc0jY(5kG#DKO0&zdBK6-n>tMyImnGW-w|zl~>V<1cUt|93 zE1jFV8%XqdRqc!u1tB_BIPGL`W-EqNyYKWhLq4Uy!}I0OE_-pC^qtEgN6 zDUo=SxikRqpW^=>vE4){(rUfBgGT|SRA98!AK+9u_d7#0Hn%sWPQTv-KRkg3sPhWl;}JFI7a&U-#(b;1L|&4?c3xX z_Hi`aN}9{{R@~TLgzf=w7`;5I1(L1t=AT-(KfNvWM<7}+yZcg}E(4M=8;ZwoDhBf@ zfEj>Wz+ke3iWSkbWt!=rfA1unU!Z$^Eez0>`86K=N=29t1IDqkN-kTJp_;~k?zV3k zz>5wIaub=i*8&EM>E@-gk6#F3%?gF3Gz%m^0F&aHYao>}! zeo#t(C4YF^Njz;Q>&9LttW~IHq=^6F5(eIPfZS~7?#U(4}Ys$?5r zPr6a!q?1wFIw_z4qc#rjW0qAjgm)Z1KXj^4Zqa&u?7eHw^K*qFSEi9h5OLo-7}gr! zCTdpYZ}PG?qjZ0Sbnki!$wRg$E+!iJO96I8<{avhZNMi$*E0w1H z(cmjV@u)^=`4x^Io^+YUnX@eK?NWypC5#9DwjcdU3(q$VOqVDb;fWwiu{R;Re7(ERr$o)gNK2aZ14JQ3BljS zo*%kI=9J9B;V<+O>t$6f>77{yhqm(dh;$NEC$%IZHV$(FSe5s+CE)0nI6L~Oat_t6%)u+F22H_|kszys)T&`!za zX4CnzN=bDvovAXB?4}+S{pWz>z?zOte{4QqYYzwOS1ZeJDYlaaTQj&DeEyUd^!EYD zS#@SHD3Z!~80X%81fPJUB72jk-itZhu~1i^LnH%>2!Tv8F`xK}%GWPvD8N z_5DWa_h`{>qD=%L?tsH&S-2#k#Ns_y`Vy?&K0q9$nbmrF>mam`eBSqs$($@$6?0FS`QXipK2OcE66)fd6_xVi&2vEt z8)k(2CAs_S5u=>t*59IksBZ2k*Q~|gi!m2m(LR@3CqHjKJlJ6SJcw6X)D)O<@D@a` zfN}xm9{Z27Sf(t7svk0J&om7Ev+O4aO_B6dNPnKD^{R`?u7rCj>P_jTdTHAc$VQj4 z@y8-oMJPjm{kN+#;thNx@lSvrRztldiM;v)-RSQJySvVsBIXK;Ef)H(94j-&aB+hm zuAP^_j*~{@i?iFNp~ZEjHGE9q>_cleVSbrq=#YQ)<&y_77V`_ZB8vS6I_m@)ZOywhhWPjt8_hd`!}r*{E0nYU4(8ANuep`WY2 zCi-`KyFhm6(qoFh4NB)&%@+qQUl%o|X!e~PTUqA(tB%5G8*%Thr%noml?glZ_+BZ> z=V*A%5S$|p>oR5|AV$q3Ph|}^{@RFwyR-^P*2`6=U!S_e&Px|uiX6X}@s57n3@5s1 zMeZVehoatD%sMEE?zZ$dq#%WRBrINsC{|(X&v57#q%&}cez($tFi9(l%qX0&Bmyh4 zKNi-a=pxQZBE9h?FHbo^kJx^oPy)TjFEJ4v?&o|xjA<<*zD_Pd%K~aeM#2dHOfm5> z;r1s@VoxXU*MaG^mvtI1tRtH`1NxS^DhmjNAhRjrp#!aqtFK@dU_X5&mPxamDqx!G za2;iPgHMTSdEnJ=*&?n_2UI$={B)K4eAYBf2KDVYlLFK?WR=*aQH$|(I>gu-t`Cg=D$YO9Qn8{D7wLaL?5|gP4dBp)_l-17zhb)^V~*=0N&RfFrlPPH#0Z%02w=W9 zOfN;!FKHDk`$@tuyZa##DTXs=r3a9(0 znG*43YqE*PGNu%-qj&zvZ3pvJ5N0Z|9crO#l`7|rFkfPudvPRPL}4-KM#AUL3NZ>$ z-4r`LKI$0rFD@;)aoy6R-f0eCc4Q_jXR^AZ2X93hwVx&XN{5gU6jbLXTK3FEHeAm6 za(0xKFEE{c`tM^z@GsSIOEP2T85=@&8W`NjuSUfyTFbHRac{ih;l<@Uo08Rrd!hH* zL~3T$rGQFq@$zAsHSfQx|5DpUT9*+6gLggRrH#7rV;Cvn0+v8CL}N{_EBWBE8%kY9*RC;UcQeB=Qh)i< zXf$srh@uf5H!kX(`+kkfijo$)>eoYfz6lNqjG|d$ldxP~6&THeXFSYo_k4iDm?nER z`sAxt*#{obX?E>FrNEjC?C>eCC!_Yz?R@F0zC76Grn0L@Ne+ttJeZ>_%(anlT=rq; z(#(uhc=J*a8jm;#pgDica8NTJI>$1%A2&|j^}w)a#^F4Z$U`W9x8(iTt5yx+o43m7 zGl+fFXW--TY?$_&fo?xwEe=A5(2fgUx>-ryjRG>G0UzWXkwkP_J)Y?Wgo+-5^u?yV z4>ZS-f-Kc0zkLh>mf3~TsvyDtIl9t678qkI)r2eU8Q!`A@OO*y^9cpRL-pt1KlLzr#x-I&DcL67l%fjp8K2 z0u^n%d7;ApQQZ>y<-_2m+3$t#q85UP9WmzsvIqGK%rnImHS(B6;NEl0cDazT(a{b= z$utH7M|g~R*qC}rXe^zd&ZKz_K0gt4H$_h&GK>)71>W20mH>7f@40ClcbUF7=}}{Y zEPsU#fBBg4#p@}Oo}!Cr>-?d2Lrf>j4k=N-UwnSjq*YLXzRTe%=?G$B!JFPqHsaIS zy;F!vWCFFuxc$5P_*ridDEULdYMZ5De8S{KyTM00Gg>n6cHo zwZjL+r$PKh1s~naJS{E+oa2W_-hp{X?1g<#ybEDEHU$OL6z(auZ4POG&;ZKG1B5&# z`{dzEL4?a0oLyk;!FN5)o{QW11@W;ETErU{=)KqU5q&YRoY4;gM0)H{M4NugF0ixd z@eF?iWMMT82Jxjir5kO*m4|EHt2$D;=$k1Aw@AZO=o-x=s#rsb?V|;1Xu$rQ3^xiq zy{usW=VqysE|J+h=a++yNw#e*REdRrHAY`&tQm2I=ztl-;5*}KpNzJ3o?n}W<1W=?aR?jI@_Wp>&onL^nG!SU_b;vs>3uJE)D z3vR%Oj@{M1>VG?BX;&|l# zfWD|e_nRL`xbBJKDOo)RSi|+!=8pUTHr)@lZg}_mlvH zBB!FjSbLP83XmzfG)O6jxQc#}URvwdQasl>&%6%guNlM>@M6K8;xg8L^yo>8aOeo< z-1O+d7TcT{p_mF)CJ8xB!Z)43lIVypbqMm;PmIMlrpMI7qnLKnIlXif%z^-JR*~gS02hw zE~Dw#wQ!|BuCUUnS5g?Z25kAKYC0ag`k3|vG^%AS!Y`-?ajh-(i@2Bm>5*KNl%=tV z$}CC_EtPgGdDc7tWxi`#z))pjVs)46NdlpO6!2ifi^VW(;gSHw{d+$>6@ainuF6XK zb!p*Hn{dtALtd$s|0$63Q+N9x0kt7k$@B~k zJPo9?486EhIPq`g{Cir*Xk4D)N6IFm&}oUrQ(gn?p4WhMCgUnRr8zQBm#td-hv+Vm zbJq&%4=vDc8uAO>6?qFOqBUen6#~2l1&)V#z->)@6G>*m{JZFD-KnZVFQWY;SDEpm za~}spC6$YraM9Z;;)7%Ys**NEp(qZq{DnD2?ox|K?rnv@WCE&A)~j?&_#Az}B| z_Kc=5{f`}5!NQcdQ@fvmd$mMLStNzb%S7Qv{^oTs;cAG`ctLG14Q%&AnOLx{wHtVu zFadh4@)qZcf}8hKwOS*&n$Y86{8I$oJAj-VXDR_jzOuei7KBXi4NQSf>v@cllhd2n<j|(tMJE6-TxXJVLXo>hObMnSKrC<3Qi3&w zEt5cbDu)h_H|N&q;=cKxVfVbfOTL;KI>P7al=??9R@kxc#rbO7 zJV!{pn&Xe3b&Bnru7otmvpY`Qs@h$6vb0Q~r8P$Dbl$URd2k#*4AbRnW^SF9xI{6B z42Cpq6T#$OX-P%IFtmehPChF1$) z?dkB!kJ3T^x#mrsq9utVLI(+JwvDQ$JDLdfbIwP$S&!Z|@Z)0kh@Lef9(e{9SNr!A zz%*EWVsjrS0uf4;LV7}J_j4QyP*5Jng7hvIkI;4JA~Cp#IOXS9hm^GlxJmVMUgmzY zOcpd1zlZMFjIG^mr3EstF2{FYUF+)S#!}BgORBGZdBNAVBV*fdBai>xS|NWr!d|_I zt4gCpmDO6o(DmLoR&r{OB6)j$EX!}&Nm|oPA`=j6R ztCR6VQC=5B~ zzz`(^J+v_*!rd~hO|wb-$YlOID0aMA@BRBg(^hMIiARvR;_WB(ZdQm9_UG?U8D0ru z^z(J0#l(xss$YfJt<<#zcO#W)Ii2`aJnn&{%XG{JxGQ^GGIV3`U*{RTr+xT z<3i@h=`g#tT(dW}ECp1}l#Hz>k?mu+3RHBg8cbruH`spZ>F##cI11EruHVca!0BRQ zH;Aj-Jkqu2SefTJrT1fNMJVHT!F!fec3(KmA`uT_+hrb-cdCDF=)+KJoKp}50X&)q z3_37fjncEsi?Bit39MaktzA0#yBq$Ne)+8gJ%mVo9Km8@p_X)W#uxH7g!Y6r^Ogm= zEFZry?Y?r^1@SOJd7H3cW(K6xuxRUwM^v!qYj8>bCP|3-%-dtvZxiCE+NitiAkYQF zMVLQZ<#9_vnv3HIOEtw3%Ft~nr@%zb^04b%B|-qK8?)zWUq=EaEEI?@;2`KnxY8jg zOxYn#UL;t(q%0hnYOegJA%Kboa z+27hai7kPHB)uu(+H4Tpfs^`V`i0)Nomc&i$F^7r;t#!7(NhidDKrI@ZhRuumdbcN z1=1aCg5kNe$%&n`R0$3&)?Xd2d@0c{Z{Ap z<;%da6p%cyy09iU2DQy`8yX!nE=2=T)wlurT>X0X!blOBystL7M-{^=%+S;zk8;wL2+tzLi6L=#hC#)2h2i%fQt-vhsH z3vd6xnd>nr&5PV$EyAwdd>CTR_G58*Qlj!ophi^d9T2yE*-^$(vQ1ylReM^q;7@T= zPmh~wviNcSe1U<*Z~ejL0->eYf-d;e*}}SYy_=?BwY2fK`%bk~mSW@3kq=3-(D&bm zv$s+?TFKV!r42T~m#FK7jgP!rl_S9?aC>%{D2g#1!tSo0FtOFDz+EwKe8BsKFUfjx zkUd1C9Dm&-fZ^-6=*~)67(flWbO%ZOGkxBQoNMBgZ)fck&gm4Dsd%=zoka}nZp0hP zk2JpVy@spdqE39~dK0hc4=`f&KR-PFNGQus{%Gy7d#h%vd;~rSl>ey3?ivhnjMzsn zK>~6dC_6;Ih#WA_i8(UvkPnaU0PB(!!+qc2!ezx&V+yoX+%qi7rl}|4G+?YlyLs{I z*y$au()P9Qd$d%a@IpIt8Sx|Y8oANffsw8N5TM99AflX1t_+qbN_wk2#&!XHIoK8> zE7QNiVuWrLkYmsEvwdf~Sdmbk7K6~ZSO5Bgj8J@6Ip~t#p<+5+uvbcv&vEWFHd@Ux z16_J4Z%`Ya`fO$%5RRH3uC!=859dpv1xAT}_ z0bl_94wAImjC*&jJt!?ku|SW@eq42;!B(HS?w4g78G>558Y4{jg%4gNt4)zt7)0!r z>Lp0NmB%qSW&9=ZGiqrc)_RA_hxsHGVe(35M7PdXspa?5-G;=a3S4f3z5UR(F&oE5 zpc@wwI}J&@cWQBBJoR$GG|pC?sC+_IA6pdEPBdT@gj7F8XW4;)| zYGT}a;lApAR#k%XdE3hNMP5Cuw7TjR0{0{Hzc0bwwdJ^a>+knpNu>r}=>JMN5cuP% z(pHnKXd^?3!ekM5v_GIQhf##}7D{0UNxsiN>EfQd&S+@)hb#tdkdSlsEfO>PJNim1u784X&n?}Ho=Pd8l-zOw2%vx=TBDDz6s6N= zwZ~;wI-Qwmn=wXBk}&z%b-N#O6$@95yGy@b@RxsN+0yB;8ez&7Juu!W?faGG=rvP^ zfLhK>MHKKx5Z`Q~kBl1bMXSZ+@jEa0Yq^>PiKNf!(!@HTrAnLD<;OpEc2Y1)>##%L zdp2m#-_0PO#@$Gia`f8tRMHtf35(iF+9dLX%2Ui}{pciS;vU+KFUxj`dPcaBXl(WF z@XchfOM+bszrOv^z21a^>=1y1$G-J`rE?j9S>u_%1BwQ+6h>az2v29R?Xm2bp8(0x zY<6wy9&~eQAKA7RV|PHaUA~y_zgQkH?=efAmKOvLsls3{DZZTA725uxxlzz0Y*|6~ z0tqFxs!&OA5_^-5B!kQJhP)kXYRPqi(CUM+DGFsTN#w3q=7@dPbME8-S4O4f6;u() z!rNDNw6r3E@4dv1vuMoNn3o2n?Il{}UksN(vX$H7I5(6LZ?gv9f13Z%xK}!R<^f|A zt}%(is}Gg|I$cGxYAHkBF`RTF*^;O$U(TAcT9U5)MiU4krq^>Pt3zqCQ4WaDifiBA8wU)h>=kDLds9lieUq&r_ctp*?%0AOWa2;=d5trucFjO3U#HH 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 - /// 添加LabelText属性，可以对labelText进行设置 - /// - public string LabelText - { - get { return labText.Text; } - set { labText.Text = value; } - } - - /// - /// 上面Label的图片图片连接 - /// - public Image LabelTopImage - { - get { return labPicture.Image; } - set { labPicture.Image = value; } - } - - /// - /// 文字位置坐标 - /// - public Point LabelPoint - { - get { return labText.Location; } - set { labText.Location = value; } - } - - private void labPicture_MouseHover(object sender, EventArgs e) - { - LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent; - lpc.BackColor = Color.FromArgb(0, 151, 186); - } - - private void labPicture_MouseLeave(object sender, EventArgs e) - { - LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent; - lpc.BackColor = Color.FromArgb(19, 46, 53); - } - - private void labText_MouseHover(object sender, EventArgs e) - { - LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent; - lpc.BackColor = Color.FromArgb(0, 151, 186); - } - - private void labText_MouseLeave(object sender, EventArgs e) - { - LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent; - lpc.BackColor = Color.FromArgb(19, 46, 53); - } - - private void LabPictureControl_MouseHover(object sender, EventArgs e) - { - LabPictureControl lpc = sender as LabPictureControl; - lpc.BackColor = Color.FromArgb(0, 151, 186); - } - - private void LabPictureControl_MouseLeave(object sender, EventArgs e) - { - LabPictureControl lpc = sender as LabPictureControl; - lpc.BackColor = Color.FromArgb(19, 46, 53); - } - } -} \ No newline at end of file diff --git a/Analysis/UserControl/LabPictureControl.designer.cs b/Analysis/UserControl/LabPictureControl.designer.cs deleted file mode 100644 index 9899bbd..0000000 --- a/Analysis/UserControl/LabPictureControl.designer.cs +++ /dev/null @@ -1,84 +0,0 @@ -namespace UserControlClass -{ - public partial class LabPictureControl - { - /// - /// 必需的设计器变量。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 清理所有正在使用的资源。 - /// - /// 如果应释放托管资源，为 true；否则为 false。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region 组件设计器生成的代码 - - /// - /// 设计器支持所需的方法 - 不要 - /// 使用代码编辑器修改此方法的内容。 - /// - private void InitializeComponent() - { - this.labText = new System.Windows.Forms.Label(); - this.labPicture = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // labText - // - this.labText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.labText.Location = new System.Drawing.Point(2, 59); - this.labText.Name = "labText"; - this.labText.Size = new System.Drawing.Size(83, 25); - this.labText.TabIndex = 1; - this.labText.Text = "添加抽屉"; - this.labText.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labText.MouseLeave += new System.EventHandler(this.labText_MouseLeave); - this.labText.MouseHover += new System.EventHandler(this.labText_MouseHover); - // - // labPicture - // - this.labPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.labPicture.Location = new System.Drawing.Point(0, 3); - this.labPicture.Name = "labPicture"; - this.labPicture.Padding = new System.Windows.Forms.Padding(17, 21, 17, 21); - this.labPicture.Size = new System.Drawing.Size(86, 54); - this.labPicture.TabIndex = 0; - this.labPicture.MouseLeave += new System.EventHandler(this.labPicture_MouseLeave); - this.labPicture.MouseHover += new System.EventHandler(this.labPicture_MouseHover); - // - // LabPictureControl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - this.Controls.Add(this.labText); - this.Controls.Add(this.labPicture); - this.Font = new System.Drawing.Font("Segoe UI", 9.75F); - this.ForeColor = System.Drawing.Color.White; - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "LabPictureControl"; - this.Size = new System.Drawing.Size(86, 85); - this.MouseLeave += new System.EventHandler(this.LabPictureControl_MouseLeave); - this.MouseHover += new System.EventHandler(this.LabPictureControl_MouseHover); - this.ResumeLayout(false); - - } - - #endregion - - public System.Windows.Forms.Label labPicture; - public System.Windows.Forms.Label labText; - } -} diff --git a/Analysis/UserControl/LabPictureControl.resx b/Analysis/UserControl/LabPictureControl.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Analysis/UserControl/LabPictureControl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Analysis/bin/x64/Debug/DAL.dll.config b/Analysis/bin/x64/Debug/DAL.dll.config deleted file mode 100644 index ed0ef66..0000000 --- a/Analysis/bin/x64/Debug/DAL.dll.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -
- - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Analysis/bin/x64/Debug/DAL.pdb b/Analysis/bin/x64/Debug/DAL.pdb deleted file mode 100644 index 96a958504364d0444c5c148338819f1fe96e3c2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58880 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 diff --git a/Analysis/bin/x64/Debug/Debug.txt b/Analysis/bin/x64/Debug/Debug.txt index dee1ff0..dce5e8f 100644 --- a/Analysis/bin/x64/Debug/Debug.txt +++ b/Analysis/bin/x64/Debug/Debug.txt @@ -1,12 +1,15 @@ -2025-08-05 09:09:41.596----软件Program Main函数开始执行-- -2025-08-05 09:09:41.600--加载配置文件——>开始 -2025-08-05 09:09:41.633--加载配置文件错误：System.FormatException: 输入字符串的格式不正确。 - 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) - 在 System.Double.Parse(String s) - 在 NSAnalysis.ConfigDfn.LoadConfig() 位置 D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\Define\Define.cs:行号 138 - 在 NSAnalysis.ConfigDfn.LoadConfigFile() 位置 D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\Define\Define.cs:行号 202 -2025-08-05 09:09:42.414--数据库连接 SqlServerName：127.0.0.1 -2025-08-05 09:09:42.415--数据库连接 SqlUserName：sa -2025-08-05 09:09:42.417--数据库连接 SqlPassword：Hexagon123 -2025-08-05 09:09:42.419--数据库连接 SqlDbName：CJLR -2025-08-05 09:09:42.420--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123; +2025-08-06 15:35:41.846----软件Program Main函数开始执行-- +2025-08-06 15:35:41.848--加载配置文件——>开始 +2025-08-06 15:35:41.870--数据库连接 SqlServerName：127.0.0.1 +2025-08-06 15:35:41.871--数据库连接 SqlUserName：sa +2025-08-06 15:35:41.871--数据库连接 SqlPassword：Hexagon123 +2025-08-06 15:35:41.872--数据库连接 SqlDbName：CJLR +2025-08-06 15:35:41.873--加载配置文件——>完成 +2025-08-06 15:35:43.537--数据库连接 SqlServerName：127.0.0.1 +2025-08-06 15:35:43.537--数据库连接 SqlUserName：sa +2025-08-06 15:35:43.539--数据库连接 SqlPassword：Hexagon123 +2025-08-06 15:35:43.540--数据库连接 SqlDbName：CJLR +2025-08-06 15:35:43.541--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123; +2025-08-06 15:35:43.809-- 进入解析CSV文件模式，开始解析扫码CSV文件！ +2025-08-06 15:35:43.810--软件首次启动， Nextsense EH3 CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEH3 +2025-08-06 15:35:43.811--软件首次启动， Nextsense EHY CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEHY diff --git a/Analysis/bin/x64/Debug/File/AnalysisConfig.ini b/Analysis/bin/x64/Debug/File/AnalysisConfig.ini index 14d8012..9af78e6 100644 --- a/Analysis/bin/x64/Debug/File/AnalysisConfig.ini +++ b/Analysis/bin/x64/Debug/File/AnalysisConfig.ini @@ -17,12 +17,6 @@ CLMSModeID=10 AuthorizationMode=1 -;1:上传IOT；0：不上传IOT -StartIOTFlag=0 -IOTAddress=http://10.188.2.56:9337/web/httpServlet/api/saveGfResult -IOTCarTypeAddr=http://10.188.2.56:9337/web/httpServlet/api/queryGFModelAndMaterial - - TolerancePercentage=1.5 ExceptionPercentage=6 ;权限密码 @@ -66,17 +60,4 @@ SqlUserName=sa SqlPassword=Hexagon123 -[TCP] -ModbusTcp_IP=127.0.0.1 -ModbusTcp_Port=502 -ModbusTcp_Addr=1 -ModbusTcp_Reconnected=1 -PLC_StartAddr=100 -PLC_Length=100 -PlcType=3 -ModbusTcp_ReverseSequence=0 -PLC_S7StartAddr=100 -PLC_S7ByteLength=200 -PLC_S7DataBlock=DB4100 -PLC_S7ReadByteCount=200 diff --git a/Analysis/bin/x64/Debug/NSAnalysis.exe b/Analysis/bin/x64/Debug/NSAnalysis.exe index b1c6bf338434948c050beb18083e4e28e84575a1..b21bf22ccd3b7882253bb2ba6afa2a8a60a639b0 100644 GIT binary patch delta 179521 zcmcG134k0$^>^>=>|A>!y|bCwBgssT-E?+0kc8Y^iGm1%T!IN_M3h6Yp*IM+WILeX zfgm_45>YTJDhh&#w{m*l_XQDeMfr<(pz=3-zu&9s?&|KD-Qf3q3z?~U_1>#juU@@+ zRb5@P<1Od!xbfxJzHabq9gVXs{r9-F(CW-Ax2)F;Syth?UHi5@a@}_i>$rEw>dIZW zV6fw#Hw{^Hum8)I_5&KPY^#?WkW2~Y+IShL7=$6 zE0xBq+~`3X((VqBXcTw>J_I8^;8_<$5k4X9E}9?1_bmt>RxsBjV3qCeyoewx6`@_W z)qW9VX>;eJa2o)bQm#_J9#YgljSr^=uv^!J<>gsx7|`Z)ey&!o?NeJFr$KA}e^l0_ zE+3MyGDsUpIBk1~3mwLBn>3-kJY$Uk54{gomzh`u=yvvmPO=v>&SK&!qo~btq1_3d4g5UEnT> zkZQ-*1|}S0Ew%iRwCci)0zMv0?*e69x|+I+<^;u=J-Pj1r4!?1vMdJQ5W@FSa7tY3 z4uoW`G7!n=Yg_f8)KEwvv1@Z`_&2dH>%f?2-BNI3ZA~D32&@Fc69dw%52eu3Y52Mj zuB2Ot{(od6RR6k76Dv@Mvr;OmI{V3Ys$(*Epg%0>b5xWJC+GayE%nh%av=&iXDsvYgMM~RO>g(+5 z%D68C->iH(o004;j?adT(tzD9_$XOpWh=7{zN9S%Jj%+sC!t(QI`i(yNQ?G{tbBWx z%4~deXwKj%0JkgE=I#7=&dQf_W9TOL)W$D{hBl)8lqAW&b8L~7kJv+_5g&AOhn4Fd zvw?AHHo!20m5d#l@ybErvYJL82qE1WZ#c++77f}+VvJ4_ zqj4O_NQy?gd)vJ+U`HCwD2qIof;lgf&+{6!`NMt>8`0BI+0!PLpRJ9~?wB|q2$=re zmlF}+u6z%;7sz+jy->dE@?CW=;rGNV@!3_V%~yDZ+A@V#sQ;EVixdS-Q^+c= zJvlZDqj$Vm=;?4@MLq?0QrKOJ&+cN)KS}W`)=pCVil{-FQPj+e9lAM1cRMMIRd*`n zz%f++6a^6J?QFmXDb2^uYDRXpN6Ter`xOr>x5V|qtO_wX;5s2*Kl0_m?mo*q89j&; zdcfV$_)$265#)Ro0TpUz)*PdPWUm+ID&^)1s>6g+cd`C?@QIiyUd05jWTzMBXIiLr#+8dDVwDR4Ra&~NK(a!EHcUX2uyElP; z$NYE|ip3{X-8TxMovm(W!-|;7zU^InDA2MV7D;L@^KL+@QrqZUP2_4hw|g09wTlJo zCVZN+T7=yA*TSJA)nt~jPJrl;+qNp_mNMSw$a*Wd&9uxlGz7cJiSf63%JFsXNyAx$r($v7u99$(a7(3z9X%qflKi~D_`679_p z2eU~> z#6MiA?f*{qtzgmV{RZ5+^4FYG-II~&ezjFCcZ}JEyxpe6qD&Xl-L? zWXRu2h6vd<)Ab`V+moepUG~ddQJM+s8beHiuXdPw&_?JqXCb7rs;ssCG*T092cuGZ z*82-8&Iu^vAi&6tL^@O zL72+Wx7#XIb~-nR{>HLa2jXP(E=KuiA1cdQ^HAAfBuL|BO9uR%z}`W7g&lE0yAn8v z{^R!DV|jl?o1J$6d1P!(X5vO95ZApEUvN|J;@2qtALSzVCdtt^eILB$l9y81u^rXp zGVaYNZr_u^z+w7)4x!BHo%!`3Ll<|A9fm-u;JzDJh+3Ro_^!=%-h;1_wYz7;>Zly2 zx$Pd$W{*jrN{1e66{?%N3aTn}HdM3h){euFZ(QJ1253FmV>D)97VRv($*E-i($@Hd zGjA?b6^e~OF(!25ai{-FCIO$PHT*S^D>6mCOfQ&ig^0aX-+QKQ>(YAkyWI-VSG1HSsZN zTE@K_-v#&M_;f$PkE8kVNqj&(h;K`I_tVS-BaP_pXYjEn+g)7tNyZpw1M{b}r+74iL=Sh`mbgJ=W34kgJoE5QtVj6z65}(S6cUFWJj7e=sq-P9W2BGo2X3} zqHp8vVRQVbJ={KE7{8)v;}dNc8I%IBI;OUi6)8{)rC>O1xcKR(pUy{m850#I6oaP0 zZ(x*dH~`o=_bUM8-LEzt+oyUULTQe$uTdLc$H&#zanxu-Rq(v~4VF^GU4bnr{Klqz ztG?#&P2zkj&4KW|`)!uSIE46O?%!AD&RvcbQ1lWd)ptnsU3^%T(%2k`NkDsUr~5s8 zk65sjQm*l%edqX&^g3o7&PzYQm$w1~(fuJ(Fhl|>?vJ8O)rA8MN~-Qp%*;>C%+FNj zA$(z)e;8lhCNR#3qjGnv(ucXn>b;N^YRJz~;68$nPU*$2y!RrOo(;&d?!0$VkipU& z4z<&}0)Vb{SJJ|~tAaveek8~MQzrR>_bK9zotpRV3Cfmrzaa1ZB*+ny5pqF5U1O{A z-tU4kS^X9y-!(Rr_nr(3Xs88mzjpG@#DOp$ZGq0`z5{s z-imeA%pa}B5$jgA?c2C+{ZIv?9%B%0v|?dh*ne`~&N_dx8n>@o6cpv8D9554i=JA) ze(iEf7R-&P0&~^1QTsWQsOe1bGR|WfrSYZ>bA~nSf0~eiuERn=YON62;DS@K{aMMT zi(;~&h_WHDOv?6_X0i!h#(7-H@fON9OT)Ch0vpyaEpLpK1hSVy-top)HoR$gKV>&r z=bfmplEc#C z0l};Igj*t;O8JBU2f<_DH|P^Ew~0@f)7W{)v;V86E|0qDl0%P>ZW?d=`OxzJ|86QD zwxY0sCenZPZH*%jtGDgnIRCKyPdGqKzEv#BkQ>1;wvZXD%1oAuQ@h6cbA?Qy|D-5N zZT#o3MgD=>9_%3*x2WJ zBU_$D^h~%%GyKk~`xGg2*PJ6u7ZR7Pd?8oZ8Lo(A84m=&D$t-%INJL632 zP@(ybgB3!I=1hPZM;_Tf*eeLxpQ8AdaVwY^%n!sm^!jD_#7!d-}wxRUmg~p z2|(laBP;%4DAq?pu)|n!cA^!%ZR#7xFFI<)O0VU79>iS*1cNIPMBIxE*18h#)hy>f zYQ&ZQfRXdI6C)SLSP7Kf`&qduD5K<9ZE7ry=X1_IsAVK? zz_~il=bd{R7adjeJET>Ui?N5Hmff=~=RQ(os@n;a?Vc(Z9yrPZEpqn=@xAq2(pgi_ z2MSja!@2x>5L;xrtit47cyN~4(}qTt3X>m02Ax?~3kr1e${%{y0^hR zYs~`lHW8{lTXDXMdV_Ava+gk*NxUr|)fi5}dNFVgC;h}61Zu<8?H`8(!8n()wpR<>+kF9bH0eGut}myv+WguHSTl!QO9O9e%2H5SDzgpkb)X{Kd$om>pFwqAA-z$)6?F8@daZrE#j;v*Q!yT4y zVh+@v?H%3`BOa`OjF=b3p+ogA5qd)$I=B8wLO&CS&a3|pB6`1zL+96C=*`Jl7x;#t zwPO8VGB^xy6I`l4iY9s&C%~O`JPd^p32;~aE;4x_0q(AUk>Dp2V85sSal(i4@j7SK z?=%Uy|Q7H-zP*~RUU{ezn7)1$>r17LAi|5pzZ?pVt zu4DT>%=Tor-^=gz?f2me&#MJ#Pp%3Y^^6+oE{%xWTnz!S(y}M|g<<>l`$?JE4r3(W z2NeU!?a2)!7=V_pmpqQbs@I;t@j6J=zWob|$rlxqFDWLH+mjngFxh7zA2jZOx5$q2 zaNIFSWSlJ3f#)h%Yr~_w4QGK)0DNi!AL@~7X7Xe~#5z7F5Fd_*YZ^`juqLc8I>5ut z@gvUdz1B&!YJlGboC&~P5r^8>o*7#z9O#%t%-E;SB5YUZoJJTu9f^?5Q? zrvg(ICRjWNM$E=d)q&)>3B|8A?nm{kSAw(pYSnlguTZ_KX|RZT0)gFmXmr(`Z#10{ zQ}S9=R_|=Ltk~mr#nul`=ds?3TaQS*_p`=@+GluUkO6jr4J~n z*(*5nv~g2qpkkbNQl+&E>TkzX6O)51yzdxt5CA#m7)M+bbtnfg{H*tsG0f;ULphjf zEeA_$gY_GdatM`OjGToao}Q3{K+2)c7z@n`(&*t%kBJjpn4)P{k_(Rsi#J^by{Xm& z9?t-iT@x_fe-iA2%a$f^fH^HB(E;WZ(F81heYNUMLln*;O|Utm2$8JvuH%!MFxz9Fp z=GShPU7_)|z^a+C>$PKRr~7J-)ebBvdJE=e z0}S_R$e(U#bG({w$hnS@FGhH+7K|GqyV&qzbSy0@W)ZyjcTs=bjSJ0nM%@I|55SO3)J=Hk z$%X1eM%8p)p#qp`A&1Yh+F(KfLhv0!2*FDFZ~@kX)(g$g4H4)lLlKy1CIbB*%g_f~ zV|^e5e>6l8tW60e2ylKNg3z>;qG^QQHxz-Hln8qMWf`<^dQ1c%D3hHIdj%`01p>o< z5R!cj3FzoU37APp;OjR)CRv8*6v1uW9)xCpLkK}k3PE5fgpeF=2*J6jRtzE_=G1_! z>-C2~-i1@??s_$R2&m&=uT`tXG(xy{f+36`VwSdQX9hEh%-Dnvx*H;HwR!ITQLf^` zpgFT2$MF}&W?a{V%3=nmi&@!$K;AY0|D;|~QwyLvWfIn; zEfiJYpkEi_dO*hvfwg2~ZcFvvdYR~R-djTz{S+#4FuOyu6~~og??WinFAr6n3l+>* zSowHe=m*#&ki8z~SwgGUl+TXR6?cCXRET7Ur~=L=u0~Qbi$;!B(}cs?sFFT&_8v6b+1t+bAp+% zP_F(m6;U6y$fzNFZB<`vCUR^Ez9=ldC=Uo&BXTe0m-j82&7tV&?V3F|bbRZLV2{ls z>=O0KDL`17^91*p#xBXUOaG~Q+ohjWmL~EaHT>i2-{^%{vb0C-ZBqapr(vGu%A{+NR&IwcJA|*=6T2HoV;}M*a*WHO{ zkW&~6a4!Q$SDcrj1v_2=fQB9mr~?kU9oq=JfFDe;I={3-@`~OKF)t#L#}8Fwcq}(0I{I&?VZwS0T0v-jR7VjMq z^n4BVp|%?%@O2ULJ0s{_5%gVvj^emR#=>T*1qW|q6aHb8tG!X_Ejf|T&34QA2aVZz zil5%!Lo6Pd^}2gVgnqz|>eP8)8@xAxecMh2cs^nsbCz1D#Za;l>t`S!2zY9uL@I>NY!6g#`6UK z(lEK5sSBzAPKAgZc#3#OnBoXiu*;FE?09vUe+^QLcHY3hKODT{3g-5czh51^QJ#JMg^aS$sQNA4o&SnHn$ z%V5Mv-;eRn} zWG$%QI*;=44PfT{oa$3ADDW#Su7u#+9mn9 z-oBEbH}xLL&zF}|b~(?5D=K-1qD)?z(QnNL=d~b6yLATyffIlrTYwhK0sf1TQSP1+ zX#b6uehZVnO21#g zhjYsR0F%OVJE$2O+$x1fu<%0)@?rILn-tsyH?jS8CTo4$KcY&YY*OB-zCOyYzU@FX z9@t@f8P3-KH>bkqfw#=G&XGusWMsmv$ftWV*bi-ylj+V;C`AbLIWTI0;y#}!%J|x? zpJgoTc=mZ_^0T1XF_#id-j7dt!?o0F`QFJ;xxC^UY(G9=6emlkX!7c5-8deRlk`~5 z37N^=D5(Dp2Id~Ege1T{hG{&lwY>KwaNT32$e*H%k;w$J1@IoA1qf`bIBA)2@ZP(3 zjI9g2ok+=hUfo4Kj|skV_ES3oelm-I<3l7AsL656^3LhS!+0r)Sn>#zW-26#X=V}+ zA+vJJ0+tMT(xV>_AE%lsg@dTKSs|WWhLrP@lzrF&%E}!kAWfD21}uY0@i-}7sTAr; zQ-v7mA!R*DDTSKSPnG@{m5TWX_VB|b;QL9yBT2yTl7R0f0pHdDKiu{HW)fvj0>D!^ zu(T=h)f0RX-B06=`s};C+zL`|uI9pl%HNe@Rh#O}ek# z>HWD$)4RO(zEoG0yS;%X&>n9^8tRv4c?T1m(Ddx4nzl2OoGC=pc4yGe2-KAZb*Di+ z21x7Qo@Kx^|JiAftw2o`)ax}d<#M^1EtmU3WA;t+n$y&pD^0Dr+RU2E{mN|PL$5s0 z)WioflecsJSK90iTFaSKfy!x6Um7$g4XUI;)ikJ|AUT2%RXLDG8w@~C&>x)uTghC? z2|YS57&ywm5aDz|;KVNo-b;{|$tu8loLDatEJO*uMw>{YJqEOjizlw?SV)Jp)Y7{T zbG_|AmNWB%wdL|Ixok(k`;Fn;RMkC^L^=k@T9<*YQ@r9$tV5>j@Wzlfe-2=$W1#Oi z7ZuLcVW}+W5S4mMQH-c`>KqjA8XoYDmi*upkr9=8r!udi&nfOi$YK%`d6(pJ&I>6@ z#o4Typ-w@a41rEiLCL2i{yPoTBNXw@31m@Me;BbwJu~?qaL-KMiqBb9&GQWKE&YoJ!Ilbu9m^_8N)2=Do>1*Rns zxtXA=;9Uo0xhFTKE*t23C-o-%I&ms!F)86Sn-5(!se~ATcORGoa23$RjH}KWM4lHcVE%}5Sc<0M3g%w|8JIecQQ5BH zL16)7(Oh;7&-FSgf!Qdzjpl1C_r<7X#G401TfK3vF_FWGvRt`j7YC{nX9BC-X?NPC ziI*_hC6PZerN7+c9ZSYNRlL8?hKcgL%LwZ* zAeiuuM6q`l3gj)ca^0?vueZGW00<AE@ErhO%j+On zP-A24HS z8L>y!qa$H)s-WVYgA#8ODBW|Ba*uYX4eo1|t8tv;BOF0#{P{I=hjDH&SDurxt9HMW zW4fZ!d8P+cy3kmD#oCu%C;InZ0xmR`p2|*I3SXpvSE0nT6PKmpOq6adyQhDr>VZ31 zJseD_yu@CD+nVg2LGM#Ux7J-N4FaZfSmPU4EX;hb+W5;Ai!u*a87 z%NoN47$AL2GUyE%4p{J%YMobO7{W&E4*ESR6A~&x0|9#%dVdGpc^UKrd+x28*}1*_ zW_BKB-!**bd{l?;T2VUkjU%W7xssUaF84fe8X<B>$X&roS};eIO3>U;<* z3iNEW$E;CJk~jtcGE)t6Lp7kAL@8nO`OfAtd)YYN{9Wu(KYS*i!!(Hd#TI*=5kUDs zd$Id+theClX5(F#*@0TX7Jx18=aFz-l=se-soTAPxEL&5?uAGV!>i!cgwH(F9k}ZxLm=0$4)Vn|>7dw>qwf7zGwKADW z?k-d}Z|9d>N>x!wRWNlE3HWkBdAYrO{5jT8;EAt79kAWZr6iOVaEyIJpaVY1RQ()k zKO@u}YMDt{Zqe?8K!wY^UR&I z5&0jK2LQ5hE<$(cgKYjJQB26>&k1-h3`acxw${zTE(XN967aR1fqYpU-7W8D?>9d6 zeT{gYR`0}Eah*qBGt$Aj1m(7GD*&cuW&B~ zV8j3zN%sq&3|z@QNPDou3*7CXuxFoV+gohEyoEL_<3+hZ^0+fZk%QyV(oxz?q&FZA3iOG^kUv%Vd^ES#-CX;)QHDDpT1_HJnrEwJ2q6a8T7mX?A54u+lerz60Q(> z4Km|{l@7TZwBhYBLQjX!r4!(#L9?wKaIXZ^eJwt4W8mxX)hVA@dAqMG=iNh% zy`IH6?<-8dfhW!^-llY}dzHZ5H{uJgZQ_ch3c&8wgyMD&nNqCXxPWQAfb0S^z zUW4Lo5E~cWS=eWJ6S8>~_!bzxKLWIFQWZcIybHlRE-3&yxD0?zv0U8UkCQ##AE_eM z#dt~auWvd~KMc!Sb!cY`wKE{E84iE@L)cGraEPN+(vV6W^M!Tea8+(}y0J4r{BVHS zB`5QdF^_Xb@S%3wId?YywAdn*@J&>6_<1)1_Nc zE#0svl7z8zE4o*aE6lspYU!qErd_%zE;B9N6qa7Py$mg~&0r^koGjh2S__tLU3Qn< zsVul#E!}$h%CoR^`&(ll|E2701Z%ajig(I(c|ANNKt16rvB8RNR;0>s8$lLI_N??8 zVvaor7bn@X5Qj5J+@+q)Ar_g1z!h5^C0V=eue=@J@yE4!-c4vuxsUOf_aT*Ry?R(Z z*m&qI>lUzcn@0SBw`#0@>*_;;@EXzt@wIKkt6{G(^3ZlLsYrZk$K%s(_rk_U-a5xu z@o1NF9^NM)C1zsmmd83l#d&`~p$d^;F*3tVVI9RMJLP`6fBoy}TfM&mNlk-6jG3AI zAg~Z*M%oSycbAW7b6|)u=l~Z{gWf!5B*-ieOx%FZEDzd)-V#9Foyd(KbG(^(p^