diff --git a/Analysis/CjlrForm/AboutSoftwareInfo.designer.cs b/Analysis/CjlrForm/AboutSoftwareInfo.designer.cs index d1036ee..352c269 100644 --- a/Analysis/CjlrForm/AboutSoftwareInfo.designer.cs +++ b/Analysis/CjlrForm/AboutSoftwareInfo.designer.cs @@ -30,6 +30,7 @@ { 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.labelExpiryDateValue = new System.Windows.Forms.Label(); this.labelExpiryDate = new System.Windows.Forms.Label(); @@ -38,10 +39,9 @@ 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(); - 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(); @@ -85,6 +85,17 @@ ((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(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; + // // labTitle // this.labTitle.Anchor = System.Windows.Forms.AnchorStyles.Top; @@ -194,6 +205,18 @@ 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.BackColor = System.Drawing.Color.White; + this.pictureBox2.Image = global::NSAnalysis.Properties.Resources.Hexagon_logo_horz_Chinese_black; + this.pictureBox2.Location = new System.Drawing.Point(409, 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; @@ -214,29 +237,6 @@ 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); diff --git a/Analysis/DAL/CjlrDAL.cs b/Analysis/DAL/CjlrDAL.cs index b2bd92d..7dbd88a 100644 --- a/Analysis/DAL/CjlrDAL.cs +++ b/Analysis/DAL/CjlrDAL.cs @@ -98,7 +98,6 @@ namespace NSAnalysis.DAL } // 从CJLR_MeaData 中查询 总测量项 Good测量项 NoGood测量项 Reject测量项 FPY - public DataTable SelectMeasureResultByCarID(string strCarID) { string strSql = @" @@ -133,7 +132,6 @@ NULLIF( } // 每个测量点的上下限和偏差分析（包含合并的测量时间） - public DataTable SelectMeasureDataByCarID(string strCarID) { string strSql = @"SELECT @@ -155,13 +153,53 @@ NULLIF( SqlParameter[] parameters = new SqlParameter[] { - new SqlParameter("@ProductNum", strCarID) + new SqlParameter("@ProductNum", strCarID), }; DataTable dt = SQLHelper.ExecuteQuery(strSql, parameters, CommandType.Text); return dt; } + // 获取特定车辆ID和时间范围内的测量数据 + public DataTable SelectTMeasureDataByCarIDAndTime(string strCarID, string strStartTime, string strEndTime) + { + StringBuilder strSql = new StringBuilder(@" + SELECT +ProductNum, + PointName, + Model, + DimensionName, + DimensionValue, + NominalValue, + NominalValue + ToleranceLower1 AS LowerLimit, + NominalValue + ToleranceUpper1 AS UpperLimit, + Classification, + CAST(MeasureDate AS DATETIME) + CAST(MeasureTime AS DATETIME) AS MeasureDateTime + FROM CJLR.dbo.CJLR_MeaData + WHERE 1=1 + "); + + List parameters = new List(); + + if (!string.IsNullOrWhiteSpace(strCarID)) + { + strSql.Append(" AND ProductNum = @ProductNum"); + parameters.Add(new SqlParameter("@ProductNum", strCarID)); + } + + strSql.Append(@" + AND (CAST(MeasureDate AS datetime) + CAST(MeasureTime AS datetime)) >= @StartTime + AND (CAST(MeasureDate AS datetime) + CAST(MeasureTime AS datetime)) <= @EndTime + ORDER BY MeasureDate, MeasureTime + "); + + parameters.Add(new SqlParameter("@StartTime", DateTime.Parse(strStartTime))); + parameters.Add(new SqlParameter("@EndTime", DateTime.Parse(strEndTime))); + + return SQLHelper.ExecuteQuery(strSql.ToString(), parameters.ToArray(), CommandType.Text); + } + + #endregion #region Insert Function diff --git a/Analysis/FormMain.cs b/Analysis/FormMain.cs index e44f1be..4286fd5 100644 --- a/Analysis/FormMain.cs +++ b/Analysis/FormMain.cs @@ -252,7 +252,7 @@ namespace NSAnalysis { tmReadNextsenseCSV.Stop(); - AnalysisNxsCSV(); + //AnalysisNxsCSV(); tmReadNextsenseCSV.Start(); } @@ -556,7 +556,7 @@ namespace NSAnalysis } } - private void genCSV() + private void GenCustomerReport() { //#region 解析完报告后，重新生成客户模板报告 @@ -833,7 +833,7 @@ namespace NSAnalysis string strEndTime = rdtpEndTime.Value.ToString("yyyy-MM-dd") + " 23:59:59"; string strCarID = rtbPartID.Text.Trim(); PageTable.Clear(); - //PageTable = tmdal.SelectTMeasureDataByCarIDAndTime(strCarID, strStartTime, strEndTime); + PageTable = tmdal.SelectTMeasureDataByCarIDAndTime(strCarID, strStartTime, strEndTime); if (PageTable.Rows.Count > 0) { recordCount = PageTable.Rows.Count; //记录总行数 @@ -946,7 +946,7 @@ namespace NSAnalysis } // 将数据写入CSV文件 - File.WriteAllText(filePath, sb.ToString()); + File.WriteAllText(filePath, sb.ToString(), Encoding.GetEncoding("GBK")); } public static void ExportDataTableDataToCsv(DataTable dt, string filePath) @@ -991,7 +991,18 @@ namespace NSAnalysis if (Directory.Exists(m_Folder.SelectedPath)) { strCSVExportPath = m_Folder.SelectedPath + "\\合格率" + strExportTime + ".CSV"; - ExportdgvDataToCsv(dgvFPYResult, strCSVExportPath); + + try + { + ExportdgvDataToCsv(dgvFPYResult, strCSVExportPath); + MyBase.TraceWriteLine("合格率数据导出成功，路径为：" + strCSVExportPath); + //弹窗 提示 + MessageBox.Show("合格率数据导出成功，路径为：" + strCSVExportPath, "导出成功", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + MyBase.TraceWriteLine("导出合格率数据时发生错误：" + ex.Message); + } } } if (dgvSelectMeasureData.Visible == true && dgvSelectMeasureData.Rows.Count > 0) @@ -1000,7 +1011,19 @@ namespace NSAnalysis if (Directory.Exists(m_Folder.SelectedPath)) { strCSVExportPath = m_Folder.SelectedPath + "\\车身尺寸数据" + strExportTime + ".CSV"; - ExportDataTableDataToCsv(PageTable, strCSVExportPath); + + try + { + ExportDataTableDataToCsv(PageTable, strCSVExportPath); + MyBase.TraceWriteLine("车身尺寸数据导出成功，路径为：" + strCSVExportPath); + + //弹窗 提示 + MessageBox.Show("车身尺寸数据导出成功，路径为：" + strCSVExportPath, "导出成功", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + MyBase.TraceWriteLine("导出车身尺寸数据时发生错误：" + ex.Message); + } } } } diff --git a/Analysis/FormMain.designer.cs b/Analysis/FormMain.designer.cs index 9303ddf..a4adde1 100644 --- a/Analysis/FormMain.designer.cs +++ b/Analysis/FormMain.designer.cs @@ -32,28 +32,28 @@ namespace NSAnalysis { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Title title3 = new System.Windows.Forms.DataVisualization.Charting.Title(); - Telerik.WinControls.UI.RadListDataItem radListDataItem5 = new Telerik.WinControls.UI.RadListDataItem(); - Telerik.WinControls.UI.RadListDataItem radListDataItem6 = new Telerik.WinControls.UI.RadListDataItem(); - Telerik.WinControls.UI.RadListDataItem radListDataItem7 = new Telerik.WinControls.UI.RadListDataItem(); - Telerik.WinControls.UI.RadListDataItem radListDataItem8 = new Telerik.WinControls.UI.RadListDataItem(); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Title title4 = new System.Windows.Forms.DataVisualization.Charting.Title(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title(); + 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(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Title title2 = new System.Windows.Forms.DataVisualization.Charting.Title(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar(); this.label2 = new System.Windows.Forms.Label(); this.labTitle = new System.Windows.Forms.Label(); @@ -117,15 +117,6 @@ namespace NSAnalysis this.radLabel11 = new Telerik.WinControls.UI.RadLabel(); this.chartFPYLine = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.dgvSelectMeasureData = new System.Windows.Forms.DataGridView(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.MeasureItemResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dgvFPYResult = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -151,6 +142,15 @@ namespace NSAnalysis this.MeasureValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.MeasureDateTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Classification = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MeasureItemResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit(); this.radTitleBar1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.radStatusStrip1)).BeginInit(); @@ -354,7 +354,7 @@ namespace NSAnalysis this.RPV.ItemSizeMode = ((Telerik.WinControls.UI.PageViewItemSizeMode)((Telerik.WinControls.UI.PageViewItemSizeMode.EqualWidth | Telerik.WinControls.UI.PageViewItemSizeMode.EqualHeight))); this.RPV.Location = new System.Drawing.Point(1, 42); this.RPV.Name = "RPV"; - this.RPV.SelectedPage = this.rpvpAnalysis; + this.RPV.SelectedPage = this.rpvpSearch; this.RPV.Size = new System.Drawing.Size(1918, 1008); this.RPV.TabIndex = 127; this.RPV.ViewMode = Telerik.WinControls.UI.PageViewMode.NavigationView; @@ -437,7 +437,7 @@ namespace NSAnalysis ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161))))); ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161))))); ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).HorizontalLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 分析主界面"; + ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 查询界面"; ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).FocusBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161))))); ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.White; ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); @@ -541,14 +541,14 @@ namespace NSAnalysis this.dgvMeasureContent.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); this.dgvMeasureContent.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvMeasureContent.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle12.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvMeasureContent.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvMeasureContent.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dgvMeasureContent.ColumnHeadersHeight = 38; this.dgvMeasureContent.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.PointName, @@ -565,20 +565,20 @@ namespace NSAnalysis this.dgvMeasureContent.Name = "dgvMeasureContent"; this.dgvMeasureContent.ReadOnly = true; this.dgvMeasureContent.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle13.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle13.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvMeasureContent.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvMeasureContent.RowHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvMeasureContent.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; - dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle14.Font = new System.Drawing.Font("Segoe UI", 10F); - dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - this.dgvMeasureContent.RowsDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("Segoe UI", 10F); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); + this.dgvMeasureContent.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvMeasureContent.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Segoe UI", 10F); this.dgvMeasureContent.RowTemplate.Height = 38; this.dgvMeasureContent.Size = new System.Drawing.Size(1082, 846); @@ -834,18 +834,18 @@ namespace NSAnalysis | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.chartResultPie.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - chartArea3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - chartArea3.Name = "ChartArea1"; - this.chartResultPie.ChartAreas.Add(chartArea3); - legend2.Alignment = System.Drawing.StringAlignment.Center; - legend2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - legend2.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Bottom; - legend2.Font = new System.Drawing.Font("Segoe UI", 10F); - legend2.ForeColor = System.Drawing.Color.White; - legend2.IsTextAutoFit = false; - legend2.Name = "Legend1"; - legend2.TitleForeColor = System.Drawing.Color.White; - this.chartResultPie.Legends.Add(legend2); + chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + chartArea1.Name = "ChartArea1"; + this.chartResultPie.ChartAreas.Add(chartArea1); + legend1.Alignment = System.Drawing.StringAlignment.Center; + legend1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Bottom; + legend1.Font = new System.Drawing.Font("Segoe UI", 10F); + legend1.ForeColor = System.Drawing.Color.White; + legend1.IsTextAutoFit = false; + legend1.Name = "Legend1"; + legend1.TitleForeColor = System.Drawing.Color.White; + this.chartResultPie.Legends.Add(legend1); this.chartResultPie.Location = new System.Drawing.Point(3, 3); this.chartResultPie.Name = "chartResultPie"; this.chartResultPie.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.None; @@ -853,21 +853,21 @@ namespace NSAnalysis System.Drawing.Color.Green, System.Drawing.Color.Orange, System.Drawing.Color.Red}; - series3.ChartArea = "ChartArea1"; - series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie; - series3.Font = new System.Drawing.Font("微软雅黑", 10F); - series3.LabelForeColor = System.Drawing.Color.White; - series3.Legend = "Legend1"; - series3.Name = "Series1"; - this.chartResultPie.Series.Add(series3); + series1.ChartArea = "ChartArea1"; + series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie; + series1.Font = new System.Drawing.Font("微软雅黑", 10F); + series1.LabelForeColor = System.Drawing.Color.White; + series1.Legend = "Legend1"; + series1.Name = "Series1"; + this.chartResultPie.Series.Add(series1); this.chartResultPie.Size = new System.Drawing.Size(728, 584); this.chartResultPie.TabIndex = 0; this.chartResultPie.Text = "chartFPY"; - title3.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - title3.ForeColor = System.Drawing.Color.White; - title3.Name = "Title1"; - title3.Text = "合格率"; - this.chartResultPie.Titles.Add(title3); + title1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + title1.ForeColor = System.Drawing.Color.White; + title1.Name = "Title1"; + title1.Text = "合格率"; + this.chartResultPie.Titles.Add(title1); // // rpvpSearch // @@ -907,14 +907,14 @@ namespace NSAnalysis this.rddlPageRecorderCount.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; this.rddlPageRecorderCount.Font = new System.Drawing.Font("Segoe UI", 12F); this.rddlPageRecorderCount.ForeColor = System.Drawing.Color.White; - radListDataItem5.Text = "20"; - radListDataItem6.Text = "50"; - radListDataItem7.Text = "100"; - radListDataItem8.Text = "200"; - this.rddlPageRecorderCount.Items.Add(radListDataItem5); - this.rddlPageRecorderCount.Items.Add(radListDataItem6); - this.rddlPageRecorderCount.Items.Add(radListDataItem7); - this.rddlPageRecorderCount.Items.Add(radListDataItem8); + radListDataItem1.Text = "20"; + radListDataItem2.Text = "50"; + radListDataItem3.Text = "100"; + radListDataItem4.Text = "200"; + this.rddlPageRecorderCount.Items.Add(radListDataItem1); + this.rddlPageRecorderCount.Items.Add(radListDataItem2); + this.rddlPageRecorderCount.Items.Add(radListDataItem3); + this.rddlPageRecorderCount.Items.Add(radListDataItem4); this.rddlPageRecorderCount.Location = new System.Drawing.Point(718, 9); this.rddlPageRecorderCount.Name = "rddlPageRecorderCount"; // @@ -1459,43 +1459,43 @@ namespace NSAnalysis | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.chartFPYLine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - chartArea4.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White; - chartArea4.AxisX.LineColor = System.Drawing.Color.White; - chartArea4.AxisX.MajorGrid.LineColor = System.Drawing.Color.White; - chartArea4.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet; - chartArea4.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White; - chartArea4.AxisX.MinorGrid.LineColor = System.Drawing.Color.White; - chartArea4.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White; - chartArea4.AxisX.TitleForeColor = System.Drawing.Color.White; - chartArea4.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White; - chartArea4.AxisY.LineColor = System.Drawing.Color.White; - chartArea4.AxisY.MajorGrid.LineColor = System.Drawing.Color.White; - chartArea4.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash; - chartArea4.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White; - chartArea4.AxisY.MinorGrid.LineColor = System.Drawing.Color.White; - chartArea4.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White; - chartArea4.AxisY.TitleForeColor = System.Drawing.Color.White; - chartArea4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); - chartArea4.Name = "ChartArea1"; - this.chartFPYLine.ChartAreas.Add(chartArea4); + chartArea2.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White; + chartArea2.AxisX.LineColor = System.Drawing.Color.White; + chartArea2.AxisX.MajorGrid.LineColor = System.Drawing.Color.White; + chartArea2.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet; + chartArea2.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White; + chartArea2.AxisX.MinorGrid.LineColor = System.Drawing.Color.White; + chartArea2.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White; + chartArea2.AxisX.TitleForeColor = System.Drawing.Color.White; + chartArea2.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White; + chartArea2.AxisY.LineColor = System.Drawing.Color.White; + chartArea2.AxisY.MajorGrid.LineColor = System.Drawing.Color.White; + chartArea2.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash; + chartArea2.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White; + chartArea2.AxisY.MinorGrid.LineColor = System.Drawing.Color.White; + chartArea2.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White; + chartArea2.AxisY.TitleForeColor = System.Drawing.Color.White; + chartArea2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53))))); + chartArea2.Name = "ChartArea1"; + this.chartFPYLine.ChartAreas.Add(chartArea2); this.chartFPYLine.Location = new System.Drawing.Point(1240, 127); this.chartFPYLine.Name = "chartFPYLine"; - series4.BorderWidth = 3; - series4.ChartArea = "ChartArea1"; - series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series4.Color = System.Drawing.Color.Lime; - series4.MarkerSize = 9; - series4.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle; - series4.Name = "Series1"; - this.chartFPYLine.Series.Add(series4); + series2.BorderWidth = 3; + series2.ChartArea = "ChartArea1"; + series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series2.Color = System.Drawing.Color.Lime; + series2.MarkerSize = 9; + series2.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle; + series2.Name = "Series1"; + this.chartFPYLine.Series.Add(series2); this.chartFPYLine.Size = new System.Drawing.Size(596, 517); this.chartFPYLine.TabIndex = 77; this.chartFPYLine.Text = "chartFPY"; - title4.Font = new System.Drawing.Font("微软雅黑", 12F); - title4.ForeColor = System.Drawing.Color.White; - title4.Name = "Title1"; - title4.Text = "合格率"; - this.chartFPYLine.Titles.Add(title4); + title2.Font = new System.Drawing.Font("微软雅黑", 12F); + title2.ForeColor = System.Drawing.Color.White; + title2.Name = "Title1"; + title2.Text = "合格率"; + this.chartFPYLine.Titles.Add(title2); this.chartFPYLine.Visible = false; // // dgvSelectMeasureData @@ -1508,14 +1508,14 @@ namespace NSAnalysis this.dgvSelectMeasureData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); this.dgvSelectMeasureData.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvSelectMeasureData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvSelectMeasureData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvSelectMeasureData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvSelectMeasureData.ColumnHeadersHeight = 37; this.dgvSelectMeasureData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column2, @@ -1527,113 +1527,39 @@ namespace NSAnalysis this.dataGridViewTextBoxColumn6, this.dataGridViewTextBoxColumn7, this.MeasureItemResult}); - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle16.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectMeasureData.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectMeasureData.DefaultCellStyle = dataGridViewCellStyle5; this.dgvSelectMeasureData.EnableHeadersVisualStyles = false; this.dgvSelectMeasureData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(181)))), ((int)(((byte)(200))))); this.dgvSelectMeasureData.Location = new System.Drawing.Point(30, 126); this.dgvSelectMeasureData.Name = "dgvSelectMeasureData"; this.dgvSelectMeasureData.ReadOnly = true; this.dgvSelectMeasureData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvSelectMeasureData.RowHeadersDefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvSelectMeasureData.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgvSelectMeasureData.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; - dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 10F); - dataGridViewCellStyle18.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - this.dgvSelectMeasureData.RowsDefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10F); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); + this.dgvSelectMeasureData.RowsDefaultCellStyle = dataGridViewCellStyle7; this.dgvSelectMeasureData.RowTemplate.Height = 37; this.dgvSelectMeasureData.Size = new System.Drawing.Size(1204, 805); this.dgvSelectMeasureData.TabIndex = 174; this.dgvSelectMeasureData.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvSelectMeasureData_RowStateChanged); // - // Column2 - // - this.Column2.DataPropertyName = "CarID"; - this.Column2.HeaderText = "车身编号"; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.Width = 170; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "MeasPointName"; - this.dataGridViewTextBoxColumn1.HeaderText = "测量点名称"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewTextBoxColumn1.Width = 150; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "DimensionName"; - this.dataGridViewTextBoxColumn2.HeaderText = "尺寸名"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.ReadOnly = true; - this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewTextBoxColumn2.Width = 80; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "NormalValue"; - this.dataGridViewTextBoxColumn3.HeaderText = "理论值"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.ReadOnly = true; - this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.DataPropertyName = "LowerTolVal"; - this.dataGridViewTextBoxColumn4.HeaderText = "下公差"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.ReadOnly = true; - this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.DataPropertyName = "UpperTolVal"; - this.dataGridViewTextBoxColumn5.HeaderText = "上公差"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; - this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.DataPropertyName = "MeasureValue"; - this.dataGridViewTextBoxColumn6.HeaderText = "实测值"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; - this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.DataPropertyName = "MeasureDate"; - this.dataGridViewTextBoxColumn7.HeaderText = "测量时间"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; - this.dataGridViewTextBoxColumn7.Width = 190; - // - // MeasureItemResult - // - this.MeasureItemResult.DataPropertyName = "MeasureItemResult"; - this.MeasureItemResult.HeaderText = "结果"; - this.MeasureItemResult.Name = "MeasureItemResult"; - this.MeasureItemResult.ReadOnly = true; - this.MeasureItemResult.Width = 120; - // // dgvFPYResult // this.dgvFPYResult.AllowUserToAddRows = false; @@ -1644,14 +1570,14 @@ namespace NSAnalysis this.dgvFPYResult.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); this.dgvFPYResult.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvFPYResult.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle19.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvFPYResult.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvFPYResult.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; this.dgvFPYResult.ColumnHeadersHeight = 37; this.dgvFPYResult.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn9, @@ -1662,34 +1588,34 @@ namespace NSAnalysis this.dataGridViewTextBoxColumn14, this.dataGridViewTextBoxColumn16, this.SMResult}); - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle20.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFPYResult.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFPYResult.DefaultCellStyle = dataGridViewCellStyle9; this.dgvFPYResult.EnableHeadersVisualStyles = false; this.dgvFPYResult.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(181)))), ((int)(((byte)(200))))); this.dgvFPYResult.Location = new System.Drawing.Point(29, 126); this.dgvFPYResult.Name = "dgvFPYResult"; this.dgvFPYResult.ReadOnly = true; this.dgvFPYResult.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle21.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle21.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvFPYResult.RowHeadersDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvFPYResult.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvFPYResult.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; - dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); - dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 10F); - dataGridViewCellStyle22.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); - this.dgvFPYResult.RowsDefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68))))); + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10F); + dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186))))); + this.dgvFPYResult.RowsDefaultCellStyle = dataGridViewCellStyle11; this.dgvFPYResult.RowTemplate.Height = 37; this.dgvFPYResult.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvFPYResult.Size = new System.Drawing.Size(1205, 798); @@ -1918,6 +1844,80 @@ namespace NSAnalysis this.Classification.ReadOnly = true; this.Classification.Width = 150; // + // Column2 + // + this.Column2.DataPropertyName = "ProductNum"; + this.Column2.HeaderText = "车身编号"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.Width = 170; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.DataPropertyName = "PointName"; + this.dataGridViewTextBoxColumn1.HeaderText = "测量点名称"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewTextBoxColumn1.Width = 150; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "DimensionName"; + this.dataGridViewTextBoxColumn2.HeaderText = "尺寸名"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; + this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewTextBoxColumn2.Width = 80; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.DataPropertyName = "NominalValue"; + this.dataGridViewTextBoxColumn3.HeaderText = "理论值"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; + this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.DataPropertyName = "LowerLimit"; + this.dataGridViewTextBoxColumn4.HeaderText = "下公差"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.ReadOnly = true; + this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.DataPropertyName = "UpperLimit"; + this.dataGridViewTextBoxColumn5.HeaderText = "上公差"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.DataPropertyName = "DimensionValue"; + this.dataGridViewTextBoxColumn6.HeaderText = "实测值"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; + this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.DataPropertyName = "MeasureDateTime"; + this.dataGridViewTextBoxColumn7.HeaderText = "测量时间"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.ReadOnly = true; + this.dataGridViewTextBoxColumn7.Width = 190; + // + // MeasureItemResult + // + this.MeasureItemResult.DataPropertyName = "Classification"; + this.MeasureItemResult.HeaderText = "结果"; + this.MeasureItemResult.Name = "MeasureItemResult"; + this.MeasureItemResult.ReadOnly = true; + this.MeasureItemResult.Width = 120; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F); @@ -2067,15 +2067,6 @@ namespace NSAnalysis private System.Windows.Forms.Label labCarType; private System.Windows.Forms.Label label24; private LabPictureControl lpcShowLog; - private System.Windows.Forms.DataGridViewTextBoxColumn Column2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private System.Windows.Forms.DataGridViewTextBoxColumn MeasureItemResult; private System.Windows.Forms.Timer tmrMonitorDBToCreateReport; private LabPictureControl lpcSoftwareSetup; private LabPictureControl lpcToleranceSetup; @@ -2087,5 +2078,14 @@ namespace NSAnalysis private System.Windows.Forms.DataGridViewTextBoxColumn MeasureValue; private System.Windows.Forms.DataGridViewTextBoxColumn MeasureDateTime; private System.Windows.Forms.DataGridViewTextBoxColumn Classification; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; + private System.Windows.Forms.DataGridViewTextBoxColumn MeasureItemResult; } } diff --git a/Analysis/FormMain.resx b/Analysis/FormMain.resx index c253a6d..b33b31b 100644 --- a/Analysis/FormMain.resx +++ b/Analysis/FormMain.resx @@ -150,65 +150,6 @@ IHTCfZQWuRBGlIrQoi/wc3unYB2yIezXtu/xFw+lctWAOpr3s5YWKFgAon3/xnp3cjPKCDsamCTUelHG M5zL/kBDiUN9j/R9EOdzZ+k8yb/At2NlgydJjTKiVtSdVKk/m/kVANjAPs34ScEaMJfVMw3t6bm6s6lp qEc4R0mJ+26dgwn6qipE706fjsJ1VnvEI8VA/PC3/lOjX79/AdonQT85iOsDAAAAAElFTkSuQmCC - - - - - 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= - - - - - 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== @@ -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 diff --git a/Analysis/bin/x64/Debug/Debug.txt b/Analysis/bin/x64/Debug/Debug.txt index ddcd79a..1faa538 100644 --- a/Analysis/bin/x64/Debug/Debug.txt +++ b/Analysis/bin/x64/Debug/Debug.txt @@ -1,63 +1,22 @@ -2025-08-11 14:06:58.559----软件Program Main函数开始执行-- -2025-08-11 14:06:58.561--加载配置文件——>开始 -2025-08-11 14:06:58.583--数据库连接 SqlServerName：127.0.0.1 -2025-08-11 14:06:58.584--数据库连接 SqlUserName：sa -2025-08-11 14:06:58.585--数据库连接 SqlPassword：Hexagon123 -2025-08-11 14:06:58.586--数据库连接 SqlDbName：CJLR -2025-08-11 14:06:58.587--加载配置文件——>完成 -2025-08-11 14:07:00.986--数据库连接 SqlServerName：127.0.0.1 -2025-08-11 14:07:00.987--数据库连接 SqlUserName：sa -2025-08-11 14:07:00.988--数据库连接 SqlPassword：Hexagon123 -2025-08-11 14:07:00.988--数据库连接 SqlDbName：CJLR -2025-08-11 14:07:00.989--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123; -2025-08-11 14:07:01.365-- 进入解析CSV文件模式，开始解析扫码CSV文件！ -2025-08-11 14:07:01.367--软件首次启动， Nextsense EH3 CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEH3 -2025-08-11 14:07:16.368--存在EH3 CSV文件，开始解析： -2025-08-11 14:07:16.371--开始解析NextSense EH3 CSV 报告：D:\cherytestEH3\L2903097.csv -2025-08-11 14:07:16.375--CSV行数据不完整，跳过该行： -2025-08-11 14:07:16.376--测量时间：2020-04-20 08:40:12 -2025-08-11 14:07:16.377--车型：MY20 -2025-08-11 14:07:17.035--Copy D:\cherytestEH3\L2903097.csv TO D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\File\NextSenseCSVBackup\L2903097.csv Done. 备份完成 -2025-08-11 14:07:17.043--解析NextSense EH3 CSV 报告完毕！ -2025-08-11 14:07:17.044--正在查询车ID为：L2903097 的测量结果。 -2025-08-11 14:07:17.109--将EH3总结果插入数据库完毕。 -2025-08-11 14:07:17.110--全部插入解析完毕，删除文件：L2903097.csv -2025-08-11 14:07:27.247--存在EH3 CSV文件，开始解析： -2025-08-11 14:07:27.266--开始解析NextSense EH3 CSV 报告：D:\cherytestEH3\L3903096.csv -2025-08-11 14:07:27.267--CSV行数据不完整，跳过该行： -2025-08-11 14:07:27.268--测量时间：2020-04-20 08:46:43 -2025-08-11 14:07:27.269--车型：MY20 -2025-08-11 14:07:27.479--Copy D:\cherytestEH3\L3903096.csv TO D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\File\NextSenseCSVBackup\L3903096.csv Done. 备份完成 -2025-08-11 14:07:27.480--解析NextSense EH3 CSV 报告完毕！ -2025-08-11 14:07:27.481--正在查询车ID为：L3903096 的测量结果。 -2025-08-11 14:07:27.487--将EH3总结果插入数据库完毕。 -2025-08-11 14:07:27.489--全部插入解析完毕，删除文件：L3903096.csv -2025-08-11 14:07:27.519--开始解析NextSense EH3 CSV 报告：D:\cherytestEH3\L4903095.csv -2025-08-11 14:07:27.520--CSV行数据不完整，跳过该行： -2025-08-11 14:07:27.521--测量时间：2020-04-20 08:57:32 -2025-08-11 14:07:27.522--车型：MY20 -2025-08-11 14:07:27.728--Copy D:\cherytestEH3\L4903095.csv TO D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\File\NextSenseCSVBackup\L4903095.csv Done. 备份完成 -2025-08-11 14:07:27.729--解析NextSense EH3 CSV 报告完毕！ -2025-08-11 14:07:27.730--正在查询车ID为：L4903095 的测量结果。 -2025-08-11 14:07:27.758--将EH3总结果插入数据库完毕。 -2025-08-11 14:07:27.759--全部插入解析完毕，删除文件：L4903095.csv -2025-08-11 14:07:27.795--开始解析NextSense EH3 CSV 报告：D:\cherytestEH3\L5903094.csv -2025-08-11 14:07:27.796--CSV行数据不完整，跳过该行： -2025-08-11 14:07:27.797--测量时间：2020-04-24 20:04:58 -2025-08-11 14:07:27.798--车型：MY20 -2025-08-11 14:07:27.978--Copy D:\cherytestEH3\L5903094.csv TO D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\File\NextSenseCSVBackup\L5903094.csv Done. 备份完成 -2025-08-11 14:07:27.981--解析NextSense EH3 CSV 报告完毕！ -2025-08-11 14:07:27.983--正在查询车ID为：L5903094 的测量结果。 -2025-08-11 14:07:27.992--将EH3总结果插入数据库完毕。 -2025-08-11 14:07:27.993--全部插入解析完毕，删除文件：L5903094.csv -2025-08-11 14:07:38.031--存在EH3 CSV文件，开始解析： -2025-08-11 14:07:38.034--开始解析NextSense EH3 CSV 报告：D:\cherytestEH3\L8903091.csv -2025-08-11 14:07:38.035--CSV行数据不完整，跳过该行： -2025-08-11 14:07:38.036--测量时间：2020-04-07 09:24:54 -2025-08-11 14:07:38.037--车型：MY20 -2025-08-11 14:07:38.245--Copy D:\cherytestEH3\L8903091.csv TO D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\File\NextSenseCSVBackup\L8903091.csv Done. 备份完成 -2025-08-11 14:07:38.245--解析NextSense EH3 CSV 报告完毕！ -2025-08-11 14:07:38.246--正在查询车ID为：L8903091 的测量结果。 -2025-08-11 14:07:38.257--将EH3总结果插入数据库完毕。 -2025-08-11 14:07:38.258--全部插入解析完毕，删除文件：L8903091.csv -2025-08-11 14:08:31.679---------------海克斯康面隙分析软件程序关闭--------------------- +2025-08-11 15:03:04.024----软件Program Main函数开始执行-- +2025-08-11 15:03:04.031--加载配置文件——>开始 +2025-08-11 15:03:04.037--数据库连接 SqlServerName：127.0.0.1 +2025-08-11 15:03:04.038--数据库连接 SqlUserName：sa +2025-08-11 15:03:04.039--数据库连接 SqlPassword：Hexagon123 +2025-08-11 15:03:04.064--数据库连接 SqlDbName：CJLR +2025-08-11 15:03:04.065--加载配置文件——>完成 +2025-08-11 15:03:05.918--数据库连接 SqlServerName：127.0.0.1 +2025-08-11 15:03:05.919--数据库连接 SqlUserName：sa +2025-08-11 15:03:05.920--数据库连接 SqlPassword：Hexagon123 +2025-08-11 15:03:05.921--数据库连接 SqlDbName：CJLR +2025-08-11 15:03:05.922--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123; +2025-08-11 15:03:06.206-- 进入解析CSV文件模式，开始解析扫码CSV文件！ +2025-08-11 15:03:06.208--软件首次启动， Nextsense EH3 CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEH3 +2025-08-11 15:03:12.470--车身尺寸数据导出成功，路径为：C:\Users\zhengxuan.zhang\Desktop\车身尺寸数据20250811150310982.CSV +2025-08-11 15:03:26.159--合格率数据导出成功，路径为：C:\Users\zhengxuan.zhang\Desktop\合格率20250811150325109.CSV +2025-08-11 15:04:09.338--数据库连接 SqlServerName：127.0.0.1 +2025-08-11 15:04:09.340--数据库连接 SqlUserName：sa +2025-08-11 15:04:09.340--数据库连接 SqlPassword：Hexagon123 +2025-08-11 15:04:09.343--数据库连接 SqlDbName：CJLR +2025-08-11 15:04:09.343--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123; +2025-08-11 15:04:24.311---------------海克斯康面隙分析软件程序关闭--------------------- diff --git a/Analysis/bin/x64/Debug/NSAnalysis.exe b/Analysis/bin/x64/Debug/NSAnalysis.exe index d3647a0..863c88a 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 40b30df..79bd2b0 100644 Binary files a/Analysis/bin/x64/Debug/NSAnalysis.pdb and b/Analysis/bin/x64/Debug/NSAnalysis.pdb differ