diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index ba41e66..5fd0419 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index ba41e66..5fd0419 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs index 994fa95..3d6893b 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -356,10 +356,12 @@ private void dataGridView_CounterResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - - dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex].ReadOnly = false;//将当前单元格设为可读 - dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex];//获取当前单元格 - dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 + if (e.ColumnIndex == 4|| e.ColumnIndex == 5 || e.ColumnIndex == 6) + { + dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex].ReadOnly = false;//将当前单元格设为可读 + dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex];//获取当前单元格 + dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 + } if (e.ColumnIndex == 4) { valueOld = dataGridView_CounterResult.CurrentCell.Value.ToString(); @@ -746,6 +748,9 @@ long initId = counterDetecInitService.addOrUpdate(freq, cycle); dataGridView_CounterResult.Rows[e.RowIndex].Cells[8].Value = initId; } + + dataGridView_CounterResult.Rows[e.RowIndex].Cells[7].Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + updateDatabase(); } diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index ba41e66..5fd0419 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs index 994fa95..3d6893b 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -356,10 +356,12 @@ private void dataGridView_CounterResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - - dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex].ReadOnly = false;//将当前单元格设为可读 - dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex];//获取当前单元格 - dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 + if (e.ColumnIndex == 4|| e.ColumnIndex == 5 || e.ColumnIndex == 6) + { + dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex].ReadOnly = false;//将当前单元格设为可读 + dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex];//获取当前单元格 + dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 + } if (e.ColumnIndex == 4) { valueOld = dataGridView_CounterResult.CurrentCell.Value.ToString(); @@ -746,6 +748,9 @@ long initId = counterDetecInitService.addOrUpdate(freq, cycle); dataGridView_CounterResult.Rows[e.RowIndex].Cells[8].Value = initId; } + + dataGridView_CounterResult.Rows[e.RowIndex].Cells[7].Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + updateDatabase(); } diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index 7b6a643..ce2e4ef 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -88,8 +88,19 @@ resultBootStr = dataGridView_times.Rows[0].Cells[5].Value.ToString(); resultAgeStr = dataGridView_times.Rows[0].Cells[6].Value.ToString(); LoadData(deviceId, "1-1", startTime, endTime); - - tabPageEvent("tab_stability"); + + if (!resultAccStr.Equals("")) tabPageEvent("tab_accuracy"); + if (!resultStaStr1.Equals("") || !resultStaStr10.Equals("") || !resultStaStr100.Equals("")) + { + tabPageEvent("tab_stability"); + if (!resultStaStr1.Equals("")) radio_1s.Checked = true; + else if (!resultStaStr10.Equals("")) radio_10s.Checked = true; + else if(!resultStaStr20.Equals("")) radio_20s.Checked = true; + else if (!resultStaStr100.Equals("")) radio_100s.Checked = true; + } + if (!resultBootStr.Equals("")) tabPageEvent("tab_bootFeature"); + if (!resultAgeStr.Equals("")) tabPageEvent("tab_ageRate"); + } if (dataGridView_Data.Rows.Count == 0) btn_reDetec.Enabled = false; } @@ -99,7 +110,7 @@ { if (label_reDetecting.Visible == true) { - MessageBox.Show("正在进行重新检测，请稍后关闭此界面..."); + MessageBox.Show("正在进行重新检测，请稍后再离开此界面..."); return; } this.HideMaskAction(); @@ -240,9 +251,7 @@ label_noTimes.Visible = false; dataGridView_times.DataSource = tableTimes; - - - + // width=407px dataGridView_times.Columns[0].Width = 40; dataGridView_times.Columns[1].Width = 120; @@ -288,15 +297,25 @@ { startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); - resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); - resultStaStr10 = dataGridView_times.Rows[0].Cells[9].Value.ToString(); - resultStaStr20 = dataGridView_times.Rows[0].Cells[10].Value.ToString(); - resultStaStr100 = dataGridView_times.Rows[0].Cells[11].Value.ToString(); - resultStaStr1 = dataGridView_times.Rows[0].Cells[8].Value.ToString(); - resultBootStr = dataGridView_times.Rows[0].Cells[5].Value.ToString(); - resultAgeStr = dataGridView_times.Rows[0].Cells[6].Value.ToString(); + resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); + resultStaStr10 = dataGridView_times.Rows[rowIndex].Cells[9].Value.ToString(); + resultStaStr20 = dataGridView_times.Rows[rowIndex].Cells[10].Value.ToString(); + resultStaStr100 = dataGridView_times.Rows[rowIndex].Cells[11].Value.ToString(); + resultStaStr1 = dataGridView_times.Rows[rowIndex].Cells[8].Value.ToString(); + resultBootStr = dataGridView_times.Rows[rowIndex].Cells[5].Value.ToString(); + resultAgeStr = dataGridView_times.Rows[rowIndex].Cells[6].Value.ToString(); - tabPageEvent(tabControl1.SelectedTab.Name); + if (!resultAccStr.Equals("")) tabPageEvent("tab_accuracy"); + if (!resultStaStr1.Equals("") || !resultStaStr10.Equals("") || !resultStaStr100.Equals("")) + { + tabPageEvent("tab_stability"); + if (!resultStaStr1.Equals("")) radio_1s.Checked = true; + else if (!resultStaStr10.Equals("")) radio_10s.Checked = true; + else if (!resultStaStr20.Equals("")) radio_20s.Checked = true; + else if (!resultStaStr100.Equals("")) radio_100s.Checked = true; + } + if (!resultBootStr.Equals("")) tabPageEvent("tab_bootFeature"); + if (!resultAgeStr.Equals("")) tabPageEvent("tab_ageRate"); } } @@ -315,7 +334,8 @@ LoadData(deviceId, "1-1", startTime, endTime); groupBox3.Text = "1s频率稳定度"; stability result = new stability(); - if(!resultStaStr1.Equals("-1")&& !resultStaStr1.Equals("-2")&&!resultStaStr1.Equals("-3")) result.label_stability.Text = resultStaStr1; + result.label_stability.Text = ""; + if (!resultStaStr1.Equals("-1")&& !resultStaStr1.Equals("-2")&&!resultStaStr1.Equals("-3")) result.label_stability.Text = resultStaStr1; result.Show(); panel_result.Controls.Add(result); @@ -333,6 +353,7 @@ LoadData(deviceId, "2", startTime, endTime); groupBox3.Text = "频率准确度"; accuracy result = new accuracy(); + result.label_accuracy.Text = ""; if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3")) result.label_accuracy.Text = resultAccStr; result.Show(); panel_result.Controls.Add(result); @@ -349,6 +370,7 @@ LoadData(deviceId, "3", startTime, endTime); groupBox3.Text = "开机特性"; bootFeature result = new bootFeature(); + result.label_bootFeature.Text = ""; if (!resultBootStr.Equals("-1") && !resultBootStr.Equals("-2") && !resultBootStr.Equals("-3")) result.label_bootFeature.Text = resultBootStr; result.Show(); panel_result.Controls.Add(result); @@ -362,6 +384,8 @@ LoadData(deviceId, "4", startTime, endTime); groupBox3.Text = "日老化率"; ageRate result = new ageRate(tableOriginData); + result.label_k.Text = ""; + result.label_r.Text = ""; if (!resultAgeStr.Equals("-1") && !resultAgeStr.Equals("-2") && !resultAgeStr.Equals("-3")) { if (resultAgeStr.Split(',').Length > 1) @@ -381,8 +405,7 @@ panel_radios.Visible = false; LoadData_Counter(deviceId); groupBox3.Text = "计数器范围及灵敏度"; - //ageRate result = new ageRate(tableOriginData); - //result.Show(); + break; } default: break; diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index ba41e66..5fd0419 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs index 994fa95..3d6893b 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -356,10 +356,12 @@ private void dataGridView_CounterResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - - dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex].ReadOnly = false;//将当前单元格设为可读 - dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex];//获取当前单元格 - dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 + if (e.ColumnIndex == 4|| e.ColumnIndex == 5 || e.ColumnIndex == 6) + { + dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex].ReadOnly = false;//将当前单元格设为可读 + dataGridView_CounterResult.CurrentCell = dataGridView_CounterResult.Rows[e.RowIndex].Cells[e.ColumnIndex];//获取当前单元格 + dataGridView_CounterResult.BeginEdit(true);//将单元格设为编辑状态 + } if (e.ColumnIndex == 4) { valueOld = dataGridView_CounterResult.CurrentCell.Value.ToString(); @@ -746,6 +748,9 @@ long initId = counterDetecInitService.addOrUpdate(freq, cycle); dataGridView_CounterResult.Rows[e.RowIndex].Cells[8].Value = initId; } + + dataGridView_CounterResult.Rows[e.RowIndex].Cells[7].Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + updateDatabase(); } diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index 7b6a643..ce2e4ef 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -88,8 +88,19 @@ resultBootStr = dataGridView_times.Rows[0].Cells[5].Value.ToString(); resultAgeStr = dataGridView_times.Rows[0].Cells[6].Value.ToString(); LoadData(deviceId, "1-1", startTime, endTime); - - tabPageEvent("tab_stability"); + + if (!resultAccStr.Equals("")) tabPageEvent("tab_accuracy"); + if (!resultStaStr1.Equals("") || !resultStaStr10.Equals("") || !resultStaStr100.Equals("")) + { + tabPageEvent("tab_stability"); + if (!resultStaStr1.Equals("")) radio_1s.Checked = true; + else if (!resultStaStr10.Equals("")) radio_10s.Checked = true; + else if(!resultStaStr20.Equals("")) radio_20s.Checked = true; + else if (!resultStaStr100.Equals("")) radio_100s.Checked = true; + } + if (!resultBootStr.Equals("")) tabPageEvent("tab_bootFeature"); + if (!resultAgeStr.Equals("")) tabPageEvent("tab_ageRate"); + } if (dataGridView_Data.Rows.Count == 0) btn_reDetec.Enabled = false; } @@ -99,7 +110,7 @@ { if (label_reDetecting.Visible == true) { - MessageBox.Show("正在进行重新检测，请稍后关闭此界面..."); + MessageBox.Show("正在进行重新检测，请稍后再离开此界面..."); return; } this.HideMaskAction(); @@ -240,9 +251,7 @@ label_noTimes.Visible = false; dataGridView_times.DataSource = tableTimes; - - - + // width=407px dataGridView_times.Columns[0].Width = 40; dataGridView_times.Columns[1].Width = 120; @@ -288,15 +297,25 @@ { startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); - resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); - resultStaStr10 = dataGridView_times.Rows[0].Cells[9].Value.ToString(); - resultStaStr20 = dataGridView_times.Rows[0].Cells[10].Value.ToString(); - resultStaStr100 = dataGridView_times.Rows[0].Cells[11].Value.ToString(); - resultStaStr1 = dataGridView_times.Rows[0].Cells[8].Value.ToString(); - resultBootStr = dataGridView_times.Rows[0].Cells[5].Value.ToString(); - resultAgeStr = dataGridView_times.Rows[0].Cells[6].Value.ToString(); + resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); + resultStaStr10 = dataGridView_times.Rows[rowIndex].Cells[9].Value.ToString(); + resultStaStr20 = dataGridView_times.Rows[rowIndex].Cells[10].Value.ToString(); + resultStaStr100 = dataGridView_times.Rows[rowIndex].Cells[11].Value.ToString(); + resultStaStr1 = dataGridView_times.Rows[rowIndex].Cells[8].Value.ToString(); + resultBootStr = dataGridView_times.Rows[rowIndex].Cells[5].Value.ToString(); + resultAgeStr = dataGridView_times.Rows[rowIndex].Cells[6].Value.ToString(); - tabPageEvent(tabControl1.SelectedTab.Name); + if (!resultAccStr.Equals("")) tabPageEvent("tab_accuracy"); + if (!resultStaStr1.Equals("") || !resultStaStr10.Equals("") || !resultStaStr100.Equals("")) + { + tabPageEvent("tab_stability"); + if (!resultStaStr1.Equals("")) radio_1s.Checked = true; + else if (!resultStaStr10.Equals("")) radio_10s.Checked = true; + else if (!resultStaStr20.Equals("")) radio_20s.Checked = true; + else if (!resultStaStr100.Equals("")) radio_100s.Checked = true; + } + if (!resultBootStr.Equals("")) tabPageEvent("tab_bootFeature"); + if (!resultAgeStr.Equals("")) tabPageEvent("tab_ageRate"); } } @@ -315,7 +334,8 @@ LoadData(deviceId, "1-1", startTime, endTime); groupBox3.Text = "1s频率稳定度"; stability result = new stability(); - if(!resultStaStr1.Equals("-1")&& !resultStaStr1.Equals("-2")&&!resultStaStr1.Equals("-3")) result.label_stability.Text = resultStaStr1; + result.label_stability.Text = ""; + if (!resultStaStr1.Equals("-1")&& !resultStaStr1.Equals("-2")&&!resultStaStr1.Equals("-3")) result.label_stability.Text = resultStaStr1; result.Show(); panel_result.Controls.Add(result); @@ -333,6 +353,7 @@ LoadData(deviceId, "2", startTime, endTime); groupBox3.Text = "频率准确度"; accuracy result = new accuracy(); + result.label_accuracy.Text = ""; if (!resultAccStr.Equals("-1") && !resultAccStr.Equals("-2") && !resultAccStr.Equals("-3")) result.label_accuracy.Text = resultAccStr; result.Show(); panel_result.Controls.Add(result); @@ -349,6 +370,7 @@ LoadData(deviceId, "3", startTime, endTime); groupBox3.Text = "开机特性"; bootFeature result = new bootFeature(); + result.label_bootFeature.Text = ""; if (!resultBootStr.Equals("-1") && !resultBootStr.Equals("-2") && !resultBootStr.Equals("-3")) result.label_bootFeature.Text = resultBootStr; result.Show(); panel_result.Controls.Add(result); @@ -362,6 +384,8 @@ LoadData(deviceId, "4", startTime, endTime); groupBox3.Text = "日老化率"; ageRate result = new ageRate(tableOriginData); + result.label_k.Text = ""; + result.label_r.Text = ""; if (!resultAgeStr.Equals("-1") && !resultAgeStr.Equals("-2") && !resultAgeStr.Equals("-3")) { if (resultAgeStr.Split(',').Length > 1) @@ -381,8 +405,7 @@ panel_radios.Visible = false; LoadData_Counter(deviceId); groupBox3.Text = "计数器范围及灵敏度"; - //ageRate result = new ageRate(tableOriginData); - //result.Show(); + break; } default: break; diff --git a/RbFreqStandMeasure/tools/DetectionHelper.cs b/RbFreqStandMeasure/tools/DetectionHelper.cs index 3d32d45..e732f79 100644 --- a/RbFreqStandMeasure/tools/DetectionHelper.cs +++ b/RbFreqStandMeasure/tools/DetectionHelper.cs @@ -429,7 +429,7 @@ Thread.Sleep(500); } - result = sum / 3 + ""; + result = Math.Abs(sum / 3) + ""; timerAccuracy.Dispose(); while (true)