diff --git a/Analysis/9.Analysis.csproj b/Analysis/9.Analysis.csproj
index f52a9ee..24c0baf 100644
--- a/Analysis/9.Analysis.csproj
+++ b/Analysis/9.Analysis.csproj
@@ -133,6 +133,18 @@
+
+ Form
+
+
+ FEHVLeftCarData.cs
+
+
+ Form
+
+
+ FEHVRightCarData.cs
+
Form
@@ -145,12 +157,6 @@
FEH3RightCarData.cs
-
- Form
-
-
- FEHVRightCarData.cs
-
Form
@@ -230,15 +236,18 @@
AboutSoftwareInfo.cs
+
+ FEHVLeftCarData.cs
+
+
+ FEHVRightCarData.cs
+
FEH3LeftCarData.cs
FEH3RightCarData.cs
-
- FEHVRightCarData.cs
-
CenterControl.cs
diff --git a/Analysis/CarDataDisplayForm/FEHYLeftCarData.designer.cs b/Analysis/CarDataDisplayForm/FEHYLeftCarData.designer.cs
new file mode 100644
index 0000000..8ffdedb
--- /dev/null
+++ b/Analysis/CarDataDisplayForm/FEHYLeftCarData.designer.cs
@@ -0,0 +1,562 @@
+namespace NSAnalysis
+{
+ partial class FEHYLeftCarData
+ {
+ ///
+ /// 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()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FEHYLeftCarData));
+ this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
+ this.label2 = new System.Windows.Forms.Label();
+ this.labTitle = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.labVIN = new System.Windows.Forms.Label();
+ this.tmrRefreshData = new System.Windows.Forms.Timer(this.components);
+ this.btnRefresh = new System.Windows.Forms.Button();
+ this.pictureBox2 = new System.Windows.Forms.PictureBox();
+ this.pbLeftCar = new System.Windows.Forms.PictureBox();
+ this.L13 = new UserControlClass.UCVWNextSense();
+ this.L14 = new UserControlClass.UCVWNextSense();
+ this.L22 = new UserControlClass.UCVWNextSense();
+ this.L16 = new UserControlClass.UCVWNextSense();
+ this.L18 = new UserControlClass.UCVWNextSense();
+ this.L15 = new UserControlClass.UCVWNextSense();
+ this.L21 = new UserControlClass.UCVWNextSense();
+ this.L12 = new UserControlClass.UCVWNextSense();
+ this.L08 = new UserControlClass.UCVWNextSense();
+ this.L01 = new UserControlClass.UCVWNextSense();
+ this.L03 = new UserControlClass.UCVWNextSense();
+ this.L02 = new UserControlClass.UCVWNextSense();
+ this.L04 = new UserControlClass.UCVWNextSense();
+ this.L06 = new UserControlClass.UCVWNextSense();
+ this.L10 = new UserControlClass.UCVWNextSense();
+ ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit();
+ this.radTitleBar1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pbLeftCar)).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(1918, 37);
+ this.radTitleBar1.TabIndex = 0;
+ this.radTitleBar1.TabStop = false;
+ this.radTitleBar1.Text = "左侧车身测量数据";
+ ((Telerik.WinControls.UI.RadTitleBarElement)(this.radTitleBar1.GetChildAt(0))).Text = "左侧车身测量数据";
+ ((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(875, -5);
+ this.label2.Name = "label2";
+ this.label2.Padding = new System.Windows.Forms.Padding(20, 14, 20, 14);
+ this.label2.Size = new System.Drawing.Size(40, 50);
+ 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(911, 7);
+ this.labTitle.Name = "labTitle";
+ this.labTitle.Size = new System.Drawing.Size(164, 25);
+ this.labTitle.TabIndex = 0;
+ this.labTitle.Text = "左侧车身测量数据";
+ //
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("Segoe UI", 58F);
+ this.label3.Location = new System.Drawing.Point(502, 970);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(253, 104);
+ this.label3.TabIndex = 37;
+ this.label3.Text = "VIN:";
+ //
+ // labVIN
+ //
+ this.labVIN.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.labVIN.AutoSize = true;
+ this.labVIN.Font = new System.Drawing.Font("Segoe UI", 58F);
+ this.labVIN.Location = new System.Drawing.Point(761, 970);
+ this.labVIN.Name = "labVIN";
+ this.labVIN.Size = new System.Drawing.Size(838, 104);
+ this.labVIN.TabIndex = 36;
+ this.labVIN.Text = "LNNACDEBXRDA20251";
+ //
+ // tmrRefreshData
+ //
+ this.tmrRefreshData.Interval = 1000;
+ this.tmrRefreshData.Tick += new System.EventHandler(this.tmrRefreshData_Tick);
+ //
+ // btnRefresh
+ //
+ this.btnRefresh.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnRefresh.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+ this.btnRefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnRefresh.Font = new System.Drawing.Font("宋体", 3F);
+ this.btnRefresh.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+ this.btnRefresh.Image = global::NSAnalysis.Properties.Resources.Refresh64;
+ this.btnRefresh.Location = new System.Drawing.Point(1695, 978);
+ this.btnRefresh.Name = "btnRefresh";
+ this.btnRefresh.Size = new System.Drawing.Size(86, 92);
+ this.btnRefresh.TabIndex = 35;
+ this.btnRefresh.UseVisualStyleBackColor = false;
+ this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
+ //
+ // pictureBox2
+ //
+ this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.pictureBox2.Image = global::NSAnalysis.Properties.Resources.hexagonlogotransparent;
+ this.pictureBox2.Location = new System.Drawing.Point(100, 981);
+ this.pictureBox2.Name = "pictureBox2";
+ this.pictureBox2.Size = new System.Drawing.Size(316, 83);
+ this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox2.TabIndex = 34;
+ this.pictureBox2.TabStop = false;
+ //
+ // pbLeftCar
+ //
+ this.pbLeftCar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.pbLeftCar.Image = ((System.Drawing.Image)(resources.GetObject("pbLeftCar.Image")));
+ this.pbLeftCar.Location = new System.Drawing.Point(3, 40);
+ this.pbLeftCar.Name = "pbLeftCar";
+ this.pbLeftCar.Size = new System.Drawing.Size(1916, 925);
+ this.pbLeftCar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pbLeftCar.TabIndex = 1;
+ this.pbLeftCar.TabStop = false;
+ //
+ // L13
+ //
+ this.L13.BackColor = System.Drawing.Color.White;
+ this.L13.ForeColor = System.Drawing.Color.Black;
+ this.L13.labFLowerUpper = "-2.0/2.0";
+ this.L13.labFText = "F";
+ this.L13.labFVal = "0.3";
+ this.L13.labGLowerUpper = "1.0/6.0";
+ this.L13.labGText = "G";
+ this.L13.labGVal = "3.7";
+ this.L13.labTitleText = "L-13";
+ this.L13.Location = new System.Drawing.Point(1023, 801);
+ this.L13.Name = "L13";
+ this.L13.Size = new System.Drawing.Size(220, 145);
+ this.L13.TabIndex = 62;
+ this.L13.tlpBackColor = System.Drawing.Color.Lime;
+ this.L13.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L13.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L13.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L14
+ //
+ this.L14.BackColor = System.Drawing.Color.White;
+ this.L14.ForeColor = System.Drawing.Color.Black;
+ this.L14.labFLowerUpper = "-2.0/2.0";
+ this.L14.labFText = "F";
+ this.L14.labFVal = "-1.5mm";
+ this.L14.labGLowerUpper = "1.0/6.0";
+ this.L14.labGText = "G";
+ this.L14.labGVal = "3.2mm";
+ this.L14.labTitleText = "L-14";
+ this.L14.Location = new System.Drawing.Point(1508, 100);
+ this.L14.Name = "L14";
+ this.L14.Size = new System.Drawing.Size(220, 145);
+ this.L14.TabIndex = 61;
+ this.L14.tlpBackColor = System.Drawing.Color.Lime;
+ this.L14.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L14.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L14.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L22
+ //
+ this.L22.BackColor = System.Drawing.Color.White;
+ this.L22.ForeColor = System.Drawing.Color.Black;
+ this.L22.labFLowerUpper = "-2.0/2.0";
+ this.L22.labFText = "F";
+ this.L22.labFVal = "0.0";
+ this.L22.labGLowerUpper = "1.0/6.0";
+ this.L22.labGText = "G";
+ this.L22.labGVal = "6.0";
+ this.L22.labTitleText = "L-22";
+ this.L22.Location = new System.Drawing.Point(1641, 801);
+ this.L22.Name = "L22";
+ this.L22.Size = new System.Drawing.Size(220, 145);
+ this.L22.TabIndex = 60;
+ this.L22.tlpBackColor = System.Drawing.Color.Lime;
+ this.L22.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L22.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L22.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L16
+ //
+ this.L16.BackColor = System.Drawing.Color.White;
+ this.L16.ForeColor = System.Drawing.Color.Black;
+ this.L16.labFLowerUpper = "-2.0/2.0";
+ this.L16.labFText = "F";
+ this.L16.labFVal = "-2.0mm";
+ this.L16.labGLowerUpper = "1.0/6.0";
+ this.L16.labGText = "G";
+ this.L16.labGVal = "2.7mm";
+ this.L16.labTitleText = "L-16";
+ this.L16.Location = new System.Drawing.Point(1696, 413);
+ this.L16.Name = "L16";
+ this.L16.Size = new System.Drawing.Size(220, 145);
+ this.L16.TabIndex = 59;
+ this.L16.tlpBackColor = System.Drawing.Color.Lime;
+ this.L16.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L16.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L16.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L18
+ //
+ this.L18.BackColor = System.Drawing.Color.White;
+ this.L18.ForeColor = System.Drawing.Color.Black;
+ this.L18.labFLowerUpper = "0.0/4.0";
+ this.L18.labFText = "F";
+ this.L18.labFVal = "-2.7";
+ this.L18.labGLowerUpper = "1.0/6.0";
+ this.L18.labGText = "G";
+ this.L18.labGVal = "2.7";
+ this.L18.labTitleText = "L-18";
+ this.L18.Location = new System.Drawing.Point(1694, 596);
+ this.L18.Name = "L18";
+ this.L18.Size = new System.Drawing.Size(220, 145);
+ this.L18.TabIndex = 58;
+ this.L18.tlpBackColor = System.Drawing.Color.Red;
+ this.L18.tlpFBackColor = System.Drawing.Color.Red;
+ this.L18.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L18.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L15
+ //
+ this.L15.BackColor = System.Drawing.Color.White;
+ this.L15.ForeColor = System.Drawing.Color.Black;
+ this.L15.labFLowerUpper = "-2.0/2.0";
+ this.L15.labFText = "F";
+ this.L15.labFVal = "-1.9mm";
+ this.L15.labGLowerUpper = "1.0/6.0";
+ this.L15.labGText = "G";
+ this.L15.labGVal = "2.8mm";
+ this.L15.labTitleText = "L-15";
+ this.L15.Location = new System.Drawing.Point(1692, 255);
+ this.L15.Name = "L15";
+ this.L15.Size = new System.Drawing.Size(220, 145);
+ this.L15.TabIndex = 56;
+ this.L15.tlpBackColor = System.Drawing.Color.Lime;
+ this.L15.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L15.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L15.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L21
+ //
+ this.L21.BackColor = System.Drawing.Color.White;
+ this.L21.ForeColor = System.Drawing.Color.Black;
+ this.L21.labFLowerUpper = "-2.0/2.0";
+ this.L21.labFText = "F";
+ this.L21.labFVal = "-0.2mm";
+ this.L21.labGLowerUpper = "1.0/6.0";
+ this.L21.labGText = "G";
+ this.L21.labGVal = "6.1mm";
+ this.L21.labTitleText = "L-21";
+ this.L21.Location = new System.Drawing.Point(1354, 801);
+ this.L21.Name = "L21";
+ this.L21.Size = new System.Drawing.Size(220, 145);
+ this.L21.TabIndex = 50;
+ this.L21.tlpBackColor = System.Drawing.Color.Lime;
+ this.L21.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L21.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L21.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L12
+ //
+ this.L12.BackColor = System.Drawing.Color.White;
+ this.L12.ForeColor = System.Drawing.Color.Black;
+ this.L12.labFLowerUpper = "-2.0/2.0";
+ this.L12.labFText = "F";
+ this.L12.labFVal = "-0.2mm";
+ this.L12.labGLowerUpper = "1.0/6.0";
+ this.L12.labGText = "G";
+ this.L12.labGVal = "3.0mm";
+ this.L12.labTitleText = "L-12";
+ this.L12.Location = new System.Drawing.Point(1195, 105);
+ this.L12.Name = "L12";
+ this.L12.Size = new System.Drawing.Size(220, 145);
+ this.L12.TabIndex = 49;
+ this.L12.tlpBackColor = System.Drawing.Color.Lime;
+ this.L12.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L12.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L12.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L08
+ //
+ this.L08.BackColor = System.Drawing.Color.White;
+ this.L08.ForeColor = System.Drawing.Color.Black;
+ this.L08.labFLowerUpper = "-2.0/2.0";
+ this.L08.labFText = "F";
+ this.L08.labFVal = "0.3mm";
+ this.L08.labGLowerUpper = "1.0/6.0";
+ this.L08.labGText = "G";
+ this.L08.labGVal = "3.1mm";
+ this.L08.labTitleText = "L-08";
+ this.L08.Location = new System.Drawing.Point(879, 103);
+ this.L08.Name = "L08";
+ this.L08.Size = new System.Drawing.Size(220, 145);
+ this.L08.TabIndex = 48;
+ this.L08.tlpBackColor = System.Drawing.Color.Lime;
+ this.L08.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L08.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L08.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L01
+ //
+ this.L01.BackColor = System.Drawing.Color.White;
+ this.L01.ForeColor = System.Drawing.Color.Black;
+ this.L01.labFLowerUpper = "-3.0/2.0";
+ this.L01.labFText = "F";
+ this.L01.labFVal = "0.7mm";
+ this.L01.labGLowerUpper = "1.0/5.0";
+ this.L01.labGText = "G";
+ this.L01.labGVal = "4.1mm";
+ this.L01.labTitleText = "L-01";
+ this.L01.Location = new System.Drawing.Point(7, 581);
+ this.L01.Name = "L01";
+ this.L01.Size = new System.Drawing.Size(220, 145);
+ this.L01.TabIndex = 46;
+ this.L01.tlpBackColor = System.Drawing.Color.Lime;
+ this.L01.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L01.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L01.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L03
+ //
+ this.L03.BackColor = System.Drawing.Color.White;
+ this.L03.ForeColor = System.Drawing.Color.Black;
+ this.L03.labFLowerUpper = "-3.0/2.0";
+ this.L03.labFText = "F";
+ this.L03.labFVal = "-0.6";
+ this.L03.labGLowerUpper = "1.0/6.0";
+ this.L03.labGText = "G";
+ this.L03.labGVal = "3.9";
+ this.L03.labTitleText = "L-03";
+ this.L03.Location = new System.Drawing.Point(323, 109);
+ this.L03.Name = "L03";
+ this.L03.Size = new System.Drawing.Size(220, 145);
+ this.L03.TabIndex = 40;
+ this.L03.tlpBackColor = System.Drawing.Color.Lime;
+ this.L03.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L03.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L03.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L02
+ //
+ this.L02.BackColor = System.Drawing.Color.White;
+ this.L02.ForeColor = System.Drawing.Color.Black;
+ this.L02.labFLowerUpper = "-3.0/2.0";
+ this.L02.labFText = "F";
+ this.L02.labFVal = "-0.2";
+ this.L02.labGLowerUpper = "1.0/6.0";
+ this.L02.labGText = "G";
+ this.L02.labGVal = "4.4";
+ this.L02.labTitleText = "L-02";
+ this.L02.Location = new System.Drawing.Point(46, 109);
+ this.L02.Name = "L02";
+ this.L02.Size = new System.Drawing.Size(220, 145);
+ this.L02.TabIndex = 44;
+ this.L02.tlpBackColor = System.Drawing.Color.Lime;
+ this.L02.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L02.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L02.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L04
+ //
+ this.L04.BackColor = System.Drawing.Color.White;
+ this.L04.ForeColor = System.Drawing.Color.Black;
+ this.L04.labFLowerUpper = "-1.0/2.0";
+ this.L04.labFText = "F";
+ this.L04.labFVal = "-0.1";
+ this.L04.labGLowerUpper = "1.0/6.0";
+ this.L04.labGText = "G";
+ this.L04.labGVal = "3.1";
+ this.L04.labTitleText = "L-04";
+ this.L04.Location = new System.Drawing.Point(604, 109);
+ this.L04.Name = "L04";
+ this.L04.Size = new System.Drawing.Size(220, 145);
+ this.L04.TabIndex = 43;
+ this.L04.tlpBackColor = System.Drawing.Color.Lime;
+ this.L04.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L04.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L04.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L06
+ //
+ this.L06.BackColor = System.Drawing.Color.White;
+ this.L06.ForeColor = System.Drawing.Color.Black;
+ this.L06.labFLowerUpper = "-2.0/2.0";
+ this.L06.labFText = "F";
+ this.L06.labFVal = "-0.1";
+ this.L06.labGLowerUpper = "1.0/6.0";
+ this.L06.labGText = "G";
+ this.L06.labGVal = "3.4";
+ this.L06.labTitleText = "L-06";
+ this.L06.Location = new System.Drawing.Point(423, 801);
+ this.L06.Name = "L06";
+ this.L06.Size = new System.Drawing.Size(220, 145);
+ this.L06.TabIndex = 42;
+ this.L06.tlpBackColor = System.Drawing.Color.Lime;
+ this.L06.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L06.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L06.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // L10
+ //
+ this.L10.BackColor = System.Drawing.Color.White;
+ this.L10.ForeColor = System.Drawing.Color.Black;
+ this.L10.labFLowerUpper = "-2.0/2.0";
+ this.L10.labFText = "F";
+ this.L10.labFVal = "0.3";
+ this.L10.labGLowerUpper = "1.0/6.0";
+ this.L10.labGText = "G";
+ this.L10.labGVal = "3.7";
+ this.L10.labTitleText = "L-10";
+ this.L10.Location = new System.Drawing.Point(715, 801);
+ this.L10.Name = "L10";
+ this.L10.Size = new System.Drawing.Size(220, 145);
+ this.L10.TabIndex = 38;
+ this.L10.tlpBackColor = System.Drawing.Color.Lime;
+ this.L10.tlpFBackColor = System.Drawing.Color.Lime;
+ this.L10.tlpGBackColor = System.Drawing.Color.Lime;
+ this.L10.tlpTitleBackSize = new System.Drawing.Size(216, 49);
+ //
+ // FEHYLeftCarData
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ 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(1920, 1080);
+ this.Controls.Add(this.L13);
+ this.Controls.Add(this.L14);
+ this.Controls.Add(this.L22);
+ this.Controls.Add(this.L16);
+ this.Controls.Add(this.L18);
+ this.Controls.Add(this.L15);
+ this.Controls.Add(this.L21);
+ this.Controls.Add(this.L12);
+ this.Controls.Add(this.L08);
+ this.Controls.Add(this.L01);
+ this.Controls.Add(this.L03);
+ this.Controls.Add(this.L02);
+ this.Controls.Add(this.L04);
+ this.Controls.Add(this.L06);
+ this.Controls.Add(this.labVIN);
+ this.Controls.Add(this.L10);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.btnRefresh);
+ this.Controls.Add(this.pictureBox2);
+ this.Controls.Add(this.pbLeftCar);
+ this.Controls.Add(this.radTitleBar1);
+ this.Font = new System.Drawing.Font("宋体", 9F);
+ this.ForeColor = System.Drawing.Color.White;
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximumSize = new System.Drawing.Size(1920, 1080);
+ this.Name = "FEHYLeftCarData";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "左侧车身测量数据";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FEHYLeftCarData_FormClosing);
+ this.Load += new System.EventHandler(this.FEHYLeftCarData_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit();
+ this.radTitleBar1.ResumeLayout(false);
+ this.radTitleBar1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pbLeftCar)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private Telerik.WinControls.UI.RadTitleBar radTitleBar1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label labTitle;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label labVIN;
+ private System.Windows.Forms.Button btnRefresh;
+ private System.Windows.Forms.PictureBox pictureBox2;
+ private System.Windows.Forms.Timer tmrRefreshData;
+ private System.Windows.Forms.PictureBox pbLeftCar;
+ private UserControlClass.UCVWNextSense L10;
+ private UserControlClass.UCVWNextSense L03;
+ private UserControlClass.UCVWNextSense L06;
+ private UserControlClass.UCVWNextSense L04;
+ private UserControlClass.UCVWNextSense L02;
+ private UserControlClass.UCVWNextSense L01;
+ private UserControlClass.UCVWNextSense L08;
+ private UserControlClass.UCVWNextSense L12;
+ private UserControlClass.UCVWNextSense L21;
+ private UserControlClass.UCVWNextSense L15;
+ private UserControlClass.UCVWNextSense L18;
+ private UserControlClass.UCVWNextSense L16;
+ private UserControlClass.UCVWNextSense L22;
+ private UserControlClass.UCVWNextSense L14;
+ private UserControlClass.UCVWNextSense L13;
+ }
+}
diff --git a/Analysis/CenterControl.cs b/Analysis/CenterControl.cs
index d4cbfe0..882f5f7 100644
--- a/Analysis/CenterControl.cs
+++ b/Analysis/CenterControl.cs
@@ -2564,11 +2564,20 @@ namespace NSAnalysis
{
PlcObject.InsertWriteQueue(PlcSignalDfn.WCarType, (byte)1);
}
- else
+ else if (strCarType.ToUpper().Contains("EHY"))
{
PlcObject.InsertWriteQueue(PlcSignalDfn.WCarType, (byte)2);
}
- PlcObject.InsertWriteQueue(PlcSignalDfn.WCarColor, strCarColor);
+ else if (strCarType.ToUpper().Contains("EHV"))
+ {
+ PlcObject.InsertWriteQueue(PlcSignalDfn.WCarType, (byte)3);
+ }
+ else
+ {
+ PlcObject.InsertWriteQueue(PlcSignalDfn.WCarType, (byte)0);
+ MyBase.TraceWriteLine($"未匹配到车型,输入字符为:{strCarType}");
+ }
+ PlcObject.InsertWriteQueue(PlcSignalDfn.WCarColor, strCarColor);
MyBase.TraceWriteLine("往PLC写入车型: " + strCarType + " ;车身颜色:" + strCarColor);
tmdal.InsertVIN(strCarID);
MyBase.TraceWriteLine(strCarID + " 插入到数据库表TTempSaveVIN中完成。");
@@ -2708,10 +2717,18 @@ namespace NSAnalysis
{
strCarID = strCarID + "_EH3";
}
- else
+ else if (strCarType.ToUpper().Contains("EHY"))
{
strCarID = strCarID + "_EHY";
}
+ else if (strCarType.ToUpper().Contains("EHV"))
+ {
+ strCarID = strCarID + "_EHV";
+ }
+ else
+ {
+ MyBase.TraceWriteLine($"未匹配到具体的车型,传入字符{strCarType}");
+ }
}
tmdal.updateMaintenceInfo(strCarID, 1);
MyBase.TraceWriteLine("CarPassFlag 0->10 更新到MaintenceInfo数据库位置1中的VIN为: " + strCarID);
diff --git a/Analysis/bin/x64/Debug/NSAnalysis.exe b/Analysis/bin/x64/Debug/NSAnalysis.exe
index 0e95498..a0d57bb 100644
Binary files a/Analysis/bin/x64/Debug/NSAnalysis.exe and b/Analysis/bin/x64/Debug/NSAnalysis.exe differ
diff --git a/Analysis/bin/x64/Debug/NSAnalysis.pdb b/Analysis/bin/x64/Debug/NSAnalysis.pdb
index 510ae9b..5c7cb43 100644
Binary files a/Analysis/bin/x64/Debug/NSAnalysis.pdb and b/Analysis/bin/x64/Debug/NSAnalysis.pdb differ