diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs index 9157e65..d5ff4fa 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -29,19 +29,17 @@ /// private void InitializeComponent() { - this.checkBox9 = new System.Windows.Forms.CheckBox(); - this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.checkBox_startNow = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.channel1 = new DevComponents.Editors.ComboItem(); - this.channel2 = new DevComponents.Editors.ComboItem(); - this.channel3 = new DevComponents.Editors.ComboItem(); - this.channel4 = new DevComponents.Editors.ComboItem(); - this.channel5 = new DevComponents.Editors.ComboItem(); + this.btn_downTypeList = new System.Windows.Forms.Button(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label7 = new System.Windows.Forms.Label(); + this.btn_downChannelList = new System.Windows.Forms.Button(); + this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label4 = new System.Windows.Forms.Label(); this.inputCustName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label2 = new System.Windows.Forms.Label(); @@ -53,22 +51,31 @@ this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.cbBox_devType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.channel1 = new DevComponents.Editors.ComboItem(); + this.channel2 = new DevComponents.Editors.ComboItem(); + this.channel3 = new DevComponents.Editors.ComboItem(); + this.channel4 = new DevComponents.Editors.ComboItem(); + this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); + this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); + this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); + this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.endTimeEst = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.checkBox10 = new System.Windows.Forms.CheckBox(); - this.checkBox11 = new System.Windows.Forms.CheckBox(); - this.checkBox12 = new System.Windows.Forms.CheckBox(); - this.checkBox13 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox_100s = new System.Windows.Forms.CheckBox(); + this.checkBox_20s = new System.Windows.Forms.CheckBox(); + this.checkBox_10s = new System.Windows.Forms.CheckBox(); + this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -77,62 +84,18 @@ this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // checkBox9 + // checkBox_startNow // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(491, 355); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 19; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; - // - // btnSave - // - this.btnSave.EnterBackColor = System.Drawing.Color.Blue; - this.btnSave.EnterForeColor = System.Drawing.Color.White; - this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnSave.FlatAppearance.BorderSize = 0; - this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); - this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(141, 351); - this.btnSave.Name = "btnSave"; - this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnSave.PressForeColor = System.Drawing.Color.White; - this.btnSave.Radius = 5; - this.btnSave.Size = new System.Drawing.Size(120, 30); - this.btnSave.TabIndex = 17; - this.btnSave.Text = "开始检测"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnCancelSetDev - // - this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; - this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnCancelSetDev.FlatAppearance.BorderSize = 0; - this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(301, 351); - this.btnCancelSetDev.Name = "btnCancelSetDev"; - this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Radius = 5; - this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); - this.btnCancelSetDev.TabIndex = 18; - this.btnCancelSetDev.Text = "取消"; - this.btnCancelSetDev.UseVisualStyleBackColor = true; - this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.checkBox_startNow.AutoSize = true; + this.checkBox_startNow.Enabled = false; + this.checkBox_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_startNow.Location = new System.Drawing.Point(500, 429); + this.checkBox_startNow.Name = "checkBox_startNow"; + this.checkBox_startNow.Size = new System.Drawing.Size(84, 24); + this.checkBox_startNow.TabIndex = 19; + this.checkBox_startNow.Text = "立即开始"; + this.checkBox_startNow.UseVisualStyleBackColor = true; + this.checkBox_startNow.CheckedChanged += new System.EventHandler(this.checkBox_startNow_CheckedChanged); // // panel1 // @@ -141,7 +104,7 @@ this.panel1.Controls.Add(this.labelTitle); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(640, 32); this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -153,7 +116,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(610, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -174,7 +137,12 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.channelFree); + this.groupBox4.Controls.Add(this.btn_downTypeList); + this.groupBox4.Controls.Add(this.text_devType); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.btn_downChannelList); + this.groupBox4.Controls.Add(this.text_channelNo); + this.groupBox4.Controls.Add(this.cbBox_channelFree); this.groupBox4.Controls.Add(this.label4); this.groupBox4.Controls.Add(this.inputCustName); this.groupBox4.Controls.Add(this.label2); @@ -186,57 +154,116 @@ this.groupBox4.Controls.Add(this.inputDevName); this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.cbBox_devType); this.groupBox4.Location = new System.Drawing.Point(10, 33); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(580, 140); + this.groupBox4.Size = new System.Drawing.Size(617, 175); this.groupBox4.TabIndex = 38; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // - // channelFree + // btn_downTypeList // - this.channelFree.DisplayMember = "Text"; - this.channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.channelFree.FormattingEnabled = true; - this.channelFree.ItemHeight = 18; - this.channelFree.Location = new System.Drawing.Point(400, 97); - this.channelFree.Name = "channelFree"; - this.channelFree.Size = new System.Drawing.Size(150, 24); - this.channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.channelFree.TabIndex = 41; + this.btn_downTypeList.BackColor = System.Drawing.Color.White; + this.btn_downTypeList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downTypeList.FlatAppearance.BorderSize = 0; + this.btn_downTypeList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downTypeList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downTypeList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downTypeList.Location = new System.Drawing.Point(541, 59); + this.btn_downTypeList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downTypeList.Name = "btn_downTypeList"; + this.btn_downTypeList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downTypeList.Size = new System.Drawing.Size(18, 23); + this.btn_downTypeList.TabIndex = 52; + this.btn_downTypeList.Text = "﹀"; + this.btn_downTypeList.UseVisualStyleBackColor = false; + this.btn_downTypeList.Click += new System.EventHandler(this.btn_downTypeList_Click); // - // channel1 + // text_devType // - this.channel1.Text = "通道1"; - this.channel1.Value = "1"; // - // channel2 // - this.channel2.Text = "通道2"; - this.channel2.Value = "2"; // - // channel3 + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.Location = new System.Drawing.Point(400, 57); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.Size = new System.Drawing.Size(162, 27); + this.text_devType.TabIndex = 50; // - this.channel3.Text = "通道3"; - this.channel3.Value = "3"; + // label7 // - // channel4 + this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(314, 57); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(76, 27); + this.label7.TabIndex = 51; + this.label7.Text = "仪器类型"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - this.channel4.Text = "通道4"; - this.channel4.Value = "4"; + // btn_downChannelList // - // channel5 + this.btn_downChannelList.BackColor = System.Drawing.Color.White; + this.btn_downChannelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downChannelList.FlatAppearance.BorderSize = 0; + this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downChannelList.Location = new System.Drawing.Point(249, 138); + this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downChannelList.Name = "btn_downChannelList"; + this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downChannelList.Size = new System.Drawing.Size(17, 23); + this.btn_downChannelList.TabIndex = 48; + this.btn_downChannelList.Text = "﹀"; + this.btn_downChannelList.UseVisualStyleBackColor = false; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // - this.channel5.Text = "通道5"; - this.channel5.Value = "5"; + // text_channelNo + // + this.text_channelNo.BackColor = System.Drawing.Color.White; + // + // + // + this.text_channelNo.Border.Class = "TextBoxBorder"; + this.text_channelNo.Border.CornerDiameter = 5; + this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_channelNo.Location = new System.Drawing.Point(110, 136); + this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); + this.text_channelNo.Name = "text_channelNo"; + this.text_channelNo.PreventEnterBeep = true; + this.text_channelNo.ReadOnly = true; + this.text_channelNo.Size = new System.Drawing.Size(162, 27); + this.text_channelNo.TabIndex = 49; + // + // cbBox_channelFree + // + this.cbBox_channelFree.DisplayMember = "Text"; + this.cbBox_channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_channelFree.FormattingEnabled = true; + this.cbBox_channelFree.ItemHeight = 18; + this.cbBox_channelFree.Location = new System.Drawing.Point(110, 136); + this.cbBox_channelFree.Name = "cbBox_channelFree"; + this.cbBox_channelFree.Size = new System.Drawing.Size(150, 24); + this.cbBox_channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_channelFree.TabIndex = 41; + this.cbBox_channelFree.SelectedIndexChanged += new System.EventHandler(this.cbBox_channelFree_SelectedIndexChanged); // // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(290, 94); + this.label4.Location = new System.Drawing.Point(13, 136); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); + this.label4.Size = new System.Drawing.Size(86, 27); this.label4.TabIndex = 47; this.label4.Text = "选择通道"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -250,17 +277,17 @@ this.inputCustName.Border.CornerDiameter = 5; this.inputCustName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustName.Location = new System.Drawing.Point(110, 94); + this.inputCustName.Location = new System.Drawing.Point(401, 94); this.inputCustName.Margin = new System.Windows.Forms.Padding(0); this.inputCustName.Name = "inputCustName"; this.inputCustName.PreventEnterBeep = true; - this.inputCustName.Size = new System.Drawing.Size(150, 27); + this.inputCustName.Size = new System.Drawing.Size(162, 27); this.inputCustName.TabIndex = 40; // // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(20, 94); + this.label2.Location = new System.Drawing.Point(310, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(80, 27); @@ -277,11 +304,11 @@ this.inputCustComp.Border.CornerDiameter = 5; this.inputCustComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustComp.Location = new System.Drawing.Point(400, 57); + this.inputCustComp.Location = new System.Drawing.Point(110, 98); this.inputCustComp.Margin = new System.Windows.Forms.Padding(0); this.inputCustComp.Name = "inputCustComp"; this.inputCustComp.PreventEnterBeep = true; - this.inputCustComp.Size = new System.Drawing.Size(150, 27); + this.inputCustComp.Size = new System.Drawing.Size(162, 27); this.inputCustComp.TabIndex = 39; // // inputDevModel @@ -297,16 +324,16 @@ this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); this.inputDevModel.Name = "inputDevModel"; this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 27); + this.inputDevModel.Size = new System.Drawing.Size(162, 27); this.inputDevModel.TabIndex = 38; // // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(290, 57); + this.label1.Location = new System.Drawing.Point(9, 98); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); + this.label1.Size = new System.Drawing.Size(91, 27); this.label1.TabIndex = 45; this.label1.Text = "送检单位"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -335,7 +362,7 @@ this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); this.inputDevCode.Name = "inputDevCode"; this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 27); + this.inputDevCode.Size = new System.Drawing.Size(162, 27); this.inputDevCode.TabIndex = 37; // // inputDevName @@ -351,7 +378,7 @@ this.inputDevName.Margin = new System.Windows.Forms.Padding(0); this.inputDevName.Name = "inputDevName"; this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 27); + this.inputDevName.Size = new System.Drawing.Size(162, 27); this.inputDevName.TabIndex = 36; // // label8 @@ -376,22 +403,120 @@ this.label5.Text = "仪器名称"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // cbBox_devType + // + this.cbBox_devType.DisplayMember = "Text"; + this.cbBox_devType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_devType.FormattingEnabled = true; + this.cbBox_devType.ItemHeight = 18; + this.cbBox_devType.Location = new System.Drawing.Point(402, 59); + this.cbBox_devType.Name = "cbBox_devType"; + this.cbBox_devType.Size = new System.Drawing.Size(158, 24); + this.cbBox_devType.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_devType.TabIndex = 54; + this.cbBox_devType.SelectedIndexChanged += new System.EventHandler(this.cbBox_devType_SelectedIndexChanged); + // + // channel1 + // + this.channel1.Text = "通道1"; + this.channel1.Value = "1"; + // + // channel2 + // + this.channel2.Text = "通道2"; + this.channel2.Value = "2"; + // + // channel3 + // + this.channel3.Text = "通道3"; + this.channel3.Value = "3"; + // + // channel4 + // + this.channel4.Text = "通道4"; + this.channel4.Value = "4"; + // + // channel5 + // + this.channel5.Text = "通道5"; + this.channel5.Value = "5"; + // // groupBox1 // + this.groupBox1.Controls.Add(this.checkBox_count); + this.groupBox1.Controls.Add(this.checkBox_ageRate); + this.groupBox1.Controls.Add(this.checkBox_bootFeature); + this.groupBox1.Controls.Add(this.checkBox_accuracy); + this.groupBox1.Controls.Add(this.checkBox_stability); this.groupBox1.Controls.Add(this.endTimeEst); this.groupBox1.Controls.Add(this.startTime); - this.groupBox1.Controls.Add(this.checkBox10); - this.groupBox1.Controls.Add(this.checkBox11); - this.groupBox1.Controls.Add(this.checkBox12); - this.groupBox1.Controls.Add(this.checkBox13); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label12); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(10, 174); + this.groupBox1.Enabled = false; + this.groupBox1.Location = new System.Drawing.Point(10, 212); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 98); + this.groupBox1.Size = new System.Drawing.Size(617, 140); this.groupBox1.TabIndex = 39; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(114, 55); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 351; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // checkBox_ageRate + // + this.checkBox_ageRate.AutoSize = true; + this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_ageRate.Location = new System.Drawing.Point(467, 25); + this.checkBox_ageRate.Name = "checkBox_ageRate"; + this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); + this.checkBox_ageRate.TabIndex = 350; + this.checkBox_ageRate.Text = "日老化率"; + this.checkBox_ageRate.UseVisualStyleBackColor = true; + // + // checkBox_bootFeature + // + this.checkBox_bootFeature.AutoSize = true; + this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_bootFeature.Location = new System.Drawing.Point(348, 25); + this.checkBox_bootFeature.Name = "checkBox_bootFeature"; + this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); + this.checkBox_bootFeature.TabIndex = 349; + this.checkBox_bootFeature.Text = "开机特性"; + this.checkBox_bootFeature.UseVisualStyleBackColor = true; + // + // checkBox_accuracy + // + this.checkBox_accuracy.AutoSize = true; + this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_accuracy.Location = new System.Drawing.Point(232, 25); + this.checkBox_accuracy.Name = "checkBox_accuracy"; + this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); + this.checkBox_accuracy.TabIndex = 347; + this.checkBox_accuracy.Text = "频率准确度"; + this.checkBox_accuracy.UseVisualStyleBackColor = true; + // + // checkBox_stability + // + this.checkBox_stability.AutoSize = true; + this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_stability.Location = new System.Drawing.Point(114, 25); + this.checkBox_stability.Name = "checkBox_stability"; + this.checkBox_stability.Size = new System.Drawing.Size(98, 24); + this.checkBox_stability.TabIndex = 348; + this.checkBox_stability.Text = "频率稳定度"; + this.checkBox_stability.UseVisualStyleBackColor = true; + this.checkBox_stability.CheckedChanged += new System.EventHandler(this.checkBox_stability_CheckedChanged); // // endTimeEst // @@ -406,7 +531,7 @@ this.endTimeEst.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.endTimeEst.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.endTimeEst.IsPopupCalendarOpen = false; - this.endTimeEst.Location = new System.Drawing.Point(395, 57); + this.endTimeEst.Location = new System.Drawing.Point(395, 94); // // // @@ -456,7 +581,7 @@ this.startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.startTime.IsPopupCalendarOpen = false; - this.startTime.Location = new System.Drawing.Point(115, 57); + this.startTime.Location = new System.Drawing.Point(107, 94); // // // @@ -493,54 +618,10 @@ this.startTime.TabIndex = 43; this.startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); // - // checkBox10 - // - this.checkBox10.AutoSize = true; - this.checkBox10.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox10.Location = new System.Drawing.Point(425, 20); - this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(84, 24); - this.checkBox10.TabIndex = 42; - this.checkBox10.Text = "日老化率"; - this.checkBox10.UseVisualStyleBackColor = true; - // - // checkBox11 - // - this.checkBox11.AutoSize = true; - this.checkBox11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox11.Location = new System.Drawing.Point(331, 20); - this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(84, 24); - this.checkBox11.TabIndex = 41; - this.checkBox11.Text = "开机特性"; - this.checkBox11.UseVisualStyleBackColor = true; - // - // checkBox12 - // - this.checkBox12.AutoSize = true; - this.checkBox12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox12.Location = new System.Drawing.Point(223, 20); - this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(98, 24); - this.checkBox12.TabIndex = 39; - this.checkBox12.Text = "频率准确度"; - this.checkBox12.UseVisualStyleBackColor = true; - // - // checkBox13 - // - this.checkBox13.AutoSize = true; - this.checkBox13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox13.Location = new System.Drawing.Point(115, 20); - this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(98, 24); - this.checkBox13.TabIndex = 38; - this.checkBox13.Text = "频率稳定度"; - this.checkBox13.UseVisualStyleBackColor = true; - // // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(290, 55); + this.label3.Location = new System.Drawing.Point(290, 92); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -551,7 +632,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 55); + this.label12.Location = new System.Drawing.Point(5, 92); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(100, 27); @@ -562,7 +643,7 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 18); + this.label13.Location = new System.Drawing.Point(5, 23); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -573,13 +654,14 @@ // groupBox2 // this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.checkBox1); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.checkBox3); - this.groupBox2.Controls.Add(this.checkBox4); - this.groupBox2.Location = new System.Drawing.Point(9, 278); + this.groupBox2.Controls.Add(this.checkBox_100s); + this.groupBox2.Controls.Add(this.checkBox_20s); + this.groupBox2.Controls.Add(this.checkBox_10s); + this.groupBox2.Controls.Add(this.checkBox_1s); + this.groupBox2.Enabled = false; + this.groupBox2.Location = new System.Drawing.Point(9, 353); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 53); + this.groupBox2.Size = new System.Drawing.Size(618, 53); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; // @@ -594,60 +676,107 @@ this.label6.Text = "频率稳定度"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox1 + // checkBox_100s // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox1.Location = new System.Drawing.Point(425, 19); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(60, 24); - this.checkBox1.TabIndex = 42; - this.checkBox1.Text = "100S"; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox_100s.AutoSize = true; + this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_100s.Location = new System.Drawing.Point(468, 19); + this.checkBox_100s.Name = "checkBox_100s"; + this.checkBox_100s.Size = new System.Drawing.Size(60, 24); + this.checkBox_100s.TabIndex = 42; + this.checkBox_100s.Text = "100S"; + this.checkBox_100s.UseVisualStyleBackColor = true; // - // checkBox2 + // checkBox_20s // - this.checkBox2.AutoSize = true; - this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox2.Location = new System.Drawing.Point(331, 19); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(52, 24); - this.checkBox2.TabIndex = 41; - this.checkBox2.Text = "20S"; - this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox_20s.AutoSize = true; + this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_20s.Location = new System.Drawing.Point(349, 19); + this.checkBox_20s.Name = "checkBox_20s"; + this.checkBox_20s.Size = new System.Drawing.Size(52, 24); + this.checkBox_20s.TabIndex = 41; + this.checkBox_20s.Text = "20S"; + this.checkBox_20s.UseVisualStyleBackColor = true; // - // checkBox3 + // checkBox_10s // - this.checkBox3.AutoSize = true; - this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox3.Location = new System.Drawing.Point(223, 19); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(52, 24); - this.checkBox3.TabIndex = 40; - this.checkBox3.Text = "10S"; - this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox_10s.AutoSize = true; + this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_10s.Location = new System.Drawing.Point(233, 19); + this.checkBox_10s.Name = "checkBox_10s"; + this.checkBox_10s.Size = new System.Drawing.Size(52, 24); + this.checkBox_10s.TabIndex = 40; + this.checkBox_10s.Text = "10S"; + this.checkBox_10s.UseVisualStyleBackColor = true; // - // checkBox4 + // checkBox_1s // - this.checkBox4.AutoSize = true; - this.checkBox4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox4.Location = new System.Drawing.Point(115, 19); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(44, 24); - this.checkBox4.TabIndex = 39; - this.checkBox4.Text = "1S"; - this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox_1s.AutoSize = true; + this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_1s.Location = new System.Drawing.Point(115, 19); + this.checkBox_1s.Name = "checkBox_1s"; + this.checkBox_1s.Size = new System.Drawing.Size(44, 24); + this.checkBox_1s.TabIndex = 39; + this.checkBox_1s.Text = "1S"; + this.checkBox_1s.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(150, 425); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(120, 30); + this.btnSave.TabIndex = 17; + this.btnSave.Text = "开始检测"; + this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // btnCancelSetDev + // + this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancelSetDev.FlatAppearance.BorderSize = 0; + this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Location = new System.Drawing.Point(310, 425); + this.btnCancelSetDev.Name = "btnCancelSetDev"; + this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Radius = 5; + this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); + this.btnCancelSetDev.TabIndex = 18; + this.btnCancelSetDev.Text = "取消"; + this.btnCancelSetDev.UseVisualStyleBackColor = true; + this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); // // AddDevDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 407); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(642, 483); this.ControlBox = false; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox4); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_startNow); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.panel1); @@ -669,24 +798,16 @@ } #endregion - - private System.Windows.Forms.CheckBox checkBox9; - private RoundButton btnSave; private RoundButton btnCancelSetDev; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label labelTitle; private System.Windows.Forms.GroupBox groupBox4; - private DevComponents.DotNetBar.Controls.ComboBoxEx channelFree; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_channelFree; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustName; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevName; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.Editors.ComboItem channel1; @@ -695,20 +816,34 @@ private DevComponents.Editors.ComboItem channel4; private DevComponents.Editors.ComboItem channel5; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; - private DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; - private System.Windows.Forms.CheckBox checkBox10; - private System.Windows.Forms.CheckBox checkBox11; - private System.Windows.Forms.CheckBox checkBox12; - private System.Windows.Forms.CheckBox checkBox13; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; + public DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; + private System.Windows.Forms.Button btn_downTypeList; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_devType; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustName; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + public System.Windows.Forms.CheckBox checkBox_startNow; + public DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; + public DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; + public System.Windows.Forms.CheckBox checkBox_100s; + public System.Windows.Forms.CheckBox checkBox_20s; + public System.Windows.Forms.CheckBox checkBox_10s; + public System.Windows.Forms.CheckBox checkBox_1s; + public System.Windows.Forms.CheckBox checkBox_count; + public System.Windows.Forms.CheckBox checkBox_ageRate; + public System.Windows.Forms.CheckBox checkBox_bootFeature; + public System.Windows.Forms.CheckBox checkBox_accuracy; + public System.Windows.Forms.CheckBox checkBox_stability; + public System.Windows.Forms.Button btn_downChannelList; + public RoundButton btnSave; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs index 9157e65..d5ff4fa 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -29,19 +29,17 @@ /// private void InitializeComponent() { - this.checkBox9 = new System.Windows.Forms.CheckBox(); - this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.checkBox_startNow = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.channel1 = new DevComponents.Editors.ComboItem(); - this.channel2 = new DevComponents.Editors.ComboItem(); - this.channel3 = new DevComponents.Editors.ComboItem(); - this.channel4 = new DevComponents.Editors.ComboItem(); - this.channel5 = new DevComponents.Editors.ComboItem(); + this.btn_downTypeList = new System.Windows.Forms.Button(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label7 = new System.Windows.Forms.Label(); + this.btn_downChannelList = new System.Windows.Forms.Button(); + this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label4 = new System.Windows.Forms.Label(); this.inputCustName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label2 = new System.Windows.Forms.Label(); @@ -53,22 +51,31 @@ this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.cbBox_devType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.channel1 = new DevComponents.Editors.ComboItem(); + this.channel2 = new DevComponents.Editors.ComboItem(); + this.channel3 = new DevComponents.Editors.ComboItem(); + this.channel4 = new DevComponents.Editors.ComboItem(); + this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); + this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); + this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); + this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.endTimeEst = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.checkBox10 = new System.Windows.Forms.CheckBox(); - this.checkBox11 = new System.Windows.Forms.CheckBox(); - this.checkBox12 = new System.Windows.Forms.CheckBox(); - this.checkBox13 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox_100s = new System.Windows.Forms.CheckBox(); + this.checkBox_20s = new System.Windows.Forms.CheckBox(); + this.checkBox_10s = new System.Windows.Forms.CheckBox(); + this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -77,62 +84,18 @@ this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // checkBox9 + // checkBox_startNow // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(491, 355); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 19; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; - // - // btnSave - // - this.btnSave.EnterBackColor = System.Drawing.Color.Blue; - this.btnSave.EnterForeColor = System.Drawing.Color.White; - this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnSave.FlatAppearance.BorderSize = 0; - this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); - this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(141, 351); - this.btnSave.Name = "btnSave"; - this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnSave.PressForeColor = System.Drawing.Color.White; - this.btnSave.Radius = 5; - this.btnSave.Size = new System.Drawing.Size(120, 30); - this.btnSave.TabIndex = 17; - this.btnSave.Text = "开始检测"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnCancelSetDev - // - this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; - this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnCancelSetDev.FlatAppearance.BorderSize = 0; - this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(301, 351); - this.btnCancelSetDev.Name = "btnCancelSetDev"; - this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Radius = 5; - this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); - this.btnCancelSetDev.TabIndex = 18; - this.btnCancelSetDev.Text = "取消"; - this.btnCancelSetDev.UseVisualStyleBackColor = true; - this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.checkBox_startNow.AutoSize = true; + this.checkBox_startNow.Enabled = false; + this.checkBox_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_startNow.Location = new System.Drawing.Point(500, 429); + this.checkBox_startNow.Name = "checkBox_startNow"; + this.checkBox_startNow.Size = new System.Drawing.Size(84, 24); + this.checkBox_startNow.TabIndex = 19; + this.checkBox_startNow.Text = "立即开始"; + this.checkBox_startNow.UseVisualStyleBackColor = true; + this.checkBox_startNow.CheckedChanged += new System.EventHandler(this.checkBox_startNow_CheckedChanged); // // panel1 // @@ -141,7 +104,7 @@ this.panel1.Controls.Add(this.labelTitle); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(640, 32); this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -153,7 +116,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(610, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -174,7 +137,12 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.channelFree); + this.groupBox4.Controls.Add(this.btn_downTypeList); + this.groupBox4.Controls.Add(this.text_devType); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.btn_downChannelList); + this.groupBox4.Controls.Add(this.text_channelNo); + this.groupBox4.Controls.Add(this.cbBox_channelFree); this.groupBox4.Controls.Add(this.label4); this.groupBox4.Controls.Add(this.inputCustName); this.groupBox4.Controls.Add(this.label2); @@ -186,57 +154,116 @@ this.groupBox4.Controls.Add(this.inputDevName); this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.cbBox_devType); this.groupBox4.Location = new System.Drawing.Point(10, 33); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(580, 140); + this.groupBox4.Size = new System.Drawing.Size(617, 175); this.groupBox4.TabIndex = 38; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // - // channelFree + // btn_downTypeList // - this.channelFree.DisplayMember = "Text"; - this.channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.channelFree.FormattingEnabled = true; - this.channelFree.ItemHeight = 18; - this.channelFree.Location = new System.Drawing.Point(400, 97); - this.channelFree.Name = "channelFree"; - this.channelFree.Size = new System.Drawing.Size(150, 24); - this.channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.channelFree.TabIndex = 41; + this.btn_downTypeList.BackColor = System.Drawing.Color.White; + this.btn_downTypeList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downTypeList.FlatAppearance.BorderSize = 0; + this.btn_downTypeList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downTypeList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downTypeList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downTypeList.Location = new System.Drawing.Point(541, 59); + this.btn_downTypeList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downTypeList.Name = "btn_downTypeList"; + this.btn_downTypeList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downTypeList.Size = new System.Drawing.Size(18, 23); + this.btn_downTypeList.TabIndex = 52; + this.btn_downTypeList.Text = "﹀"; + this.btn_downTypeList.UseVisualStyleBackColor = false; + this.btn_downTypeList.Click += new System.EventHandler(this.btn_downTypeList_Click); // - // channel1 + // text_devType // - this.channel1.Text = "通道1"; - this.channel1.Value = "1"; // - // channel2 // - this.channel2.Text = "通道2"; - this.channel2.Value = "2"; // - // channel3 + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.Location = new System.Drawing.Point(400, 57); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.Size = new System.Drawing.Size(162, 27); + this.text_devType.TabIndex = 50; // - this.channel3.Text = "通道3"; - this.channel3.Value = "3"; + // label7 // - // channel4 + this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(314, 57); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(76, 27); + this.label7.TabIndex = 51; + this.label7.Text = "仪器类型"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - this.channel4.Text = "通道4"; - this.channel4.Value = "4"; + // btn_downChannelList // - // channel5 + this.btn_downChannelList.BackColor = System.Drawing.Color.White; + this.btn_downChannelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downChannelList.FlatAppearance.BorderSize = 0; + this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downChannelList.Location = new System.Drawing.Point(249, 138); + this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downChannelList.Name = "btn_downChannelList"; + this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downChannelList.Size = new System.Drawing.Size(17, 23); + this.btn_downChannelList.TabIndex = 48; + this.btn_downChannelList.Text = "﹀"; + this.btn_downChannelList.UseVisualStyleBackColor = false; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // - this.channel5.Text = "通道5"; - this.channel5.Value = "5"; + // text_channelNo + // + this.text_channelNo.BackColor = System.Drawing.Color.White; + // + // + // + this.text_channelNo.Border.Class = "TextBoxBorder"; + this.text_channelNo.Border.CornerDiameter = 5; + this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_channelNo.Location = new System.Drawing.Point(110, 136); + this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); + this.text_channelNo.Name = "text_channelNo"; + this.text_channelNo.PreventEnterBeep = true; + this.text_channelNo.ReadOnly = true; + this.text_channelNo.Size = new System.Drawing.Size(162, 27); + this.text_channelNo.TabIndex = 49; + // + // cbBox_channelFree + // + this.cbBox_channelFree.DisplayMember = "Text"; + this.cbBox_channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_channelFree.FormattingEnabled = true; + this.cbBox_channelFree.ItemHeight = 18; + this.cbBox_channelFree.Location = new System.Drawing.Point(110, 136); + this.cbBox_channelFree.Name = "cbBox_channelFree"; + this.cbBox_channelFree.Size = new System.Drawing.Size(150, 24); + this.cbBox_channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_channelFree.TabIndex = 41; + this.cbBox_channelFree.SelectedIndexChanged += new System.EventHandler(this.cbBox_channelFree_SelectedIndexChanged); // // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(290, 94); + this.label4.Location = new System.Drawing.Point(13, 136); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); + this.label4.Size = new System.Drawing.Size(86, 27); this.label4.TabIndex = 47; this.label4.Text = "选择通道"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -250,17 +277,17 @@ this.inputCustName.Border.CornerDiameter = 5; this.inputCustName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustName.Location = new System.Drawing.Point(110, 94); + this.inputCustName.Location = new System.Drawing.Point(401, 94); this.inputCustName.Margin = new System.Windows.Forms.Padding(0); this.inputCustName.Name = "inputCustName"; this.inputCustName.PreventEnterBeep = true; - this.inputCustName.Size = new System.Drawing.Size(150, 27); + this.inputCustName.Size = new System.Drawing.Size(162, 27); this.inputCustName.TabIndex = 40; // // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(20, 94); + this.label2.Location = new System.Drawing.Point(310, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(80, 27); @@ -277,11 +304,11 @@ this.inputCustComp.Border.CornerDiameter = 5; this.inputCustComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustComp.Location = new System.Drawing.Point(400, 57); + this.inputCustComp.Location = new System.Drawing.Point(110, 98); this.inputCustComp.Margin = new System.Windows.Forms.Padding(0); this.inputCustComp.Name = "inputCustComp"; this.inputCustComp.PreventEnterBeep = true; - this.inputCustComp.Size = new System.Drawing.Size(150, 27); + this.inputCustComp.Size = new System.Drawing.Size(162, 27); this.inputCustComp.TabIndex = 39; // // inputDevModel @@ -297,16 +324,16 @@ this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); this.inputDevModel.Name = "inputDevModel"; this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 27); + this.inputDevModel.Size = new System.Drawing.Size(162, 27); this.inputDevModel.TabIndex = 38; // // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(290, 57); + this.label1.Location = new System.Drawing.Point(9, 98); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); + this.label1.Size = new System.Drawing.Size(91, 27); this.label1.TabIndex = 45; this.label1.Text = "送检单位"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -335,7 +362,7 @@ this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); this.inputDevCode.Name = "inputDevCode"; this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 27); + this.inputDevCode.Size = new System.Drawing.Size(162, 27); this.inputDevCode.TabIndex = 37; // // inputDevName @@ -351,7 +378,7 @@ this.inputDevName.Margin = new System.Windows.Forms.Padding(0); this.inputDevName.Name = "inputDevName"; this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 27); + this.inputDevName.Size = new System.Drawing.Size(162, 27); this.inputDevName.TabIndex = 36; // // label8 @@ -376,22 +403,120 @@ this.label5.Text = "仪器名称"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // cbBox_devType + // + this.cbBox_devType.DisplayMember = "Text"; + this.cbBox_devType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_devType.FormattingEnabled = true; + this.cbBox_devType.ItemHeight = 18; + this.cbBox_devType.Location = new System.Drawing.Point(402, 59); + this.cbBox_devType.Name = "cbBox_devType"; + this.cbBox_devType.Size = new System.Drawing.Size(158, 24); + this.cbBox_devType.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_devType.TabIndex = 54; + this.cbBox_devType.SelectedIndexChanged += new System.EventHandler(this.cbBox_devType_SelectedIndexChanged); + // + // channel1 + // + this.channel1.Text = "通道1"; + this.channel1.Value = "1"; + // + // channel2 + // + this.channel2.Text = "通道2"; + this.channel2.Value = "2"; + // + // channel3 + // + this.channel3.Text = "通道3"; + this.channel3.Value = "3"; + // + // channel4 + // + this.channel4.Text = "通道4"; + this.channel4.Value = "4"; + // + // channel5 + // + this.channel5.Text = "通道5"; + this.channel5.Value = "5"; + // // groupBox1 // + this.groupBox1.Controls.Add(this.checkBox_count); + this.groupBox1.Controls.Add(this.checkBox_ageRate); + this.groupBox1.Controls.Add(this.checkBox_bootFeature); + this.groupBox1.Controls.Add(this.checkBox_accuracy); + this.groupBox1.Controls.Add(this.checkBox_stability); this.groupBox1.Controls.Add(this.endTimeEst); this.groupBox1.Controls.Add(this.startTime); - this.groupBox1.Controls.Add(this.checkBox10); - this.groupBox1.Controls.Add(this.checkBox11); - this.groupBox1.Controls.Add(this.checkBox12); - this.groupBox1.Controls.Add(this.checkBox13); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label12); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(10, 174); + this.groupBox1.Enabled = false; + this.groupBox1.Location = new System.Drawing.Point(10, 212); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 98); + this.groupBox1.Size = new System.Drawing.Size(617, 140); this.groupBox1.TabIndex = 39; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(114, 55); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 351; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // checkBox_ageRate + // + this.checkBox_ageRate.AutoSize = true; + this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_ageRate.Location = new System.Drawing.Point(467, 25); + this.checkBox_ageRate.Name = "checkBox_ageRate"; + this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); + this.checkBox_ageRate.TabIndex = 350; + this.checkBox_ageRate.Text = "日老化率"; + this.checkBox_ageRate.UseVisualStyleBackColor = true; + // + // checkBox_bootFeature + // + this.checkBox_bootFeature.AutoSize = true; + this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_bootFeature.Location = new System.Drawing.Point(348, 25); + this.checkBox_bootFeature.Name = "checkBox_bootFeature"; + this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); + this.checkBox_bootFeature.TabIndex = 349; + this.checkBox_bootFeature.Text = "开机特性"; + this.checkBox_bootFeature.UseVisualStyleBackColor = true; + // + // checkBox_accuracy + // + this.checkBox_accuracy.AutoSize = true; + this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_accuracy.Location = new System.Drawing.Point(232, 25); + this.checkBox_accuracy.Name = "checkBox_accuracy"; + this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); + this.checkBox_accuracy.TabIndex = 347; + this.checkBox_accuracy.Text = "频率准确度"; + this.checkBox_accuracy.UseVisualStyleBackColor = true; + // + // checkBox_stability + // + this.checkBox_stability.AutoSize = true; + this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_stability.Location = new System.Drawing.Point(114, 25); + this.checkBox_stability.Name = "checkBox_stability"; + this.checkBox_stability.Size = new System.Drawing.Size(98, 24); + this.checkBox_stability.TabIndex = 348; + this.checkBox_stability.Text = "频率稳定度"; + this.checkBox_stability.UseVisualStyleBackColor = true; + this.checkBox_stability.CheckedChanged += new System.EventHandler(this.checkBox_stability_CheckedChanged); // // endTimeEst // @@ -406,7 +531,7 @@ this.endTimeEst.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.endTimeEst.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.endTimeEst.IsPopupCalendarOpen = false; - this.endTimeEst.Location = new System.Drawing.Point(395, 57); + this.endTimeEst.Location = new System.Drawing.Point(395, 94); // // // @@ -456,7 +581,7 @@ this.startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.startTime.IsPopupCalendarOpen = false; - this.startTime.Location = new System.Drawing.Point(115, 57); + this.startTime.Location = new System.Drawing.Point(107, 94); // // // @@ -493,54 +618,10 @@ this.startTime.TabIndex = 43; this.startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); // - // checkBox10 - // - this.checkBox10.AutoSize = true; - this.checkBox10.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox10.Location = new System.Drawing.Point(425, 20); - this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(84, 24); - this.checkBox10.TabIndex = 42; - this.checkBox10.Text = "日老化率"; - this.checkBox10.UseVisualStyleBackColor = true; - // - // checkBox11 - // - this.checkBox11.AutoSize = true; - this.checkBox11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox11.Location = new System.Drawing.Point(331, 20); - this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(84, 24); - this.checkBox11.TabIndex = 41; - this.checkBox11.Text = "开机特性"; - this.checkBox11.UseVisualStyleBackColor = true; - // - // checkBox12 - // - this.checkBox12.AutoSize = true; - this.checkBox12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox12.Location = new System.Drawing.Point(223, 20); - this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(98, 24); - this.checkBox12.TabIndex = 39; - this.checkBox12.Text = "频率准确度"; - this.checkBox12.UseVisualStyleBackColor = true; - // - // checkBox13 - // - this.checkBox13.AutoSize = true; - this.checkBox13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox13.Location = new System.Drawing.Point(115, 20); - this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(98, 24); - this.checkBox13.TabIndex = 38; - this.checkBox13.Text = "频率稳定度"; - this.checkBox13.UseVisualStyleBackColor = true; - // // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(290, 55); + this.label3.Location = new System.Drawing.Point(290, 92); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -551,7 +632,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 55); + this.label12.Location = new System.Drawing.Point(5, 92); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(100, 27); @@ -562,7 +643,7 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 18); + this.label13.Location = new System.Drawing.Point(5, 23); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -573,13 +654,14 @@ // groupBox2 // this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.checkBox1); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.checkBox3); - this.groupBox2.Controls.Add(this.checkBox4); - this.groupBox2.Location = new System.Drawing.Point(9, 278); + this.groupBox2.Controls.Add(this.checkBox_100s); + this.groupBox2.Controls.Add(this.checkBox_20s); + this.groupBox2.Controls.Add(this.checkBox_10s); + this.groupBox2.Controls.Add(this.checkBox_1s); + this.groupBox2.Enabled = false; + this.groupBox2.Location = new System.Drawing.Point(9, 353); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 53); + this.groupBox2.Size = new System.Drawing.Size(618, 53); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; // @@ -594,60 +676,107 @@ this.label6.Text = "频率稳定度"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox1 + // checkBox_100s // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox1.Location = new System.Drawing.Point(425, 19); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(60, 24); - this.checkBox1.TabIndex = 42; - this.checkBox1.Text = "100S"; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox_100s.AutoSize = true; + this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_100s.Location = new System.Drawing.Point(468, 19); + this.checkBox_100s.Name = "checkBox_100s"; + this.checkBox_100s.Size = new System.Drawing.Size(60, 24); + this.checkBox_100s.TabIndex = 42; + this.checkBox_100s.Text = "100S"; + this.checkBox_100s.UseVisualStyleBackColor = true; // - // checkBox2 + // checkBox_20s // - this.checkBox2.AutoSize = true; - this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox2.Location = new System.Drawing.Point(331, 19); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(52, 24); - this.checkBox2.TabIndex = 41; - this.checkBox2.Text = "20S"; - this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox_20s.AutoSize = true; + this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_20s.Location = new System.Drawing.Point(349, 19); + this.checkBox_20s.Name = "checkBox_20s"; + this.checkBox_20s.Size = new System.Drawing.Size(52, 24); + this.checkBox_20s.TabIndex = 41; + this.checkBox_20s.Text = "20S"; + this.checkBox_20s.UseVisualStyleBackColor = true; // - // checkBox3 + // checkBox_10s // - this.checkBox3.AutoSize = true; - this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox3.Location = new System.Drawing.Point(223, 19); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(52, 24); - this.checkBox3.TabIndex = 40; - this.checkBox3.Text = "10S"; - this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox_10s.AutoSize = true; + this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_10s.Location = new System.Drawing.Point(233, 19); + this.checkBox_10s.Name = "checkBox_10s"; + this.checkBox_10s.Size = new System.Drawing.Size(52, 24); + this.checkBox_10s.TabIndex = 40; + this.checkBox_10s.Text = "10S"; + this.checkBox_10s.UseVisualStyleBackColor = true; // - // checkBox4 + // checkBox_1s // - this.checkBox4.AutoSize = true; - this.checkBox4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox4.Location = new System.Drawing.Point(115, 19); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(44, 24); - this.checkBox4.TabIndex = 39; - this.checkBox4.Text = "1S"; - this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox_1s.AutoSize = true; + this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_1s.Location = new System.Drawing.Point(115, 19); + this.checkBox_1s.Name = "checkBox_1s"; + this.checkBox_1s.Size = new System.Drawing.Size(44, 24); + this.checkBox_1s.TabIndex = 39; + this.checkBox_1s.Text = "1S"; + this.checkBox_1s.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(150, 425); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(120, 30); + this.btnSave.TabIndex = 17; + this.btnSave.Text = "开始检测"; + this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // btnCancelSetDev + // + this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancelSetDev.FlatAppearance.BorderSize = 0; + this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Location = new System.Drawing.Point(310, 425); + this.btnCancelSetDev.Name = "btnCancelSetDev"; + this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Radius = 5; + this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); + this.btnCancelSetDev.TabIndex = 18; + this.btnCancelSetDev.Text = "取消"; + this.btnCancelSetDev.UseVisualStyleBackColor = true; + this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); // // AddDevDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 407); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(642, 483); this.ControlBox = false; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox4); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_startNow); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.panel1); @@ -669,24 +798,16 @@ } #endregion - - private System.Windows.Forms.CheckBox checkBox9; - private RoundButton btnSave; private RoundButton btnCancelSetDev; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label labelTitle; private System.Windows.Forms.GroupBox groupBox4; - private DevComponents.DotNetBar.Controls.ComboBoxEx channelFree; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_channelFree; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustName; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevName; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.Editors.ComboItem channel1; @@ -695,20 +816,34 @@ private DevComponents.Editors.ComboItem channel4; private DevComponents.Editors.ComboItem channel5; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; - private DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; - private System.Windows.Forms.CheckBox checkBox10; - private System.Windows.Forms.CheckBox checkBox11; - private System.Windows.Forms.CheckBox checkBox12; - private System.Windows.Forms.CheckBox checkBox13; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; + public DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; + private System.Windows.Forms.Button btn_downTypeList; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_devType; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustName; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + public System.Windows.Forms.CheckBox checkBox_startNow; + public DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; + public DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; + public System.Windows.Forms.CheckBox checkBox_100s; + public System.Windows.Forms.CheckBox checkBox_20s; + public System.Windows.Forms.CheckBox checkBox_10s; + public System.Windows.Forms.CheckBox checkBox_1s; + public System.Windows.Forms.CheckBox checkBox_count; + public System.Windows.Forms.CheckBox checkBox_ageRate; + public System.Windows.Forms.CheckBox checkBox_bootFeature; + public System.Windows.Forms.CheckBox checkBox_accuracy; + public System.Windows.Forms.CheckBox checkBox_stability; + public System.Windows.Forms.Button btn_downChannelList; + public RoundButton btnSave; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs index 652c6b4..a2dbf38 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -27,6 +27,10 @@ } #endregion + DictService dictService = new DictServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + public Action HideMaskAction { get; @@ -37,7 +41,21 @@ { InitializeComponent(); - ((ComboBoxEx)this.Controls.Find("channelFree", true)[0]).SelectedIndex = 0; + cbBox_devType.DataSource = dictService.getTypeListByCodeType("devType"); + btnSave.Text = "添加仪器"; + if (HomeCtrlForm.channelFreeList.Count > 0) + { + cbBox_channelFree.Items.Add(""); + foreach (string item in HomeCtrlForm.channelFreeList) + { + cbBox_channelFree.Items.Add(item); + } + } + else + { + text_channelNo.WatermarkText = "无空闲通道可选"; + + } } // 关闭对话框 @@ -49,6 +67,19 @@ // 添加并开始检测 private void btnSave_Click(object sender, EventArgs e) { + if (text_channelNo.Text.Trim() != "") + { + if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + { + MessageBox.Show("请选择频率稳定度！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + } // 取得输入框的参数 string devName = ((TextBoxX) this.Controls.Find("inputDevName", true)[0]).Text; string devCode = ((TextBoxX) this.Controls.Find("inputDevCode", true)[0]).Text; @@ -56,7 +87,7 @@ string devCustomComp = ((TextBoxX)this.Controls.Find("inputCustComp", true)[0]).Text; string devCustomName = ((TextBoxX)this.Controls.Find("inputCustName", true)[0]).Text; - ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("channelFree", true)[0]; + ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("cbBox_channelFree", true)[0]; string channelNo = (string)((ComboItem)channels.SelectedItem).Value; // 初始化数据访问接口 @@ -64,13 +95,80 @@ int id = devService.add(devName, devCode, "1", devModel, devCustomComp, devCustomName, channelNo); if (id >= 0) { + if (btnSave.Text.Equals("添加并开始检测")) + { + //detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval); + // 重新加载首页的通道状态 + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + } // 添加成功，继续保存检测项目和开始时间 this.HideMaskAction(); + } else { LogHelper.WriteErrorLog(this.GetType(), "添加设备[" + devName + "]失败"); } } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = true; + } + + private void groupBox4_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void groupBox1_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void btn_downTypeList_Click(object sender, EventArgs e) + { + cbBox_devType.DroppedDown = true; + } + + private void checkBox_startNow_CheckedChanged(object sender, EventArgs e) + { + startTime.Value = DateTime.Now; + } + + private void cbBox_devType_SelectedIndexChanged(object sender, EventArgs e) + { + text_devType.Text = cbBox_devType.SelectedItem.ToString(); + } + + private void cbBox_channelFree_SelectedIndexChanged(object sender, EventArgs e) + { + text_channelNo.Text = cbBox_channelFree.SelectedItem.ToString(); + + if (text_channelNo.Text != "") + { + btnSave.Text = "添加并开始检测"; + checkBox_startNow.Enabled = true; + groupBox1.Enabled = true; + } + else + { + btnSave.Text = "添加仪器"; + groupBox1.Enabled = false; checkBox_startNow.Enabled = false; + } + } + + private void checkBox13_CheckedChanged(object sender, EventArgs e) + { + + } + + private void checkBox_stability_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_stability.Checked) groupBox2.Enabled = true; + else groupBox2.Enabled = false; + } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs index 9157e65..d5ff4fa 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -29,19 +29,17 @@ /// private void InitializeComponent() { - this.checkBox9 = new System.Windows.Forms.CheckBox(); - this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.checkBox_startNow = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.channel1 = new DevComponents.Editors.ComboItem(); - this.channel2 = new DevComponents.Editors.ComboItem(); - this.channel3 = new DevComponents.Editors.ComboItem(); - this.channel4 = new DevComponents.Editors.ComboItem(); - this.channel5 = new DevComponents.Editors.ComboItem(); + this.btn_downTypeList = new System.Windows.Forms.Button(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label7 = new System.Windows.Forms.Label(); + this.btn_downChannelList = new System.Windows.Forms.Button(); + this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label4 = new System.Windows.Forms.Label(); this.inputCustName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label2 = new System.Windows.Forms.Label(); @@ -53,22 +51,31 @@ this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.cbBox_devType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.channel1 = new DevComponents.Editors.ComboItem(); + this.channel2 = new DevComponents.Editors.ComboItem(); + this.channel3 = new DevComponents.Editors.ComboItem(); + this.channel4 = new DevComponents.Editors.ComboItem(); + this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); + this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); + this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); + this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.endTimeEst = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.checkBox10 = new System.Windows.Forms.CheckBox(); - this.checkBox11 = new System.Windows.Forms.CheckBox(); - this.checkBox12 = new System.Windows.Forms.CheckBox(); - this.checkBox13 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox_100s = new System.Windows.Forms.CheckBox(); + this.checkBox_20s = new System.Windows.Forms.CheckBox(); + this.checkBox_10s = new System.Windows.Forms.CheckBox(); + this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -77,62 +84,18 @@ this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // checkBox9 + // checkBox_startNow // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(491, 355); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 19; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; - // - // btnSave - // - this.btnSave.EnterBackColor = System.Drawing.Color.Blue; - this.btnSave.EnterForeColor = System.Drawing.Color.White; - this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnSave.FlatAppearance.BorderSize = 0; - this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); - this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(141, 351); - this.btnSave.Name = "btnSave"; - this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnSave.PressForeColor = System.Drawing.Color.White; - this.btnSave.Radius = 5; - this.btnSave.Size = new System.Drawing.Size(120, 30); - this.btnSave.TabIndex = 17; - this.btnSave.Text = "开始检测"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnCancelSetDev - // - this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; - this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnCancelSetDev.FlatAppearance.BorderSize = 0; - this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(301, 351); - this.btnCancelSetDev.Name = "btnCancelSetDev"; - this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Radius = 5; - this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); - this.btnCancelSetDev.TabIndex = 18; - this.btnCancelSetDev.Text = "取消"; - this.btnCancelSetDev.UseVisualStyleBackColor = true; - this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.checkBox_startNow.AutoSize = true; + this.checkBox_startNow.Enabled = false; + this.checkBox_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_startNow.Location = new System.Drawing.Point(500, 429); + this.checkBox_startNow.Name = "checkBox_startNow"; + this.checkBox_startNow.Size = new System.Drawing.Size(84, 24); + this.checkBox_startNow.TabIndex = 19; + this.checkBox_startNow.Text = "立即开始"; + this.checkBox_startNow.UseVisualStyleBackColor = true; + this.checkBox_startNow.CheckedChanged += new System.EventHandler(this.checkBox_startNow_CheckedChanged); // // panel1 // @@ -141,7 +104,7 @@ this.panel1.Controls.Add(this.labelTitle); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(640, 32); this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -153,7 +116,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(610, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -174,7 +137,12 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.channelFree); + this.groupBox4.Controls.Add(this.btn_downTypeList); + this.groupBox4.Controls.Add(this.text_devType); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.btn_downChannelList); + this.groupBox4.Controls.Add(this.text_channelNo); + this.groupBox4.Controls.Add(this.cbBox_channelFree); this.groupBox4.Controls.Add(this.label4); this.groupBox4.Controls.Add(this.inputCustName); this.groupBox4.Controls.Add(this.label2); @@ -186,57 +154,116 @@ this.groupBox4.Controls.Add(this.inputDevName); this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.cbBox_devType); this.groupBox4.Location = new System.Drawing.Point(10, 33); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(580, 140); + this.groupBox4.Size = new System.Drawing.Size(617, 175); this.groupBox4.TabIndex = 38; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // - // channelFree + // btn_downTypeList // - this.channelFree.DisplayMember = "Text"; - this.channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.channelFree.FormattingEnabled = true; - this.channelFree.ItemHeight = 18; - this.channelFree.Location = new System.Drawing.Point(400, 97); - this.channelFree.Name = "channelFree"; - this.channelFree.Size = new System.Drawing.Size(150, 24); - this.channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.channelFree.TabIndex = 41; + this.btn_downTypeList.BackColor = System.Drawing.Color.White; + this.btn_downTypeList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downTypeList.FlatAppearance.BorderSize = 0; + this.btn_downTypeList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downTypeList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downTypeList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downTypeList.Location = new System.Drawing.Point(541, 59); + this.btn_downTypeList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downTypeList.Name = "btn_downTypeList"; + this.btn_downTypeList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downTypeList.Size = new System.Drawing.Size(18, 23); + this.btn_downTypeList.TabIndex = 52; + this.btn_downTypeList.Text = "﹀"; + this.btn_downTypeList.UseVisualStyleBackColor = false; + this.btn_downTypeList.Click += new System.EventHandler(this.btn_downTypeList_Click); // - // channel1 + // text_devType // - this.channel1.Text = "通道1"; - this.channel1.Value = "1"; // - // channel2 // - this.channel2.Text = "通道2"; - this.channel2.Value = "2"; // - // channel3 + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.Location = new System.Drawing.Point(400, 57); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.Size = new System.Drawing.Size(162, 27); + this.text_devType.TabIndex = 50; // - this.channel3.Text = "通道3"; - this.channel3.Value = "3"; + // label7 // - // channel4 + this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(314, 57); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(76, 27); + this.label7.TabIndex = 51; + this.label7.Text = "仪器类型"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - this.channel4.Text = "通道4"; - this.channel4.Value = "4"; + // btn_downChannelList // - // channel5 + this.btn_downChannelList.BackColor = System.Drawing.Color.White; + this.btn_downChannelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downChannelList.FlatAppearance.BorderSize = 0; + this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downChannelList.Location = new System.Drawing.Point(249, 138); + this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downChannelList.Name = "btn_downChannelList"; + this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downChannelList.Size = new System.Drawing.Size(17, 23); + this.btn_downChannelList.TabIndex = 48; + this.btn_downChannelList.Text = "﹀"; + this.btn_downChannelList.UseVisualStyleBackColor = false; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // - this.channel5.Text = "通道5"; - this.channel5.Value = "5"; + // text_channelNo + // + this.text_channelNo.BackColor = System.Drawing.Color.White; + // + // + // + this.text_channelNo.Border.Class = "TextBoxBorder"; + this.text_channelNo.Border.CornerDiameter = 5; + this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_channelNo.Location = new System.Drawing.Point(110, 136); + this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); + this.text_channelNo.Name = "text_channelNo"; + this.text_channelNo.PreventEnterBeep = true; + this.text_channelNo.ReadOnly = true; + this.text_channelNo.Size = new System.Drawing.Size(162, 27); + this.text_channelNo.TabIndex = 49; + // + // cbBox_channelFree + // + this.cbBox_channelFree.DisplayMember = "Text"; + this.cbBox_channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_channelFree.FormattingEnabled = true; + this.cbBox_channelFree.ItemHeight = 18; + this.cbBox_channelFree.Location = new System.Drawing.Point(110, 136); + this.cbBox_channelFree.Name = "cbBox_channelFree"; + this.cbBox_channelFree.Size = new System.Drawing.Size(150, 24); + this.cbBox_channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_channelFree.TabIndex = 41; + this.cbBox_channelFree.SelectedIndexChanged += new System.EventHandler(this.cbBox_channelFree_SelectedIndexChanged); // // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(290, 94); + this.label4.Location = new System.Drawing.Point(13, 136); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); + this.label4.Size = new System.Drawing.Size(86, 27); this.label4.TabIndex = 47; this.label4.Text = "选择通道"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -250,17 +277,17 @@ this.inputCustName.Border.CornerDiameter = 5; this.inputCustName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustName.Location = new System.Drawing.Point(110, 94); + this.inputCustName.Location = new System.Drawing.Point(401, 94); this.inputCustName.Margin = new System.Windows.Forms.Padding(0); this.inputCustName.Name = "inputCustName"; this.inputCustName.PreventEnterBeep = true; - this.inputCustName.Size = new System.Drawing.Size(150, 27); + this.inputCustName.Size = new System.Drawing.Size(162, 27); this.inputCustName.TabIndex = 40; // // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(20, 94); + this.label2.Location = new System.Drawing.Point(310, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(80, 27); @@ -277,11 +304,11 @@ this.inputCustComp.Border.CornerDiameter = 5; this.inputCustComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustComp.Location = new System.Drawing.Point(400, 57); + this.inputCustComp.Location = new System.Drawing.Point(110, 98); this.inputCustComp.Margin = new System.Windows.Forms.Padding(0); this.inputCustComp.Name = "inputCustComp"; this.inputCustComp.PreventEnterBeep = true; - this.inputCustComp.Size = new System.Drawing.Size(150, 27); + this.inputCustComp.Size = new System.Drawing.Size(162, 27); this.inputCustComp.TabIndex = 39; // // inputDevModel @@ -297,16 +324,16 @@ this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); this.inputDevModel.Name = "inputDevModel"; this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 27); + this.inputDevModel.Size = new System.Drawing.Size(162, 27); this.inputDevModel.TabIndex = 38; // // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(290, 57); + this.label1.Location = new System.Drawing.Point(9, 98); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); + this.label1.Size = new System.Drawing.Size(91, 27); this.label1.TabIndex = 45; this.label1.Text = "送检单位"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -335,7 +362,7 @@ this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); this.inputDevCode.Name = "inputDevCode"; this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 27); + this.inputDevCode.Size = new System.Drawing.Size(162, 27); this.inputDevCode.TabIndex = 37; // // inputDevName @@ -351,7 +378,7 @@ this.inputDevName.Margin = new System.Windows.Forms.Padding(0); this.inputDevName.Name = "inputDevName"; this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 27); + this.inputDevName.Size = new System.Drawing.Size(162, 27); this.inputDevName.TabIndex = 36; // // label8 @@ -376,22 +403,120 @@ this.label5.Text = "仪器名称"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // cbBox_devType + // + this.cbBox_devType.DisplayMember = "Text"; + this.cbBox_devType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_devType.FormattingEnabled = true; + this.cbBox_devType.ItemHeight = 18; + this.cbBox_devType.Location = new System.Drawing.Point(402, 59); + this.cbBox_devType.Name = "cbBox_devType"; + this.cbBox_devType.Size = new System.Drawing.Size(158, 24); + this.cbBox_devType.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_devType.TabIndex = 54; + this.cbBox_devType.SelectedIndexChanged += new System.EventHandler(this.cbBox_devType_SelectedIndexChanged); + // + // channel1 + // + this.channel1.Text = "通道1"; + this.channel1.Value = "1"; + // + // channel2 + // + this.channel2.Text = "通道2"; + this.channel2.Value = "2"; + // + // channel3 + // + this.channel3.Text = "通道3"; + this.channel3.Value = "3"; + // + // channel4 + // + this.channel4.Text = "通道4"; + this.channel4.Value = "4"; + // + // channel5 + // + this.channel5.Text = "通道5"; + this.channel5.Value = "5"; + // // groupBox1 // + this.groupBox1.Controls.Add(this.checkBox_count); + this.groupBox1.Controls.Add(this.checkBox_ageRate); + this.groupBox1.Controls.Add(this.checkBox_bootFeature); + this.groupBox1.Controls.Add(this.checkBox_accuracy); + this.groupBox1.Controls.Add(this.checkBox_stability); this.groupBox1.Controls.Add(this.endTimeEst); this.groupBox1.Controls.Add(this.startTime); - this.groupBox1.Controls.Add(this.checkBox10); - this.groupBox1.Controls.Add(this.checkBox11); - this.groupBox1.Controls.Add(this.checkBox12); - this.groupBox1.Controls.Add(this.checkBox13); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label12); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(10, 174); + this.groupBox1.Enabled = false; + this.groupBox1.Location = new System.Drawing.Point(10, 212); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 98); + this.groupBox1.Size = new System.Drawing.Size(617, 140); this.groupBox1.TabIndex = 39; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(114, 55); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 351; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // checkBox_ageRate + // + this.checkBox_ageRate.AutoSize = true; + this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_ageRate.Location = new System.Drawing.Point(467, 25); + this.checkBox_ageRate.Name = "checkBox_ageRate"; + this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); + this.checkBox_ageRate.TabIndex = 350; + this.checkBox_ageRate.Text = "日老化率"; + this.checkBox_ageRate.UseVisualStyleBackColor = true; + // + // checkBox_bootFeature + // + this.checkBox_bootFeature.AutoSize = true; + this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_bootFeature.Location = new System.Drawing.Point(348, 25); + this.checkBox_bootFeature.Name = "checkBox_bootFeature"; + this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); + this.checkBox_bootFeature.TabIndex = 349; + this.checkBox_bootFeature.Text = "开机特性"; + this.checkBox_bootFeature.UseVisualStyleBackColor = true; + // + // checkBox_accuracy + // + this.checkBox_accuracy.AutoSize = true; + this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_accuracy.Location = new System.Drawing.Point(232, 25); + this.checkBox_accuracy.Name = "checkBox_accuracy"; + this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); + this.checkBox_accuracy.TabIndex = 347; + this.checkBox_accuracy.Text = "频率准确度"; + this.checkBox_accuracy.UseVisualStyleBackColor = true; + // + // checkBox_stability + // + this.checkBox_stability.AutoSize = true; + this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_stability.Location = new System.Drawing.Point(114, 25); + this.checkBox_stability.Name = "checkBox_stability"; + this.checkBox_stability.Size = new System.Drawing.Size(98, 24); + this.checkBox_stability.TabIndex = 348; + this.checkBox_stability.Text = "频率稳定度"; + this.checkBox_stability.UseVisualStyleBackColor = true; + this.checkBox_stability.CheckedChanged += new System.EventHandler(this.checkBox_stability_CheckedChanged); // // endTimeEst // @@ -406,7 +531,7 @@ this.endTimeEst.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.endTimeEst.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.endTimeEst.IsPopupCalendarOpen = false; - this.endTimeEst.Location = new System.Drawing.Point(395, 57); + this.endTimeEst.Location = new System.Drawing.Point(395, 94); // // // @@ -456,7 +581,7 @@ this.startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.startTime.IsPopupCalendarOpen = false; - this.startTime.Location = new System.Drawing.Point(115, 57); + this.startTime.Location = new System.Drawing.Point(107, 94); // // // @@ -493,54 +618,10 @@ this.startTime.TabIndex = 43; this.startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); // - // checkBox10 - // - this.checkBox10.AutoSize = true; - this.checkBox10.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox10.Location = new System.Drawing.Point(425, 20); - this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(84, 24); - this.checkBox10.TabIndex = 42; - this.checkBox10.Text = "日老化率"; - this.checkBox10.UseVisualStyleBackColor = true; - // - // checkBox11 - // - this.checkBox11.AutoSize = true; - this.checkBox11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox11.Location = new System.Drawing.Point(331, 20); - this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(84, 24); - this.checkBox11.TabIndex = 41; - this.checkBox11.Text = "开机特性"; - this.checkBox11.UseVisualStyleBackColor = true; - // - // checkBox12 - // - this.checkBox12.AutoSize = true; - this.checkBox12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox12.Location = new System.Drawing.Point(223, 20); - this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(98, 24); - this.checkBox12.TabIndex = 39; - this.checkBox12.Text = "频率准确度"; - this.checkBox12.UseVisualStyleBackColor = true; - // - // checkBox13 - // - this.checkBox13.AutoSize = true; - this.checkBox13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox13.Location = new System.Drawing.Point(115, 20); - this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(98, 24); - this.checkBox13.TabIndex = 38; - this.checkBox13.Text = "频率稳定度"; - this.checkBox13.UseVisualStyleBackColor = true; - // // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(290, 55); + this.label3.Location = new System.Drawing.Point(290, 92); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -551,7 +632,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 55); + this.label12.Location = new System.Drawing.Point(5, 92); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(100, 27); @@ -562,7 +643,7 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 18); + this.label13.Location = new System.Drawing.Point(5, 23); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -573,13 +654,14 @@ // groupBox2 // this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.checkBox1); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.checkBox3); - this.groupBox2.Controls.Add(this.checkBox4); - this.groupBox2.Location = new System.Drawing.Point(9, 278); + this.groupBox2.Controls.Add(this.checkBox_100s); + this.groupBox2.Controls.Add(this.checkBox_20s); + this.groupBox2.Controls.Add(this.checkBox_10s); + this.groupBox2.Controls.Add(this.checkBox_1s); + this.groupBox2.Enabled = false; + this.groupBox2.Location = new System.Drawing.Point(9, 353); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 53); + this.groupBox2.Size = new System.Drawing.Size(618, 53); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; // @@ -594,60 +676,107 @@ this.label6.Text = "频率稳定度"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox1 + // checkBox_100s // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox1.Location = new System.Drawing.Point(425, 19); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(60, 24); - this.checkBox1.TabIndex = 42; - this.checkBox1.Text = "100S"; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox_100s.AutoSize = true; + this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_100s.Location = new System.Drawing.Point(468, 19); + this.checkBox_100s.Name = "checkBox_100s"; + this.checkBox_100s.Size = new System.Drawing.Size(60, 24); + this.checkBox_100s.TabIndex = 42; + this.checkBox_100s.Text = "100S"; + this.checkBox_100s.UseVisualStyleBackColor = true; // - // checkBox2 + // checkBox_20s // - this.checkBox2.AutoSize = true; - this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox2.Location = new System.Drawing.Point(331, 19); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(52, 24); - this.checkBox2.TabIndex = 41; - this.checkBox2.Text = "20S"; - this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox_20s.AutoSize = true; + this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_20s.Location = new System.Drawing.Point(349, 19); + this.checkBox_20s.Name = "checkBox_20s"; + this.checkBox_20s.Size = new System.Drawing.Size(52, 24); + this.checkBox_20s.TabIndex = 41; + this.checkBox_20s.Text = "20S"; + this.checkBox_20s.UseVisualStyleBackColor = true; // - // checkBox3 + // checkBox_10s // - this.checkBox3.AutoSize = true; - this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox3.Location = new System.Drawing.Point(223, 19); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(52, 24); - this.checkBox3.TabIndex = 40; - this.checkBox3.Text = "10S"; - this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox_10s.AutoSize = true; + this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_10s.Location = new System.Drawing.Point(233, 19); + this.checkBox_10s.Name = "checkBox_10s"; + this.checkBox_10s.Size = new System.Drawing.Size(52, 24); + this.checkBox_10s.TabIndex = 40; + this.checkBox_10s.Text = "10S"; + this.checkBox_10s.UseVisualStyleBackColor = true; // - // checkBox4 + // checkBox_1s // - this.checkBox4.AutoSize = true; - this.checkBox4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox4.Location = new System.Drawing.Point(115, 19); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(44, 24); - this.checkBox4.TabIndex = 39; - this.checkBox4.Text = "1S"; - this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox_1s.AutoSize = true; + this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_1s.Location = new System.Drawing.Point(115, 19); + this.checkBox_1s.Name = "checkBox_1s"; + this.checkBox_1s.Size = new System.Drawing.Size(44, 24); + this.checkBox_1s.TabIndex = 39; + this.checkBox_1s.Text = "1S"; + this.checkBox_1s.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(150, 425); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(120, 30); + this.btnSave.TabIndex = 17; + this.btnSave.Text = "开始检测"; + this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // btnCancelSetDev + // + this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancelSetDev.FlatAppearance.BorderSize = 0; + this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Location = new System.Drawing.Point(310, 425); + this.btnCancelSetDev.Name = "btnCancelSetDev"; + this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Radius = 5; + this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); + this.btnCancelSetDev.TabIndex = 18; + this.btnCancelSetDev.Text = "取消"; + this.btnCancelSetDev.UseVisualStyleBackColor = true; + this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); // // AddDevDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 407); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(642, 483); this.ControlBox = false; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox4); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_startNow); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.panel1); @@ -669,24 +798,16 @@ } #endregion - - private System.Windows.Forms.CheckBox checkBox9; - private RoundButton btnSave; private RoundButton btnCancelSetDev; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label labelTitle; private System.Windows.Forms.GroupBox groupBox4; - private DevComponents.DotNetBar.Controls.ComboBoxEx channelFree; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_channelFree; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustName; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevName; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.Editors.ComboItem channel1; @@ -695,20 +816,34 @@ private DevComponents.Editors.ComboItem channel4; private DevComponents.Editors.ComboItem channel5; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; - private DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; - private System.Windows.Forms.CheckBox checkBox10; - private System.Windows.Forms.CheckBox checkBox11; - private System.Windows.Forms.CheckBox checkBox12; - private System.Windows.Forms.CheckBox checkBox13; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; + public DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; + private System.Windows.Forms.Button btn_downTypeList; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_devType; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustName; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + public System.Windows.Forms.CheckBox checkBox_startNow; + public DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; + public DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; + public System.Windows.Forms.CheckBox checkBox_100s; + public System.Windows.Forms.CheckBox checkBox_20s; + public System.Windows.Forms.CheckBox checkBox_10s; + public System.Windows.Forms.CheckBox checkBox_1s; + public System.Windows.Forms.CheckBox checkBox_count; + public System.Windows.Forms.CheckBox checkBox_ageRate; + public System.Windows.Forms.CheckBox checkBox_bootFeature; + public System.Windows.Forms.CheckBox checkBox_accuracy; + public System.Windows.Forms.CheckBox checkBox_stability; + public System.Windows.Forms.Button btn_downChannelList; + public RoundButton btnSave; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs index 652c6b4..a2dbf38 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -27,6 +27,10 @@ } #endregion + DictService dictService = new DictServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + public Action HideMaskAction { get; @@ -37,7 +41,21 @@ { InitializeComponent(); - ((ComboBoxEx)this.Controls.Find("channelFree", true)[0]).SelectedIndex = 0; + cbBox_devType.DataSource = dictService.getTypeListByCodeType("devType"); + btnSave.Text = "添加仪器"; + if (HomeCtrlForm.channelFreeList.Count > 0) + { + cbBox_channelFree.Items.Add(""); + foreach (string item in HomeCtrlForm.channelFreeList) + { + cbBox_channelFree.Items.Add(item); + } + } + else + { + text_channelNo.WatermarkText = "无空闲通道可选"; + + } } // 关闭对话框 @@ -49,6 +67,19 @@ // 添加并开始检测 private void btnSave_Click(object sender, EventArgs e) { + if (text_channelNo.Text.Trim() != "") + { + if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + { + MessageBox.Show("请选择频率稳定度！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + } // 取得输入框的参数 string devName = ((TextBoxX) this.Controls.Find("inputDevName", true)[0]).Text; string devCode = ((TextBoxX) this.Controls.Find("inputDevCode", true)[0]).Text; @@ -56,7 +87,7 @@ string devCustomComp = ((TextBoxX)this.Controls.Find("inputCustComp", true)[0]).Text; string devCustomName = ((TextBoxX)this.Controls.Find("inputCustName", true)[0]).Text; - ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("channelFree", true)[0]; + ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("cbBox_channelFree", true)[0]; string channelNo = (string)((ComboItem)channels.SelectedItem).Value; // 初始化数据访问接口 @@ -64,13 +95,80 @@ int id = devService.add(devName, devCode, "1", devModel, devCustomComp, devCustomName, channelNo); if (id >= 0) { + if (btnSave.Text.Equals("添加并开始检测")) + { + //detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval); + // 重新加载首页的通道状态 + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + } // 添加成功，继续保存检测项目和开始时间 this.HideMaskAction(); + } else { LogHelper.WriteErrorLog(this.GetType(), "添加设备[" + devName + "]失败"); } } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = true; + } + + private void groupBox4_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void groupBox1_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void btn_downTypeList_Click(object sender, EventArgs e) + { + cbBox_devType.DroppedDown = true; + } + + private void checkBox_startNow_CheckedChanged(object sender, EventArgs e) + { + startTime.Value = DateTime.Now; + } + + private void cbBox_devType_SelectedIndexChanged(object sender, EventArgs e) + { + text_devType.Text = cbBox_devType.SelectedItem.ToString(); + } + + private void cbBox_channelFree_SelectedIndexChanged(object sender, EventArgs e) + { + text_channelNo.Text = cbBox_channelFree.SelectedItem.ToString(); + + if (text_channelNo.Text != "") + { + btnSave.Text = "添加并开始检测"; + checkBox_startNow.Enabled = true; + groupBox1.Enabled = true; + } + else + { + btnSave.Text = "添加仪器"; + groupBox1.Enabled = false; checkBox_startNow.Enabled = false; + } + } + + private void checkBox13_CheckedChanged(object sender, EventArgs e) + { + + } + + private void checkBox_stability_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_stability.Checked) groupBox2.Enabled = true; + else groupBox2.Enabled = false; + } } } diff --git a/RbFreqStandMeasure/info/DetailDlg.Designer.cs b/RbFreqStandMeasure/info/DetailDlg.Designer.cs index 05ffc1f..eeded9f 100644 --- a/RbFreqStandMeasure/info/DetailDlg.Designer.cs +++ b/RbFreqStandMeasure/info/DetailDlg.Designer.cs @@ -29,9 +29,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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(); this.panel1 = new System.Windows.Forms.Panel(); + this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.channel1 = new DevComponents.Editors.ComboItem(); this.channel2 = new DevComponents.Editors.ComboItem(); @@ -39,32 +40,32 @@ this.channel4 = new DevComponents.Editors.ComboItem(); this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.dataGridView_Data = new System.Windows.Forms.DataGridView(); - this.btn_accurary = new System.Windows.Forms.Button(); - this.btn_bootFeature = new System.Windows.Forms.Button(); this.btn_ageRate = new System.Windows.Forms.Button(); + this.btn_bootFeature = new System.Windows.Forms.Button(); + this.btn_accurary = new System.Windows.Forms.Button(); + this.btn_stability = new System.Windows.Forms.Button(); + this.dataGridView_Data = new System.Windows.Forms.DataGridView(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label_endTime = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label_customerComp = new System.Windows.Forms.Label(); + this.label_devCode = new System.Windows.Forms.Label(); this.label_customerName = new System.Windows.Forms.Label(); this.label_devModel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.label_startTime = new System.Windows.Forms.Label(); - this.label_customerComp = new System.Windows.Forms.Label(); - this.label_devCode = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnExitDev = new System.Windows.Forms.Button(); - this.btn_stability = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.button1 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).BeginInit(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -78,6 +79,22 @@ this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // + // btnExitDev + // + this.btnExitDev.BackColor = System.Drawing.Color.Transparent; + this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; + this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnExitDev.FlatAppearance.BorderSize = 0; + this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btnExitDev.Location = new System.Drawing.Point(869, 5); + this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); + this.btnExitDev.Name = "btnExitDev"; + this.btnExitDev.Size = new System.Drawing.Size(20, 20); + this.btnExitDev.TabIndex = 2; + this.btnExitDev.UseVisualStyleBackColor = false; + this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // // labelTitle // this.labelTitle.BackColor = System.Drawing.Color.Transparent; @@ -116,6 +133,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.btn_ageRate); this.groupBox1.Controls.Add(this.btn_bootFeature); this.groupBox1.Controls.Add(this.btn_accurary); @@ -123,278 +141,39 @@ this.groupBox1.Controls.Add(this.dataGridView_Data); this.groupBox1.Location = new System.Drawing.Point(8, 39); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(298, 493); + this.groupBox1.Size = new System.Drawing.Size(439, 493); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // - // dataGridView_Data - // - this.dataGridView_Data.AllowUserToAddRows = false; - this.dataGridView_Data.AllowUserToDeleteRows = false; - this.dataGridView_Data.AllowUserToResizeColumns = false; - this.dataGridView_Data.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Data.ColumnHeadersHeight = 40; - this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dataGridView_Data.Location = new System.Drawing.Point(5, 14); - this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Data.Name = "dataGridView_Data"; - this.dataGridView_Data.ReadOnly = true; - this.dataGridView_Data.RowHeadersVisible = false; - this.dataGridView_Data.RowHeadersWidth = 30; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.NullValue = "-"; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Data.RowTemplate.Height = 44; - this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView_Data.Size = new System.Drawing.Size(289, 429); - this.dataGridView_Data.TabIndex = 3; - // - // btn_accurary - // - this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_accurary.Location = new System.Drawing.Point(79, 446); - this.btn_accurary.Name = "btn_accurary"; - this.btn_accurary.Size = new System.Drawing.Size(79, 31); - this.btn_accurary.TabIndex = 5; - this.btn_accurary.Text = "频率准确度"; - this.btn_accurary.UseVisualStyleBackColor = true; - // - // btn_bootFeature - // - this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_bootFeature.Location = new System.Drawing.Point(154, 446); - this.btn_bootFeature.Name = "btn_bootFeature"; - this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); - this.btn_bootFeature.TabIndex = 6; - this.btn_bootFeature.Text = "开机特性"; - this.btn_bootFeature.UseVisualStyleBackColor = true; - // // btn_ageRate // this.btn_ageRate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_ageRate.Location = new System.Drawing.Point(222, 446); + this.btn_ageRate.Location = new System.Drawing.Point(240, 446); this.btn_ageRate.Name = "btn_ageRate"; this.btn_ageRate.Size = new System.Drawing.Size(75, 31); this.btn_ageRate.TabIndex = 7; this.btn_ageRate.Text = "日老化率"; this.btn_ageRate.UseVisualStyleBackColor = true; // - // groupBox2 + // btn_bootFeature // - this.groupBox2.Controls.Add(this.label_startTime); - this.groupBox2.Controls.Add(this.label_customerComp); - this.groupBox2.Controls.Add(this.label_devCode); - this.groupBox2.Controls.Add(this.label_endTime); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label_customerName); - this.groupBox2.Controls.Add(this.label_devModel); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox2.Location = new System.Drawing.Point(316, 39); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(570, 128); - this.groupBox2.TabIndex = 0; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "仪器基本信息"; + this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_bootFeature.Location = new System.Drawing.Point(161, 446); + this.btn_bootFeature.Name = "btn_bootFeature"; + this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); + this.btn_bootFeature.TabIndex = 6; + this.btn_bootFeature.Text = "开机特性"; + this.btn_bootFeature.UseVisualStyleBackColor = true; // - // label_endTime + // btn_accurary // - this.label_endTime.BackColor = System.Drawing.Color.Transparent; - this.label_endTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_endTime.Location = new System.Drawing.Point(154, 93); - this.label_endTime.Margin = new System.Windows.Forms.Padding(0); - this.label_endTime.Name = "label_endTime"; - this.label_endTime.Size = new System.Drawing.Size(83, 27); - this.label_endTime.TabIndex = 78; - this.label_endTime.Text = "仪器名称："; - this.label_endTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(54, 93); - this.label3.Margin = new System.Windows.Forms.Padding(0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(100, 27); - this.label3.TabIndex = 77; - this.label3.Text = "结束时间："; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerName - // - this.label_customerName.BackColor = System.Drawing.Color.Transparent; - this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerName.Location = new System.Drawing.Point(154, 57); - this.label_customerName.Margin = new System.Windows.Forms.Padding(0); - this.label_customerName.Name = "label_customerName"; - this.label_customerName.Size = new System.Drawing.Size(83, 27); - this.label_customerName.TabIndex = 76; - this.label_customerName.Text = "仪器名称："; - this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devModel - // - this.label_devModel.BackColor = System.Drawing.Color.Transparent; - this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devModel.Location = new System.Drawing.Point(154, 25); - this.label_devModel.Margin = new System.Windows.Forms.Padding(0); - this.label_devModel.Name = "label_devModel"; - this.label_devModel.Size = new System.Drawing.Size(83, 27); - this.label_devModel.TabIndex = 75; - this.label_devModel.Text = "仪器名称："; - this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(327, 93); - this.label4.Margin = new System.Windows.Forms.Padding(0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); - this.label4.TabIndex = 73; - this.label4.Text = "开始时间："; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(74, 57); - this.label2.Margin = new System.Windows.Forms.Padding(0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 27); - this.label2.TabIndex = 72; - this.label2.Text = "联系人："; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(327, 59); - this.label1.Margin = new System.Windows.Forms.Padding(0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); - this.label1.TabIndex = 71; - this.label1.Text = "送检单位："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(67, 25); - this.label9.Margin = new System.Windows.Forms.Padding(0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 27); - this.label9.TabIndex = 70; - this.label9.Text = "仪器型号："; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(327, 25); - this.label8.Margin = new System.Windows.Forms.Padding(0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(100, 27); - this.label8.TabIndex = 69; - this.label8.Text = "仪器编号："; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_startTime - // - this.label_startTime.BackColor = System.Drawing.Color.Transparent; - this.label_startTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_startTime.Location = new System.Drawing.Point(427, 93); - this.label_startTime.Margin = new System.Windows.Forms.Padding(0); - this.label_startTime.Name = "label_startTime"; - this.label_startTime.Size = new System.Drawing.Size(83, 27); - this.label_startTime.TabIndex = 81; - this.label_startTime.Text = "仪器名称："; - this.label_startTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerComp - // - this.label_customerComp.BackColor = System.Drawing.Color.Transparent; - this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerComp.Location = new System.Drawing.Point(427, 59); - this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); - this.label_customerComp.Name = "label_customerComp"; - this.label_customerComp.Size = new System.Drawing.Size(83, 27); - this.label_customerComp.TabIndex = 80; - this.label_customerComp.Text = "仪器名称："; - this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devCode - // - this.label_devCode.BackColor = System.Drawing.Color.Transparent; - this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devCode.Location = new System.Drawing.Point(427, 25); - this.label_devCode.Margin = new System.Windows.Forms.Padding(0); - this.label_devCode.Name = "label_devCode"; - this.label_devCode.Size = new System.Drawing.Size(83, 27); - this.label_devCode.TabIndex = 79; - this.label_devCode.Text = "仪器名称："; - this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.panel2); - this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox3.Location = new System.Drawing.Point(316, 173); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(570, 359); - this.groupBox3.TabIndex = 19; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "频率稳定度"; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(6, 25); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(558, 328); - this.panel2.TabIndex = 0; - // - // btnExitDev - // - this.btnExitDev.BackColor = System.Drawing.Color.Transparent; - this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; - this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnExitDev.FlatAppearance.BorderSize = 0; - this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(799, 5); - this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); - this.btnExitDev.Name = "btnExitDev"; - this.btnExitDev.Size = new System.Drawing.Size(20, 20); - this.btnExitDev.TabIndex = 2; - this.btnExitDev.UseVisualStyleBackColor = false; - this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_accurary.Location = new System.Drawing.Point(83, 446); + this.btn_accurary.Name = "btn_accurary"; + this.btn_accurary.Size = new System.Drawing.Size(79, 31); + this.btn_accurary.TabIndex = 5; + this.btn_accurary.Text = "频率准确度"; + this.btn_accurary.UseVisualStyleBackColor = true; // // btn_stability // @@ -406,12 +185,212 @@ this.btn_stability.Text = "频率稳定度"; this.btn_stability.UseVisualStyleBackColor = true; // + // dataGridView_Data + // + this.dataGridView_Data.AllowUserToAddRows = false; + this.dataGridView_Data.AllowUserToDeleteRows = false; + this.dataGridView_Data.AllowUserToResizeColumns = false; + this.dataGridView_Data.AllowUserToResizeRows = false; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Data.ColumnHeadersHeight = 40; + this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_Data.Location = new System.Drawing.Point(6, 14); + this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Data.Name = "dataGridView_Data"; + this.dataGridView_Data.ReadOnly = true; + this.dataGridView_Data.RowHeadersVisible = false; + this.dataGridView_Data.RowHeadersWidth = 30; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.NullValue = "-"; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle8; + this.dataGridView_Data.RowTemplate.Height = 44; + this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_Data.Size = new System.Drawing.Size(425, 429); + this.dataGridView_Data.TabIndex = 3; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label_customerComp); + this.groupBox2.Controls.Add(this.label_devCode); + this.groupBox2.Controls.Add(this.label_customerName); + this.groupBox2.Controls.Add(this.label_devModel); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox2.Location = new System.Drawing.Point(453, 39); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(433, 105); + this.groupBox2.TabIndex = 0; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "仪器基本信息"; + // + // label_customerComp + // + this.label_customerComp.BackColor = System.Drawing.Color.Transparent; + this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerComp.Location = new System.Drawing.Point(319, 64); + this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); + this.label_customerComp.Name = "label_customerComp"; + this.label_customerComp.Size = new System.Drawing.Size(111, 27); + this.label_customerComp.TabIndex = 80; + this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devCode + // + this.label_devCode.BackColor = System.Drawing.Color.Transparent; + this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devCode.Location = new System.Drawing.Point(319, 30); + this.label_devCode.Margin = new System.Windows.Forms.Padding(0); + this.label_devCode.Name = "label_devCode"; + this.label_devCode.Size = new System.Drawing.Size(111, 27); + this.label_devCode.TabIndex = 79; + this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_customerName + // + this.label_customerName.BackColor = System.Drawing.Color.Transparent; + this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerName.Location = new System.Drawing.Point(98, 62); + this.label_customerName.Margin = new System.Windows.Forms.Padding(0); + this.label_customerName.Name = "label_customerName"; + this.label_customerName.Size = new System.Drawing.Size(83, 27); + this.label_customerName.TabIndex = 76; + this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devModel + // + this.label_devModel.BackColor = System.Drawing.Color.Transparent; + this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devModel.Location = new System.Drawing.Point(98, 30); + this.label_devModel.Margin = new System.Windows.Forms.Padding(0); + this.label_devModel.Name = "label_devModel"; + this.label_devModel.Size = new System.Drawing.Size(83, 27); + this.label_devModel.TabIndex = 75; + this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(18, 62); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(80, 27); + this.label2.TabIndex = 72; + this.label2.Text = "联系人："; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(234, 64); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(85, 27); + this.label1.TabIndex = 71; + this.label1.Text = "送检单位："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Transparent; + this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(11, 30); + this.label9.Margin = new System.Windows.Forms.Padding(0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(87, 27); + this.label9.TabIndex = 70; + this.label9.Text = "仪器型号："; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.Transparent; + this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(238, 30); + this.label8.Margin = new System.Windows.Forms.Padding(0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(81, 27); + this.label8.TabIndex = 69; + this.label8.Text = "仪器编号："; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.panel2); + this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox3.Location = new System.Drawing.Point(453, 288); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(433, 244); + this.groupBox3.TabIndex = 19; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "频率稳定度"; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(14, 29); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(405, 199); + this.panel2.TabIndex = 0; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.dataGridView1); + this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox4.Location = new System.Drawing.Point(453, 150); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(433, 132); + this.groupBox4.TabIndex = 81; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "检测记录"; + // + // dataGridView1 + // + this.dataGridView1.BackgroundColor = System.Drawing.Color.White; + this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Location = new System.Drawing.Point(12, 24); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(407, 101); + this.dataGridView1.TabIndex = 0; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button1.Location = new System.Drawing.Point(314, 446); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(125, 31); + this.button1.TabIndex = 8; + this.button1.Text = "计数器范围及灵敏度"; + this.button1.UseVisualStyleBackColor = true; + // // DetailDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(898, 546); this.ControlBox = false; + this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -425,6 +404,8 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } @@ -444,14 +425,10 @@ private System.Windows.Forms.Button btn_accurary; private System.Windows.Forms.DataGridView dataGridView_Data; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label_startTime; private System.Windows.Forms.Label label_customerComp; private System.Windows.Forms.Label label_devCode; - private System.Windows.Forms.Label label_endTime; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label_customerName; private System.Windows.Forms.Label label_devModel; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; @@ -459,5 +436,8 @@ private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btn_stability; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs index 9157e65..d5ff4fa 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -29,19 +29,17 @@ /// private void InitializeComponent() { - this.checkBox9 = new System.Windows.Forms.CheckBox(); - this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.checkBox_startNow = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.channel1 = new DevComponents.Editors.ComboItem(); - this.channel2 = new DevComponents.Editors.ComboItem(); - this.channel3 = new DevComponents.Editors.ComboItem(); - this.channel4 = new DevComponents.Editors.ComboItem(); - this.channel5 = new DevComponents.Editors.ComboItem(); + this.btn_downTypeList = new System.Windows.Forms.Button(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label7 = new System.Windows.Forms.Label(); + this.btn_downChannelList = new System.Windows.Forms.Button(); + this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label4 = new System.Windows.Forms.Label(); this.inputCustName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label2 = new System.Windows.Forms.Label(); @@ -53,22 +51,31 @@ this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.cbBox_devType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.channel1 = new DevComponents.Editors.ComboItem(); + this.channel2 = new DevComponents.Editors.ComboItem(); + this.channel3 = new DevComponents.Editors.ComboItem(); + this.channel4 = new DevComponents.Editors.ComboItem(); + this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); + this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); + this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); + this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.endTimeEst = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.checkBox10 = new System.Windows.Forms.CheckBox(); - this.checkBox11 = new System.Windows.Forms.CheckBox(); - this.checkBox12 = new System.Windows.Forms.CheckBox(); - this.checkBox13 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox_100s = new System.Windows.Forms.CheckBox(); + this.checkBox_20s = new System.Windows.Forms.CheckBox(); + this.checkBox_10s = new System.Windows.Forms.CheckBox(); + this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -77,62 +84,18 @@ this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // checkBox9 + // checkBox_startNow // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(491, 355); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 19; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; - // - // btnSave - // - this.btnSave.EnterBackColor = System.Drawing.Color.Blue; - this.btnSave.EnterForeColor = System.Drawing.Color.White; - this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnSave.FlatAppearance.BorderSize = 0; - this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); - this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(141, 351); - this.btnSave.Name = "btnSave"; - this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnSave.PressForeColor = System.Drawing.Color.White; - this.btnSave.Radius = 5; - this.btnSave.Size = new System.Drawing.Size(120, 30); - this.btnSave.TabIndex = 17; - this.btnSave.Text = "开始检测"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnCancelSetDev - // - this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; - this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnCancelSetDev.FlatAppearance.BorderSize = 0; - this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(301, 351); - this.btnCancelSetDev.Name = "btnCancelSetDev"; - this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Radius = 5; - this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); - this.btnCancelSetDev.TabIndex = 18; - this.btnCancelSetDev.Text = "取消"; - this.btnCancelSetDev.UseVisualStyleBackColor = true; - this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.checkBox_startNow.AutoSize = true; + this.checkBox_startNow.Enabled = false; + this.checkBox_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_startNow.Location = new System.Drawing.Point(500, 429); + this.checkBox_startNow.Name = "checkBox_startNow"; + this.checkBox_startNow.Size = new System.Drawing.Size(84, 24); + this.checkBox_startNow.TabIndex = 19; + this.checkBox_startNow.Text = "立即开始"; + this.checkBox_startNow.UseVisualStyleBackColor = true; + this.checkBox_startNow.CheckedChanged += new System.EventHandler(this.checkBox_startNow_CheckedChanged); // // panel1 // @@ -141,7 +104,7 @@ this.panel1.Controls.Add(this.labelTitle); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(640, 32); this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -153,7 +116,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(610, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -174,7 +137,12 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.channelFree); + this.groupBox4.Controls.Add(this.btn_downTypeList); + this.groupBox4.Controls.Add(this.text_devType); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.btn_downChannelList); + this.groupBox4.Controls.Add(this.text_channelNo); + this.groupBox4.Controls.Add(this.cbBox_channelFree); this.groupBox4.Controls.Add(this.label4); this.groupBox4.Controls.Add(this.inputCustName); this.groupBox4.Controls.Add(this.label2); @@ -186,57 +154,116 @@ this.groupBox4.Controls.Add(this.inputDevName); this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.cbBox_devType); this.groupBox4.Location = new System.Drawing.Point(10, 33); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(580, 140); + this.groupBox4.Size = new System.Drawing.Size(617, 175); this.groupBox4.TabIndex = 38; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // - // channelFree + // btn_downTypeList // - this.channelFree.DisplayMember = "Text"; - this.channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.channelFree.FormattingEnabled = true; - this.channelFree.ItemHeight = 18; - this.channelFree.Location = new System.Drawing.Point(400, 97); - this.channelFree.Name = "channelFree"; - this.channelFree.Size = new System.Drawing.Size(150, 24); - this.channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.channelFree.TabIndex = 41; + this.btn_downTypeList.BackColor = System.Drawing.Color.White; + this.btn_downTypeList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downTypeList.FlatAppearance.BorderSize = 0; + this.btn_downTypeList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downTypeList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downTypeList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downTypeList.Location = new System.Drawing.Point(541, 59); + this.btn_downTypeList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downTypeList.Name = "btn_downTypeList"; + this.btn_downTypeList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downTypeList.Size = new System.Drawing.Size(18, 23); + this.btn_downTypeList.TabIndex = 52; + this.btn_downTypeList.Text = "﹀"; + this.btn_downTypeList.UseVisualStyleBackColor = false; + this.btn_downTypeList.Click += new System.EventHandler(this.btn_downTypeList_Click); // - // channel1 + // text_devType // - this.channel1.Text = "通道1"; - this.channel1.Value = "1"; // - // channel2 // - this.channel2.Text = "通道2"; - this.channel2.Value = "2"; // - // channel3 + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.Location = new System.Drawing.Point(400, 57); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.Size = new System.Drawing.Size(162, 27); + this.text_devType.TabIndex = 50; // - this.channel3.Text = "通道3"; - this.channel3.Value = "3"; + // label7 // - // channel4 + this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(314, 57); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(76, 27); + this.label7.TabIndex = 51; + this.label7.Text = "仪器类型"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - this.channel4.Text = "通道4"; - this.channel4.Value = "4"; + // btn_downChannelList // - // channel5 + this.btn_downChannelList.BackColor = System.Drawing.Color.White; + this.btn_downChannelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downChannelList.FlatAppearance.BorderSize = 0; + this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downChannelList.Location = new System.Drawing.Point(249, 138); + this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downChannelList.Name = "btn_downChannelList"; + this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downChannelList.Size = new System.Drawing.Size(17, 23); + this.btn_downChannelList.TabIndex = 48; + this.btn_downChannelList.Text = "﹀"; + this.btn_downChannelList.UseVisualStyleBackColor = false; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // - this.channel5.Text = "通道5"; - this.channel5.Value = "5"; + // text_channelNo + // + this.text_channelNo.BackColor = System.Drawing.Color.White; + // + // + // + this.text_channelNo.Border.Class = "TextBoxBorder"; + this.text_channelNo.Border.CornerDiameter = 5; + this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_channelNo.Location = new System.Drawing.Point(110, 136); + this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); + this.text_channelNo.Name = "text_channelNo"; + this.text_channelNo.PreventEnterBeep = true; + this.text_channelNo.ReadOnly = true; + this.text_channelNo.Size = new System.Drawing.Size(162, 27); + this.text_channelNo.TabIndex = 49; + // + // cbBox_channelFree + // + this.cbBox_channelFree.DisplayMember = "Text"; + this.cbBox_channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_channelFree.FormattingEnabled = true; + this.cbBox_channelFree.ItemHeight = 18; + this.cbBox_channelFree.Location = new System.Drawing.Point(110, 136); + this.cbBox_channelFree.Name = "cbBox_channelFree"; + this.cbBox_channelFree.Size = new System.Drawing.Size(150, 24); + this.cbBox_channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_channelFree.TabIndex = 41; + this.cbBox_channelFree.SelectedIndexChanged += new System.EventHandler(this.cbBox_channelFree_SelectedIndexChanged); // // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(290, 94); + this.label4.Location = new System.Drawing.Point(13, 136); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); + this.label4.Size = new System.Drawing.Size(86, 27); this.label4.TabIndex = 47; this.label4.Text = "选择通道"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -250,17 +277,17 @@ this.inputCustName.Border.CornerDiameter = 5; this.inputCustName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustName.Location = new System.Drawing.Point(110, 94); + this.inputCustName.Location = new System.Drawing.Point(401, 94); this.inputCustName.Margin = new System.Windows.Forms.Padding(0); this.inputCustName.Name = "inputCustName"; this.inputCustName.PreventEnterBeep = true; - this.inputCustName.Size = new System.Drawing.Size(150, 27); + this.inputCustName.Size = new System.Drawing.Size(162, 27); this.inputCustName.TabIndex = 40; // // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(20, 94); + this.label2.Location = new System.Drawing.Point(310, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(80, 27); @@ -277,11 +304,11 @@ this.inputCustComp.Border.CornerDiameter = 5; this.inputCustComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustComp.Location = new System.Drawing.Point(400, 57); + this.inputCustComp.Location = new System.Drawing.Point(110, 98); this.inputCustComp.Margin = new System.Windows.Forms.Padding(0); this.inputCustComp.Name = "inputCustComp"; this.inputCustComp.PreventEnterBeep = true; - this.inputCustComp.Size = new System.Drawing.Size(150, 27); + this.inputCustComp.Size = new System.Drawing.Size(162, 27); this.inputCustComp.TabIndex = 39; // // inputDevModel @@ -297,16 +324,16 @@ this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); this.inputDevModel.Name = "inputDevModel"; this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 27); + this.inputDevModel.Size = new System.Drawing.Size(162, 27); this.inputDevModel.TabIndex = 38; // // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(290, 57); + this.label1.Location = new System.Drawing.Point(9, 98); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); + this.label1.Size = new System.Drawing.Size(91, 27); this.label1.TabIndex = 45; this.label1.Text = "送检单位"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -335,7 +362,7 @@ this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); this.inputDevCode.Name = "inputDevCode"; this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 27); + this.inputDevCode.Size = new System.Drawing.Size(162, 27); this.inputDevCode.TabIndex = 37; // // inputDevName @@ -351,7 +378,7 @@ this.inputDevName.Margin = new System.Windows.Forms.Padding(0); this.inputDevName.Name = "inputDevName"; this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 27); + this.inputDevName.Size = new System.Drawing.Size(162, 27); this.inputDevName.TabIndex = 36; // // label8 @@ -376,22 +403,120 @@ this.label5.Text = "仪器名称"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // cbBox_devType + // + this.cbBox_devType.DisplayMember = "Text"; + this.cbBox_devType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_devType.FormattingEnabled = true; + this.cbBox_devType.ItemHeight = 18; + this.cbBox_devType.Location = new System.Drawing.Point(402, 59); + this.cbBox_devType.Name = "cbBox_devType"; + this.cbBox_devType.Size = new System.Drawing.Size(158, 24); + this.cbBox_devType.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_devType.TabIndex = 54; + this.cbBox_devType.SelectedIndexChanged += new System.EventHandler(this.cbBox_devType_SelectedIndexChanged); + // + // channel1 + // + this.channel1.Text = "通道1"; + this.channel1.Value = "1"; + // + // channel2 + // + this.channel2.Text = "通道2"; + this.channel2.Value = "2"; + // + // channel3 + // + this.channel3.Text = "通道3"; + this.channel3.Value = "3"; + // + // channel4 + // + this.channel4.Text = "通道4"; + this.channel4.Value = "4"; + // + // channel5 + // + this.channel5.Text = "通道5"; + this.channel5.Value = "5"; + // // groupBox1 // + this.groupBox1.Controls.Add(this.checkBox_count); + this.groupBox1.Controls.Add(this.checkBox_ageRate); + this.groupBox1.Controls.Add(this.checkBox_bootFeature); + this.groupBox1.Controls.Add(this.checkBox_accuracy); + this.groupBox1.Controls.Add(this.checkBox_stability); this.groupBox1.Controls.Add(this.endTimeEst); this.groupBox1.Controls.Add(this.startTime); - this.groupBox1.Controls.Add(this.checkBox10); - this.groupBox1.Controls.Add(this.checkBox11); - this.groupBox1.Controls.Add(this.checkBox12); - this.groupBox1.Controls.Add(this.checkBox13); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label12); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(10, 174); + this.groupBox1.Enabled = false; + this.groupBox1.Location = new System.Drawing.Point(10, 212); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 98); + this.groupBox1.Size = new System.Drawing.Size(617, 140); this.groupBox1.TabIndex = 39; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(114, 55); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 351; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // checkBox_ageRate + // + this.checkBox_ageRate.AutoSize = true; + this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_ageRate.Location = new System.Drawing.Point(467, 25); + this.checkBox_ageRate.Name = "checkBox_ageRate"; + this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); + this.checkBox_ageRate.TabIndex = 350; + this.checkBox_ageRate.Text = "日老化率"; + this.checkBox_ageRate.UseVisualStyleBackColor = true; + // + // checkBox_bootFeature + // + this.checkBox_bootFeature.AutoSize = true; + this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_bootFeature.Location = new System.Drawing.Point(348, 25); + this.checkBox_bootFeature.Name = "checkBox_bootFeature"; + this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); + this.checkBox_bootFeature.TabIndex = 349; + this.checkBox_bootFeature.Text = "开机特性"; + this.checkBox_bootFeature.UseVisualStyleBackColor = true; + // + // checkBox_accuracy + // + this.checkBox_accuracy.AutoSize = true; + this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_accuracy.Location = new System.Drawing.Point(232, 25); + this.checkBox_accuracy.Name = "checkBox_accuracy"; + this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); + this.checkBox_accuracy.TabIndex = 347; + this.checkBox_accuracy.Text = "频率准确度"; + this.checkBox_accuracy.UseVisualStyleBackColor = true; + // + // checkBox_stability + // + this.checkBox_stability.AutoSize = true; + this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_stability.Location = new System.Drawing.Point(114, 25); + this.checkBox_stability.Name = "checkBox_stability"; + this.checkBox_stability.Size = new System.Drawing.Size(98, 24); + this.checkBox_stability.TabIndex = 348; + this.checkBox_stability.Text = "频率稳定度"; + this.checkBox_stability.UseVisualStyleBackColor = true; + this.checkBox_stability.CheckedChanged += new System.EventHandler(this.checkBox_stability_CheckedChanged); // // endTimeEst // @@ -406,7 +531,7 @@ this.endTimeEst.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.endTimeEst.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.endTimeEst.IsPopupCalendarOpen = false; - this.endTimeEst.Location = new System.Drawing.Point(395, 57); + this.endTimeEst.Location = new System.Drawing.Point(395, 94); // // // @@ -456,7 +581,7 @@ this.startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.startTime.IsPopupCalendarOpen = false; - this.startTime.Location = new System.Drawing.Point(115, 57); + this.startTime.Location = new System.Drawing.Point(107, 94); // // // @@ -493,54 +618,10 @@ this.startTime.TabIndex = 43; this.startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); // - // checkBox10 - // - this.checkBox10.AutoSize = true; - this.checkBox10.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox10.Location = new System.Drawing.Point(425, 20); - this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(84, 24); - this.checkBox10.TabIndex = 42; - this.checkBox10.Text = "日老化率"; - this.checkBox10.UseVisualStyleBackColor = true; - // - // checkBox11 - // - this.checkBox11.AutoSize = true; - this.checkBox11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox11.Location = new System.Drawing.Point(331, 20); - this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(84, 24); - this.checkBox11.TabIndex = 41; - this.checkBox11.Text = "开机特性"; - this.checkBox11.UseVisualStyleBackColor = true; - // - // checkBox12 - // - this.checkBox12.AutoSize = true; - this.checkBox12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox12.Location = new System.Drawing.Point(223, 20); - this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(98, 24); - this.checkBox12.TabIndex = 39; - this.checkBox12.Text = "频率准确度"; - this.checkBox12.UseVisualStyleBackColor = true; - // - // checkBox13 - // - this.checkBox13.AutoSize = true; - this.checkBox13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox13.Location = new System.Drawing.Point(115, 20); - this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(98, 24); - this.checkBox13.TabIndex = 38; - this.checkBox13.Text = "频率稳定度"; - this.checkBox13.UseVisualStyleBackColor = true; - // // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(290, 55); + this.label3.Location = new System.Drawing.Point(290, 92); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -551,7 +632,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 55); + this.label12.Location = new System.Drawing.Point(5, 92); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(100, 27); @@ -562,7 +643,7 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 18); + this.label13.Location = new System.Drawing.Point(5, 23); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -573,13 +654,14 @@ // groupBox2 // this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.checkBox1); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.checkBox3); - this.groupBox2.Controls.Add(this.checkBox4); - this.groupBox2.Location = new System.Drawing.Point(9, 278); + this.groupBox2.Controls.Add(this.checkBox_100s); + this.groupBox2.Controls.Add(this.checkBox_20s); + this.groupBox2.Controls.Add(this.checkBox_10s); + this.groupBox2.Controls.Add(this.checkBox_1s); + this.groupBox2.Enabled = false; + this.groupBox2.Location = new System.Drawing.Point(9, 353); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 53); + this.groupBox2.Size = new System.Drawing.Size(618, 53); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; // @@ -594,60 +676,107 @@ this.label6.Text = "频率稳定度"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox1 + // checkBox_100s // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox1.Location = new System.Drawing.Point(425, 19); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(60, 24); - this.checkBox1.TabIndex = 42; - this.checkBox1.Text = "100S"; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox_100s.AutoSize = true; + this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_100s.Location = new System.Drawing.Point(468, 19); + this.checkBox_100s.Name = "checkBox_100s"; + this.checkBox_100s.Size = new System.Drawing.Size(60, 24); + this.checkBox_100s.TabIndex = 42; + this.checkBox_100s.Text = "100S"; + this.checkBox_100s.UseVisualStyleBackColor = true; // - // checkBox2 + // checkBox_20s // - this.checkBox2.AutoSize = true; - this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox2.Location = new System.Drawing.Point(331, 19); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(52, 24); - this.checkBox2.TabIndex = 41; - this.checkBox2.Text = "20S"; - this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox_20s.AutoSize = true; + this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_20s.Location = new System.Drawing.Point(349, 19); + this.checkBox_20s.Name = "checkBox_20s"; + this.checkBox_20s.Size = new System.Drawing.Size(52, 24); + this.checkBox_20s.TabIndex = 41; + this.checkBox_20s.Text = "20S"; + this.checkBox_20s.UseVisualStyleBackColor = true; // - // checkBox3 + // checkBox_10s // - this.checkBox3.AutoSize = true; - this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox3.Location = new System.Drawing.Point(223, 19); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(52, 24); - this.checkBox3.TabIndex = 40; - this.checkBox3.Text = "10S"; - this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox_10s.AutoSize = true; + this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_10s.Location = new System.Drawing.Point(233, 19); + this.checkBox_10s.Name = "checkBox_10s"; + this.checkBox_10s.Size = new System.Drawing.Size(52, 24); + this.checkBox_10s.TabIndex = 40; + this.checkBox_10s.Text = "10S"; + this.checkBox_10s.UseVisualStyleBackColor = true; // - // checkBox4 + // checkBox_1s // - this.checkBox4.AutoSize = true; - this.checkBox4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox4.Location = new System.Drawing.Point(115, 19); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(44, 24); - this.checkBox4.TabIndex = 39; - this.checkBox4.Text = "1S"; - this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox_1s.AutoSize = true; + this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_1s.Location = new System.Drawing.Point(115, 19); + this.checkBox_1s.Name = "checkBox_1s"; + this.checkBox_1s.Size = new System.Drawing.Size(44, 24); + this.checkBox_1s.TabIndex = 39; + this.checkBox_1s.Text = "1S"; + this.checkBox_1s.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(150, 425); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(120, 30); + this.btnSave.TabIndex = 17; + this.btnSave.Text = "开始检测"; + this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // btnCancelSetDev + // + this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancelSetDev.FlatAppearance.BorderSize = 0; + this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Location = new System.Drawing.Point(310, 425); + this.btnCancelSetDev.Name = "btnCancelSetDev"; + this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Radius = 5; + this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); + this.btnCancelSetDev.TabIndex = 18; + this.btnCancelSetDev.Text = "取消"; + this.btnCancelSetDev.UseVisualStyleBackColor = true; + this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); // // AddDevDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 407); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(642, 483); this.ControlBox = false; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox4); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_startNow); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.panel1); @@ -669,24 +798,16 @@ } #endregion - - private System.Windows.Forms.CheckBox checkBox9; - private RoundButton btnSave; private RoundButton btnCancelSetDev; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label labelTitle; private System.Windows.Forms.GroupBox groupBox4; - private DevComponents.DotNetBar.Controls.ComboBoxEx channelFree; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_channelFree; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustName; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevName; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.Editors.ComboItem channel1; @@ -695,20 +816,34 @@ private DevComponents.Editors.ComboItem channel4; private DevComponents.Editors.ComboItem channel5; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; - private DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; - private System.Windows.Forms.CheckBox checkBox10; - private System.Windows.Forms.CheckBox checkBox11; - private System.Windows.Forms.CheckBox checkBox12; - private System.Windows.Forms.CheckBox checkBox13; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; + public DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; + private System.Windows.Forms.Button btn_downTypeList; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_devType; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustName; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + public System.Windows.Forms.CheckBox checkBox_startNow; + public DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; + public DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; + public System.Windows.Forms.CheckBox checkBox_100s; + public System.Windows.Forms.CheckBox checkBox_20s; + public System.Windows.Forms.CheckBox checkBox_10s; + public System.Windows.Forms.CheckBox checkBox_1s; + public System.Windows.Forms.CheckBox checkBox_count; + public System.Windows.Forms.CheckBox checkBox_ageRate; + public System.Windows.Forms.CheckBox checkBox_bootFeature; + public System.Windows.Forms.CheckBox checkBox_accuracy; + public System.Windows.Forms.CheckBox checkBox_stability; + public System.Windows.Forms.Button btn_downChannelList; + public RoundButton btnSave; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs index 652c6b4..a2dbf38 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -27,6 +27,10 @@ } #endregion + DictService dictService = new DictServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + public Action HideMaskAction { get; @@ -37,7 +41,21 @@ { InitializeComponent(); - ((ComboBoxEx)this.Controls.Find("channelFree", true)[0]).SelectedIndex = 0; + cbBox_devType.DataSource = dictService.getTypeListByCodeType("devType"); + btnSave.Text = "添加仪器"; + if (HomeCtrlForm.channelFreeList.Count > 0) + { + cbBox_channelFree.Items.Add(""); + foreach (string item in HomeCtrlForm.channelFreeList) + { + cbBox_channelFree.Items.Add(item); + } + } + else + { + text_channelNo.WatermarkText = "无空闲通道可选"; + + } } // 关闭对话框 @@ -49,6 +67,19 @@ // 添加并开始检测 private void btnSave_Click(object sender, EventArgs e) { + if (text_channelNo.Text.Trim() != "") + { + if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + { + MessageBox.Show("请选择频率稳定度！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + } // 取得输入框的参数 string devName = ((TextBoxX) this.Controls.Find("inputDevName", true)[0]).Text; string devCode = ((TextBoxX) this.Controls.Find("inputDevCode", true)[0]).Text; @@ -56,7 +87,7 @@ string devCustomComp = ((TextBoxX)this.Controls.Find("inputCustComp", true)[0]).Text; string devCustomName = ((TextBoxX)this.Controls.Find("inputCustName", true)[0]).Text; - ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("channelFree", true)[0]; + ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("cbBox_channelFree", true)[0]; string channelNo = (string)((ComboItem)channels.SelectedItem).Value; // 初始化数据访问接口 @@ -64,13 +95,80 @@ int id = devService.add(devName, devCode, "1", devModel, devCustomComp, devCustomName, channelNo); if (id >= 0) { + if (btnSave.Text.Equals("添加并开始检测")) + { + //detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval); + // 重新加载首页的通道状态 + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + } // 添加成功，继续保存检测项目和开始时间 this.HideMaskAction(); + } else { LogHelper.WriteErrorLog(this.GetType(), "添加设备[" + devName + "]失败"); } } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = true; + } + + private void groupBox4_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void groupBox1_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void btn_downTypeList_Click(object sender, EventArgs e) + { + cbBox_devType.DroppedDown = true; + } + + private void checkBox_startNow_CheckedChanged(object sender, EventArgs e) + { + startTime.Value = DateTime.Now; + } + + private void cbBox_devType_SelectedIndexChanged(object sender, EventArgs e) + { + text_devType.Text = cbBox_devType.SelectedItem.ToString(); + } + + private void cbBox_channelFree_SelectedIndexChanged(object sender, EventArgs e) + { + text_channelNo.Text = cbBox_channelFree.SelectedItem.ToString(); + + if (text_channelNo.Text != "") + { + btnSave.Text = "添加并开始检测"; + checkBox_startNow.Enabled = true; + groupBox1.Enabled = true; + } + else + { + btnSave.Text = "添加仪器"; + groupBox1.Enabled = false; checkBox_startNow.Enabled = false; + } + } + + private void checkBox13_CheckedChanged(object sender, EventArgs e) + { + + } + + private void checkBox_stability_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_stability.Checked) groupBox2.Enabled = true; + else groupBox2.Enabled = false; + } } } diff --git a/RbFreqStandMeasure/info/DetailDlg.Designer.cs b/RbFreqStandMeasure/info/DetailDlg.Designer.cs index 05ffc1f..eeded9f 100644 --- a/RbFreqStandMeasure/info/DetailDlg.Designer.cs +++ b/RbFreqStandMeasure/info/DetailDlg.Designer.cs @@ -29,9 +29,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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(); this.panel1 = new System.Windows.Forms.Panel(); + this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.channel1 = new DevComponents.Editors.ComboItem(); this.channel2 = new DevComponents.Editors.ComboItem(); @@ -39,32 +40,32 @@ this.channel4 = new DevComponents.Editors.ComboItem(); this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.dataGridView_Data = new System.Windows.Forms.DataGridView(); - this.btn_accurary = new System.Windows.Forms.Button(); - this.btn_bootFeature = new System.Windows.Forms.Button(); this.btn_ageRate = new System.Windows.Forms.Button(); + this.btn_bootFeature = new System.Windows.Forms.Button(); + this.btn_accurary = new System.Windows.Forms.Button(); + this.btn_stability = new System.Windows.Forms.Button(); + this.dataGridView_Data = new System.Windows.Forms.DataGridView(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label_endTime = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label_customerComp = new System.Windows.Forms.Label(); + this.label_devCode = new System.Windows.Forms.Label(); this.label_customerName = new System.Windows.Forms.Label(); this.label_devModel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.label_startTime = new System.Windows.Forms.Label(); - this.label_customerComp = new System.Windows.Forms.Label(); - this.label_devCode = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnExitDev = new System.Windows.Forms.Button(); - this.btn_stability = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.button1 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).BeginInit(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -78,6 +79,22 @@ this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // + // btnExitDev + // + this.btnExitDev.BackColor = System.Drawing.Color.Transparent; + this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; + this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnExitDev.FlatAppearance.BorderSize = 0; + this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btnExitDev.Location = new System.Drawing.Point(869, 5); + this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); + this.btnExitDev.Name = "btnExitDev"; + this.btnExitDev.Size = new System.Drawing.Size(20, 20); + this.btnExitDev.TabIndex = 2; + this.btnExitDev.UseVisualStyleBackColor = false; + this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // // labelTitle // this.labelTitle.BackColor = System.Drawing.Color.Transparent; @@ -116,6 +133,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.btn_ageRate); this.groupBox1.Controls.Add(this.btn_bootFeature); this.groupBox1.Controls.Add(this.btn_accurary); @@ -123,278 +141,39 @@ this.groupBox1.Controls.Add(this.dataGridView_Data); this.groupBox1.Location = new System.Drawing.Point(8, 39); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(298, 493); + this.groupBox1.Size = new System.Drawing.Size(439, 493); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // - // dataGridView_Data - // - this.dataGridView_Data.AllowUserToAddRows = false; - this.dataGridView_Data.AllowUserToDeleteRows = false; - this.dataGridView_Data.AllowUserToResizeColumns = false; - this.dataGridView_Data.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Data.ColumnHeadersHeight = 40; - this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dataGridView_Data.Location = new System.Drawing.Point(5, 14); - this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Data.Name = "dataGridView_Data"; - this.dataGridView_Data.ReadOnly = true; - this.dataGridView_Data.RowHeadersVisible = false; - this.dataGridView_Data.RowHeadersWidth = 30; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.NullValue = "-"; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Data.RowTemplate.Height = 44; - this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView_Data.Size = new System.Drawing.Size(289, 429); - this.dataGridView_Data.TabIndex = 3; - // - // btn_accurary - // - this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_accurary.Location = new System.Drawing.Point(79, 446); - this.btn_accurary.Name = "btn_accurary"; - this.btn_accurary.Size = new System.Drawing.Size(79, 31); - this.btn_accurary.TabIndex = 5; - this.btn_accurary.Text = "频率准确度"; - this.btn_accurary.UseVisualStyleBackColor = true; - // - // btn_bootFeature - // - this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_bootFeature.Location = new System.Drawing.Point(154, 446); - this.btn_bootFeature.Name = "btn_bootFeature"; - this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); - this.btn_bootFeature.TabIndex = 6; - this.btn_bootFeature.Text = "开机特性"; - this.btn_bootFeature.UseVisualStyleBackColor = true; - // // btn_ageRate // this.btn_ageRate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_ageRate.Location = new System.Drawing.Point(222, 446); + this.btn_ageRate.Location = new System.Drawing.Point(240, 446); this.btn_ageRate.Name = "btn_ageRate"; this.btn_ageRate.Size = new System.Drawing.Size(75, 31); this.btn_ageRate.TabIndex = 7; this.btn_ageRate.Text = "日老化率"; this.btn_ageRate.UseVisualStyleBackColor = true; // - // groupBox2 + // btn_bootFeature // - this.groupBox2.Controls.Add(this.label_startTime); - this.groupBox2.Controls.Add(this.label_customerComp); - this.groupBox2.Controls.Add(this.label_devCode); - this.groupBox2.Controls.Add(this.label_endTime); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label_customerName); - this.groupBox2.Controls.Add(this.label_devModel); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox2.Location = new System.Drawing.Point(316, 39); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(570, 128); - this.groupBox2.TabIndex = 0; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "仪器基本信息"; + this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_bootFeature.Location = new System.Drawing.Point(161, 446); + this.btn_bootFeature.Name = "btn_bootFeature"; + this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); + this.btn_bootFeature.TabIndex = 6; + this.btn_bootFeature.Text = "开机特性"; + this.btn_bootFeature.UseVisualStyleBackColor = true; // - // label_endTime + // btn_accurary // - this.label_endTime.BackColor = System.Drawing.Color.Transparent; - this.label_endTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_endTime.Location = new System.Drawing.Point(154, 93); - this.label_endTime.Margin = new System.Windows.Forms.Padding(0); - this.label_endTime.Name = "label_endTime"; - this.label_endTime.Size = new System.Drawing.Size(83, 27); - this.label_endTime.TabIndex = 78; - this.label_endTime.Text = "仪器名称："; - this.label_endTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(54, 93); - this.label3.Margin = new System.Windows.Forms.Padding(0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(100, 27); - this.label3.TabIndex = 77; - this.label3.Text = "结束时间："; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerName - // - this.label_customerName.BackColor = System.Drawing.Color.Transparent; - this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerName.Location = new System.Drawing.Point(154, 57); - this.label_customerName.Margin = new System.Windows.Forms.Padding(0); - this.label_customerName.Name = "label_customerName"; - this.label_customerName.Size = new System.Drawing.Size(83, 27); - this.label_customerName.TabIndex = 76; - this.label_customerName.Text = "仪器名称："; - this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devModel - // - this.label_devModel.BackColor = System.Drawing.Color.Transparent; - this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devModel.Location = new System.Drawing.Point(154, 25); - this.label_devModel.Margin = new System.Windows.Forms.Padding(0); - this.label_devModel.Name = "label_devModel"; - this.label_devModel.Size = new System.Drawing.Size(83, 27); - this.label_devModel.TabIndex = 75; - this.label_devModel.Text = "仪器名称："; - this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(327, 93); - this.label4.Margin = new System.Windows.Forms.Padding(0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); - this.label4.TabIndex = 73; - this.label4.Text = "开始时间："; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(74, 57); - this.label2.Margin = new System.Windows.Forms.Padding(0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 27); - this.label2.TabIndex = 72; - this.label2.Text = "联系人："; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(327, 59); - this.label1.Margin = new System.Windows.Forms.Padding(0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); - this.label1.TabIndex = 71; - this.label1.Text = "送检单位："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(67, 25); - this.label9.Margin = new System.Windows.Forms.Padding(0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 27); - this.label9.TabIndex = 70; - this.label9.Text = "仪器型号："; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(327, 25); - this.label8.Margin = new System.Windows.Forms.Padding(0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(100, 27); - this.label8.TabIndex = 69; - this.label8.Text = "仪器编号："; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_startTime - // - this.label_startTime.BackColor = System.Drawing.Color.Transparent; - this.label_startTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_startTime.Location = new System.Drawing.Point(427, 93); - this.label_startTime.Margin = new System.Windows.Forms.Padding(0); - this.label_startTime.Name = "label_startTime"; - this.label_startTime.Size = new System.Drawing.Size(83, 27); - this.label_startTime.TabIndex = 81; - this.label_startTime.Text = "仪器名称："; - this.label_startTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerComp - // - this.label_customerComp.BackColor = System.Drawing.Color.Transparent; - this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerComp.Location = new System.Drawing.Point(427, 59); - this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); - this.label_customerComp.Name = "label_customerComp"; - this.label_customerComp.Size = new System.Drawing.Size(83, 27); - this.label_customerComp.TabIndex = 80; - this.label_customerComp.Text = "仪器名称："; - this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devCode - // - this.label_devCode.BackColor = System.Drawing.Color.Transparent; - this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devCode.Location = new System.Drawing.Point(427, 25); - this.label_devCode.Margin = new System.Windows.Forms.Padding(0); - this.label_devCode.Name = "label_devCode"; - this.label_devCode.Size = new System.Drawing.Size(83, 27); - this.label_devCode.TabIndex = 79; - this.label_devCode.Text = "仪器名称："; - this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.panel2); - this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox3.Location = new System.Drawing.Point(316, 173); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(570, 359); - this.groupBox3.TabIndex = 19; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "频率稳定度"; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(6, 25); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(558, 328); - this.panel2.TabIndex = 0; - // - // btnExitDev - // - this.btnExitDev.BackColor = System.Drawing.Color.Transparent; - this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; - this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnExitDev.FlatAppearance.BorderSize = 0; - this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(799, 5); - this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); - this.btnExitDev.Name = "btnExitDev"; - this.btnExitDev.Size = new System.Drawing.Size(20, 20); - this.btnExitDev.TabIndex = 2; - this.btnExitDev.UseVisualStyleBackColor = false; - this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_accurary.Location = new System.Drawing.Point(83, 446); + this.btn_accurary.Name = "btn_accurary"; + this.btn_accurary.Size = new System.Drawing.Size(79, 31); + this.btn_accurary.TabIndex = 5; + this.btn_accurary.Text = "频率准确度"; + this.btn_accurary.UseVisualStyleBackColor = true; // // btn_stability // @@ -406,12 +185,212 @@ this.btn_stability.Text = "频率稳定度"; this.btn_stability.UseVisualStyleBackColor = true; // + // dataGridView_Data + // + this.dataGridView_Data.AllowUserToAddRows = false; + this.dataGridView_Data.AllowUserToDeleteRows = false; + this.dataGridView_Data.AllowUserToResizeColumns = false; + this.dataGridView_Data.AllowUserToResizeRows = false; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Data.ColumnHeadersHeight = 40; + this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_Data.Location = new System.Drawing.Point(6, 14); + this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Data.Name = "dataGridView_Data"; + this.dataGridView_Data.ReadOnly = true; + this.dataGridView_Data.RowHeadersVisible = false; + this.dataGridView_Data.RowHeadersWidth = 30; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.NullValue = "-"; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle8; + this.dataGridView_Data.RowTemplate.Height = 44; + this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_Data.Size = new System.Drawing.Size(425, 429); + this.dataGridView_Data.TabIndex = 3; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label_customerComp); + this.groupBox2.Controls.Add(this.label_devCode); + this.groupBox2.Controls.Add(this.label_customerName); + this.groupBox2.Controls.Add(this.label_devModel); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox2.Location = new System.Drawing.Point(453, 39); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(433, 105); + this.groupBox2.TabIndex = 0; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "仪器基本信息"; + // + // label_customerComp + // + this.label_customerComp.BackColor = System.Drawing.Color.Transparent; + this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerComp.Location = new System.Drawing.Point(319, 64); + this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); + this.label_customerComp.Name = "label_customerComp"; + this.label_customerComp.Size = new System.Drawing.Size(111, 27); + this.label_customerComp.TabIndex = 80; + this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devCode + // + this.label_devCode.BackColor = System.Drawing.Color.Transparent; + this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devCode.Location = new System.Drawing.Point(319, 30); + this.label_devCode.Margin = new System.Windows.Forms.Padding(0); + this.label_devCode.Name = "label_devCode"; + this.label_devCode.Size = new System.Drawing.Size(111, 27); + this.label_devCode.TabIndex = 79; + this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_customerName + // + this.label_customerName.BackColor = System.Drawing.Color.Transparent; + this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerName.Location = new System.Drawing.Point(98, 62); + this.label_customerName.Margin = new System.Windows.Forms.Padding(0); + this.label_customerName.Name = "label_customerName"; + this.label_customerName.Size = new System.Drawing.Size(83, 27); + this.label_customerName.TabIndex = 76; + this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devModel + // + this.label_devModel.BackColor = System.Drawing.Color.Transparent; + this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devModel.Location = new System.Drawing.Point(98, 30); + this.label_devModel.Margin = new System.Windows.Forms.Padding(0); + this.label_devModel.Name = "label_devModel"; + this.label_devModel.Size = new System.Drawing.Size(83, 27); + this.label_devModel.TabIndex = 75; + this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(18, 62); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(80, 27); + this.label2.TabIndex = 72; + this.label2.Text = "联系人："; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(234, 64); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(85, 27); + this.label1.TabIndex = 71; + this.label1.Text = "送检单位："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Transparent; + this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(11, 30); + this.label9.Margin = new System.Windows.Forms.Padding(0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(87, 27); + this.label9.TabIndex = 70; + this.label9.Text = "仪器型号："; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.Transparent; + this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(238, 30); + this.label8.Margin = new System.Windows.Forms.Padding(0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(81, 27); + this.label8.TabIndex = 69; + this.label8.Text = "仪器编号："; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.panel2); + this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox3.Location = new System.Drawing.Point(453, 288); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(433, 244); + this.groupBox3.TabIndex = 19; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "频率稳定度"; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(14, 29); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(405, 199); + this.panel2.TabIndex = 0; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.dataGridView1); + this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox4.Location = new System.Drawing.Point(453, 150); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(433, 132); + this.groupBox4.TabIndex = 81; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "检测记录"; + // + // dataGridView1 + // + this.dataGridView1.BackgroundColor = System.Drawing.Color.White; + this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Location = new System.Drawing.Point(12, 24); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(407, 101); + this.dataGridView1.TabIndex = 0; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button1.Location = new System.Drawing.Point(314, 446); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(125, 31); + this.button1.TabIndex = 8; + this.button1.Text = "计数器范围及灵敏度"; + this.button1.UseVisualStyleBackColor = true; + // // DetailDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(898, 546); this.ControlBox = false; + this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -425,6 +404,8 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } @@ -444,14 +425,10 @@ private System.Windows.Forms.Button btn_accurary; private System.Windows.Forms.DataGridView dataGridView_Data; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label_startTime; private System.Windows.Forms.Label label_customerComp; private System.Windows.Forms.Label label_devCode; - private System.Windows.Forms.Label label_endTime; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label_customerName; private System.Windows.Forms.Label label_devModel; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; @@ -459,5 +436,8 @@ private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btn_stability; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index 93c641f..dff1a64 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -39,14 +39,22 @@ this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); this.labelCurrentPage = new System.Windows.Forms.Label(); - this.tableDevList = new System.Windows.Forms.DataGridView(); + this.dataGridView_DevList = new System.Windows.Forms.DataGridView(); this.panel2 = new System.Windows.Forms.Panel(); + this.btn_downDevStatus = new System.Windows.Forms.Button(); + this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.comboBox_DevStatus = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.All = new DevComponents.Editors.ComboItem(); this.toBeTested = new DevComponents.Editors.ComboItem(); this.testing = new DevComponents.Editors.ComboItem(); this.tested = new DevComponents.Editors.ComboItem(); this.labelDevStatus = new System.Windows.Forms.Label(); + this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevCode = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -57,18 +65,10 @@ this.inputCustomComp = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelCustomComp = new System.Windows.Forms.Label(); this.labelDevName = new System.Windows.Forms.Label(); - this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btn_downDevStatus = new System.Windows.Forms.Button(); - this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.panelNodata.SuspendLayout(); this.panelPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).BeginInit(); this.panel2.SuspendLayout(); this.SuspendLayout(); // @@ -77,7 +77,7 @@ this.panel1.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_list; this.panel1.Controls.Add(this.panelNodata); this.panel1.Controls.Add(this.panelPage); - this.panel1.Controls.Add(this.tableDevList); + this.panel1.Controls.Add(this.dataGridView_DevList); this.panel1.Controls.Add(this.panel2); this.panel1.Location = new System.Drawing.Point(10, 5); this.panel1.Margin = new System.Windows.Forms.Padding(0); @@ -164,31 +164,31 @@ this.labelCurrentPage.TabIndex = 315; this.labelCurrentPage.Text = "1"; // - // tableDevList + // dataGridView_DevList // - this.tableDevList.AllowUserToAddRows = false; - this.tableDevList.AllowUserToDeleteRows = false; - this.tableDevList.AllowUserToResizeColumns = false; - this.tableDevList.AllowUserToResizeRows = false; + this.dataGridView_DevList.AllowUserToAddRows = false; + this.dataGridView_DevList.AllowUserToDeleteRows = false; + this.dataGridView_DevList.AllowUserToResizeColumns = false; + this.dataGridView_DevList.AllowUserToResizeRows = false; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.tableDevList.BackgroundColor = System.Drawing.Color.White; - this.tableDevList.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.tableDevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.tableDevList.ColumnHeadersHeight = 40; - this.tableDevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.tableDevList.Location = new System.Drawing.Point(20, 100); - this.tableDevList.Margin = new System.Windows.Forms.Padding(0); - this.tableDevList.Name = "tableDevList"; - this.tableDevList.ReadOnly = true; - this.tableDevList.RowHeadersVisible = false; - this.tableDevList.RowHeadersWidth = 30; + this.dataGridView_DevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView_DevList.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_DevList.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_DevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_DevList.ColumnHeadersHeight = 40; + this.dataGridView_DevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_DevList.Location = new System.Drawing.Point(20, 100); + this.dataGridView_DevList.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_DevList.Name = "dataGridView_DevList"; + this.dataGridView_DevList.ReadOnly = true; + this.dataGridView_DevList.RowHeadersVisible = false; + this.dataGridView_DevList.RowHeadersWidth = 30; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); @@ -197,11 +197,11 @@ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.tableDevList.RowTemplate.Height = 44; - this.tableDevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.tableDevList.Size = new System.Drawing.Size(964, 480); - this.tableDevList.TabIndex = 2; + this.dataGridView_DevList.RowsDefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView_DevList.RowTemplate.Height = 44; + this.dataGridView_DevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_DevList.Size = new System.Drawing.Size(964, 480); + this.dataGridView_DevList.TabIndex = 2; // // panel2 // @@ -231,245 +231,6 @@ this.panel2.Size = new System.Drawing.Size(964, 80); this.panel2.TabIndex = 1; // - // comboBox_DevStatus - // - this.comboBox_DevStatus.DisplayMember = "Text"; - this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBox_DevStatus.FormattingEnabled = true; - this.comboBox_DevStatus.ItemHeight = 20; - this.comboBox_DevStatus.Items.AddRange(new object[] { - this.All, - this.toBeTested, - this.testing, - this.tested}); - this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); - this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); - this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); - this.comboBox_DevStatus.Name = "comboBox_DevStatus"; - this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 26); - this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBox_DevStatus.TabIndex = 2; - this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); - // - // All - // - this.All.Text = "全部"; - // - // toBeTested - // - this.toBeTested.Text = "待检测"; - this.toBeTested.Value = "1"; - // - // testing - // - this.testing.Text = "检测中"; - this.testing.Value = "2"; - // - // tested - // - this.tested.Text = "已检测"; - this.tested.Value = "3"; - // - // labelDevStatus - // - this.labelDevStatus.AutoSize = true; - this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; - this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevStatus.Location = new System.Drawing.Point(480, 45); - this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.labelDevStatus.Name = "labelDevStatus"; - this.labelDevStatus.Size = new System.Drawing.Size(74, 21); - this.labelDevStatus.TabIndex = 11; - this.labelDevStatus.Text = "仪器状态"; - // - // inputDevName - // - // - // - // - this.inputDevName.Border.Class = "TextBoxBorder"; - this.inputDevName.Border.CornerDiameter = 5; - this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevName.Location = new System.Drawing.Point(80, 3); - this.inputDevName.Margin = new System.Windows.Forms.Padding(0); - this.inputDevName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevName.Name = "inputDevName"; - this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 26); - this.inputDevName.TabIndex = 9; - this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevName.WatermarkText = "请输入仪器名称"; - // - // inputDevModel - // - // - // - // - this.inputDevModel.Border.Class = "TextBoxBorder"; - this.inputDevModel.Border.CornerDiameter = 5; - this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevModel.Location = new System.Drawing.Point(320, 3); - this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); - this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevModel.Name = "inputDevModel"; - this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 26); - this.inputDevModel.TabIndex = 8; - this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevModel.WatermarkText = "请输入仪器型号"; - // - // inputDevCode - // - // - // - // - this.inputDevCode.Border.Class = "TextBoxBorder"; - this.inputDevCode.Border.CornerDiameter = 5; - this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevCode.Location = new System.Drawing.Point(560, 3); - this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); - this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevCode.Name = "inputDevCode"; - this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 26); - this.inputDevCode.TabIndex = 7; - this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevCode.WatermarkText = "请输入仪器编号"; - // - // inputCustomName - // - // - // - // - this.inputCustomName.Border.Class = "TextBoxBorder"; - this.inputCustomName.Border.CornerDiameter = 5; - this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomName.Location = new System.Drawing.Point(320, 43); - this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomName.Name = "inputCustomName"; - this.inputCustomName.PreventEnterBeep = true; - this.inputCustomName.Size = new System.Drawing.Size(150, 26); - this.inputCustomName.TabIndex = 6; - this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomName.WatermarkText = "请输入联系人"; - // - // labelCustomName - // - this.labelCustomName.BackColor = System.Drawing.Color.Transparent; - this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomName.Location = new System.Drawing.Point(240, 45); - this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomName.Name = "labelCustomName"; - this.labelCustomName.Size = new System.Drawing.Size(74, 21); - this.labelCustomName.TabIndex = 5; - this.labelCustomName.Text = "联系人"; - this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // labelDevNo - // - this.labelDevNo.AutoSize = true; - this.labelDevNo.BackColor = System.Drawing.Color.Transparent; - this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevNo.Location = new System.Drawing.Point(480, 5); - this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); - this.labelDevNo.Name = "labelDevNo"; - this.labelDevNo.Size = new System.Drawing.Size(74, 21); - this.labelDevNo.TabIndex = 4; - this.labelDevNo.Text = "仪器编号"; - // - // labelDevModel - // - this.labelDevModel.AutoSize = true; - this.labelDevModel.BackColor = System.Drawing.Color.Transparent; - this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevModel.Location = new System.Drawing.Point(240, 5); - this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); - this.labelDevModel.Name = "labelDevModel"; - this.labelDevModel.Size = new System.Drawing.Size(74, 21); - this.labelDevModel.TabIndex = 4; - this.labelDevModel.Text = "仪器型号"; - // - // inputCustomComp - // - // - // - // - this.inputCustomComp.Border.Class = "TextBoxBorder"; - this.inputCustomComp.Border.CornerDiameter = 5; - this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomComp.Border.MaximumHeight = 26; - this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomComp.Location = new System.Drawing.Point(80, 43); - this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomComp.Name = "inputCustomComp"; - this.inputCustomComp.PreventEnterBeep = true; - this.inputCustomComp.Size = new System.Drawing.Size(150, 26); - this.inputCustomComp.TabIndex = 3; - this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomComp.WatermarkText = "请输入送检单位名称"; - // - // labelCustomComp - // - this.labelCustomComp.AutoSize = true; - this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; - this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomComp.Location = new System.Drawing.Point(0, 45); - this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomComp.Name = "labelCustomComp"; - this.labelCustomComp.Size = new System.Drawing.Size(74, 21); - this.labelCustomComp.TabIndex = 0; - this.labelCustomComp.Text = "送检单位"; - // - // labelDevName - // - this.labelDevName.AutoSize = true; - this.labelDevName.BackColor = System.Drawing.Color.Transparent; - this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevName.Location = new System.Drawing.Point(0, 5); - this.labelDevName.Margin = new System.Windows.Forms.Padding(0); - this.labelDevName.Name = "labelDevName"; - this.labelDevName.Size = new System.Drawing.Size(74, 21); - this.labelDevName.TabIndex = 0; - this.labelDevName.Text = "仪器名称"; - // - // inputDevStatus - // - // - // - // - this.inputDevStatus.Border.Class = "TextBoxBorder"; - this.inputDevStatus.Border.CornerDiameter = 5; - this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevStatus.Location = new System.Drawing.Point(560, 43); - this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevStatus.Name = "inputDevStatus"; - this.inputDevStatus.PreventEnterBeep = true; - this.inputDevStatus.Size = new System.Drawing.Size(150, 26); - this.inputDevStatus.TabIndex = 15; - this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevStatus.WatermarkText = "请选择仪器状态"; - // // btn_downDevStatus // this.btn_downDevStatus.BackColor = System.Drawing.Color.Transparent; @@ -488,6 +249,26 @@ this.btn_downDevStatus.UseVisualStyleBackColor = false; this.btn_downDevStatus.Click += new System.EventHandler(this.btn_downDevStatus_Click); // + // inputDevStatus + // + // + // + // + this.inputDevStatus.Border.Class = "TextBoxBorder"; + this.inputDevStatus.Border.CornerDiameter = 5; + this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevStatus.Location = new System.Drawing.Point(560, 42); + this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevStatus.Name = "inputDevStatus"; + this.inputDevStatus.PreventEnterBeep = true; + this.inputDevStatus.Size = new System.Drawing.Size(150, 28); + this.inputDevStatus.TabIndex = 15; + this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevStatus.WatermarkText = "请选择仪器状态"; + // // btnExport // this.btnExport.EnterBackColor = System.Drawing.Color.Blue; @@ -607,6 +388,59 @@ this.btnEdit.UseVisualStyleBackColor = true; this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click); // + // comboBox_DevStatus + // + this.comboBox_DevStatus.DisplayMember = "Text"; + this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.comboBox_DevStatus.FormattingEnabled = true; + this.comboBox_DevStatus.ItemHeight = 21; + this.comboBox_DevStatus.Items.AddRange(new object[] { + this.All, + this.toBeTested, + this.testing, + this.tested}); + this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); + this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); + this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); + this.comboBox_DevStatus.Name = "comboBox_DevStatus"; + this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 27); + this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.comboBox_DevStatus.TabIndex = 2; + this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); + // + // All + // + this.All.Text = "全部"; + // + // toBeTested + // + this.toBeTested.Text = "待检测"; + this.toBeTested.Value = "1"; + // + // testing + // + this.testing.Text = "检测中"; + this.testing.Value = "2"; + // + // tested + // + this.tested.Text = "已检测"; + this.tested.Value = "3"; + // + // labelDevStatus + // + this.labelDevStatus.AutoSize = true; + this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; + this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevStatus.Location = new System.Drawing.Point(480, 45); + this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.labelDevStatus.Name = "labelDevStatus"; + this.labelDevStatus.Size = new System.Drawing.Size(74, 21); + this.labelDevStatus.TabIndex = 11; + this.labelDevStatus.Text = "仪器状态"; + // // btnQuery // this.btnQuery.EnterBackColor = System.Drawing.Color.Blue; @@ -631,6 +465,172 @@ this.btnQuery.UseVisualStyleBackColor = true; this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click); // + // inputDevName + // + // + // + // + this.inputDevName.Border.Class = "TextBoxBorder"; + this.inputDevName.Border.CornerDiameter = 5; + this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevName.Location = new System.Drawing.Point(80, 3); + this.inputDevName.Margin = new System.Windows.Forms.Padding(0); + this.inputDevName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevName.Name = "inputDevName"; + this.inputDevName.PreventEnterBeep = true; + this.inputDevName.Size = new System.Drawing.Size(150, 28); + this.inputDevName.TabIndex = 9; + this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevName.WatermarkText = "请输入仪器名称"; + // + // inputDevModel + // + // + // + // + this.inputDevModel.Border.Class = "TextBoxBorder"; + this.inputDevModel.Border.CornerDiameter = 5; + this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevModel.Location = new System.Drawing.Point(320, 3); + this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); + this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevModel.Name = "inputDevModel"; + this.inputDevModel.PreventEnterBeep = true; + this.inputDevModel.Size = new System.Drawing.Size(150, 28); + this.inputDevModel.TabIndex = 8; + this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevModel.WatermarkText = "请输入仪器型号"; + // + // inputDevCode + // + // + // + // + this.inputDevCode.Border.Class = "TextBoxBorder"; + this.inputDevCode.Border.CornerDiameter = 5; + this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevCode.Location = new System.Drawing.Point(560, 3); + this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); + this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevCode.Name = "inputDevCode"; + this.inputDevCode.PreventEnterBeep = true; + this.inputDevCode.Size = new System.Drawing.Size(150, 28); + this.inputDevCode.TabIndex = 7; + this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevCode.WatermarkText = "请输入仪器编号"; + // + // inputCustomName + // + // + // + // + this.inputCustomName.Border.Class = "TextBoxBorder"; + this.inputCustomName.Border.CornerDiameter = 5; + this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomName.Location = new System.Drawing.Point(320, 43); + this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomName.Name = "inputCustomName"; + this.inputCustomName.PreventEnterBeep = true; + this.inputCustomName.Size = new System.Drawing.Size(150, 28); + this.inputCustomName.TabIndex = 6; + this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomName.WatermarkText = "请输入联系人"; + // + // labelCustomName + // + this.labelCustomName.BackColor = System.Drawing.Color.Transparent; + this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomName.Location = new System.Drawing.Point(240, 45); + this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomName.Name = "labelCustomName"; + this.labelCustomName.Size = new System.Drawing.Size(74, 21); + this.labelCustomName.TabIndex = 5; + this.labelCustomName.Text = "联系人"; + this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // labelDevNo + // + this.labelDevNo.AutoSize = true; + this.labelDevNo.BackColor = System.Drawing.Color.Transparent; + this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevNo.Location = new System.Drawing.Point(480, 5); + this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); + this.labelDevNo.Name = "labelDevNo"; + this.labelDevNo.Size = new System.Drawing.Size(74, 21); + this.labelDevNo.TabIndex = 4; + this.labelDevNo.Text = "仪器编号"; + // + // labelDevModel + // + this.labelDevModel.AutoSize = true; + this.labelDevModel.BackColor = System.Drawing.Color.Transparent; + this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevModel.Location = new System.Drawing.Point(240, 5); + this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); + this.labelDevModel.Name = "labelDevModel"; + this.labelDevModel.Size = new System.Drawing.Size(74, 21); + this.labelDevModel.TabIndex = 4; + this.labelDevModel.Text = "仪器型号"; + // + // inputCustomComp + // + // + // + // + this.inputCustomComp.Border.Class = "TextBoxBorder"; + this.inputCustomComp.Border.CornerDiameter = 5; + this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomComp.Border.MaximumHeight = 26; + this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomComp.Location = new System.Drawing.Point(80, 43); + this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomComp.Name = "inputCustomComp"; + this.inputCustomComp.PreventEnterBeep = true; + this.inputCustomComp.Size = new System.Drawing.Size(150, 28); + this.inputCustomComp.TabIndex = 3; + this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomComp.WatermarkText = "请输入送检单位名称"; + // + // labelCustomComp + // + this.labelCustomComp.AutoSize = true; + this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; + this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomComp.Location = new System.Drawing.Point(0, 45); + this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomComp.Name = "labelCustomComp"; + this.labelCustomComp.Size = new System.Drawing.Size(74, 21); + this.labelCustomComp.TabIndex = 0; + this.labelCustomComp.Text = "送检单位"; + // + // labelDevName + // + this.labelDevName.AutoSize = true; + this.labelDevName.BackColor = System.Drawing.Color.Transparent; + this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevName.Location = new System.Drawing.Point(0, 5); + this.labelDevName.Margin = new System.Windows.Forms.Padding(0); + this.labelDevName.Name = "labelDevName"; + this.labelDevName.Size = new System.Drawing.Size(74, 21); + this.labelDevName.TabIndex = 0; + this.labelDevName.Text = "仪器名称"; + // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -644,7 +644,7 @@ this.panelNodata.ResumeLayout(false); this.panelPage.ResumeLayout(false); this.panelPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); this.ResumeLayout(false); @@ -677,7 +677,7 @@ private RoundButton btnDelete; private RoundButton btnDetail; private RoundButton btnExport; - private System.Windows.Forms.DataGridView tableDevList; + private System.Windows.Forms.DataGridView dataGridView_DevList; private System.Windows.Forms.Button btnNext; private System.Windows.Forms.Button btnPre; private System.Windows.Forms.Label labelPageCount; diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs index 9157e65..d5ff4fa 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -29,19 +29,17 @@ /// private void InitializeComponent() { - this.checkBox9 = new System.Windows.Forms.CheckBox(); - this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.checkBox_startNow = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.channel1 = new DevComponents.Editors.ComboItem(); - this.channel2 = new DevComponents.Editors.ComboItem(); - this.channel3 = new DevComponents.Editors.ComboItem(); - this.channel4 = new DevComponents.Editors.ComboItem(); - this.channel5 = new DevComponents.Editors.ComboItem(); + this.btn_downTypeList = new System.Windows.Forms.Button(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label7 = new System.Windows.Forms.Label(); + this.btn_downChannelList = new System.Windows.Forms.Button(); + this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label4 = new System.Windows.Forms.Label(); this.inputCustName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label2 = new System.Windows.Forms.Label(); @@ -53,22 +51,31 @@ this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.cbBox_devType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.channel1 = new DevComponents.Editors.ComboItem(); + this.channel2 = new DevComponents.Editors.ComboItem(); + this.channel3 = new DevComponents.Editors.ComboItem(); + this.channel4 = new DevComponents.Editors.ComboItem(); + this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); + this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); + this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); + this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.endTimeEst = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.checkBox10 = new System.Windows.Forms.CheckBox(); - this.checkBox11 = new System.Windows.Forms.CheckBox(); - this.checkBox12 = new System.Windows.Forms.CheckBox(); - this.checkBox13 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox_100s = new System.Windows.Forms.CheckBox(); + this.checkBox_20s = new System.Windows.Forms.CheckBox(); + this.checkBox_10s = new System.Windows.Forms.CheckBox(); + this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -77,62 +84,18 @@ this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // checkBox9 + // checkBox_startNow // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(491, 355); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 19; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; - // - // btnSave - // - this.btnSave.EnterBackColor = System.Drawing.Color.Blue; - this.btnSave.EnterForeColor = System.Drawing.Color.White; - this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnSave.FlatAppearance.BorderSize = 0; - this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); - this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(141, 351); - this.btnSave.Name = "btnSave"; - this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnSave.PressForeColor = System.Drawing.Color.White; - this.btnSave.Radius = 5; - this.btnSave.Size = new System.Drawing.Size(120, 30); - this.btnSave.TabIndex = 17; - this.btnSave.Text = "开始检测"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnCancelSetDev - // - this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; - this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnCancelSetDev.FlatAppearance.BorderSize = 0; - this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(301, 351); - this.btnCancelSetDev.Name = "btnCancelSetDev"; - this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Radius = 5; - this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); - this.btnCancelSetDev.TabIndex = 18; - this.btnCancelSetDev.Text = "取消"; - this.btnCancelSetDev.UseVisualStyleBackColor = true; - this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.checkBox_startNow.AutoSize = true; + this.checkBox_startNow.Enabled = false; + this.checkBox_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_startNow.Location = new System.Drawing.Point(500, 429); + this.checkBox_startNow.Name = "checkBox_startNow"; + this.checkBox_startNow.Size = new System.Drawing.Size(84, 24); + this.checkBox_startNow.TabIndex = 19; + this.checkBox_startNow.Text = "立即开始"; + this.checkBox_startNow.UseVisualStyleBackColor = true; + this.checkBox_startNow.CheckedChanged += new System.EventHandler(this.checkBox_startNow_CheckedChanged); // // panel1 // @@ -141,7 +104,7 @@ this.panel1.Controls.Add(this.labelTitle); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(640, 32); this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -153,7 +116,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(610, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -174,7 +137,12 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.channelFree); + this.groupBox4.Controls.Add(this.btn_downTypeList); + this.groupBox4.Controls.Add(this.text_devType); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.btn_downChannelList); + this.groupBox4.Controls.Add(this.text_channelNo); + this.groupBox4.Controls.Add(this.cbBox_channelFree); this.groupBox4.Controls.Add(this.label4); this.groupBox4.Controls.Add(this.inputCustName); this.groupBox4.Controls.Add(this.label2); @@ -186,57 +154,116 @@ this.groupBox4.Controls.Add(this.inputDevName); this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.cbBox_devType); this.groupBox4.Location = new System.Drawing.Point(10, 33); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(580, 140); + this.groupBox4.Size = new System.Drawing.Size(617, 175); this.groupBox4.TabIndex = 38; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // - // channelFree + // btn_downTypeList // - this.channelFree.DisplayMember = "Text"; - this.channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.channelFree.FormattingEnabled = true; - this.channelFree.ItemHeight = 18; - this.channelFree.Location = new System.Drawing.Point(400, 97); - this.channelFree.Name = "channelFree"; - this.channelFree.Size = new System.Drawing.Size(150, 24); - this.channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.channelFree.TabIndex = 41; + this.btn_downTypeList.BackColor = System.Drawing.Color.White; + this.btn_downTypeList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downTypeList.FlatAppearance.BorderSize = 0; + this.btn_downTypeList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downTypeList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downTypeList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downTypeList.Location = new System.Drawing.Point(541, 59); + this.btn_downTypeList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downTypeList.Name = "btn_downTypeList"; + this.btn_downTypeList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downTypeList.Size = new System.Drawing.Size(18, 23); + this.btn_downTypeList.TabIndex = 52; + this.btn_downTypeList.Text = "﹀"; + this.btn_downTypeList.UseVisualStyleBackColor = false; + this.btn_downTypeList.Click += new System.EventHandler(this.btn_downTypeList_Click); // - // channel1 + // text_devType // - this.channel1.Text = "通道1"; - this.channel1.Value = "1"; // - // channel2 // - this.channel2.Text = "通道2"; - this.channel2.Value = "2"; // - // channel3 + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.Location = new System.Drawing.Point(400, 57); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.Size = new System.Drawing.Size(162, 27); + this.text_devType.TabIndex = 50; // - this.channel3.Text = "通道3"; - this.channel3.Value = "3"; + // label7 // - // channel4 + this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(314, 57); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(76, 27); + this.label7.TabIndex = 51; + this.label7.Text = "仪器类型"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - this.channel4.Text = "通道4"; - this.channel4.Value = "4"; + // btn_downChannelList // - // channel5 + this.btn_downChannelList.BackColor = System.Drawing.Color.White; + this.btn_downChannelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downChannelList.FlatAppearance.BorderSize = 0; + this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downChannelList.Location = new System.Drawing.Point(249, 138); + this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downChannelList.Name = "btn_downChannelList"; + this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downChannelList.Size = new System.Drawing.Size(17, 23); + this.btn_downChannelList.TabIndex = 48; + this.btn_downChannelList.Text = "﹀"; + this.btn_downChannelList.UseVisualStyleBackColor = false; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // - this.channel5.Text = "通道5"; - this.channel5.Value = "5"; + // text_channelNo + // + this.text_channelNo.BackColor = System.Drawing.Color.White; + // + // + // + this.text_channelNo.Border.Class = "TextBoxBorder"; + this.text_channelNo.Border.CornerDiameter = 5; + this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_channelNo.Location = new System.Drawing.Point(110, 136); + this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); + this.text_channelNo.Name = "text_channelNo"; + this.text_channelNo.PreventEnterBeep = true; + this.text_channelNo.ReadOnly = true; + this.text_channelNo.Size = new System.Drawing.Size(162, 27); + this.text_channelNo.TabIndex = 49; + // + // cbBox_channelFree + // + this.cbBox_channelFree.DisplayMember = "Text"; + this.cbBox_channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_channelFree.FormattingEnabled = true; + this.cbBox_channelFree.ItemHeight = 18; + this.cbBox_channelFree.Location = new System.Drawing.Point(110, 136); + this.cbBox_channelFree.Name = "cbBox_channelFree"; + this.cbBox_channelFree.Size = new System.Drawing.Size(150, 24); + this.cbBox_channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_channelFree.TabIndex = 41; + this.cbBox_channelFree.SelectedIndexChanged += new System.EventHandler(this.cbBox_channelFree_SelectedIndexChanged); // // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(290, 94); + this.label4.Location = new System.Drawing.Point(13, 136); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); + this.label4.Size = new System.Drawing.Size(86, 27); this.label4.TabIndex = 47; this.label4.Text = "选择通道"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -250,17 +277,17 @@ this.inputCustName.Border.CornerDiameter = 5; this.inputCustName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustName.Location = new System.Drawing.Point(110, 94); + this.inputCustName.Location = new System.Drawing.Point(401, 94); this.inputCustName.Margin = new System.Windows.Forms.Padding(0); this.inputCustName.Name = "inputCustName"; this.inputCustName.PreventEnterBeep = true; - this.inputCustName.Size = new System.Drawing.Size(150, 27); + this.inputCustName.Size = new System.Drawing.Size(162, 27); this.inputCustName.TabIndex = 40; // // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(20, 94); + this.label2.Location = new System.Drawing.Point(310, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(80, 27); @@ -277,11 +304,11 @@ this.inputCustComp.Border.CornerDiameter = 5; this.inputCustComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustComp.Location = new System.Drawing.Point(400, 57); + this.inputCustComp.Location = new System.Drawing.Point(110, 98); this.inputCustComp.Margin = new System.Windows.Forms.Padding(0); this.inputCustComp.Name = "inputCustComp"; this.inputCustComp.PreventEnterBeep = true; - this.inputCustComp.Size = new System.Drawing.Size(150, 27); + this.inputCustComp.Size = new System.Drawing.Size(162, 27); this.inputCustComp.TabIndex = 39; // // inputDevModel @@ -297,16 +324,16 @@ this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); this.inputDevModel.Name = "inputDevModel"; this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 27); + this.inputDevModel.Size = new System.Drawing.Size(162, 27); this.inputDevModel.TabIndex = 38; // // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(290, 57); + this.label1.Location = new System.Drawing.Point(9, 98); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); + this.label1.Size = new System.Drawing.Size(91, 27); this.label1.TabIndex = 45; this.label1.Text = "送检单位"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -335,7 +362,7 @@ this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); this.inputDevCode.Name = "inputDevCode"; this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 27); + this.inputDevCode.Size = new System.Drawing.Size(162, 27); this.inputDevCode.TabIndex = 37; // // inputDevName @@ -351,7 +378,7 @@ this.inputDevName.Margin = new System.Windows.Forms.Padding(0); this.inputDevName.Name = "inputDevName"; this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 27); + this.inputDevName.Size = new System.Drawing.Size(162, 27); this.inputDevName.TabIndex = 36; // // label8 @@ -376,22 +403,120 @@ this.label5.Text = "仪器名称"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // cbBox_devType + // + this.cbBox_devType.DisplayMember = "Text"; + this.cbBox_devType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_devType.FormattingEnabled = true; + this.cbBox_devType.ItemHeight = 18; + this.cbBox_devType.Location = new System.Drawing.Point(402, 59); + this.cbBox_devType.Name = "cbBox_devType"; + this.cbBox_devType.Size = new System.Drawing.Size(158, 24); + this.cbBox_devType.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_devType.TabIndex = 54; + this.cbBox_devType.SelectedIndexChanged += new System.EventHandler(this.cbBox_devType_SelectedIndexChanged); + // + // channel1 + // + this.channel1.Text = "通道1"; + this.channel1.Value = "1"; + // + // channel2 + // + this.channel2.Text = "通道2"; + this.channel2.Value = "2"; + // + // channel3 + // + this.channel3.Text = "通道3"; + this.channel3.Value = "3"; + // + // channel4 + // + this.channel4.Text = "通道4"; + this.channel4.Value = "4"; + // + // channel5 + // + this.channel5.Text = "通道5"; + this.channel5.Value = "5"; + // // groupBox1 // + this.groupBox1.Controls.Add(this.checkBox_count); + this.groupBox1.Controls.Add(this.checkBox_ageRate); + this.groupBox1.Controls.Add(this.checkBox_bootFeature); + this.groupBox1.Controls.Add(this.checkBox_accuracy); + this.groupBox1.Controls.Add(this.checkBox_stability); this.groupBox1.Controls.Add(this.endTimeEst); this.groupBox1.Controls.Add(this.startTime); - this.groupBox1.Controls.Add(this.checkBox10); - this.groupBox1.Controls.Add(this.checkBox11); - this.groupBox1.Controls.Add(this.checkBox12); - this.groupBox1.Controls.Add(this.checkBox13); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label12); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(10, 174); + this.groupBox1.Enabled = false; + this.groupBox1.Location = new System.Drawing.Point(10, 212); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 98); + this.groupBox1.Size = new System.Drawing.Size(617, 140); this.groupBox1.TabIndex = 39; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(114, 55); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 351; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // checkBox_ageRate + // + this.checkBox_ageRate.AutoSize = true; + this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_ageRate.Location = new System.Drawing.Point(467, 25); + this.checkBox_ageRate.Name = "checkBox_ageRate"; + this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); + this.checkBox_ageRate.TabIndex = 350; + this.checkBox_ageRate.Text = "日老化率"; + this.checkBox_ageRate.UseVisualStyleBackColor = true; + // + // checkBox_bootFeature + // + this.checkBox_bootFeature.AutoSize = true; + this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_bootFeature.Location = new System.Drawing.Point(348, 25); + this.checkBox_bootFeature.Name = "checkBox_bootFeature"; + this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); + this.checkBox_bootFeature.TabIndex = 349; + this.checkBox_bootFeature.Text = "开机特性"; + this.checkBox_bootFeature.UseVisualStyleBackColor = true; + // + // checkBox_accuracy + // + this.checkBox_accuracy.AutoSize = true; + this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_accuracy.Location = new System.Drawing.Point(232, 25); + this.checkBox_accuracy.Name = "checkBox_accuracy"; + this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); + this.checkBox_accuracy.TabIndex = 347; + this.checkBox_accuracy.Text = "频率准确度"; + this.checkBox_accuracy.UseVisualStyleBackColor = true; + // + // checkBox_stability + // + this.checkBox_stability.AutoSize = true; + this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_stability.Location = new System.Drawing.Point(114, 25); + this.checkBox_stability.Name = "checkBox_stability"; + this.checkBox_stability.Size = new System.Drawing.Size(98, 24); + this.checkBox_stability.TabIndex = 348; + this.checkBox_stability.Text = "频率稳定度"; + this.checkBox_stability.UseVisualStyleBackColor = true; + this.checkBox_stability.CheckedChanged += new System.EventHandler(this.checkBox_stability_CheckedChanged); // // endTimeEst // @@ -406,7 +531,7 @@ this.endTimeEst.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.endTimeEst.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.endTimeEst.IsPopupCalendarOpen = false; - this.endTimeEst.Location = new System.Drawing.Point(395, 57); + this.endTimeEst.Location = new System.Drawing.Point(395, 94); // // // @@ -456,7 +581,7 @@ this.startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.startTime.IsPopupCalendarOpen = false; - this.startTime.Location = new System.Drawing.Point(115, 57); + this.startTime.Location = new System.Drawing.Point(107, 94); // // // @@ -493,54 +618,10 @@ this.startTime.TabIndex = 43; this.startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); // - // checkBox10 - // - this.checkBox10.AutoSize = true; - this.checkBox10.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox10.Location = new System.Drawing.Point(425, 20); - this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(84, 24); - this.checkBox10.TabIndex = 42; - this.checkBox10.Text = "日老化率"; - this.checkBox10.UseVisualStyleBackColor = true; - // - // checkBox11 - // - this.checkBox11.AutoSize = true; - this.checkBox11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox11.Location = new System.Drawing.Point(331, 20); - this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(84, 24); - this.checkBox11.TabIndex = 41; - this.checkBox11.Text = "开机特性"; - this.checkBox11.UseVisualStyleBackColor = true; - // - // checkBox12 - // - this.checkBox12.AutoSize = true; - this.checkBox12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox12.Location = new System.Drawing.Point(223, 20); - this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(98, 24); - this.checkBox12.TabIndex = 39; - this.checkBox12.Text = "频率准确度"; - this.checkBox12.UseVisualStyleBackColor = true; - // - // checkBox13 - // - this.checkBox13.AutoSize = true; - this.checkBox13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox13.Location = new System.Drawing.Point(115, 20); - this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(98, 24); - this.checkBox13.TabIndex = 38; - this.checkBox13.Text = "频率稳定度"; - this.checkBox13.UseVisualStyleBackColor = true; - // // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(290, 55); + this.label3.Location = new System.Drawing.Point(290, 92); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -551,7 +632,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 55); + this.label12.Location = new System.Drawing.Point(5, 92); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(100, 27); @@ -562,7 +643,7 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 18); + this.label13.Location = new System.Drawing.Point(5, 23); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -573,13 +654,14 @@ // groupBox2 // this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.checkBox1); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.checkBox3); - this.groupBox2.Controls.Add(this.checkBox4); - this.groupBox2.Location = new System.Drawing.Point(9, 278); + this.groupBox2.Controls.Add(this.checkBox_100s); + this.groupBox2.Controls.Add(this.checkBox_20s); + this.groupBox2.Controls.Add(this.checkBox_10s); + this.groupBox2.Controls.Add(this.checkBox_1s); + this.groupBox2.Enabled = false; + this.groupBox2.Location = new System.Drawing.Point(9, 353); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 53); + this.groupBox2.Size = new System.Drawing.Size(618, 53); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; // @@ -594,60 +676,107 @@ this.label6.Text = "频率稳定度"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox1 + // checkBox_100s // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox1.Location = new System.Drawing.Point(425, 19); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(60, 24); - this.checkBox1.TabIndex = 42; - this.checkBox1.Text = "100S"; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox_100s.AutoSize = true; + this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_100s.Location = new System.Drawing.Point(468, 19); + this.checkBox_100s.Name = "checkBox_100s"; + this.checkBox_100s.Size = new System.Drawing.Size(60, 24); + this.checkBox_100s.TabIndex = 42; + this.checkBox_100s.Text = "100S"; + this.checkBox_100s.UseVisualStyleBackColor = true; // - // checkBox2 + // checkBox_20s // - this.checkBox2.AutoSize = true; - this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox2.Location = new System.Drawing.Point(331, 19); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(52, 24); - this.checkBox2.TabIndex = 41; - this.checkBox2.Text = "20S"; - this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox_20s.AutoSize = true; + this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_20s.Location = new System.Drawing.Point(349, 19); + this.checkBox_20s.Name = "checkBox_20s"; + this.checkBox_20s.Size = new System.Drawing.Size(52, 24); + this.checkBox_20s.TabIndex = 41; + this.checkBox_20s.Text = "20S"; + this.checkBox_20s.UseVisualStyleBackColor = true; // - // checkBox3 + // checkBox_10s // - this.checkBox3.AutoSize = true; - this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox3.Location = new System.Drawing.Point(223, 19); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(52, 24); - this.checkBox3.TabIndex = 40; - this.checkBox3.Text = "10S"; - this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox_10s.AutoSize = true; + this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_10s.Location = new System.Drawing.Point(233, 19); + this.checkBox_10s.Name = "checkBox_10s"; + this.checkBox_10s.Size = new System.Drawing.Size(52, 24); + this.checkBox_10s.TabIndex = 40; + this.checkBox_10s.Text = "10S"; + this.checkBox_10s.UseVisualStyleBackColor = true; // - // checkBox4 + // checkBox_1s // - this.checkBox4.AutoSize = true; - this.checkBox4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox4.Location = new System.Drawing.Point(115, 19); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(44, 24); - this.checkBox4.TabIndex = 39; - this.checkBox4.Text = "1S"; - this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox_1s.AutoSize = true; + this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_1s.Location = new System.Drawing.Point(115, 19); + this.checkBox_1s.Name = "checkBox_1s"; + this.checkBox_1s.Size = new System.Drawing.Size(44, 24); + this.checkBox_1s.TabIndex = 39; + this.checkBox_1s.Text = "1S"; + this.checkBox_1s.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(150, 425); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(120, 30); + this.btnSave.TabIndex = 17; + this.btnSave.Text = "开始检测"; + this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // btnCancelSetDev + // + this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancelSetDev.FlatAppearance.BorderSize = 0; + this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Location = new System.Drawing.Point(310, 425); + this.btnCancelSetDev.Name = "btnCancelSetDev"; + this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Radius = 5; + this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); + this.btnCancelSetDev.TabIndex = 18; + this.btnCancelSetDev.Text = "取消"; + this.btnCancelSetDev.UseVisualStyleBackColor = true; + this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); // // AddDevDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 407); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(642, 483); this.ControlBox = false; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox4); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_startNow); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.panel1); @@ -669,24 +798,16 @@ } #endregion - - private System.Windows.Forms.CheckBox checkBox9; - private RoundButton btnSave; private RoundButton btnCancelSetDev; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label labelTitle; private System.Windows.Forms.GroupBox groupBox4; - private DevComponents.DotNetBar.Controls.ComboBoxEx channelFree; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_channelFree; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustName; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevName; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.Editors.ComboItem channel1; @@ -695,20 +816,34 @@ private DevComponents.Editors.ComboItem channel4; private DevComponents.Editors.ComboItem channel5; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; - private DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; - private System.Windows.Forms.CheckBox checkBox10; - private System.Windows.Forms.CheckBox checkBox11; - private System.Windows.Forms.CheckBox checkBox12; - private System.Windows.Forms.CheckBox checkBox13; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; + public DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; + private System.Windows.Forms.Button btn_downTypeList; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_devType; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustName; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + public System.Windows.Forms.CheckBox checkBox_startNow; + public DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; + public DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; + public System.Windows.Forms.CheckBox checkBox_100s; + public System.Windows.Forms.CheckBox checkBox_20s; + public System.Windows.Forms.CheckBox checkBox_10s; + public System.Windows.Forms.CheckBox checkBox_1s; + public System.Windows.Forms.CheckBox checkBox_count; + public System.Windows.Forms.CheckBox checkBox_ageRate; + public System.Windows.Forms.CheckBox checkBox_bootFeature; + public System.Windows.Forms.CheckBox checkBox_accuracy; + public System.Windows.Forms.CheckBox checkBox_stability; + public System.Windows.Forms.Button btn_downChannelList; + public RoundButton btnSave; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs index 652c6b4..a2dbf38 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -27,6 +27,10 @@ } #endregion + DictService dictService = new DictServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + public Action HideMaskAction { get; @@ -37,7 +41,21 @@ { InitializeComponent(); - ((ComboBoxEx)this.Controls.Find("channelFree", true)[0]).SelectedIndex = 0; + cbBox_devType.DataSource = dictService.getTypeListByCodeType("devType"); + btnSave.Text = "添加仪器"; + if (HomeCtrlForm.channelFreeList.Count > 0) + { + cbBox_channelFree.Items.Add(""); + foreach (string item in HomeCtrlForm.channelFreeList) + { + cbBox_channelFree.Items.Add(item); + } + } + else + { + text_channelNo.WatermarkText = "无空闲通道可选"; + + } } // 关闭对话框 @@ -49,6 +67,19 @@ // 添加并开始检测 private void btnSave_Click(object sender, EventArgs e) { + if (text_channelNo.Text.Trim() != "") + { + if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + { + MessageBox.Show("请选择频率稳定度！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + } // 取得输入框的参数 string devName = ((TextBoxX) this.Controls.Find("inputDevName", true)[0]).Text; string devCode = ((TextBoxX) this.Controls.Find("inputDevCode", true)[0]).Text; @@ -56,7 +87,7 @@ string devCustomComp = ((TextBoxX)this.Controls.Find("inputCustComp", true)[0]).Text; string devCustomName = ((TextBoxX)this.Controls.Find("inputCustName", true)[0]).Text; - ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("channelFree", true)[0]; + ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("cbBox_channelFree", true)[0]; string channelNo = (string)((ComboItem)channels.SelectedItem).Value; // 初始化数据访问接口 @@ -64,13 +95,80 @@ int id = devService.add(devName, devCode, "1", devModel, devCustomComp, devCustomName, channelNo); if (id >= 0) { + if (btnSave.Text.Equals("添加并开始检测")) + { + //detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval); + // 重新加载首页的通道状态 + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + } // 添加成功，继续保存检测项目和开始时间 this.HideMaskAction(); + } else { LogHelper.WriteErrorLog(this.GetType(), "添加设备[" + devName + "]失败"); } } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = true; + } + + private void groupBox4_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void groupBox1_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void btn_downTypeList_Click(object sender, EventArgs e) + { + cbBox_devType.DroppedDown = true; + } + + private void checkBox_startNow_CheckedChanged(object sender, EventArgs e) + { + startTime.Value = DateTime.Now; + } + + private void cbBox_devType_SelectedIndexChanged(object sender, EventArgs e) + { + text_devType.Text = cbBox_devType.SelectedItem.ToString(); + } + + private void cbBox_channelFree_SelectedIndexChanged(object sender, EventArgs e) + { + text_channelNo.Text = cbBox_channelFree.SelectedItem.ToString(); + + if (text_channelNo.Text != "") + { + btnSave.Text = "添加并开始检测"; + checkBox_startNow.Enabled = true; + groupBox1.Enabled = true; + } + else + { + btnSave.Text = "添加仪器"; + groupBox1.Enabled = false; checkBox_startNow.Enabled = false; + } + } + + private void checkBox13_CheckedChanged(object sender, EventArgs e) + { + + } + + private void checkBox_stability_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_stability.Checked) groupBox2.Enabled = true; + else groupBox2.Enabled = false; + } } } diff --git a/RbFreqStandMeasure/info/DetailDlg.Designer.cs b/RbFreqStandMeasure/info/DetailDlg.Designer.cs index 05ffc1f..eeded9f 100644 --- a/RbFreqStandMeasure/info/DetailDlg.Designer.cs +++ b/RbFreqStandMeasure/info/DetailDlg.Designer.cs @@ -29,9 +29,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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(); this.panel1 = new System.Windows.Forms.Panel(); + this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.channel1 = new DevComponents.Editors.ComboItem(); this.channel2 = new DevComponents.Editors.ComboItem(); @@ -39,32 +40,32 @@ this.channel4 = new DevComponents.Editors.ComboItem(); this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.dataGridView_Data = new System.Windows.Forms.DataGridView(); - this.btn_accurary = new System.Windows.Forms.Button(); - this.btn_bootFeature = new System.Windows.Forms.Button(); this.btn_ageRate = new System.Windows.Forms.Button(); + this.btn_bootFeature = new System.Windows.Forms.Button(); + this.btn_accurary = new System.Windows.Forms.Button(); + this.btn_stability = new System.Windows.Forms.Button(); + this.dataGridView_Data = new System.Windows.Forms.DataGridView(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label_endTime = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label_customerComp = new System.Windows.Forms.Label(); + this.label_devCode = new System.Windows.Forms.Label(); this.label_customerName = new System.Windows.Forms.Label(); this.label_devModel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.label_startTime = new System.Windows.Forms.Label(); - this.label_customerComp = new System.Windows.Forms.Label(); - this.label_devCode = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnExitDev = new System.Windows.Forms.Button(); - this.btn_stability = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.button1 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).BeginInit(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -78,6 +79,22 @@ this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // + // btnExitDev + // + this.btnExitDev.BackColor = System.Drawing.Color.Transparent; + this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; + this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnExitDev.FlatAppearance.BorderSize = 0; + this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btnExitDev.Location = new System.Drawing.Point(869, 5); + this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); + this.btnExitDev.Name = "btnExitDev"; + this.btnExitDev.Size = new System.Drawing.Size(20, 20); + this.btnExitDev.TabIndex = 2; + this.btnExitDev.UseVisualStyleBackColor = false; + this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // // labelTitle // this.labelTitle.BackColor = System.Drawing.Color.Transparent; @@ -116,6 +133,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.btn_ageRate); this.groupBox1.Controls.Add(this.btn_bootFeature); this.groupBox1.Controls.Add(this.btn_accurary); @@ -123,278 +141,39 @@ this.groupBox1.Controls.Add(this.dataGridView_Data); this.groupBox1.Location = new System.Drawing.Point(8, 39); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(298, 493); + this.groupBox1.Size = new System.Drawing.Size(439, 493); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // - // dataGridView_Data - // - this.dataGridView_Data.AllowUserToAddRows = false; - this.dataGridView_Data.AllowUserToDeleteRows = false; - this.dataGridView_Data.AllowUserToResizeColumns = false; - this.dataGridView_Data.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Data.ColumnHeadersHeight = 40; - this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dataGridView_Data.Location = new System.Drawing.Point(5, 14); - this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Data.Name = "dataGridView_Data"; - this.dataGridView_Data.ReadOnly = true; - this.dataGridView_Data.RowHeadersVisible = false; - this.dataGridView_Data.RowHeadersWidth = 30; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.NullValue = "-"; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Data.RowTemplate.Height = 44; - this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView_Data.Size = new System.Drawing.Size(289, 429); - this.dataGridView_Data.TabIndex = 3; - // - // btn_accurary - // - this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_accurary.Location = new System.Drawing.Point(79, 446); - this.btn_accurary.Name = "btn_accurary"; - this.btn_accurary.Size = new System.Drawing.Size(79, 31); - this.btn_accurary.TabIndex = 5; - this.btn_accurary.Text = "频率准确度"; - this.btn_accurary.UseVisualStyleBackColor = true; - // - // btn_bootFeature - // - this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_bootFeature.Location = new System.Drawing.Point(154, 446); - this.btn_bootFeature.Name = "btn_bootFeature"; - this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); - this.btn_bootFeature.TabIndex = 6; - this.btn_bootFeature.Text = "开机特性"; - this.btn_bootFeature.UseVisualStyleBackColor = true; - // // btn_ageRate // this.btn_ageRate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_ageRate.Location = new System.Drawing.Point(222, 446); + this.btn_ageRate.Location = new System.Drawing.Point(240, 446); this.btn_ageRate.Name = "btn_ageRate"; this.btn_ageRate.Size = new System.Drawing.Size(75, 31); this.btn_ageRate.TabIndex = 7; this.btn_ageRate.Text = "日老化率"; this.btn_ageRate.UseVisualStyleBackColor = true; // - // groupBox2 + // btn_bootFeature // - this.groupBox2.Controls.Add(this.label_startTime); - this.groupBox2.Controls.Add(this.label_customerComp); - this.groupBox2.Controls.Add(this.label_devCode); - this.groupBox2.Controls.Add(this.label_endTime); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label_customerName); - this.groupBox2.Controls.Add(this.label_devModel); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox2.Location = new System.Drawing.Point(316, 39); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(570, 128); - this.groupBox2.TabIndex = 0; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "仪器基本信息"; + this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_bootFeature.Location = new System.Drawing.Point(161, 446); + this.btn_bootFeature.Name = "btn_bootFeature"; + this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); + this.btn_bootFeature.TabIndex = 6; + this.btn_bootFeature.Text = "开机特性"; + this.btn_bootFeature.UseVisualStyleBackColor = true; // - // label_endTime + // btn_accurary // - this.label_endTime.BackColor = System.Drawing.Color.Transparent; - this.label_endTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_endTime.Location = new System.Drawing.Point(154, 93); - this.label_endTime.Margin = new System.Windows.Forms.Padding(0); - this.label_endTime.Name = "label_endTime"; - this.label_endTime.Size = new System.Drawing.Size(83, 27); - this.label_endTime.TabIndex = 78; - this.label_endTime.Text = "仪器名称："; - this.label_endTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(54, 93); - this.label3.Margin = new System.Windows.Forms.Padding(0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(100, 27); - this.label3.TabIndex = 77; - this.label3.Text = "结束时间："; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerName - // - this.label_customerName.BackColor = System.Drawing.Color.Transparent; - this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerName.Location = new System.Drawing.Point(154, 57); - this.label_customerName.Margin = new System.Windows.Forms.Padding(0); - this.label_customerName.Name = "label_customerName"; - this.label_customerName.Size = new System.Drawing.Size(83, 27); - this.label_customerName.TabIndex = 76; - this.label_customerName.Text = "仪器名称："; - this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devModel - // - this.label_devModel.BackColor = System.Drawing.Color.Transparent; - this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devModel.Location = new System.Drawing.Point(154, 25); - this.label_devModel.Margin = new System.Windows.Forms.Padding(0); - this.label_devModel.Name = "label_devModel"; - this.label_devModel.Size = new System.Drawing.Size(83, 27); - this.label_devModel.TabIndex = 75; - this.label_devModel.Text = "仪器名称："; - this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(327, 93); - this.label4.Margin = new System.Windows.Forms.Padding(0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); - this.label4.TabIndex = 73; - this.label4.Text = "开始时间："; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(74, 57); - this.label2.Margin = new System.Windows.Forms.Padding(0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 27); - this.label2.TabIndex = 72; - this.label2.Text = "联系人："; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(327, 59); - this.label1.Margin = new System.Windows.Forms.Padding(0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); - this.label1.TabIndex = 71; - this.label1.Text = "送检单位："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(67, 25); - this.label9.Margin = new System.Windows.Forms.Padding(0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 27); - this.label9.TabIndex = 70; - this.label9.Text = "仪器型号："; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(327, 25); - this.label8.Margin = new System.Windows.Forms.Padding(0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(100, 27); - this.label8.TabIndex = 69; - this.label8.Text = "仪器编号："; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_startTime - // - this.label_startTime.BackColor = System.Drawing.Color.Transparent; - this.label_startTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_startTime.Location = new System.Drawing.Point(427, 93); - this.label_startTime.Margin = new System.Windows.Forms.Padding(0); - this.label_startTime.Name = "label_startTime"; - this.label_startTime.Size = new System.Drawing.Size(83, 27); - this.label_startTime.TabIndex = 81; - this.label_startTime.Text = "仪器名称："; - this.label_startTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerComp - // - this.label_customerComp.BackColor = System.Drawing.Color.Transparent; - this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerComp.Location = new System.Drawing.Point(427, 59); - this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); - this.label_customerComp.Name = "label_customerComp"; - this.label_customerComp.Size = new System.Drawing.Size(83, 27); - this.label_customerComp.TabIndex = 80; - this.label_customerComp.Text = "仪器名称："; - this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devCode - // - this.label_devCode.BackColor = System.Drawing.Color.Transparent; - this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devCode.Location = new System.Drawing.Point(427, 25); - this.label_devCode.Margin = new System.Windows.Forms.Padding(0); - this.label_devCode.Name = "label_devCode"; - this.label_devCode.Size = new System.Drawing.Size(83, 27); - this.label_devCode.TabIndex = 79; - this.label_devCode.Text = "仪器名称："; - this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.panel2); - this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox3.Location = new System.Drawing.Point(316, 173); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(570, 359); - this.groupBox3.TabIndex = 19; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "频率稳定度"; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(6, 25); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(558, 328); - this.panel2.TabIndex = 0; - // - // btnExitDev - // - this.btnExitDev.BackColor = System.Drawing.Color.Transparent; - this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; - this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnExitDev.FlatAppearance.BorderSize = 0; - this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(799, 5); - this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); - this.btnExitDev.Name = "btnExitDev"; - this.btnExitDev.Size = new System.Drawing.Size(20, 20); - this.btnExitDev.TabIndex = 2; - this.btnExitDev.UseVisualStyleBackColor = false; - this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_accurary.Location = new System.Drawing.Point(83, 446); + this.btn_accurary.Name = "btn_accurary"; + this.btn_accurary.Size = new System.Drawing.Size(79, 31); + this.btn_accurary.TabIndex = 5; + this.btn_accurary.Text = "频率准确度"; + this.btn_accurary.UseVisualStyleBackColor = true; // // btn_stability // @@ -406,12 +185,212 @@ this.btn_stability.Text = "频率稳定度"; this.btn_stability.UseVisualStyleBackColor = true; // + // dataGridView_Data + // + this.dataGridView_Data.AllowUserToAddRows = false; + this.dataGridView_Data.AllowUserToDeleteRows = false; + this.dataGridView_Data.AllowUserToResizeColumns = false; + this.dataGridView_Data.AllowUserToResizeRows = false; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Data.ColumnHeadersHeight = 40; + this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_Data.Location = new System.Drawing.Point(6, 14); + this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Data.Name = "dataGridView_Data"; + this.dataGridView_Data.ReadOnly = true; + this.dataGridView_Data.RowHeadersVisible = false; + this.dataGridView_Data.RowHeadersWidth = 30; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.NullValue = "-"; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle8; + this.dataGridView_Data.RowTemplate.Height = 44; + this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_Data.Size = new System.Drawing.Size(425, 429); + this.dataGridView_Data.TabIndex = 3; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label_customerComp); + this.groupBox2.Controls.Add(this.label_devCode); + this.groupBox2.Controls.Add(this.label_customerName); + this.groupBox2.Controls.Add(this.label_devModel); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox2.Location = new System.Drawing.Point(453, 39); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(433, 105); + this.groupBox2.TabIndex = 0; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "仪器基本信息"; + // + // label_customerComp + // + this.label_customerComp.BackColor = System.Drawing.Color.Transparent; + this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerComp.Location = new System.Drawing.Point(319, 64); + this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); + this.label_customerComp.Name = "label_customerComp"; + this.label_customerComp.Size = new System.Drawing.Size(111, 27); + this.label_customerComp.TabIndex = 80; + this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devCode + // + this.label_devCode.BackColor = System.Drawing.Color.Transparent; + this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devCode.Location = new System.Drawing.Point(319, 30); + this.label_devCode.Margin = new System.Windows.Forms.Padding(0); + this.label_devCode.Name = "label_devCode"; + this.label_devCode.Size = new System.Drawing.Size(111, 27); + this.label_devCode.TabIndex = 79; + this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_customerName + // + this.label_customerName.BackColor = System.Drawing.Color.Transparent; + this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerName.Location = new System.Drawing.Point(98, 62); + this.label_customerName.Margin = new System.Windows.Forms.Padding(0); + this.label_customerName.Name = "label_customerName"; + this.label_customerName.Size = new System.Drawing.Size(83, 27); + this.label_customerName.TabIndex = 76; + this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devModel + // + this.label_devModel.BackColor = System.Drawing.Color.Transparent; + this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devModel.Location = new System.Drawing.Point(98, 30); + this.label_devModel.Margin = new System.Windows.Forms.Padding(0); + this.label_devModel.Name = "label_devModel"; + this.label_devModel.Size = new System.Drawing.Size(83, 27); + this.label_devModel.TabIndex = 75; + this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(18, 62); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(80, 27); + this.label2.TabIndex = 72; + this.label2.Text = "联系人："; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(234, 64); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(85, 27); + this.label1.TabIndex = 71; + this.label1.Text = "送检单位："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Transparent; + this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(11, 30); + this.label9.Margin = new System.Windows.Forms.Padding(0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(87, 27); + this.label9.TabIndex = 70; + this.label9.Text = "仪器型号："; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.Transparent; + this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(238, 30); + this.label8.Margin = new System.Windows.Forms.Padding(0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(81, 27); + this.label8.TabIndex = 69; + this.label8.Text = "仪器编号："; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.panel2); + this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox3.Location = new System.Drawing.Point(453, 288); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(433, 244); + this.groupBox3.TabIndex = 19; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "频率稳定度"; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(14, 29); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(405, 199); + this.panel2.TabIndex = 0; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.dataGridView1); + this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox4.Location = new System.Drawing.Point(453, 150); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(433, 132); + this.groupBox4.TabIndex = 81; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "检测记录"; + // + // dataGridView1 + // + this.dataGridView1.BackgroundColor = System.Drawing.Color.White; + this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Location = new System.Drawing.Point(12, 24); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(407, 101); + this.dataGridView1.TabIndex = 0; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button1.Location = new System.Drawing.Point(314, 446); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(125, 31); + this.button1.TabIndex = 8; + this.button1.Text = "计数器范围及灵敏度"; + this.button1.UseVisualStyleBackColor = true; + // // DetailDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(898, 546); this.ControlBox = false; + this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -425,6 +404,8 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } @@ -444,14 +425,10 @@ private System.Windows.Forms.Button btn_accurary; private System.Windows.Forms.DataGridView dataGridView_Data; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label_startTime; private System.Windows.Forms.Label label_customerComp; private System.Windows.Forms.Label label_devCode; - private System.Windows.Forms.Label label_endTime; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label_customerName; private System.Windows.Forms.Label label_devModel; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; @@ -459,5 +436,8 @@ private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btn_stability; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index 93c641f..dff1a64 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -39,14 +39,22 @@ this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); this.labelCurrentPage = new System.Windows.Forms.Label(); - this.tableDevList = new System.Windows.Forms.DataGridView(); + this.dataGridView_DevList = new System.Windows.Forms.DataGridView(); this.panel2 = new System.Windows.Forms.Panel(); + this.btn_downDevStatus = new System.Windows.Forms.Button(); + this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.comboBox_DevStatus = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.All = new DevComponents.Editors.ComboItem(); this.toBeTested = new DevComponents.Editors.ComboItem(); this.testing = new DevComponents.Editors.ComboItem(); this.tested = new DevComponents.Editors.ComboItem(); this.labelDevStatus = new System.Windows.Forms.Label(); + this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevCode = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -57,18 +65,10 @@ this.inputCustomComp = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelCustomComp = new System.Windows.Forms.Label(); this.labelDevName = new System.Windows.Forms.Label(); - this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btn_downDevStatus = new System.Windows.Forms.Button(); - this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.panelNodata.SuspendLayout(); this.panelPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).BeginInit(); this.panel2.SuspendLayout(); this.SuspendLayout(); // @@ -77,7 +77,7 @@ this.panel1.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_list; this.panel1.Controls.Add(this.panelNodata); this.panel1.Controls.Add(this.panelPage); - this.panel1.Controls.Add(this.tableDevList); + this.panel1.Controls.Add(this.dataGridView_DevList); this.panel1.Controls.Add(this.panel2); this.panel1.Location = new System.Drawing.Point(10, 5); this.panel1.Margin = new System.Windows.Forms.Padding(0); @@ -164,31 +164,31 @@ this.labelCurrentPage.TabIndex = 315; this.labelCurrentPage.Text = "1"; // - // tableDevList + // dataGridView_DevList // - this.tableDevList.AllowUserToAddRows = false; - this.tableDevList.AllowUserToDeleteRows = false; - this.tableDevList.AllowUserToResizeColumns = false; - this.tableDevList.AllowUserToResizeRows = false; + this.dataGridView_DevList.AllowUserToAddRows = false; + this.dataGridView_DevList.AllowUserToDeleteRows = false; + this.dataGridView_DevList.AllowUserToResizeColumns = false; + this.dataGridView_DevList.AllowUserToResizeRows = false; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.tableDevList.BackgroundColor = System.Drawing.Color.White; - this.tableDevList.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.tableDevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.tableDevList.ColumnHeadersHeight = 40; - this.tableDevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.tableDevList.Location = new System.Drawing.Point(20, 100); - this.tableDevList.Margin = new System.Windows.Forms.Padding(0); - this.tableDevList.Name = "tableDevList"; - this.tableDevList.ReadOnly = true; - this.tableDevList.RowHeadersVisible = false; - this.tableDevList.RowHeadersWidth = 30; + this.dataGridView_DevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView_DevList.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_DevList.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_DevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_DevList.ColumnHeadersHeight = 40; + this.dataGridView_DevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_DevList.Location = new System.Drawing.Point(20, 100); + this.dataGridView_DevList.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_DevList.Name = "dataGridView_DevList"; + this.dataGridView_DevList.ReadOnly = true; + this.dataGridView_DevList.RowHeadersVisible = false; + this.dataGridView_DevList.RowHeadersWidth = 30; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); @@ -197,11 +197,11 @@ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.tableDevList.RowTemplate.Height = 44; - this.tableDevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.tableDevList.Size = new System.Drawing.Size(964, 480); - this.tableDevList.TabIndex = 2; + this.dataGridView_DevList.RowsDefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView_DevList.RowTemplate.Height = 44; + this.dataGridView_DevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_DevList.Size = new System.Drawing.Size(964, 480); + this.dataGridView_DevList.TabIndex = 2; // // panel2 // @@ -231,245 +231,6 @@ this.panel2.Size = new System.Drawing.Size(964, 80); this.panel2.TabIndex = 1; // - // comboBox_DevStatus - // - this.comboBox_DevStatus.DisplayMember = "Text"; - this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBox_DevStatus.FormattingEnabled = true; - this.comboBox_DevStatus.ItemHeight = 20; - this.comboBox_DevStatus.Items.AddRange(new object[] { - this.All, - this.toBeTested, - this.testing, - this.tested}); - this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); - this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); - this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); - this.comboBox_DevStatus.Name = "comboBox_DevStatus"; - this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 26); - this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBox_DevStatus.TabIndex = 2; - this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); - // - // All - // - this.All.Text = "全部"; - // - // toBeTested - // - this.toBeTested.Text = "待检测"; - this.toBeTested.Value = "1"; - // - // testing - // - this.testing.Text = "检测中"; - this.testing.Value = "2"; - // - // tested - // - this.tested.Text = "已检测"; - this.tested.Value = "3"; - // - // labelDevStatus - // - this.labelDevStatus.AutoSize = true; - this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; - this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevStatus.Location = new System.Drawing.Point(480, 45); - this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.labelDevStatus.Name = "labelDevStatus"; - this.labelDevStatus.Size = new System.Drawing.Size(74, 21); - this.labelDevStatus.TabIndex = 11; - this.labelDevStatus.Text = "仪器状态"; - // - // inputDevName - // - // - // - // - this.inputDevName.Border.Class = "TextBoxBorder"; - this.inputDevName.Border.CornerDiameter = 5; - this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevName.Location = new System.Drawing.Point(80, 3); - this.inputDevName.Margin = new System.Windows.Forms.Padding(0); - this.inputDevName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevName.Name = "inputDevName"; - this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 26); - this.inputDevName.TabIndex = 9; - this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevName.WatermarkText = "请输入仪器名称"; - // - // inputDevModel - // - // - // - // - this.inputDevModel.Border.Class = "TextBoxBorder"; - this.inputDevModel.Border.CornerDiameter = 5; - this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevModel.Location = new System.Drawing.Point(320, 3); - this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); - this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevModel.Name = "inputDevModel"; - this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 26); - this.inputDevModel.TabIndex = 8; - this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevModel.WatermarkText = "请输入仪器型号"; - // - // inputDevCode - // - // - // - // - this.inputDevCode.Border.Class = "TextBoxBorder"; - this.inputDevCode.Border.CornerDiameter = 5; - this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevCode.Location = new System.Drawing.Point(560, 3); - this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); - this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevCode.Name = "inputDevCode"; - this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 26); - this.inputDevCode.TabIndex = 7; - this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevCode.WatermarkText = "请输入仪器编号"; - // - // inputCustomName - // - // - // - // - this.inputCustomName.Border.Class = "TextBoxBorder"; - this.inputCustomName.Border.CornerDiameter = 5; - this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomName.Location = new System.Drawing.Point(320, 43); - this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomName.Name = "inputCustomName"; - this.inputCustomName.PreventEnterBeep = true; - this.inputCustomName.Size = new System.Drawing.Size(150, 26); - this.inputCustomName.TabIndex = 6; - this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomName.WatermarkText = "请输入联系人"; - // - // labelCustomName - // - this.labelCustomName.BackColor = System.Drawing.Color.Transparent; - this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomName.Location = new System.Drawing.Point(240, 45); - this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomName.Name = "labelCustomName"; - this.labelCustomName.Size = new System.Drawing.Size(74, 21); - this.labelCustomName.TabIndex = 5; - this.labelCustomName.Text = "联系人"; - this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // labelDevNo - // - this.labelDevNo.AutoSize = true; - this.labelDevNo.BackColor = System.Drawing.Color.Transparent; - this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevNo.Location = new System.Drawing.Point(480, 5); - this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); - this.labelDevNo.Name = "labelDevNo"; - this.labelDevNo.Size = new System.Drawing.Size(74, 21); - this.labelDevNo.TabIndex = 4; - this.labelDevNo.Text = "仪器编号"; - // - // labelDevModel - // - this.labelDevModel.AutoSize = true; - this.labelDevModel.BackColor = System.Drawing.Color.Transparent; - this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevModel.Location = new System.Drawing.Point(240, 5); - this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); - this.labelDevModel.Name = "labelDevModel"; - this.labelDevModel.Size = new System.Drawing.Size(74, 21); - this.labelDevModel.TabIndex = 4; - this.labelDevModel.Text = "仪器型号"; - // - // inputCustomComp - // - // - // - // - this.inputCustomComp.Border.Class = "TextBoxBorder"; - this.inputCustomComp.Border.CornerDiameter = 5; - this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomComp.Border.MaximumHeight = 26; - this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomComp.Location = new System.Drawing.Point(80, 43); - this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomComp.Name = "inputCustomComp"; - this.inputCustomComp.PreventEnterBeep = true; - this.inputCustomComp.Size = new System.Drawing.Size(150, 26); - this.inputCustomComp.TabIndex = 3; - this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomComp.WatermarkText = "请输入送检单位名称"; - // - // labelCustomComp - // - this.labelCustomComp.AutoSize = true; - this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; - this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomComp.Location = new System.Drawing.Point(0, 45); - this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomComp.Name = "labelCustomComp"; - this.labelCustomComp.Size = new System.Drawing.Size(74, 21); - this.labelCustomComp.TabIndex = 0; - this.labelCustomComp.Text = "送检单位"; - // - // labelDevName - // - this.labelDevName.AutoSize = true; - this.labelDevName.BackColor = System.Drawing.Color.Transparent; - this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevName.Location = new System.Drawing.Point(0, 5); - this.labelDevName.Margin = new System.Windows.Forms.Padding(0); - this.labelDevName.Name = "labelDevName"; - this.labelDevName.Size = new System.Drawing.Size(74, 21); - this.labelDevName.TabIndex = 0; - this.labelDevName.Text = "仪器名称"; - // - // inputDevStatus - // - // - // - // - this.inputDevStatus.Border.Class = "TextBoxBorder"; - this.inputDevStatus.Border.CornerDiameter = 5; - this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevStatus.Location = new System.Drawing.Point(560, 43); - this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevStatus.Name = "inputDevStatus"; - this.inputDevStatus.PreventEnterBeep = true; - this.inputDevStatus.Size = new System.Drawing.Size(150, 26); - this.inputDevStatus.TabIndex = 15; - this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevStatus.WatermarkText = "请选择仪器状态"; - // // btn_downDevStatus // this.btn_downDevStatus.BackColor = System.Drawing.Color.Transparent; @@ -488,6 +249,26 @@ this.btn_downDevStatus.UseVisualStyleBackColor = false; this.btn_downDevStatus.Click += new System.EventHandler(this.btn_downDevStatus_Click); // + // inputDevStatus + // + // + // + // + this.inputDevStatus.Border.Class = "TextBoxBorder"; + this.inputDevStatus.Border.CornerDiameter = 5; + this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevStatus.Location = new System.Drawing.Point(560, 42); + this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevStatus.Name = "inputDevStatus"; + this.inputDevStatus.PreventEnterBeep = true; + this.inputDevStatus.Size = new System.Drawing.Size(150, 28); + this.inputDevStatus.TabIndex = 15; + this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevStatus.WatermarkText = "请选择仪器状态"; + // // btnExport // this.btnExport.EnterBackColor = System.Drawing.Color.Blue; @@ -607,6 +388,59 @@ this.btnEdit.UseVisualStyleBackColor = true; this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click); // + // comboBox_DevStatus + // + this.comboBox_DevStatus.DisplayMember = "Text"; + this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.comboBox_DevStatus.FormattingEnabled = true; + this.comboBox_DevStatus.ItemHeight = 21; + this.comboBox_DevStatus.Items.AddRange(new object[] { + this.All, + this.toBeTested, + this.testing, + this.tested}); + this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); + this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); + this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); + this.comboBox_DevStatus.Name = "comboBox_DevStatus"; + this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 27); + this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.comboBox_DevStatus.TabIndex = 2; + this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); + // + // All + // + this.All.Text = "全部"; + // + // toBeTested + // + this.toBeTested.Text = "待检测"; + this.toBeTested.Value = "1"; + // + // testing + // + this.testing.Text = "检测中"; + this.testing.Value = "2"; + // + // tested + // + this.tested.Text = "已检测"; + this.tested.Value = "3"; + // + // labelDevStatus + // + this.labelDevStatus.AutoSize = true; + this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; + this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevStatus.Location = new System.Drawing.Point(480, 45); + this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.labelDevStatus.Name = "labelDevStatus"; + this.labelDevStatus.Size = new System.Drawing.Size(74, 21); + this.labelDevStatus.TabIndex = 11; + this.labelDevStatus.Text = "仪器状态"; + // // btnQuery // this.btnQuery.EnterBackColor = System.Drawing.Color.Blue; @@ -631,6 +465,172 @@ this.btnQuery.UseVisualStyleBackColor = true; this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click); // + // inputDevName + // + // + // + // + this.inputDevName.Border.Class = "TextBoxBorder"; + this.inputDevName.Border.CornerDiameter = 5; + this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevName.Location = new System.Drawing.Point(80, 3); + this.inputDevName.Margin = new System.Windows.Forms.Padding(0); + this.inputDevName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevName.Name = "inputDevName"; + this.inputDevName.PreventEnterBeep = true; + this.inputDevName.Size = new System.Drawing.Size(150, 28); + this.inputDevName.TabIndex = 9; + this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevName.WatermarkText = "请输入仪器名称"; + // + // inputDevModel + // + // + // + // + this.inputDevModel.Border.Class = "TextBoxBorder"; + this.inputDevModel.Border.CornerDiameter = 5; + this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevModel.Location = new System.Drawing.Point(320, 3); + this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); + this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevModel.Name = "inputDevModel"; + this.inputDevModel.PreventEnterBeep = true; + this.inputDevModel.Size = new System.Drawing.Size(150, 28); + this.inputDevModel.TabIndex = 8; + this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevModel.WatermarkText = "请输入仪器型号"; + // + // inputDevCode + // + // + // + // + this.inputDevCode.Border.Class = "TextBoxBorder"; + this.inputDevCode.Border.CornerDiameter = 5; + this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevCode.Location = new System.Drawing.Point(560, 3); + this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); + this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevCode.Name = "inputDevCode"; + this.inputDevCode.PreventEnterBeep = true; + this.inputDevCode.Size = new System.Drawing.Size(150, 28); + this.inputDevCode.TabIndex = 7; + this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevCode.WatermarkText = "请输入仪器编号"; + // + // inputCustomName + // + // + // + // + this.inputCustomName.Border.Class = "TextBoxBorder"; + this.inputCustomName.Border.CornerDiameter = 5; + this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomName.Location = new System.Drawing.Point(320, 43); + this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomName.Name = "inputCustomName"; + this.inputCustomName.PreventEnterBeep = true; + this.inputCustomName.Size = new System.Drawing.Size(150, 28); + this.inputCustomName.TabIndex = 6; + this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomName.WatermarkText = "请输入联系人"; + // + // labelCustomName + // + this.labelCustomName.BackColor = System.Drawing.Color.Transparent; + this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomName.Location = new System.Drawing.Point(240, 45); + this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomName.Name = "labelCustomName"; + this.labelCustomName.Size = new System.Drawing.Size(74, 21); + this.labelCustomName.TabIndex = 5; + this.labelCustomName.Text = "联系人"; + this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // labelDevNo + // + this.labelDevNo.AutoSize = true; + this.labelDevNo.BackColor = System.Drawing.Color.Transparent; + this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevNo.Location = new System.Drawing.Point(480, 5); + this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); + this.labelDevNo.Name = "labelDevNo"; + this.labelDevNo.Size = new System.Drawing.Size(74, 21); + this.labelDevNo.TabIndex = 4; + this.labelDevNo.Text = "仪器编号"; + // + // labelDevModel + // + this.labelDevModel.AutoSize = true; + this.labelDevModel.BackColor = System.Drawing.Color.Transparent; + this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevModel.Location = new System.Drawing.Point(240, 5); + this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); + this.labelDevModel.Name = "labelDevModel"; + this.labelDevModel.Size = new System.Drawing.Size(74, 21); + this.labelDevModel.TabIndex = 4; + this.labelDevModel.Text = "仪器型号"; + // + // inputCustomComp + // + // + // + // + this.inputCustomComp.Border.Class = "TextBoxBorder"; + this.inputCustomComp.Border.CornerDiameter = 5; + this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomComp.Border.MaximumHeight = 26; + this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomComp.Location = new System.Drawing.Point(80, 43); + this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomComp.Name = "inputCustomComp"; + this.inputCustomComp.PreventEnterBeep = true; + this.inputCustomComp.Size = new System.Drawing.Size(150, 28); + this.inputCustomComp.TabIndex = 3; + this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomComp.WatermarkText = "请输入送检单位名称"; + // + // labelCustomComp + // + this.labelCustomComp.AutoSize = true; + this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; + this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomComp.Location = new System.Drawing.Point(0, 45); + this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomComp.Name = "labelCustomComp"; + this.labelCustomComp.Size = new System.Drawing.Size(74, 21); + this.labelCustomComp.TabIndex = 0; + this.labelCustomComp.Text = "送检单位"; + // + // labelDevName + // + this.labelDevName.AutoSize = true; + this.labelDevName.BackColor = System.Drawing.Color.Transparent; + this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevName.Location = new System.Drawing.Point(0, 5); + this.labelDevName.Margin = new System.Windows.Forms.Padding(0); + this.labelDevName.Name = "labelDevName"; + this.labelDevName.Size = new System.Drawing.Size(74, 21); + this.labelDevName.TabIndex = 0; + this.labelDevName.Text = "仪器名称"; + // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -644,7 +644,7 @@ this.panelNodata.ResumeLayout(false); this.panelPage.ResumeLayout(false); this.panelPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); this.ResumeLayout(false); @@ -677,7 +677,7 @@ private RoundButton btnDelete; private RoundButton btnDetail; private RoundButton btnExport; - private System.Windows.Forms.DataGridView tableDevList; + private System.Windows.Forms.DataGridView dataGridView_DevList; private System.Windows.Forms.Button btnNext; private System.Windows.Forms.Button btnPre; private System.Windows.Forms.Label labelPageCount; diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 1ac72dc..93262a9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -51,8 +51,8 @@ private void InitTableDevList() { - tableDevList.Columns.Clear(); - tableDevList.Rows.Clear(); + dataGridView_DevList.Columns.Clear(); + dataGridView_DevList.Rows.Clear(); // 添加标题栏 Panel tableHeader = new Panel @@ -62,7 +62,7 @@ Location = new Point(0, 0) }; tableHeader.BackColor = titleBackColor; - tableDevList.Controls.Add(tableHeader); + dataGridView_DevList.Controls.Add(tableHeader); // 序号 Label colNo = new Label { @@ -75,7 +75,7 @@ Location = new Point(0, 0), Size = new Size(80, 40) }; - tableDevList.Controls.Add(colNo); + dataGridView_DevList.Controls.Add(colNo); colNo.BringToFront(); // 登记时间 @@ -90,7 +90,7 @@ Location = new Point(80, 0), Size = new Size(164, 40) }; - tableDevList.Controls.Add(colRegTime); + dataGridView_DevList.Controls.Add(colRegTime); colRegTime.BringToFront(); // 仪器名称 @@ -105,7 +105,7 @@ Location = new Point(244, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevName); + dataGridView_DevList.Controls.Add(colDevName); colDevName.BringToFront(); // 仪器型号 @@ -120,7 +120,7 @@ Location = new Point(364, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevType); + dataGridView_DevList.Controls.Add(colDevType); colDevType.BringToFront(); // 仪器编号 @@ -135,7 +135,7 @@ Location = new Point(484, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevNo); + dataGridView_DevList.Controls.Add(colDevNo); colDevNo.BringToFront(); // 客户名称 @@ -150,7 +150,7 @@ Location = new Point(604, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colCustomName); + dataGridView_DevList.Controls.Add(colCustomName); colCustomName.BringToFront(); // 设备状态 @@ -165,7 +165,7 @@ Location = new Point(724, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevStatus); + dataGridView_DevList.Controls.Add(colDevStatus); colDevStatus.BringToFront(); // 通道号 @@ -180,7 +180,7 @@ Location = new Point(844, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colChannelNo); + dataGridView_DevList.Controls.Add(colChannelNo); colChannelNo.BringToFront(); } @@ -198,6 +198,7 @@ devList.Columns.Add("status", Type.GetType("System.String")); devList.Columns.Add("channelNo", Type.GetType("System.String")); devList.Columns.Add("id", Type.GetType("System.Int32")); + devList.Columns.Add("customerDev", Type.GetType("System.String")); // 分页查询数据库 string devName = ""; @@ -252,7 +253,7 @@ foreach ( DeviceDto device in queryList ) { int index = (page-1) * limitCount + i + 1; - devList.Rows.Add(index, device.RegTime, device.DevName, device.DevModel, device.DevCode, device.CustomerName, device.StatusName, device.Channel, device.Id); + devList.Rows.Add(index, device.RegTime, device.DevName, device.DevModel, device.DevCode, device.CustomerName, device.StatusName, device.Channel, device.Id, device.CustomerDev); i++; } @@ -265,30 +266,31 @@ this.Controls.Find("panelPage", true)[0].Hide(); } - tableDevList.DataSource = devList; + dataGridView_DevList.DataSource = devList; // width=964px - tableDevList.Columns[0].Width = 80; - tableDevList.Columns[1].Width = 164; - tableDevList.Columns[2].Width = 120; - tableDevList.Columns[3].Width = 120; - tableDevList.Columns[4].Width = 120; - tableDevList.Columns[5].Width = 120; - tableDevList.Columns[6].Width = 120; - tableDevList.Columns[7].Width = 120; - tableDevList.Columns[8].Width = 0; + dataGridView_DevList.Columns[0].Width = 80; + dataGridView_DevList.Columns[1].Width = 164; + dataGridView_DevList.Columns[2].Width = 120; + dataGridView_DevList.Columns[3].Width = 120; + dataGridView_DevList.Columns[4].Width = 120; + dataGridView_DevList.Columns[5].Width = 120; + dataGridView_DevList.Columns[6].Width = 120; + dataGridView_DevList.Columns[7].Width = 120; + dataGridView_DevList.Columns[8].Width = 0; - tableDevList.Columns[8].Visible = false; // id不显示 + dataGridView_DevList.Columns[8].Visible = false; // id不显示 + dataGridView_DevList.Columns[9].Visible = false; // id不显示 - tableDevList.Columns[0].ReadOnly = true; - tableDevList.Columns[1].ReadOnly = true; - tableDevList.Columns[2].ReadOnly = true; - tableDevList.Columns[3].ReadOnly = true; - tableDevList.Columns[4].ReadOnly = true; - tableDevList.Columns[5].ReadOnly = true; - tableDevList.Columns[6].ReadOnly = true; - tableDevList.Columns[7].ReadOnly = true; - tableDevList.Columns[8].ReadOnly = true; + dataGridView_DevList.Columns[0].ReadOnly = true; + dataGridView_DevList.Columns[1].ReadOnly = true; + dataGridView_DevList.Columns[2].ReadOnly = true; + dataGridView_DevList.Columns[3].ReadOnly = true; + dataGridView_DevList.Columns[4].ReadOnly = true; + dataGridView_DevList.Columns[5].ReadOnly = true; + dataGridView_DevList.Columns[6].ReadOnly = true; + dataGridView_DevList.Columns[7].ReadOnly = true; + dataGridView_DevList.Columns[8].ReadOnly = true; } private int GetTotalCount(JObject condition) @@ -372,7 +374,7 @@ string devCode = inputDevCode.Text; string customComp = inputCustomComp.Text; string customName = inputCustomName.Text; - ComboBoxEx statusSelect = (ComboBoxEx)this.Controls.Find("inputDevStatus", true)[0]; + ComboBoxEx statusSelect = (ComboBoxEx)this.Controls.Find("comboBox_DevStatus", true)[0]; string devStatus = (string)((ComboItem)statusSelect.SelectedItem).Value; condition.RemoveAll(); @@ -442,16 +444,14 @@ private void btnDetail_Click(object sender, EventArgs e) { - int rowIndex = tableDevList.CurrentRow.Index; - int id = (int)tableDevList.Rows[rowIndex].Cells[8].Value; - MessageBox.Show(id.ToString()); + int rowIndex = dataGridView_DevList.CurrentRow.Index; + int id = (int)dataGridView_DevList.Rows[rowIndex].Cells[8].Value; DetailDlg detailDlg = new DetailDlg(); - detailDlg.Controls.Find("label_devName", true)[0].Text = tableDevList.Rows[rowIndex].Cells[2].Value.ToString(); - detailDlg.Controls.Find("label_devModel", true)[0].Text = tableDevList.Rows[rowIndex].Cells[3].Value.ToString(); - detailDlg.Controls.Find("label_devCode", true)[0].Text = tableDevList.Rows[rowIndex].Cells[4].Value.ToString(); - detailDlg.Controls.Find("label_customerComp", true)[0].Text = tableDevList.Rows[rowIndex].Cells[5].Value.ToString(); - detailDlg.Controls.Find("label_customerName", true)[0].Text = tableDevList.Rows[rowIndex].Cells[5].Value.ToString(); + detailDlg.Controls.Find("label_devModel", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[3].Value.ToString(); + detailDlg.Controls.Find("label_devCode", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[4].Value.ToString(); + detailDlg.Controls.Find("label_customerComp", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[9].Value.ToString(); + detailDlg.Controls.Find("label_customerName", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[5].Value.ToString(); detailDlg.HideMaskAction += () => { @@ -464,18 +464,27 @@ private void btnEdit_Click(object sender, EventArgs e) { - int rowIndex = tableDevList.CurrentRow.Index; - int id = (int)tableDevList.Rows[rowIndex].Cells[8].Value; - string devName = (string)tableDevList.Rows[rowIndex].Cells[2].Value; - string devModel = (string)tableDevList.Rows[rowIndex].Cells[3].Value; - string devCode = (string)tableDevList.Rows[rowIndex].Cells[4].Value; + int rowIndex = dataGridView_DevList.CurrentRow.Index; + int id = (int)dataGridView_DevList.Rows[rowIndex].Cells[8].Value; + string devName = (string)dataGridView_DevList.Rows[rowIndex].Cells[2].Value; + string devModel = (string)dataGridView_DevList.Rows[rowIndex].Cells[3].Value; + string devCode = (string)dataGridView_DevList.Rows[rowIndex].Cells[4].Value; AddDevDlg editDlg = new AddDevDlg(); - editDlg.Controls.Find("labelTitle", true)[0].Text = "修改送检仪器"; + editDlg.Controls.Find("labelTitle", true)[0].Text = "修改仪器"; editDlg.Controls.Find("inputDevName", true)[0].Text = devName; editDlg.Controls.Find("inputDevModel", true)[0].Text = devModel; editDlg.Controls.Find("inputDevCode", true)[0].Text = devCode; - + editDlg.text_devType.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[2].Value; + editDlg.inputCustComp.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[9].Value; + editDlg.inputCustName.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[5].Value; + editDlg.text_channelNo.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[7].Value; + editDlg.btnSave.Text = "保存"; + if (((string)dataGridView_DevList.Rows[rowIndex].Cells[6].Value).Equals("检测中")) + { + editDlg.btn_downChannelList.Enabled = false; + editDlg.text_channelNo.ReadOnly = true; + } editDlg.HideMaskAction += () => { this.HideMask(); @@ -492,16 +501,22 @@ private void comboBox_DevStatus_SelectedIndexChanged(object sender, EventArgs e) { - inputDevStatus.Text = comboBox_DevStatus.SelectedText; + inputDevStatus.Text = comboBox_DevStatus.SelectedItem.ToString(); } private void btnDelete_Click(object sender, EventArgs e) { + if (((string)dataGridView_DevList.Rows[dataGridView_DevList.CurrentRow.Index].Cells[6].Value).Equals("检测中")) + { + MessageBox.Show("该仪器在检测中，无法删除！"); + return; + } if (MessageBox.Show("确认删除选中仪器？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - + deviceService.delete(Convert.ToInt32(dataGridView_DevList.Rows[dataGridView_DevList.CurrentRow.Index].Cells[8].Value)); MessageBox.Show("删除成功", "提示"); + LoadDevList(condition); } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs index 9157e65..d5ff4fa 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -29,19 +29,17 @@ /// private void InitializeComponent() { - this.checkBox9 = new System.Windows.Forms.CheckBox(); - this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.checkBox_startNow = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.channel1 = new DevComponents.Editors.ComboItem(); - this.channel2 = new DevComponents.Editors.ComboItem(); - this.channel3 = new DevComponents.Editors.ComboItem(); - this.channel4 = new DevComponents.Editors.ComboItem(); - this.channel5 = new DevComponents.Editors.ComboItem(); + this.btn_downTypeList = new System.Windows.Forms.Button(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label7 = new System.Windows.Forms.Label(); + this.btn_downChannelList = new System.Windows.Forms.Button(); + this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label4 = new System.Windows.Forms.Label(); this.inputCustName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label2 = new System.Windows.Forms.Label(); @@ -53,22 +51,31 @@ this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.cbBox_devType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.channel1 = new DevComponents.Editors.ComboItem(); + this.channel2 = new DevComponents.Editors.ComboItem(); + this.channel3 = new DevComponents.Editors.ComboItem(); + this.channel4 = new DevComponents.Editors.ComboItem(); + this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); + this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); + this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); + this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.endTimeEst = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.checkBox10 = new System.Windows.Forms.CheckBox(); - this.checkBox11 = new System.Windows.Forms.CheckBox(); - this.checkBox12 = new System.Windows.Forms.CheckBox(); - this.checkBox13 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox_100s = new System.Windows.Forms.CheckBox(); + this.checkBox_20s = new System.Windows.Forms.CheckBox(); + this.checkBox_10s = new System.Windows.Forms.CheckBox(); + this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -77,62 +84,18 @@ this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // checkBox9 + // checkBox_startNow // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(491, 355); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 19; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; - // - // btnSave - // - this.btnSave.EnterBackColor = System.Drawing.Color.Blue; - this.btnSave.EnterForeColor = System.Drawing.Color.White; - this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnSave.FlatAppearance.BorderSize = 0; - this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); - this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(141, 351); - this.btnSave.Name = "btnSave"; - this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnSave.PressForeColor = System.Drawing.Color.White; - this.btnSave.Radius = 5; - this.btnSave.Size = new System.Drawing.Size(120, 30); - this.btnSave.TabIndex = 17; - this.btnSave.Text = "开始检测"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnCancelSetDev - // - this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; - this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnCancelSetDev.FlatAppearance.BorderSize = 0; - this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(301, 351); - this.btnCancelSetDev.Name = "btnCancelSetDev"; - this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Radius = 5; - this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); - this.btnCancelSetDev.TabIndex = 18; - this.btnCancelSetDev.Text = "取消"; - this.btnCancelSetDev.UseVisualStyleBackColor = true; - this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.checkBox_startNow.AutoSize = true; + this.checkBox_startNow.Enabled = false; + this.checkBox_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_startNow.Location = new System.Drawing.Point(500, 429); + this.checkBox_startNow.Name = "checkBox_startNow"; + this.checkBox_startNow.Size = new System.Drawing.Size(84, 24); + this.checkBox_startNow.TabIndex = 19; + this.checkBox_startNow.Text = "立即开始"; + this.checkBox_startNow.UseVisualStyleBackColor = true; + this.checkBox_startNow.CheckedChanged += new System.EventHandler(this.checkBox_startNow_CheckedChanged); // // panel1 // @@ -141,7 +104,7 @@ this.panel1.Controls.Add(this.labelTitle); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(640, 32); this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -153,7 +116,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(610, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -174,7 +137,12 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.channelFree); + this.groupBox4.Controls.Add(this.btn_downTypeList); + this.groupBox4.Controls.Add(this.text_devType); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.btn_downChannelList); + this.groupBox4.Controls.Add(this.text_channelNo); + this.groupBox4.Controls.Add(this.cbBox_channelFree); this.groupBox4.Controls.Add(this.label4); this.groupBox4.Controls.Add(this.inputCustName); this.groupBox4.Controls.Add(this.label2); @@ -186,57 +154,116 @@ this.groupBox4.Controls.Add(this.inputDevName); this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.cbBox_devType); this.groupBox4.Location = new System.Drawing.Point(10, 33); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(580, 140); + this.groupBox4.Size = new System.Drawing.Size(617, 175); this.groupBox4.TabIndex = 38; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // - // channelFree + // btn_downTypeList // - this.channelFree.DisplayMember = "Text"; - this.channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.channelFree.FormattingEnabled = true; - this.channelFree.ItemHeight = 18; - this.channelFree.Location = new System.Drawing.Point(400, 97); - this.channelFree.Name = "channelFree"; - this.channelFree.Size = new System.Drawing.Size(150, 24); - this.channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.channelFree.TabIndex = 41; + this.btn_downTypeList.BackColor = System.Drawing.Color.White; + this.btn_downTypeList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downTypeList.FlatAppearance.BorderSize = 0; + this.btn_downTypeList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downTypeList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downTypeList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downTypeList.Location = new System.Drawing.Point(541, 59); + this.btn_downTypeList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downTypeList.Name = "btn_downTypeList"; + this.btn_downTypeList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downTypeList.Size = new System.Drawing.Size(18, 23); + this.btn_downTypeList.TabIndex = 52; + this.btn_downTypeList.Text = "﹀"; + this.btn_downTypeList.UseVisualStyleBackColor = false; + this.btn_downTypeList.Click += new System.EventHandler(this.btn_downTypeList_Click); // - // channel1 + // text_devType // - this.channel1.Text = "通道1"; - this.channel1.Value = "1"; // - // channel2 // - this.channel2.Text = "通道2"; - this.channel2.Value = "2"; // - // channel3 + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.Location = new System.Drawing.Point(400, 57); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.Size = new System.Drawing.Size(162, 27); + this.text_devType.TabIndex = 50; // - this.channel3.Text = "通道3"; - this.channel3.Value = "3"; + // label7 // - // channel4 + this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(314, 57); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(76, 27); + this.label7.TabIndex = 51; + this.label7.Text = "仪器类型"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - this.channel4.Text = "通道4"; - this.channel4.Value = "4"; + // btn_downChannelList // - // channel5 + this.btn_downChannelList.BackColor = System.Drawing.Color.White; + this.btn_downChannelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downChannelList.FlatAppearance.BorderSize = 0; + this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downChannelList.Location = new System.Drawing.Point(249, 138); + this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downChannelList.Name = "btn_downChannelList"; + this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downChannelList.Size = new System.Drawing.Size(17, 23); + this.btn_downChannelList.TabIndex = 48; + this.btn_downChannelList.Text = "﹀"; + this.btn_downChannelList.UseVisualStyleBackColor = false; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // - this.channel5.Text = "通道5"; - this.channel5.Value = "5"; + // text_channelNo + // + this.text_channelNo.BackColor = System.Drawing.Color.White; + // + // + // + this.text_channelNo.Border.Class = "TextBoxBorder"; + this.text_channelNo.Border.CornerDiameter = 5; + this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_channelNo.Location = new System.Drawing.Point(110, 136); + this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); + this.text_channelNo.Name = "text_channelNo"; + this.text_channelNo.PreventEnterBeep = true; + this.text_channelNo.ReadOnly = true; + this.text_channelNo.Size = new System.Drawing.Size(162, 27); + this.text_channelNo.TabIndex = 49; + // + // cbBox_channelFree + // + this.cbBox_channelFree.DisplayMember = "Text"; + this.cbBox_channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_channelFree.FormattingEnabled = true; + this.cbBox_channelFree.ItemHeight = 18; + this.cbBox_channelFree.Location = new System.Drawing.Point(110, 136); + this.cbBox_channelFree.Name = "cbBox_channelFree"; + this.cbBox_channelFree.Size = new System.Drawing.Size(150, 24); + this.cbBox_channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_channelFree.TabIndex = 41; + this.cbBox_channelFree.SelectedIndexChanged += new System.EventHandler(this.cbBox_channelFree_SelectedIndexChanged); // // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(290, 94); + this.label4.Location = new System.Drawing.Point(13, 136); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); + this.label4.Size = new System.Drawing.Size(86, 27); this.label4.TabIndex = 47; this.label4.Text = "选择通道"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -250,17 +277,17 @@ this.inputCustName.Border.CornerDiameter = 5; this.inputCustName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustName.Location = new System.Drawing.Point(110, 94); + this.inputCustName.Location = new System.Drawing.Point(401, 94); this.inputCustName.Margin = new System.Windows.Forms.Padding(0); this.inputCustName.Name = "inputCustName"; this.inputCustName.PreventEnterBeep = true; - this.inputCustName.Size = new System.Drawing.Size(150, 27); + this.inputCustName.Size = new System.Drawing.Size(162, 27); this.inputCustName.TabIndex = 40; // // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(20, 94); + this.label2.Location = new System.Drawing.Point(310, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(80, 27); @@ -277,11 +304,11 @@ this.inputCustComp.Border.CornerDiameter = 5; this.inputCustComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustComp.Location = new System.Drawing.Point(400, 57); + this.inputCustComp.Location = new System.Drawing.Point(110, 98); this.inputCustComp.Margin = new System.Windows.Forms.Padding(0); this.inputCustComp.Name = "inputCustComp"; this.inputCustComp.PreventEnterBeep = true; - this.inputCustComp.Size = new System.Drawing.Size(150, 27); + this.inputCustComp.Size = new System.Drawing.Size(162, 27); this.inputCustComp.TabIndex = 39; // // inputDevModel @@ -297,16 +324,16 @@ this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); this.inputDevModel.Name = "inputDevModel"; this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 27); + this.inputDevModel.Size = new System.Drawing.Size(162, 27); this.inputDevModel.TabIndex = 38; // // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(290, 57); + this.label1.Location = new System.Drawing.Point(9, 98); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); + this.label1.Size = new System.Drawing.Size(91, 27); this.label1.TabIndex = 45; this.label1.Text = "送检单位"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -335,7 +362,7 @@ this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); this.inputDevCode.Name = "inputDevCode"; this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 27); + this.inputDevCode.Size = new System.Drawing.Size(162, 27); this.inputDevCode.TabIndex = 37; // // inputDevName @@ -351,7 +378,7 @@ this.inputDevName.Margin = new System.Windows.Forms.Padding(0); this.inputDevName.Name = "inputDevName"; this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 27); + this.inputDevName.Size = new System.Drawing.Size(162, 27); this.inputDevName.TabIndex = 36; // // label8 @@ -376,22 +403,120 @@ this.label5.Text = "仪器名称"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // cbBox_devType + // + this.cbBox_devType.DisplayMember = "Text"; + this.cbBox_devType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_devType.FormattingEnabled = true; + this.cbBox_devType.ItemHeight = 18; + this.cbBox_devType.Location = new System.Drawing.Point(402, 59); + this.cbBox_devType.Name = "cbBox_devType"; + this.cbBox_devType.Size = new System.Drawing.Size(158, 24); + this.cbBox_devType.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_devType.TabIndex = 54; + this.cbBox_devType.SelectedIndexChanged += new System.EventHandler(this.cbBox_devType_SelectedIndexChanged); + // + // channel1 + // + this.channel1.Text = "通道1"; + this.channel1.Value = "1"; + // + // channel2 + // + this.channel2.Text = "通道2"; + this.channel2.Value = "2"; + // + // channel3 + // + this.channel3.Text = "通道3"; + this.channel3.Value = "3"; + // + // channel4 + // + this.channel4.Text = "通道4"; + this.channel4.Value = "4"; + // + // channel5 + // + this.channel5.Text = "通道5"; + this.channel5.Value = "5"; + // // groupBox1 // + this.groupBox1.Controls.Add(this.checkBox_count); + this.groupBox1.Controls.Add(this.checkBox_ageRate); + this.groupBox1.Controls.Add(this.checkBox_bootFeature); + this.groupBox1.Controls.Add(this.checkBox_accuracy); + this.groupBox1.Controls.Add(this.checkBox_stability); this.groupBox1.Controls.Add(this.endTimeEst); this.groupBox1.Controls.Add(this.startTime); - this.groupBox1.Controls.Add(this.checkBox10); - this.groupBox1.Controls.Add(this.checkBox11); - this.groupBox1.Controls.Add(this.checkBox12); - this.groupBox1.Controls.Add(this.checkBox13); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label12); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(10, 174); + this.groupBox1.Enabled = false; + this.groupBox1.Location = new System.Drawing.Point(10, 212); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 98); + this.groupBox1.Size = new System.Drawing.Size(617, 140); this.groupBox1.TabIndex = 39; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(114, 55); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 351; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // checkBox_ageRate + // + this.checkBox_ageRate.AutoSize = true; + this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_ageRate.Location = new System.Drawing.Point(467, 25); + this.checkBox_ageRate.Name = "checkBox_ageRate"; + this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); + this.checkBox_ageRate.TabIndex = 350; + this.checkBox_ageRate.Text = "日老化率"; + this.checkBox_ageRate.UseVisualStyleBackColor = true; + // + // checkBox_bootFeature + // + this.checkBox_bootFeature.AutoSize = true; + this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_bootFeature.Location = new System.Drawing.Point(348, 25); + this.checkBox_bootFeature.Name = "checkBox_bootFeature"; + this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); + this.checkBox_bootFeature.TabIndex = 349; + this.checkBox_bootFeature.Text = "开机特性"; + this.checkBox_bootFeature.UseVisualStyleBackColor = true; + // + // checkBox_accuracy + // + this.checkBox_accuracy.AutoSize = true; + this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_accuracy.Location = new System.Drawing.Point(232, 25); + this.checkBox_accuracy.Name = "checkBox_accuracy"; + this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); + this.checkBox_accuracy.TabIndex = 347; + this.checkBox_accuracy.Text = "频率准确度"; + this.checkBox_accuracy.UseVisualStyleBackColor = true; + // + // checkBox_stability + // + this.checkBox_stability.AutoSize = true; + this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_stability.Location = new System.Drawing.Point(114, 25); + this.checkBox_stability.Name = "checkBox_stability"; + this.checkBox_stability.Size = new System.Drawing.Size(98, 24); + this.checkBox_stability.TabIndex = 348; + this.checkBox_stability.Text = "频率稳定度"; + this.checkBox_stability.UseVisualStyleBackColor = true; + this.checkBox_stability.CheckedChanged += new System.EventHandler(this.checkBox_stability_CheckedChanged); // // endTimeEst // @@ -406,7 +531,7 @@ this.endTimeEst.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.endTimeEst.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.endTimeEst.IsPopupCalendarOpen = false; - this.endTimeEst.Location = new System.Drawing.Point(395, 57); + this.endTimeEst.Location = new System.Drawing.Point(395, 94); // // // @@ -456,7 +581,7 @@ this.startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.startTime.IsPopupCalendarOpen = false; - this.startTime.Location = new System.Drawing.Point(115, 57); + this.startTime.Location = new System.Drawing.Point(107, 94); // // // @@ -493,54 +618,10 @@ this.startTime.TabIndex = 43; this.startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); // - // checkBox10 - // - this.checkBox10.AutoSize = true; - this.checkBox10.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox10.Location = new System.Drawing.Point(425, 20); - this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(84, 24); - this.checkBox10.TabIndex = 42; - this.checkBox10.Text = "日老化率"; - this.checkBox10.UseVisualStyleBackColor = true; - // - // checkBox11 - // - this.checkBox11.AutoSize = true; - this.checkBox11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox11.Location = new System.Drawing.Point(331, 20); - this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(84, 24); - this.checkBox11.TabIndex = 41; - this.checkBox11.Text = "开机特性"; - this.checkBox11.UseVisualStyleBackColor = true; - // - // checkBox12 - // - this.checkBox12.AutoSize = true; - this.checkBox12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox12.Location = new System.Drawing.Point(223, 20); - this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(98, 24); - this.checkBox12.TabIndex = 39; - this.checkBox12.Text = "频率准确度"; - this.checkBox12.UseVisualStyleBackColor = true; - // - // checkBox13 - // - this.checkBox13.AutoSize = true; - this.checkBox13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox13.Location = new System.Drawing.Point(115, 20); - this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(98, 24); - this.checkBox13.TabIndex = 38; - this.checkBox13.Text = "频率稳定度"; - this.checkBox13.UseVisualStyleBackColor = true; - // // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(290, 55); + this.label3.Location = new System.Drawing.Point(290, 92); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -551,7 +632,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 55); + this.label12.Location = new System.Drawing.Point(5, 92); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(100, 27); @@ -562,7 +643,7 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 18); + this.label13.Location = new System.Drawing.Point(5, 23); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -573,13 +654,14 @@ // groupBox2 // this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.checkBox1); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.checkBox3); - this.groupBox2.Controls.Add(this.checkBox4); - this.groupBox2.Location = new System.Drawing.Point(9, 278); + this.groupBox2.Controls.Add(this.checkBox_100s); + this.groupBox2.Controls.Add(this.checkBox_20s); + this.groupBox2.Controls.Add(this.checkBox_10s); + this.groupBox2.Controls.Add(this.checkBox_1s); + this.groupBox2.Enabled = false; + this.groupBox2.Location = new System.Drawing.Point(9, 353); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 53); + this.groupBox2.Size = new System.Drawing.Size(618, 53); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; // @@ -594,60 +676,107 @@ this.label6.Text = "频率稳定度"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox1 + // checkBox_100s // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox1.Location = new System.Drawing.Point(425, 19); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(60, 24); - this.checkBox1.TabIndex = 42; - this.checkBox1.Text = "100S"; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox_100s.AutoSize = true; + this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_100s.Location = new System.Drawing.Point(468, 19); + this.checkBox_100s.Name = "checkBox_100s"; + this.checkBox_100s.Size = new System.Drawing.Size(60, 24); + this.checkBox_100s.TabIndex = 42; + this.checkBox_100s.Text = "100S"; + this.checkBox_100s.UseVisualStyleBackColor = true; // - // checkBox2 + // checkBox_20s // - this.checkBox2.AutoSize = true; - this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox2.Location = new System.Drawing.Point(331, 19); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(52, 24); - this.checkBox2.TabIndex = 41; - this.checkBox2.Text = "20S"; - this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox_20s.AutoSize = true; + this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_20s.Location = new System.Drawing.Point(349, 19); + this.checkBox_20s.Name = "checkBox_20s"; + this.checkBox_20s.Size = new System.Drawing.Size(52, 24); + this.checkBox_20s.TabIndex = 41; + this.checkBox_20s.Text = "20S"; + this.checkBox_20s.UseVisualStyleBackColor = true; // - // checkBox3 + // checkBox_10s // - this.checkBox3.AutoSize = true; - this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox3.Location = new System.Drawing.Point(223, 19); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(52, 24); - this.checkBox3.TabIndex = 40; - this.checkBox3.Text = "10S"; - this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox_10s.AutoSize = true; + this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_10s.Location = new System.Drawing.Point(233, 19); + this.checkBox_10s.Name = "checkBox_10s"; + this.checkBox_10s.Size = new System.Drawing.Size(52, 24); + this.checkBox_10s.TabIndex = 40; + this.checkBox_10s.Text = "10S"; + this.checkBox_10s.UseVisualStyleBackColor = true; // - // checkBox4 + // checkBox_1s // - this.checkBox4.AutoSize = true; - this.checkBox4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox4.Location = new System.Drawing.Point(115, 19); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(44, 24); - this.checkBox4.TabIndex = 39; - this.checkBox4.Text = "1S"; - this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox_1s.AutoSize = true; + this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_1s.Location = new System.Drawing.Point(115, 19); + this.checkBox_1s.Name = "checkBox_1s"; + this.checkBox_1s.Size = new System.Drawing.Size(44, 24); + this.checkBox_1s.TabIndex = 39; + this.checkBox_1s.Text = "1S"; + this.checkBox_1s.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(150, 425); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(120, 30); + this.btnSave.TabIndex = 17; + this.btnSave.Text = "开始检测"; + this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // btnCancelSetDev + // + this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancelSetDev.FlatAppearance.BorderSize = 0; + this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Location = new System.Drawing.Point(310, 425); + this.btnCancelSetDev.Name = "btnCancelSetDev"; + this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Radius = 5; + this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); + this.btnCancelSetDev.TabIndex = 18; + this.btnCancelSetDev.Text = "取消"; + this.btnCancelSetDev.UseVisualStyleBackColor = true; + this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); // // AddDevDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 407); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(642, 483); this.ControlBox = false; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox4); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_startNow); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.panel1); @@ -669,24 +798,16 @@ } #endregion - - private System.Windows.Forms.CheckBox checkBox9; - private RoundButton btnSave; private RoundButton btnCancelSetDev; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label labelTitle; private System.Windows.Forms.GroupBox groupBox4; - private DevComponents.DotNetBar.Controls.ComboBoxEx channelFree; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_channelFree; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustName; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevName; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.Editors.ComboItem channel1; @@ -695,20 +816,34 @@ private DevComponents.Editors.ComboItem channel4; private DevComponents.Editors.ComboItem channel5; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; - private DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; - private System.Windows.Forms.CheckBox checkBox10; - private System.Windows.Forms.CheckBox checkBox11; - private System.Windows.Forms.CheckBox checkBox12; - private System.Windows.Forms.CheckBox checkBox13; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; + public DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; + private System.Windows.Forms.Button btn_downTypeList; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_devType; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustName; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + public System.Windows.Forms.CheckBox checkBox_startNow; + public DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; + public DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; + public System.Windows.Forms.CheckBox checkBox_100s; + public System.Windows.Forms.CheckBox checkBox_20s; + public System.Windows.Forms.CheckBox checkBox_10s; + public System.Windows.Forms.CheckBox checkBox_1s; + public System.Windows.Forms.CheckBox checkBox_count; + public System.Windows.Forms.CheckBox checkBox_ageRate; + public System.Windows.Forms.CheckBox checkBox_bootFeature; + public System.Windows.Forms.CheckBox checkBox_accuracy; + public System.Windows.Forms.CheckBox checkBox_stability; + public System.Windows.Forms.Button btn_downChannelList; + public RoundButton btnSave; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs index 652c6b4..a2dbf38 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -27,6 +27,10 @@ } #endregion + DictService dictService = new DictServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + public Action HideMaskAction { get; @@ -37,7 +41,21 @@ { InitializeComponent(); - ((ComboBoxEx)this.Controls.Find("channelFree", true)[0]).SelectedIndex = 0; + cbBox_devType.DataSource = dictService.getTypeListByCodeType("devType"); + btnSave.Text = "添加仪器"; + if (HomeCtrlForm.channelFreeList.Count > 0) + { + cbBox_channelFree.Items.Add(""); + foreach (string item in HomeCtrlForm.channelFreeList) + { + cbBox_channelFree.Items.Add(item); + } + } + else + { + text_channelNo.WatermarkText = "无空闲通道可选"; + + } } // 关闭对话框 @@ -49,6 +67,19 @@ // 添加并开始检测 private void btnSave_Click(object sender, EventArgs e) { + if (text_channelNo.Text.Trim() != "") + { + if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + { + MessageBox.Show("请选择频率稳定度！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + } // 取得输入框的参数 string devName = ((TextBoxX) this.Controls.Find("inputDevName", true)[0]).Text; string devCode = ((TextBoxX) this.Controls.Find("inputDevCode", true)[0]).Text; @@ -56,7 +87,7 @@ string devCustomComp = ((TextBoxX)this.Controls.Find("inputCustComp", true)[0]).Text; string devCustomName = ((TextBoxX)this.Controls.Find("inputCustName", true)[0]).Text; - ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("channelFree", true)[0]; + ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("cbBox_channelFree", true)[0]; string channelNo = (string)((ComboItem)channels.SelectedItem).Value; // 初始化数据访问接口 @@ -64,13 +95,80 @@ int id = devService.add(devName, devCode, "1", devModel, devCustomComp, devCustomName, channelNo); if (id >= 0) { + if (btnSave.Text.Equals("添加并开始检测")) + { + //detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval); + // 重新加载首页的通道状态 + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + } // 添加成功，继续保存检测项目和开始时间 this.HideMaskAction(); + } else { LogHelper.WriteErrorLog(this.GetType(), "添加设备[" + devName + "]失败"); } } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = true; + } + + private void groupBox4_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void groupBox1_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void btn_downTypeList_Click(object sender, EventArgs e) + { + cbBox_devType.DroppedDown = true; + } + + private void checkBox_startNow_CheckedChanged(object sender, EventArgs e) + { + startTime.Value = DateTime.Now; + } + + private void cbBox_devType_SelectedIndexChanged(object sender, EventArgs e) + { + text_devType.Text = cbBox_devType.SelectedItem.ToString(); + } + + private void cbBox_channelFree_SelectedIndexChanged(object sender, EventArgs e) + { + text_channelNo.Text = cbBox_channelFree.SelectedItem.ToString(); + + if (text_channelNo.Text != "") + { + btnSave.Text = "添加并开始检测"; + checkBox_startNow.Enabled = true; + groupBox1.Enabled = true; + } + else + { + btnSave.Text = "添加仪器"; + groupBox1.Enabled = false; checkBox_startNow.Enabled = false; + } + } + + private void checkBox13_CheckedChanged(object sender, EventArgs e) + { + + } + + private void checkBox_stability_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_stability.Checked) groupBox2.Enabled = true; + else groupBox2.Enabled = false; + } } } diff --git a/RbFreqStandMeasure/info/DetailDlg.Designer.cs b/RbFreqStandMeasure/info/DetailDlg.Designer.cs index 05ffc1f..eeded9f 100644 --- a/RbFreqStandMeasure/info/DetailDlg.Designer.cs +++ b/RbFreqStandMeasure/info/DetailDlg.Designer.cs @@ -29,9 +29,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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(); this.panel1 = new System.Windows.Forms.Panel(); + this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.channel1 = new DevComponents.Editors.ComboItem(); this.channel2 = new DevComponents.Editors.ComboItem(); @@ -39,32 +40,32 @@ this.channel4 = new DevComponents.Editors.ComboItem(); this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.dataGridView_Data = new System.Windows.Forms.DataGridView(); - this.btn_accurary = new System.Windows.Forms.Button(); - this.btn_bootFeature = new System.Windows.Forms.Button(); this.btn_ageRate = new System.Windows.Forms.Button(); + this.btn_bootFeature = new System.Windows.Forms.Button(); + this.btn_accurary = new System.Windows.Forms.Button(); + this.btn_stability = new System.Windows.Forms.Button(); + this.dataGridView_Data = new System.Windows.Forms.DataGridView(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label_endTime = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label_customerComp = new System.Windows.Forms.Label(); + this.label_devCode = new System.Windows.Forms.Label(); this.label_customerName = new System.Windows.Forms.Label(); this.label_devModel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.label_startTime = new System.Windows.Forms.Label(); - this.label_customerComp = new System.Windows.Forms.Label(); - this.label_devCode = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnExitDev = new System.Windows.Forms.Button(); - this.btn_stability = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.button1 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).BeginInit(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -78,6 +79,22 @@ this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // + // btnExitDev + // + this.btnExitDev.BackColor = System.Drawing.Color.Transparent; + this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; + this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnExitDev.FlatAppearance.BorderSize = 0; + this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btnExitDev.Location = new System.Drawing.Point(869, 5); + this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); + this.btnExitDev.Name = "btnExitDev"; + this.btnExitDev.Size = new System.Drawing.Size(20, 20); + this.btnExitDev.TabIndex = 2; + this.btnExitDev.UseVisualStyleBackColor = false; + this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // // labelTitle // this.labelTitle.BackColor = System.Drawing.Color.Transparent; @@ -116,6 +133,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.btn_ageRate); this.groupBox1.Controls.Add(this.btn_bootFeature); this.groupBox1.Controls.Add(this.btn_accurary); @@ -123,278 +141,39 @@ this.groupBox1.Controls.Add(this.dataGridView_Data); this.groupBox1.Location = new System.Drawing.Point(8, 39); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(298, 493); + this.groupBox1.Size = new System.Drawing.Size(439, 493); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // - // dataGridView_Data - // - this.dataGridView_Data.AllowUserToAddRows = false; - this.dataGridView_Data.AllowUserToDeleteRows = false; - this.dataGridView_Data.AllowUserToResizeColumns = false; - this.dataGridView_Data.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Data.ColumnHeadersHeight = 40; - this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dataGridView_Data.Location = new System.Drawing.Point(5, 14); - this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Data.Name = "dataGridView_Data"; - this.dataGridView_Data.ReadOnly = true; - this.dataGridView_Data.RowHeadersVisible = false; - this.dataGridView_Data.RowHeadersWidth = 30; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.NullValue = "-"; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Data.RowTemplate.Height = 44; - this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView_Data.Size = new System.Drawing.Size(289, 429); - this.dataGridView_Data.TabIndex = 3; - // - // btn_accurary - // - this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_accurary.Location = new System.Drawing.Point(79, 446); - this.btn_accurary.Name = "btn_accurary"; - this.btn_accurary.Size = new System.Drawing.Size(79, 31); - this.btn_accurary.TabIndex = 5; - this.btn_accurary.Text = "频率准确度"; - this.btn_accurary.UseVisualStyleBackColor = true; - // - // btn_bootFeature - // - this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_bootFeature.Location = new System.Drawing.Point(154, 446); - this.btn_bootFeature.Name = "btn_bootFeature"; - this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); - this.btn_bootFeature.TabIndex = 6; - this.btn_bootFeature.Text = "开机特性"; - this.btn_bootFeature.UseVisualStyleBackColor = true; - // // btn_ageRate // this.btn_ageRate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_ageRate.Location = new System.Drawing.Point(222, 446); + this.btn_ageRate.Location = new System.Drawing.Point(240, 446); this.btn_ageRate.Name = "btn_ageRate"; this.btn_ageRate.Size = new System.Drawing.Size(75, 31); this.btn_ageRate.TabIndex = 7; this.btn_ageRate.Text = "日老化率"; this.btn_ageRate.UseVisualStyleBackColor = true; // - // groupBox2 + // btn_bootFeature // - this.groupBox2.Controls.Add(this.label_startTime); - this.groupBox2.Controls.Add(this.label_customerComp); - this.groupBox2.Controls.Add(this.label_devCode); - this.groupBox2.Controls.Add(this.label_endTime); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label_customerName); - this.groupBox2.Controls.Add(this.label_devModel); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox2.Location = new System.Drawing.Point(316, 39); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(570, 128); - this.groupBox2.TabIndex = 0; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "仪器基本信息"; + this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_bootFeature.Location = new System.Drawing.Point(161, 446); + this.btn_bootFeature.Name = "btn_bootFeature"; + this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); + this.btn_bootFeature.TabIndex = 6; + this.btn_bootFeature.Text = "开机特性"; + this.btn_bootFeature.UseVisualStyleBackColor = true; // - // label_endTime + // btn_accurary // - this.label_endTime.BackColor = System.Drawing.Color.Transparent; - this.label_endTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_endTime.Location = new System.Drawing.Point(154, 93); - this.label_endTime.Margin = new System.Windows.Forms.Padding(0); - this.label_endTime.Name = "label_endTime"; - this.label_endTime.Size = new System.Drawing.Size(83, 27); - this.label_endTime.TabIndex = 78; - this.label_endTime.Text = "仪器名称："; - this.label_endTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(54, 93); - this.label3.Margin = new System.Windows.Forms.Padding(0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(100, 27); - this.label3.TabIndex = 77; - this.label3.Text = "结束时间："; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerName - // - this.label_customerName.BackColor = System.Drawing.Color.Transparent; - this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerName.Location = new System.Drawing.Point(154, 57); - this.label_customerName.Margin = new System.Windows.Forms.Padding(0); - this.label_customerName.Name = "label_customerName"; - this.label_customerName.Size = new System.Drawing.Size(83, 27); - this.label_customerName.TabIndex = 76; - this.label_customerName.Text = "仪器名称："; - this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devModel - // - this.label_devModel.BackColor = System.Drawing.Color.Transparent; - this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devModel.Location = new System.Drawing.Point(154, 25); - this.label_devModel.Margin = new System.Windows.Forms.Padding(0); - this.label_devModel.Name = "label_devModel"; - this.label_devModel.Size = new System.Drawing.Size(83, 27); - this.label_devModel.TabIndex = 75; - this.label_devModel.Text = "仪器名称："; - this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(327, 93); - this.label4.Margin = new System.Windows.Forms.Padding(0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); - this.label4.TabIndex = 73; - this.label4.Text = "开始时间："; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(74, 57); - this.label2.Margin = new System.Windows.Forms.Padding(0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 27); - this.label2.TabIndex = 72; - this.label2.Text = "联系人："; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(327, 59); - this.label1.Margin = new System.Windows.Forms.Padding(0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); - this.label1.TabIndex = 71; - this.label1.Text = "送检单位："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(67, 25); - this.label9.Margin = new System.Windows.Forms.Padding(0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 27); - this.label9.TabIndex = 70; - this.label9.Text = "仪器型号："; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(327, 25); - this.label8.Margin = new System.Windows.Forms.Padding(0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(100, 27); - this.label8.TabIndex = 69; - this.label8.Text = "仪器编号："; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_startTime - // - this.label_startTime.BackColor = System.Drawing.Color.Transparent; - this.label_startTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_startTime.Location = new System.Drawing.Point(427, 93); - this.label_startTime.Margin = new System.Windows.Forms.Padding(0); - this.label_startTime.Name = "label_startTime"; - this.label_startTime.Size = new System.Drawing.Size(83, 27); - this.label_startTime.TabIndex = 81; - this.label_startTime.Text = "仪器名称："; - this.label_startTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerComp - // - this.label_customerComp.BackColor = System.Drawing.Color.Transparent; - this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerComp.Location = new System.Drawing.Point(427, 59); - this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); - this.label_customerComp.Name = "label_customerComp"; - this.label_customerComp.Size = new System.Drawing.Size(83, 27); - this.label_customerComp.TabIndex = 80; - this.label_customerComp.Text = "仪器名称："; - this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devCode - // - this.label_devCode.BackColor = System.Drawing.Color.Transparent; - this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devCode.Location = new System.Drawing.Point(427, 25); - this.label_devCode.Margin = new System.Windows.Forms.Padding(0); - this.label_devCode.Name = "label_devCode"; - this.label_devCode.Size = new System.Drawing.Size(83, 27); - this.label_devCode.TabIndex = 79; - this.label_devCode.Text = "仪器名称："; - this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.panel2); - this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox3.Location = new System.Drawing.Point(316, 173); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(570, 359); - this.groupBox3.TabIndex = 19; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "频率稳定度"; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(6, 25); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(558, 328); - this.panel2.TabIndex = 0; - // - // btnExitDev - // - this.btnExitDev.BackColor = System.Drawing.Color.Transparent; - this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; - this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnExitDev.FlatAppearance.BorderSize = 0; - this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(799, 5); - this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); - this.btnExitDev.Name = "btnExitDev"; - this.btnExitDev.Size = new System.Drawing.Size(20, 20); - this.btnExitDev.TabIndex = 2; - this.btnExitDev.UseVisualStyleBackColor = false; - this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_accurary.Location = new System.Drawing.Point(83, 446); + this.btn_accurary.Name = "btn_accurary"; + this.btn_accurary.Size = new System.Drawing.Size(79, 31); + this.btn_accurary.TabIndex = 5; + this.btn_accurary.Text = "频率准确度"; + this.btn_accurary.UseVisualStyleBackColor = true; // // btn_stability // @@ -406,12 +185,212 @@ this.btn_stability.Text = "频率稳定度"; this.btn_stability.UseVisualStyleBackColor = true; // + // dataGridView_Data + // + this.dataGridView_Data.AllowUserToAddRows = false; + this.dataGridView_Data.AllowUserToDeleteRows = false; + this.dataGridView_Data.AllowUserToResizeColumns = false; + this.dataGridView_Data.AllowUserToResizeRows = false; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Data.ColumnHeadersHeight = 40; + this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_Data.Location = new System.Drawing.Point(6, 14); + this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Data.Name = "dataGridView_Data"; + this.dataGridView_Data.ReadOnly = true; + this.dataGridView_Data.RowHeadersVisible = false; + this.dataGridView_Data.RowHeadersWidth = 30; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.NullValue = "-"; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle8; + this.dataGridView_Data.RowTemplate.Height = 44; + this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_Data.Size = new System.Drawing.Size(425, 429); + this.dataGridView_Data.TabIndex = 3; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label_customerComp); + this.groupBox2.Controls.Add(this.label_devCode); + this.groupBox2.Controls.Add(this.label_customerName); + this.groupBox2.Controls.Add(this.label_devModel); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox2.Location = new System.Drawing.Point(453, 39); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(433, 105); + this.groupBox2.TabIndex = 0; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "仪器基本信息"; + // + // label_customerComp + // + this.label_customerComp.BackColor = System.Drawing.Color.Transparent; + this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerComp.Location = new System.Drawing.Point(319, 64); + this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); + this.label_customerComp.Name = "label_customerComp"; + this.label_customerComp.Size = new System.Drawing.Size(111, 27); + this.label_customerComp.TabIndex = 80; + this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devCode + // + this.label_devCode.BackColor = System.Drawing.Color.Transparent; + this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devCode.Location = new System.Drawing.Point(319, 30); + this.label_devCode.Margin = new System.Windows.Forms.Padding(0); + this.label_devCode.Name = "label_devCode"; + this.label_devCode.Size = new System.Drawing.Size(111, 27); + this.label_devCode.TabIndex = 79; + this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_customerName + // + this.label_customerName.BackColor = System.Drawing.Color.Transparent; + this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerName.Location = new System.Drawing.Point(98, 62); + this.label_customerName.Margin = new System.Windows.Forms.Padding(0); + this.label_customerName.Name = "label_customerName"; + this.label_customerName.Size = new System.Drawing.Size(83, 27); + this.label_customerName.TabIndex = 76; + this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devModel + // + this.label_devModel.BackColor = System.Drawing.Color.Transparent; + this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devModel.Location = new System.Drawing.Point(98, 30); + this.label_devModel.Margin = new System.Windows.Forms.Padding(0); + this.label_devModel.Name = "label_devModel"; + this.label_devModel.Size = new System.Drawing.Size(83, 27); + this.label_devModel.TabIndex = 75; + this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(18, 62); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(80, 27); + this.label2.TabIndex = 72; + this.label2.Text = "联系人："; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(234, 64); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(85, 27); + this.label1.TabIndex = 71; + this.label1.Text = "送检单位："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Transparent; + this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(11, 30); + this.label9.Margin = new System.Windows.Forms.Padding(0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(87, 27); + this.label9.TabIndex = 70; + this.label9.Text = "仪器型号："; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.Transparent; + this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(238, 30); + this.label8.Margin = new System.Windows.Forms.Padding(0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(81, 27); + this.label8.TabIndex = 69; + this.label8.Text = "仪器编号："; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.panel2); + this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox3.Location = new System.Drawing.Point(453, 288); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(433, 244); + this.groupBox3.TabIndex = 19; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "频率稳定度"; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(14, 29); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(405, 199); + this.panel2.TabIndex = 0; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.dataGridView1); + this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox4.Location = new System.Drawing.Point(453, 150); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(433, 132); + this.groupBox4.TabIndex = 81; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "检测记录"; + // + // dataGridView1 + // + this.dataGridView1.BackgroundColor = System.Drawing.Color.White; + this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Location = new System.Drawing.Point(12, 24); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(407, 101); + this.dataGridView1.TabIndex = 0; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button1.Location = new System.Drawing.Point(314, 446); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(125, 31); + this.button1.TabIndex = 8; + this.button1.Text = "计数器范围及灵敏度"; + this.button1.UseVisualStyleBackColor = true; + // // DetailDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(898, 546); this.ControlBox = false; + this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -425,6 +404,8 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } @@ -444,14 +425,10 @@ private System.Windows.Forms.Button btn_accurary; private System.Windows.Forms.DataGridView dataGridView_Data; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label_startTime; private System.Windows.Forms.Label label_customerComp; private System.Windows.Forms.Label label_devCode; - private System.Windows.Forms.Label label_endTime; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label_customerName; private System.Windows.Forms.Label label_devModel; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; @@ -459,5 +436,8 @@ private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btn_stability; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index 93c641f..dff1a64 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -39,14 +39,22 @@ this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); this.labelCurrentPage = new System.Windows.Forms.Label(); - this.tableDevList = new System.Windows.Forms.DataGridView(); + this.dataGridView_DevList = new System.Windows.Forms.DataGridView(); this.panel2 = new System.Windows.Forms.Panel(); + this.btn_downDevStatus = new System.Windows.Forms.Button(); + this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.comboBox_DevStatus = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.All = new DevComponents.Editors.ComboItem(); this.toBeTested = new DevComponents.Editors.ComboItem(); this.testing = new DevComponents.Editors.ComboItem(); this.tested = new DevComponents.Editors.ComboItem(); this.labelDevStatus = new System.Windows.Forms.Label(); + this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevCode = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -57,18 +65,10 @@ this.inputCustomComp = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelCustomComp = new System.Windows.Forms.Label(); this.labelDevName = new System.Windows.Forms.Label(); - this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btn_downDevStatus = new System.Windows.Forms.Button(); - this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.panelNodata.SuspendLayout(); this.panelPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).BeginInit(); this.panel2.SuspendLayout(); this.SuspendLayout(); // @@ -77,7 +77,7 @@ this.panel1.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_list; this.panel1.Controls.Add(this.panelNodata); this.panel1.Controls.Add(this.panelPage); - this.panel1.Controls.Add(this.tableDevList); + this.panel1.Controls.Add(this.dataGridView_DevList); this.panel1.Controls.Add(this.panel2); this.panel1.Location = new System.Drawing.Point(10, 5); this.panel1.Margin = new System.Windows.Forms.Padding(0); @@ -164,31 +164,31 @@ this.labelCurrentPage.TabIndex = 315; this.labelCurrentPage.Text = "1"; // - // tableDevList + // dataGridView_DevList // - this.tableDevList.AllowUserToAddRows = false; - this.tableDevList.AllowUserToDeleteRows = false; - this.tableDevList.AllowUserToResizeColumns = false; - this.tableDevList.AllowUserToResizeRows = false; + this.dataGridView_DevList.AllowUserToAddRows = false; + this.dataGridView_DevList.AllowUserToDeleteRows = false; + this.dataGridView_DevList.AllowUserToResizeColumns = false; + this.dataGridView_DevList.AllowUserToResizeRows = false; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.tableDevList.BackgroundColor = System.Drawing.Color.White; - this.tableDevList.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.tableDevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.tableDevList.ColumnHeadersHeight = 40; - this.tableDevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.tableDevList.Location = new System.Drawing.Point(20, 100); - this.tableDevList.Margin = new System.Windows.Forms.Padding(0); - this.tableDevList.Name = "tableDevList"; - this.tableDevList.ReadOnly = true; - this.tableDevList.RowHeadersVisible = false; - this.tableDevList.RowHeadersWidth = 30; + this.dataGridView_DevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView_DevList.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_DevList.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_DevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_DevList.ColumnHeadersHeight = 40; + this.dataGridView_DevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_DevList.Location = new System.Drawing.Point(20, 100); + this.dataGridView_DevList.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_DevList.Name = "dataGridView_DevList"; + this.dataGridView_DevList.ReadOnly = true; + this.dataGridView_DevList.RowHeadersVisible = false; + this.dataGridView_DevList.RowHeadersWidth = 30; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); @@ -197,11 +197,11 @@ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.tableDevList.RowTemplate.Height = 44; - this.tableDevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.tableDevList.Size = new System.Drawing.Size(964, 480); - this.tableDevList.TabIndex = 2; + this.dataGridView_DevList.RowsDefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView_DevList.RowTemplate.Height = 44; + this.dataGridView_DevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_DevList.Size = new System.Drawing.Size(964, 480); + this.dataGridView_DevList.TabIndex = 2; // // panel2 // @@ -231,245 +231,6 @@ this.panel2.Size = new System.Drawing.Size(964, 80); this.panel2.TabIndex = 1; // - // comboBox_DevStatus - // - this.comboBox_DevStatus.DisplayMember = "Text"; - this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBox_DevStatus.FormattingEnabled = true; - this.comboBox_DevStatus.ItemHeight = 20; - this.comboBox_DevStatus.Items.AddRange(new object[] { - this.All, - this.toBeTested, - this.testing, - this.tested}); - this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); - this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); - this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); - this.comboBox_DevStatus.Name = "comboBox_DevStatus"; - this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 26); - this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBox_DevStatus.TabIndex = 2; - this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); - // - // All - // - this.All.Text = "全部"; - // - // toBeTested - // - this.toBeTested.Text = "待检测"; - this.toBeTested.Value = "1"; - // - // testing - // - this.testing.Text = "检测中"; - this.testing.Value = "2"; - // - // tested - // - this.tested.Text = "已检测"; - this.tested.Value = "3"; - // - // labelDevStatus - // - this.labelDevStatus.AutoSize = true; - this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; - this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevStatus.Location = new System.Drawing.Point(480, 45); - this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.labelDevStatus.Name = "labelDevStatus"; - this.labelDevStatus.Size = new System.Drawing.Size(74, 21); - this.labelDevStatus.TabIndex = 11; - this.labelDevStatus.Text = "仪器状态"; - // - // inputDevName - // - // - // - // - this.inputDevName.Border.Class = "TextBoxBorder"; - this.inputDevName.Border.CornerDiameter = 5; - this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevName.Location = new System.Drawing.Point(80, 3); - this.inputDevName.Margin = new System.Windows.Forms.Padding(0); - this.inputDevName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevName.Name = "inputDevName"; - this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 26); - this.inputDevName.TabIndex = 9; - this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevName.WatermarkText = "请输入仪器名称"; - // - // inputDevModel - // - // - // - // - this.inputDevModel.Border.Class = "TextBoxBorder"; - this.inputDevModel.Border.CornerDiameter = 5; - this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevModel.Location = new System.Drawing.Point(320, 3); - this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); - this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevModel.Name = "inputDevModel"; - this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 26); - this.inputDevModel.TabIndex = 8; - this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevModel.WatermarkText = "请输入仪器型号"; - // - // inputDevCode - // - // - // - // - this.inputDevCode.Border.Class = "TextBoxBorder"; - this.inputDevCode.Border.CornerDiameter = 5; - this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevCode.Location = new System.Drawing.Point(560, 3); - this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); - this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevCode.Name = "inputDevCode"; - this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 26); - this.inputDevCode.TabIndex = 7; - this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevCode.WatermarkText = "请输入仪器编号"; - // - // inputCustomName - // - // - // - // - this.inputCustomName.Border.Class = "TextBoxBorder"; - this.inputCustomName.Border.CornerDiameter = 5; - this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomName.Location = new System.Drawing.Point(320, 43); - this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomName.Name = "inputCustomName"; - this.inputCustomName.PreventEnterBeep = true; - this.inputCustomName.Size = new System.Drawing.Size(150, 26); - this.inputCustomName.TabIndex = 6; - this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomName.WatermarkText = "请输入联系人"; - // - // labelCustomName - // - this.labelCustomName.BackColor = System.Drawing.Color.Transparent; - this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomName.Location = new System.Drawing.Point(240, 45); - this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomName.Name = "labelCustomName"; - this.labelCustomName.Size = new System.Drawing.Size(74, 21); - this.labelCustomName.TabIndex = 5; - this.labelCustomName.Text = "联系人"; - this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // labelDevNo - // - this.labelDevNo.AutoSize = true; - this.labelDevNo.BackColor = System.Drawing.Color.Transparent; - this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevNo.Location = new System.Drawing.Point(480, 5); - this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); - this.labelDevNo.Name = "labelDevNo"; - this.labelDevNo.Size = new System.Drawing.Size(74, 21); - this.labelDevNo.TabIndex = 4; - this.labelDevNo.Text = "仪器编号"; - // - // labelDevModel - // - this.labelDevModel.AutoSize = true; - this.labelDevModel.BackColor = System.Drawing.Color.Transparent; - this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevModel.Location = new System.Drawing.Point(240, 5); - this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); - this.labelDevModel.Name = "labelDevModel"; - this.labelDevModel.Size = new System.Drawing.Size(74, 21); - this.labelDevModel.TabIndex = 4; - this.labelDevModel.Text = "仪器型号"; - // - // inputCustomComp - // - // - // - // - this.inputCustomComp.Border.Class = "TextBoxBorder"; - this.inputCustomComp.Border.CornerDiameter = 5; - this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomComp.Border.MaximumHeight = 26; - this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomComp.Location = new System.Drawing.Point(80, 43); - this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomComp.Name = "inputCustomComp"; - this.inputCustomComp.PreventEnterBeep = true; - this.inputCustomComp.Size = new System.Drawing.Size(150, 26); - this.inputCustomComp.TabIndex = 3; - this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomComp.WatermarkText = "请输入送检单位名称"; - // - // labelCustomComp - // - this.labelCustomComp.AutoSize = true; - this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; - this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomComp.Location = new System.Drawing.Point(0, 45); - this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomComp.Name = "labelCustomComp"; - this.labelCustomComp.Size = new System.Drawing.Size(74, 21); - this.labelCustomComp.TabIndex = 0; - this.labelCustomComp.Text = "送检单位"; - // - // labelDevName - // - this.labelDevName.AutoSize = true; - this.labelDevName.BackColor = System.Drawing.Color.Transparent; - this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevName.Location = new System.Drawing.Point(0, 5); - this.labelDevName.Margin = new System.Windows.Forms.Padding(0); - this.labelDevName.Name = "labelDevName"; - this.labelDevName.Size = new System.Drawing.Size(74, 21); - this.labelDevName.TabIndex = 0; - this.labelDevName.Text = "仪器名称"; - // - // inputDevStatus - // - // - // - // - this.inputDevStatus.Border.Class = "TextBoxBorder"; - this.inputDevStatus.Border.CornerDiameter = 5; - this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevStatus.Location = new System.Drawing.Point(560, 43); - this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevStatus.Name = "inputDevStatus"; - this.inputDevStatus.PreventEnterBeep = true; - this.inputDevStatus.Size = new System.Drawing.Size(150, 26); - this.inputDevStatus.TabIndex = 15; - this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevStatus.WatermarkText = "请选择仪器状态"; - // // btn_downDevStatus // this.btn_downDevStatus.BackColor = System.Drawing.Color.Transparent; @@ -488,6 +249,26 @@ this.btn_downDevStatus.UseVisualStyleBackColor = false; this.btn_downDevStatus.Click += new System.EventHandler(this.btn_downDevStatus_Click); // + // inputDevStatus + // + // + // + // + this.inputDevStatus.Border.Class = "TextBoxBorder"; + this.inputDevStatus.Border.CornerDiameter = 5; + this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevStatus.Location = new System.Drawing.Point(560, 42); + this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevStatus.Name = "inputDevStatus"; + this.inputDevStatus.PreventEnterBeep = true; + this.inputDevStatus.Size = new System.Drawing.Size(150, 28); + this.inputDevStatus.TabIndex = 15; + this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevStatus.WatermarkText = "请选择仪器状态"; + // // btnExport // this.btnExport.EnterBackColor = System.Drawing.Color.Blue; @@ -607,6 +388,59 @@ this.btnEdit.UseVisualStyleBackColor = true; this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click); // + // comboBox_DevStatus + // + this.comboBox_DevStatus.DisplayMember = "Text"; + this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.comboBox_DevStatus.FormattingEnabled = true; + this.comboBox_DevStatus.ItemHeight = 21; + this.comboBox_DevStatus.Items.AddRange(new object[] { + this.All, + this.toBeTested, + this.testing, + this.tested}); + this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); + this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); + this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); + this.comboBox_DevStatus.Name = "comboBox_DevStatus"; + this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 27); + this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.comboBox_DevStatus.TabIndex = 2; + this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); + // + // All + // + this.All.Text = "全部"; + // + // toBeTested + // + this.toBeTested.Text = "待检测"; + this.toBeTested.Value = "1"; + // + // testing + // + this.testing.Text = "检测中"; + this.testing.Value = "2"; + // + // tested + // + this.tested.Text = "已检测"; + this.tested.Value = "3"; + // + // labelDevStatus + // + this.labelDevStatus.AutoSize = true; + this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; + this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevStatus.Location = new System.Drawing.Point(480, 45); + this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.labelDevStatus.Name = "labelDevStatus"; + this.labelDevStatus.Size = new System.Drawing.Size(74, 21); + this.labelDevStatus.TabIndex = 11; + this.labelDevStatus.Text = "仪器状态"; + // // btnQuery // this.btnQuery.EnterBackColor = System.Drawing.Color.Blue; @@ -631,6 +465,172 @@ this.btnQuery.UseVisualStyleBackColor = true; this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click); // + // inputDevName + // + // + // + // + this.inputDevName.Border.Class = "TextBoxBorder"; + this.inputDevName.Border.CornerDiameter = 5; + this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevName.Location = new System.Drawing.Point(80, 3); + this.inputDevName.Margin = new System.Windows.Forms.Padding(0); + this.inputDevName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevName.Name = "inputDevName"; + this.inputDevName.PreventEnterBeep = true; + this.inputDevName.Size = new System.Drawing.Size(150, 28); + this.inputDevName.TabIndex = 9; + this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevName.WatermarkText = "请输入仪器名称"; + // + // inputDevModel + // + // + // + // + this.inputDevModel.Border.Class = "TextBoxBorder"; + this.inputDevModel.Border.CornerDiameter = 5; + this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevModel.Location = new System.Drawing.Point(320, 3); + this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); + this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevModel.Name = "inputDevModel"; + this.inputDevModel.PreventEnterBeep = true; + this.inputDevModel.Size = new System.Drawing.Size(150, 28); + this.inputDevModel.TabIndex = 8; + this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevModel.WatermarkText = "请输入仪器型号"; + // + // inputDevCode + // + // + // + // + this.inputDevCode.Border.Class = "TextBoxBorder"; + this.inputDevCode.Border.CornerDiameter = 5; + this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevCode.Location = new System.Drawing.Point(560, 3); + this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); + this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevCode.Name = "inputDevCode"; + this.inputDevCode.PreventEnterBeep = true; + this.inputDevCode.Size = new System.Drawing.Size(150, 28); + this.inputDevCode.TabIndex = 7; + this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevCode.WatermarkText = "请输入仪器编号"; + // + // inputCustomName + // + // + // + // + this.inputCustomName.Border.Class = "TextBoxBorder"; + this.inputCustomName.Border.CornerDiameter = 5; + this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomName.Location = new System.Drawing.Point(320, 43); + this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomName.Name = "inputCustomName"; + this.inputCustomName.PreventEnterBeep = true; + this.inputCustomName.Size = new System.Drawing.Size(150, 28); + this.inputCustomName.TabIndex = 6; + this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomName.WatermarkText = "请输入联系人"; + // + // labelCustomName + // + this.labelCustomName.BackColor = System.Drawing.Color.Transparent; + this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomName.Location = new System.Drawing.Point(240, 45); + this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomName.Name = "labelCustomName"; + this.labelCustomName.Size = new System.Drawing.Size(74, 21); + this.labelCustomName.TabIndex = 5; + this.labelCustomName.Text = "联系人"; + this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // labelDevNo + // + this.labelDevNo.AutoSize = true; + this.labelDevNo.BackColor = System.Drawing.Color.Transparent; + this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevNo.Location = new System.Drawing.Point(480, 5); + this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); + this.labelDevNo.Name = "labelDevNo"; + this.labelDevNo.Size = new System.Drawing.Size(74, 21); + this.labelDevNo.TabIndex = 4; + this.labelDevNo.Text = "仪器编号"; + // + // labelDevModel + // + this.labelDevModel.AutoSize = true; + this.labelDevModel.BackColor = System.Drawing.Color.Transparent; + this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevModel.Location = new System.Drawing.Point(240, 5); + this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); + this.labelDevModel.Name = "labelDevModel"; + this.labelDevModel.Size = new System.Drawing.Size(74, 21); + this.labelDevModel.TabIndex = 4; + this.labelDevModel.Text = "仪器型号"; + // + // inputCustomComp + // + // + // + // + this.inputCustomComp.Border.Class = "TextBoxBorder"; + this.inputCustomComp.Border.CornerDiameter = 5; + this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomComp.Border.MaximumHeight = 26; + this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomComp.Location = new System.Drawing.Point(80, 43); + this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomComp.Name = "inputCustomComp"; + this.inputCustomComp.PreventEnterBeep = true; + this.inputCustomComp.Size = new System.Drawing.Size(150, 28); + this.inputCustomComp.TabIndex = 3; + this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomComp.WatermarkText = "请输入送检单位名称"; + // + // labelCustomComp + // + this.labelCustomComp.AutoSize = true; + this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; + this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomComp.Location = new System.Drawing.Point(0, 45); + this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomComp.Name = "labelCustomComp"; + this.labelCustomComp.Size = new System.Drawing.Size(74, 21); + this.labelCustomComp.TabIndex = 0; + this.labelCustomComp.Text = "送检单位"; + // + // labelDevName + // + this.labelDevName.AutoSize = true; + this.labelDevName.BackColor = System.Drawing.Color.Transparent; + this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevName.Location = new System.Drawing.Point(0, 5); + this.labelDevName.Margin = new System.Windows.Forms.Padding(0); + this.labelDevName.Name = "labelDevName"; + this.labelDevName.Size = new System.Drawing.Size(74, 21); + this.labelDevName.TabIndex = 0; + this.labelDevName.Text = "仪器名称"; + // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -644,7 +644,7 @@ this.panelNodata.ResumeLayout(false); this.panelPage.ResumeLayout(false); this.panelPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); this.ResumeLayout(false); @@ -677,7 +677,7 @@ private RoundButton btnDelete; private RoundButton btnDetail; private RoundButton btnExport; - private System.Windows.Forms.DataGridView tableDevList; + private System.Windows.Forms.DataGridView dataGridView_DevList; private System.Windows.Forms.Button btnNext; private System.Windows.Forms.Button btnPre; private System.Windows.Forms.Label labelPageCount; diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 1ac72dc..93262a9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -51,8 +51,8 @@ private void InitTableDevList() { - tableDevList.Columns.Clear(); - tableDevList.Rows.Clear(); + dataGridView_DevList.Columns.Clear(); + dataGridView_DevList.Rows.Clear(); // 添加标题栏 Panel tableHeader = new Panel @@ -62,7 +62,7 @@ Location = new Point(0, 0) }; tableHeader.BackColor = titleBackColor; - tableDevList.Controls.Add(tableHeader); + dataGridView_DevList.Controls.Add(tableHeader); // 序号 Label colNo = new Label { @@ -75,7 +75,7 @@ Location = new Point(0, 0), Size = new Size(80, 40) }; - tableDevList.Controls.Add(colNo); + dataGridView_DevList.Controls.Add(colNo); colNo.BringToFront(); // 登记时间 @@ -90,7 +90,7 @@ Location = new Point(80, 0), Size = new Size(164, 40) }; - tableDevList.Controls.Add(colRegTime); + dataGridView_DevList.Controls.Add(colRegTime); colRegTime.BringToFront(); // 仪器名称 @@ -105,7 +105,7 @@ Location = new Point(244, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevName); + dataGridView_DevList.Controls.Add(colDevName); colDevName.BringToFront(); // 仪器型号 @@ -120,7 +120,7 @@ Location = new Point(364, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevType); + dataGridView_DevList.Controls.Add(colDevType); colDevType.BringToFront(); // 仪器编号 @@ -135,7 +135,7 @@ Location = new Point(484, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevNo); + dataGridView_DevList.Controls.Add(colDevNo); colDevNo.BringToFront(); // 客户名称 @@ -150,7 +150,7 @@ Location = new Point(604, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colCustomName); + dataGridView_DevList.Controls.Add(colCustomName); colCustomName.BringToFront(); // 设备状态 @@ -165,7 +165,7 @@ Location = new Point(724, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevStatus); + dataGridView_DevList.Controls.Add(colDevStatus); colDevStatus.BringToFront(); // 通道号 @@ -180,7 +180,7 @@ Location = new Point(844, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colChannelNo); + dataGridView_DevList.Controls.Add(colChannelNo); colChannelNo.BringToFront(); } @@ -198,6 +198,7 @@ devList.Columns.Add("status", Type.GetType("System.String")); devList.Columns.Add("channelNo", Type.GetType("System.String")); devList.Columns.Add("id", Type.GetType("System.Int32")); + devList.Columns.Add("customerDev", Type.GetType("System.String")); // 分页查询数据库 string devName = ""; @@ -252,7 +253,7 @@ foreach ( DeviceDto device in queryList ) { int index = (page-1) * limitCount + i + 1; - devList.Rows.Add(index, device.RegTime, device.DevName, device.DevModel, device.DevCode, device.CustomerName, device.StatusName, device.Channel, device.Id); + devList.Rows.Add(index, device.RegTime, device.DevName, device.DevModel, device.DevCode, device.CustomerName, device.StatusName, device.Channel, device.Id, device.CustomerDev); i++; } @@ -265,30 +266,31 @@ this.Controls.Find("panelPage", true)[0].Hide(); } - tableDevList.DataSource = devList; + dataGridView_DevList.DataSource = devList; // width=964px - tableDevList.Columns[0].Width = 80; - tableDevList.Columns[1].Width = 164; - tableDevList.Columns[2].Width = 120; - tableDevList.Columns[3].Width = 120; - tableDevList.Columns[4].Width = 120; - tableDevList.Columns[5].Width = 120; - tableDevList.Columns[6].Width = 120; - tableDevList.Columns[7].Width = 120; - tableDevList.Columns[8].Width = 0; + dataGridView_DevList.Columns[0].Width = 80; + dataGridView_DevList.Columns[1].Width = 164; + dataGridView_DevList.Columns[2].Width = 120; + dataGridView_DevList.Columns[3].Width = 120; + dataGridView_DevList.Columns[4].Width = 120; + dataGridView_DevList.Columns[5].Width = 120; + dataGridView_DevList.Columns[6].Width = 120; + dataGridView_DevList.Columns[7].Width = 120; + dataGridView_DevList.Columns[8].Width = 0; - tableDevList.Columns[8].Visible = false; // id不显示 + dataGridView_DevList.Columns[8].Visible = false; // id不显示 + dataGridView_DevList.Columns[9].Visible = false; // id不显示 - tableDevList.Columns[0].ReadOnly = true; - tableDevList.Columns[1].ReadOnly = true; - tableDevList.Columns[2].ReadOnly = true; - tableDevList.Columns[3].ReadOnly = true; - tableDevList.Columns[4].ReadOnly = true; - tableDevList.Columns[5].ReadOnly = true; - tableDevList.Columns[6].ReadOnly = true; - tableDevList.Columns[7].ReadOnly = true; - tableDevList.Columns[8].ReadOnly = true; + dataGridView_DevList.Columns[0].ReadOnly = true; + dataGridView_DevList.Columns[1].ReadOnly = true; + dataGridView_DevList.Columns[2].ReadOnly = true; + dataGridView_DevList.Columns[3].ReadOnly = true; + dataGridView_DevList.Columns[4].ReadOnly = true; + dataGridView_DevList.Columns[5].ReadOnly = true; + dataGridView_DevList.Columns[6].ReadOnly = true; + dataGridView_DevList.Columns[7].ReadOnly = true; + dataGridView_DevList.Columns[8].ReadOnly = true; } private int GetTotalCount(JObject condition) @@ -372,7 +374,7 @@ string devCode = inputDevCode.Text; string customComp = inputCustomComp.Text; string customName = inputCustomName.Text; - ComboBoxEx statusSelect = (ComboBoxEx)this.Controls.Find("inputDevStatus", true)[0]; + ComboBoxEx statusSelect = (ComboBoxEx)this.Controls.Find("comboBox_DevStatus", true)[0]; string devStatus = (string)((ComboItem)statusSelect.SelectedItem).Value; condition.RemoveAll(); @@ -442,16 +444,14 @@ private void btnDetail_Click(object sender, EventArgs e) { - int rowIndex = tableDevList.CurrentRow.Index; - int id = (int)tableDevList.Rows[rowIndex].Cells[8].Value; - MessageBox.Show(id.ToString()); + int rowIndex = dataGridView_DevList.CurrentRow.Index; + int id = (int)dataGridView_DevList.Rows[rowIndex].Cells[8].Value; DetailDlg detailDlg = new DetailDlg(); - detailDlg.Controls.Find("label_devName", true)[0].Text = tableDevList.Rows[rowIndex].Cells[2].Value.ToString(); - detailDlg.Controls.Find("label_devModel", true)[0].Text = tableDevList.Rows[rowIndex].Cells[3].Value.ToString(); - detailDlg.Controls.Find("label_devCode", true)[0].Text = tableDevList.Rows[rowIndex].Cells[4].Value.ToString(); - detailDlg.Controls.Find("label_customerComp", true)[0].Text = tableDevList.Rows[rowIndex].Cells[5].Value.ToString(); - detailDlg.Controls.Find("label_customerName", true)[0].Text = tableDevList.Rows[rowIndex].Cells[5].Value.ToString(); + detailDlg.Controls.Find("label_devModel", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[3].Value.ToString(); + detailDlg.Controls.Find("label_devCode", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[4].Value.ToString(); + detailDlg.Controls.Find("label_customerComp", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[9].Value.ToString(); + detailDlg.Controls.Find("label_customerName", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[5].Value.ToString(); detailDlg.HideMaskAction += () => { @@ -464,18 +464,27 @@ private void btnEdit_Click(object sender, EventArgs e) { - int rowIndex = tableDevList.CurrentRow.Index; - int id = (int)tableDevList.Rows[rowIndex].Cells[8].Value; - string devName = (string)tableDevList.Rows[rowIndex].Cells[2].Value; - string devModel = (string)tableDevList.Rows[rowIndex].Cells[3].Value; - string devCode = (string)tableDevList.Rows[rowIndex].Cells[4].Value; + int rowIndex = dataGridView_DevList.CurrentRow.Index; + int id = (int)dataGridView_DevList.Rows[rowIndex].Cells[8].Value; + string devName = (string)dataGridView_DevList.Rows[rowIndex].Cells[2].Value; + string devModel = (string)dataGridView_DevList.Rows[rowIndex].Cells[3].Value; + string devCode = (string)dataGridView_DevList.Rows[rowIndex].Cells[4].Value; AddDevDlg editDlg = new AddDevDlg(); - editDlg.Controls.Find("labelTitle", true)[0].Text = "修改送检仪器"; + editDlg.Controls.Find("labelTitle", true)[0].Text = "修改仪器"; editDlg.Controls.Find("inputDevName", true)[0].Text = devName; editDlg.Controls.Find("inputDevModel", true)[0].Text = devModel; editDlg.Controls.Find("inputDevCode", true)[0].Text = devCode; - + editDlg.text_devType.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[2].Value; + editDlg.inputCustComp.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[9].Value; + editDlg.inputCustName.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[5].Value; + editDlg.text_channelNo.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[7].Value; + editDlg.btnSave.Text = "保存"; + if (((string)dataGridView_DevList.Rows[rowIndex].Cells[6].Value).Equals("检测中")) + { + editDlg.btn_downChannelList.Enabled = false; + editDlg.text_channelNo.ReadOnly = true; + } editDlg.HideMaskAction += () => { this.HideMask(); @@ -492,16 +501,22 @@ private void comboBox_DevStatus_SelectedIndexChanged(object sender, EventArgs e) { - inputDevStatus.Text = comboBox_DevStatus.SelectedText; + inputDevStatus.Text = comboBox_DevStatus.SelectedItem.ToString(); } private void btnDelete_Click(object sender, EventArgs e) { + if (((string)dataGridView_DevList.Rows[dataGridView_DevList.CurrentRow.Index].Cells[6].Value).Equals("检测中")) + { + MessageBox.Show("该仪器在检测中，无法删除！"); + return; + } if (MessageBox.Show("确认删除选中仪器？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - + deviceService.delete(Convert.ToInt32(dataGridView_DevList.Rows[dataGridView_DevList.CurrentRow.Index].Cells[8].Value)); MessageBox.Show("删除成功", "提示"); + LoadDevList(condition); } } } diff --git a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs index 8152f83..cb453d7 100644 --- a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs @@ -41,29 +41,6 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); - this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.textBoxX5 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label8 = new System.Windows.Forms.Label(); - this.textBoxX6 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label9 = new System.Windows.Forms.Label(); - this.textBoxX7 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label13 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.textBoxX9 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.textBoxX10 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label18 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.textBoxX11 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); @@ -74,12 +51,35 @@ this.label22 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.textBoxX13 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.textBoxX9 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label16 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.textBoxX10 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.textBoxX11 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label11 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.textBoxX7 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label8 = new System.Windows.Forms.Label(); + this.textBoxX6 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.textBoxX5 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label5 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // label2 @@ -259,304 +259,6 @@ this.tabPage2.Text = "计数器程控检定"; this.tabPage2.UseVisualStyleBackColor = true; // - // groupBox1 - // - this.groupBox1.Controls.Add(this.label11); - this.groupBox1.Controls.Add(this.label10); - this.groupBox1.Controls.Add(this.label9); - this.groupBox1.Controls.Add(this.textBoxX7); - this.groupBox1.Controls.Add(this.label8); - this.groupBox1.Controls.Add(this.textBoxX6); - this.groupBox1.Controls.Add(this.label6); - this.groupBox1.Controls.Add(this.label7); - this.groupBox1.Controls.Add(this.textBoxX5); - this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textBoxX1); - this.groupBox1.Location = new System.Drawing.Point(31, 18); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(904, 162); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "电平参数"; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(64, 45); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(125, 30); - this.label1.TabIndex = 6; - this.label1.Text = "信号源输出延时："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX1 - // - // - // - // - this.textBoxX1.Border.Class = "TextBoxBorder"; - this.textBoxX1.Border.CornerDiameter = 5; - this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX1.Location = new System.Drawing.Point(195, 45); - this.textBoxX1.Name = "textBoxX1"; - this.textBoxX1.PreventEnterBeep = true; - this.textBoxX1.Size = new System.Drawing.Size(168, 29); - this.textBoxX1.TabIndex = 5; - // - // label5 - // - this.label5.BackColor = System.Drawing.Color.Transparent; - this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(372, 43); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(45, 30); - this.label5.TabIndex = 7; - this.label5.Text = "ms"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label6 - // - this.label6.BackColor = System.Drawing.Color.Transparent; - this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(786, 39); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(45, 30); - this.label6.TabIndex = 10; - this.label6.Text = "V"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label7 - // - this.label7.BackColor = System.Drawing.Color.Transparent; - this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(444, 41); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(159, 30); - this.label7.TabIndex = 9; - this.label7.Text = "信号源初始电平："; - this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX5 - // - // - // - // - this.textBoxX5.Border.Class = "TextBoxBorder"; - this.textBoxX5.Border.CornerDiameter = 5; - this.textBoxX5.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX5.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX5.Location = new System.Drawing.Point(609, 41); - this.textBoxX5.Name = "textBoxX5"; - this.textBoxX5.PreventEnterBeep = true; - this.textBoxX5.Size = new System.Drawing.Size(168, 29); - this.textBoxX5.TabIndex = 8; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(30, 97); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(159, 30); - this.label8.TabIndex = 12; - this.label8.Text = "信号源电平增加值："; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX6 - // - // - // - // - this.textBoxX6.Border.Class = "TextBoxBorder"; - this.textBoxX6.Border.CornerDiameter = 5; - this.textBoxX6.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX6.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX6.Location = new System.Drawing.Point(195, 97); - this.textBoxX6.Name = "textBoxX6"; - this.textBoxX6.PreventEnterBeep = true; - this.textBoxX6.Size = new System.Drawing.Size(168, 29); - this.textBoxX6.TabIndex = 11; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(444, 97); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(159, 30); - this.label9.TabIndex = 14; - this.label9.Text = "输出电平警告值："; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX7 - // - // - // - // - this.textBoxX7.Border.Class = "TextBoxBorder"; - this.textBoxX7.Border.CornerDiameter = 5; - this.textBoxX7.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX7.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX7.Location = new System.Drawing.Point(609, 97); - this.textBoxX7.Name = "textBoxX7"; - this.textBoxX7.PreventEnterBeep = true; - this.textBoxX7.Size = new System.Drawing.Size(168, 29); - this.textBoxX7.TabIndex = 13; - // - // label10 - // - this.label10.BackColor = System.Drawing.Color.Transparent; - this.label10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(372, 97); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(45, 30); - this.label10.TabIndex = 15; - this.label10.Text = "V"; - this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label11 - // - this.label11.BackColor = System.Drawing.Color.Transparent; - this.label11.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(786, 97); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(45, 30); - this.label11.TabIndex = 16; - this.label11.Text = "V"; - this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.label13); - this.groupBox2.Controls.Add(this.label15); - this.groupBox2.Controls.Add(this.textBoxX9); - this.groupBox2.Controls.Add(this.label16); - this.groupBox2.Controls.Add(this.label17); - this.groupBox2.Controls.Add(this.textBoxX10); - this.groupBox2.Controls.Add(this.label18); - this.groupBox2.Controls.Add(this.label19); - this.groupBox2.Controls.Add(this.textBoxX11); - this.groupBox2.Location = new System.Drawing.Point(31, 194); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(904, 162); - this.groupBox2.TabIndex = 17; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "频率灵敏度"; - // - // label13 - // - this.label13.BackColor = System.Drawing.Color.Transparent; - this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(372, 97); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(45, 30); - this.label13.TabIndex = 15; - this.label13.Text = "V"; - this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label15 - // - this.label15.BackColor = System.Drawing.Color.Transparent; - this.label15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(30, 97); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(159, 30); - this.label15.TabIndex = 12; - this.label15.Text = "测量误差电平增加值："; - this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX9 - // - // - // - // - this.textBoxX9.Border.Class = "TextBoxBorder"; - this.textBoxX9.Border.CornerDiameter = 5; - this.textBoxX9.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX9.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX9.Location = new System.Drawing.Point(195, 97); - this.textBoxX9.Name = "textBoxX9"; - this.textBoxX9.PreventEnterBeep = true; - this.textBoxX9.Size = new System.Drawing.Size(168, 29); - this.textBoxX9.TabIndex = 11; - // - // label16 - // - this.label16.BackColor = System.Drawing.Color.Transparent; - this.label16.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(786, 39); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(45, 30); - this.label16.TabIndex = 10; - this.label16.Text = "V"; - this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label17 - // - this.label17.BackColor = System.Drawing.Color.Transparent; - this.label17.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(444, 41); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(159, 30); - this.label17.TabIndex = 9; - this.label17.Text = "频率差值>80MHz："; - this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX10 - // - // - // - // - this.textBoxX10.Border.Class = "TextBoxBorder"; - this.textBoxX10.Border.CornerDiameter = 5; - this.textBoxX10.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX10.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX10.Location = new System.Drawing.Point(609, 41); - this.textBoxX10.Name = "textBoxX10"; - this.textBoxX10.PreventEnterBeep = true; - this.textBoxX10.Size = new System.Drawing.Size(168, 29); - this.textBoxX10.TabIndex = 8; - // - // label18 - // - this.label18.BackColor = System.Drawing.Color.Transparent; - this.label18.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(372, 43); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(45, 30); - this.label18.TabIndex = 7; - this.label18.Text = "Hz"; - this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label19 - // - this.label19.BackColor = System.Drawing.Color.Transparent; - this.label19.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(34, 45); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(155, 30); - this.label19.TabIndex = 6; - this.label19.Text = "频率差值<=80MHz："; - this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX11 - // - // - // - // - this.textBoxX11.Border.Class = "TextBoxBorder"; - this.textBoxX11.Border.CornerDiameter = 5; - this.textBoxX11.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX11.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX11.Location = new System.Drawing.Point(195, 45); - this.textBoxX11.Name = "textBoxX11"; - this.textBoxX11.PreventEnterBeep = true; - this.textBoxX11.Size = new System.Drawing.Size(168, 29); - this.textBoxX11.TabIndex = 5; - // // groupBox3 // this.groupBox3.Controls.Add(this.label12); @@ -686,6 +388,304 @@ this.textBoxX13.Size = new System.Drawing.Size(168, 29); this.textBoxX13.TabIndex = 5; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.textBoxX9); + this.groupBox2.Controls.Add(this.label16); + this.groupBox2.Controls.Add(this.label17); + this.groupBox2.Controls.Add(this.textBoxX10); + this.groupBox2.Controls.Add(this.label18); + this.groupBox2.Controls.Add(this.label19); + this.groupBox2.Controls.Add(this.textBoxX11); + this.groupBox2.Location = new System.Drawing.Point(31, 194); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(904, 162); + this.groupBox2.TabIndex = 17; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "频率灵敏度"; + // + // label13 + // + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.Location = new System.Drawing.Point(372, 97); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(45, 30); + this.label13.TabIndex = 15; + this.label13.Text = "V"; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label15 + // + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(30, 97); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(159, 30); + this.label15.TabIndex = 12; + this.label15.Text = "测量误差电平增加值："; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX9 + // + // + // + // + this.textBoxX9.Border.Class = "TextBoxBorder"; + this.textBoxX9.Border.CornerDiameter = 5; + this.textBoxX9.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX9.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX9.Location = new System.Drawing.Point(195, 97); + this.textBoxX9.Name = "textBoxX9"; + this.textBoxX9.PreventEnterBeep = true; + this.textBoxX9.Size = new System.Drawing.Size(168, 29); + this.textBoxX9.TabIndex = 11; + // + // label16 + // + this.label16.BackColor = System.Drawing.Color.Transparent; + this.label16.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label16.Location = new System.Drawing.Point(786, 39); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(45, 30); + this.label16.TabIndex = 10; + this.label16.Text = "Hz"; + this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label17 + // + this.label17.BackColor = System.Drawing.Color.Transparent; + this.label17.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label17.Location = new System.Drawing.Point(444, 41); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(159, 30); + this.label17.TabIndex = 9; + this.label17.Text = "频率差值>80MHz："; + this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX10 + // + // + // + // + this.textBoxX10.Border.Class = "TextBoxBorder"; + this.textBoxX10.Border.CornerDiameter = 5; + this.textBoxX10.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX10.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX10.Location = new System.Drawing.Point(609, 41); + this.textBoxX10.Name = "textBoxX10"; + this.textBoxX10.PreventEnterBeep = true; + this.textBoxX10.Size = new System.Drawing.Size(168, 29); + this.textBoxX10.TabIndex = 8; + // + // label18 + // + this.label18.BackColor = System.Drawing.Color.Transparent; + this.label18.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label18.Location = new System.Drawing.Point(372, 43); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(45, 30); + this.label18.TabIndex = 7; + this.label18.Text = "Hz"; + this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label19 + // + this.label19.BackColor = System.Drawing.Color.Transparent; + this.label19.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label19.Location = new System.Drawing.Point(34, 45); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(155, 30); + this.label19.TabIndex = 6; + this.label19.Text = "频率差值<=80MHz："; + this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX11 + // + // + // + // + this.textBoxX11.Border.Class = "TextBoxBorder"; + this.textBoxX11.Border.CornerDiameter = 5; + this.textBoxX11.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX11.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX11.Location = new System.Drawing.Point(195, 45); + this.textBoxX11.Name = "textBoxX11"; + this.textBoxX11.PreventEnterBeep = true; + this.textBoxX11.Size = new System.Drawing.Size(168, 29); + this.textBoxX11.TabIndex = 5; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label11); + this.groupBox1.Controls.Add(this.label10); + this.groupBox1.Controls.Add(this.label9); + this.groupBox1.Controls.Add(this.textBoxX7); + this.groupBox1.Controls.Add(this.label8); + this.groupBox1.Controls.Add(this.textBoxX6); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label7); + this.groupBox1.Controls.Add(this.textBoxX5); + this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.textBoxX1); + this.groupBox1.Location = new System.Drawing.Point(31, 18); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(904, 162); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "电平参数"; + // + // label11 + // + this.label11.BackColor = System.Drawing.Color.Transparent; + this.label11.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label11.Location = new System.Drawing.Point(786, 97); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(45, 30); + this.label11.TabIndex = 16; + this.label11.Text = "V"; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label10 + // + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.Location = new System.Drawing.Point(372, 97); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(45, 30); + this.label10.TabIndex = 15; + this.label10.Text = "V"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Transparent; + this.label9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(444, 97); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(159, 30); + this.label9.TabIndex = 14; + this.label9.Text = "输出电平警告值："; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX7 + // + // + // + // + this.textBoxX7.Border.Class = "TextBoxBorder"; + this.textBoxX7.Border.CornerDiameter = 5; + this.textBoxX7.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX7.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX7.Location = new System.Drawing.Point(609, 97); + this.textBoxX7.Name = "textBoxX7"; + this.textBoxX7.PreventEnterBeep = true; + this.textBoxX7.Size = new System.Drawing.Size(168, 29); + this.textBoxX7.TabIndex = 13; + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.Transparent; + this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(30, 97); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(159, 30); + this.label8.TabIndex = 12; + this.label8.Text = "信号源电平增加值："; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX6 + // + // + // + // + this.textBoxX6.Border.Class = "TextBoxBorder"; + this.textBoxX6.Border.CornerDiameter = 5; + this.textBoxX6.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX6.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX6.Location = new System.Drawing.Point(195, 97); + this.textBoxX6.Name = "textBoxX6"; + this.textBoxX6.PreventEnterBeep = true; + this.textBoxX6.Size = new System.Drawing.Size(168, 29); + this.textBoxX6.TabIndex = 11; + // + // label6 + // + this.label6.BackColor = System.Drawing.Color.Transparent; + this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(786, 39); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(45, 30); + this.label6.TabIndex = 10; + this.label6.Text = "V"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label7 + // + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(444, 41); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(159, 30); + this.label7.TabIndex = 9; + this.label7.Text = "信号源初始电平："; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX5 + // + // + // + // + this.textBoxX5.Border.Class = "TextBoxBorder"; + this.textBoxX5.Border.CornerDiameter = 5; + this.textBoxX5.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX5.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX5.Location = new System.Drawing.Point(609, 41); + this.textBoxX5.Name = "textBoxX5"; + this.textBoxX5.PreventEnterBeep = true; + this.textBoxX5.Size = new System.Drawing.Size(168, 29); + this.textBoxX5.TabIndex = 8; + // + // label5 + // + this.label5.BackColor = System.Drawing.Color.Transparent; + this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(372, 43); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(45, 30); + this.label5.TabIndex = 7; + this.label5.Text = "ms"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(64, 45); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(125, 30); + this.label1.TabIndex = 6; + this.label1.Text = "信号源输出延时："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerDiameter = 5; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX1.Location = new System.Drawing.Point(195, 45); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(168, 29); + this.textBoxX1.TabIndex = 5; + // // SettingCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -701,9 +701,9 @@ this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index dcad124..24a9a22 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -3,15 +3,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 7df1f84..d3f5288 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -203,6 +203,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap calender { + get { + object obj = ResourceManager.GetObject("calender", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap CHN { get { object obj = ResourceManager.GetObject("CHN", resourceCulture); @@ -213,6 +223,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap dot_gray { + get { + object obj = ResourceManager.GetObject("dot_gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap dot_green { get { object obj = ResourceManager.GetObject("dot_green", resourceCulture); @@ -223,9 +243,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_red { + internal static System.Drawing.Bitmap dot_orange { get { - object obj = ResourceManager.GetObject("dot_red", resourceCulture); + object obj = ResourceManager.GetObject("dot_orange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -233,9 +253,9 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap dot_yellow { + internal static System.Drawing.Bitmap dot_red { get { - object obj = ResourceManager.GetObject("dot_yellow", resourceCulture); + object obj = ResourceManager.GetObject("dot_red", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -423,6 +443,16 @@ /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// + internal static System.Drawing.Bitmap line { + get { + object obj = ResourceManager.GetObject("line", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap path { get { object obj = ResourceManager.GetObject("path", resourceCulture); diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index ea2299a..8d6c9ab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -226,10 +226,19 @@ ..\Resources\dot-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dot-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\path.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calender.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dot-orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs index b28d5a4..0019b94 100644 --- a/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs +++ b/RbFreqStandMeasure/R_DataBase/Dto/DeviceView.cs @@ -42,11 +42,16 @@ //逻辑位 private int active; - + private String startTime; private String endTime; + private String stability; + private String accuracy; + private String bootFeature; + private String ageRate; + public int Id { get @@ -242,5 +247,9 @@ } } + public string Stability { get => stability; set => stability = value; } + public string Accuracy { get => accuracy; set => accuracy = value; } + public string BootFeature { get => bootFeature; set => bootFeature = value; } + public string AgeRate { get => ageRate; set => ageRate = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs index f101b94..608e90a 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/DetectionItem.cs @@ -17,16 +17,16 @@ private DateTime endTime; //频率稳定度 - private int stability; + private string stability; //频率准确度 - private int accuracy; + private string accuracy; //开机特性 - private int bootFeature; + private string bootFeature; //日老化率 - private int ageRate; + private string ageRate; //频率稳定度 private String interval; @@ -83,7 +83,7 @@ } } - public int Stability + public string Stability { get { @@ -96,7 +96,7 @@ } } - public int Accuracy + public string Accuracy { get { @@ -109,7 +109,7 @@ } } - public int BootFeature + public string BootFeature { get { @@ -122,7 +122,7 @@ } } - public int AgeRate + public string AgeRate { get { diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index c9b14f2..a33322b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,13 +8,14 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, - int bootFeature,int ageRate,String interval); + int add(long deviceId,DateTime startTime,DateTime endTime, string stability, string accuracy, + string bootFeature, string ageRate,String interval, string channelNo); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, - int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, string stability, + string accuracy, string bootFeature, string ageRate, String interval); List serach(int deviceId); + int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData); } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 650f5c0..a8280fe 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -11,7 +11,7 @@ class DetectionItemServiceImpl : DetectionItemService { - public int add(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int add(long deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval, string channelNo) { int iRetval = -1; try @@ -22,21 +22,28 @@ return iRetval; } - string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values(@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; + string sQry = "INSERT INTO r_detection_item (DEVICE_ID,START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,STABILITY_INTERVAL)" + + " VALUES (@DEVICE_ID,@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 50).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 50).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 50).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 50).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); + sQry = "UPDATE r_device SET STATUSID=@STATUSID, CHANNEL=@CHANNEL where ID=@ID"; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@STATUSID", MySqlDbType.String, 20).Value = "2"; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = channelNo; + + cmd.ExecuteNonQuery(); cmd.Dispose(); iRetval = 0; } @@ -48,7 +55,7 @@ return iRetval; } - public int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval) + public int update(int deviceId, DateTime startTime, DateTime endTime, string stability, string accuracy, string bootFeature, string ageRate, String interval) { int iRetval = -1; try @@ -59,16 +66,15 @@ return iRetval; } - string sQry = "UPDATE r_detection_item SET (START_TIME,END_TIME,STABILITY,ACCURACY,BOOT_FEATURE,AGE_RATE,INTERVAL)" + - "values (@START_TIME,@END_TIME,@STABILITY,@ACCURACY,@BOOT_FEATURE,@AGE_RATE,@INTERVAL) WHERE DEVICE_ID = " + deviceId; + string sQry = "UPDATE r_detection_item SET START_TIME=@START_TIME,END_TIME=@END_TIME,STABILITY=@STABILITY,ACCURACY=@ACCURACY,BOOT_FEATURE=@BOOT_FEATURE,AGE_RATE=@AGE_RATE,STABILITY_INTERVAL=@INTERVAL WHERE DEVICE_ID = " + deviceId; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@START_TIME", MySqlDbType.DateTime, 0).Value = startTime; cmd.Parameters.Add("@END_TIME", MySqlDbType.DateTime, 0).Value = endTime; - cmd.Parameters.Add("@STABILITY", MySqlDbType.Int64, 10).Value = stability; - cmd.Parameters.Add("@ACCURACY", MySqlDbType.Int64, 10).Value = accuracy; - cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.Int64, 10).Value = bootFeature; - cmd.Parameters.Add("@AGE_RATE", MySqlDbType.Int64, 10).Value = ageRate; + cmd.Parameters.Add("@STABILITY", MySqlDbType.String, 10).Value = stability; + cmd.Parameters.Add("@ACCURACY", MySqlDbType.String, 10).Value = accuracy; + cmd.Parameters.Add("@BOOT_FEATURE", MySqlDbType.String, 10).Value = bootFeature; + cmd.Parameters.Add("@AGE_RATE", MySqlDbType.String, 10).Value = ageRate; cmd.Parameters.Add("@INTERVAL", MySqlDbType.String, 30).Value = interval; cmd.ExecuteNonQuery(); @@ -84,6 +90,44 @@ return iRetval; } + public int stopDetection(int deviceId, DateTime startTime, DateTime endTime, bool isDeleteData) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem : 数据库链接断开"); + return iRetval; + } + + string sQry = "UPDATE r_device SET STATUSID="+"1"+", CHANNEL=@CHANNEL where ID=" + deviceId; + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 20).Value = ""; + cmd.ExecuteNonQuery(); + + if (isDeleteData) + { + sQry = "DELETE FROM r_detection_item WHERE DEVICE_ID = " + deviceId + "AND START_TIME=" + startTime + " AND END_TIME=" + endTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + + sQry = "DELETE FROM r_detection WHERE DEVICE_ID = " + deviceId + "AND LOG_TIME>=" + startTime; + cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.ExecuteNonQuery(); + } + + cmd.Dispose(); + iRetval = 0; + } + catch (MySqlException e) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "updateDetectionItem: " + e.Message); + iRetval = -1; + } + return iRetval; + } + public List serach(int deviceId) { List detectionItemList = new List(); @@ -108,10 +152,10 @@ if (!aReader.IsDBNull(1)) detectionItem.DeviceId = Convert.ToInt32(aReader.GetString(1)); if (!aReader.IsDBNull(2)) detectionItem.StartTime = Convert.ToDateTime(aReader.GetString(2)); if (!aReader.IsDBNull(3)) detectionItem.EndTime = Convert.ToDateTime(aReader.GetString(3)); - if (!aReader.IsDBNull(4)) detectionItem.Stability = Convert.ToInt32(aReader.GetString(4)); - if (!aReader.IsDBNull(5)) detectionItem.Accuracy = Convert.ToInt32(aReader.GetString(5)); - if (!aReader.IsDBNull(6)) detectionItem.BootFeature = Convert.ToInt32(aReader.GetString(6)); - if (!aReader.IsDBNull(7)) detectionItem.AgeRate = Convert.ToInt32(aReader.GetString(7)); + if (!aReader.IsDBNull(4)) detectionItem.Stability = aReader.GetString(4); + if (!aReader.IsDBNull(5)) detectionItem.Accuracy = aReader.GetString(5); + if (!aReader.IsDBNull(6)) detectionItem.BootFeature = aReader.GetString(6); + if (!aReader.IsDBNull(7)) detectionItem.AgeRate = aReader.GetString(7); if (!aReader.IsDBNull(8)) detectionItem.Interval = aReader.GetString(8); detectionItemList.Add(detectionItem); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 4305f56..1373775 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -169,8 +169,8 @@ deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); } if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); - if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); - if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(7); if (!aReader.IsDBNull(7)) { deviceDto.StatusId = aReader.GetString(7); @@ -342,7 +342,7 @@ { conn = DbConnectService.getConnection(); - string sQry = "SELECT * FROM r_device where active = 0 and STATUSID = 2 "; + string sQry = "SELECT * FROM r_deviceview where ACTIVE = 0 and STATUSID = 2 "; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); @@ -364,7 +364,7 @@ if (!aReader.IsDBNull(5)) { DateTime reg = aReader.GetDateTime(5); // regTime - deviceView.RegTime = reg.ToString("yyyy-MM-dd"); + deviceView.RegTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(6)) deviceView.CustomerName = aReader.GetString(6); // customName if (!aReader.IsDBNull(7)) deviceView.CustomerDev = aReader.GetString(7); // customDev @@ -373,13 +373,18 @@ if (!aReader.IsDBNull(10)) { DateTime reg = aReader.GetDateTime(10); // regTime - deviceView.StartTime = reg.ToString("yyyy-MM-dd"); + deviceView.StartTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } if (!aReader.IsDBNull(11)) { DateTime reg = aReader.GetDateTime(11); // regTime - deviceView.EndTime = reg.ToString("yyyy-MM-dd"); + deviceView.EndTime = reg.ToString("yyyy-MM-dd HH:mm:ss"); } + if (!aReader.IsDBNull(13)) deviceView.Stability = aReader.GetString(13); + if (!aReader.IsDBNull(14)) deviceView.Accuracy = aReader.GetString(14); + if (!aReader.IsDBNull(15)) deviceView.BootFeature = aReader.GetString(15); + if (!aReader.IsDBNull(16)) deviceView.AgeRate = aReader.GetString(16); + deviceViewList.Add(deviceView); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index ccd1497..6d1bbef 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -480,6 +480,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RbFreqStandMeasure/Resources/calender.png b/RbFreqStandMeasure/Resources/calender.png new file mode 100644 index 0000000..10d5515 --- /dev/null +++ b/RbFreqStandMeasure/Resources/calender.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-gray.png b/RbFreqStandMeasure/Resources/dot-gray.png new file mode 100644 index 0000000..e5230fd --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot-orange.png b/RbFreqStandMeasure/Resources/dot-orange.png new file mode 100644 index 0000000..9e04c97 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot-orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_gray.png b/RbFreqStandMeasure/Resources/dot_gray.png new file mode 100644 index 0000000..6342fb2 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_gray.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/dot_orange.png b/RbFreqStandMeasure/Resources/dot_orange.png new file mode 100644 index 0000000..04305b6 --- /dev/null +++ b/RbFreqStandMeasure/Resources/dot_orange.png Binary files differ diff --git a/RbFreqStandMeasure/Resources/line.png b/RbFreqStandMeasure/Resources/line.png new file mode 100644 index 0000000..5d2fbf8 --- /dev/null +++ b/RbFreqStandMeasure/Resources/line.png Binary files differ diff --git "a/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" new file mode 100644 index 0000000..5f6d28c --- /dev/null +++ "b/RbFreqStandMeasure/Resources/\346\250\252\347\272\277.png" Binary files differ diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs index bd37971..19f6f59 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.Designer.cs @@ -34,29 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - this.panel5 = new System.Windows.Forms.Panel(); - this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); - this.pic_stability_5 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); - this.pic_stability_4 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); - this.pic_stability_3 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); - this.pic_stability_2 = new System.Windows.Forms.PictureBox(); - this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); - this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); - this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); - this.pic_stability_1 = new System.Windows.Forms.PictureBox(); - this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); + this.panel_toTestDev = new System.Windows.Forms.Panel(); this.labelNodata = new System.Windows.Forms.Label(); this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); @@ -69,323 +47,79 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.labelBase = new System.Windows.Forms.Label(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); - this.panel4.SuspendLayout(); + this.panel_channelList = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.pic_ageRate_5 = new System.Windows.Forms.PictureBox(); + this.pic_stability_5 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_5 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_5 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.pic_ageRate_4 = new System.Windows.Forms.PictureBox(); + this.pic_stability_4 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_4 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_4 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pic_ageRate_3 = new System.Windows.Forms.PictureBox(); + this.pic_stability_3 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_3 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_3 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pic_ageRate_2 = new System.Windows.Forms.PictureBox(); + this.pic_stability_2 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_2 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_2 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pic_ageRate_1 = new System.Windows.Forms.PictureBox(); + this.pic_stability_1 = new System.Windows.Forms.PictureBox(); + this.pic_accuracy_1 = new System.Windows.Forms.PictureBox(); + this.pic_bootFeature_1 = new System.Windows.Forms.PictureBox(); + this.dataGridView_Channel = new System.Windows.Forms.DataGridView(); + this.panel_toTestDev.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).BeginInit(); this.panelBase.SuspendLayout(); + this.panel_channelList.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).BeginInit(); this.SuspendLayout(); // - // panel5 + // panel_toTestDev // - this.panel5.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_ct_list; - this.panel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel5.Controls.Add(this.pic_ageRate_5); - this.panel5.Controls.Add(this.pic_bootFeature_5); - this.panel5.Controls.Add(this.pic_accuracy_5); - this.panel5.Controls.Add(this.pic_stability_5); - this.panel5.Controls.Add(this.pic_ageRate_4); - this.panel5.Controls.Add(this.pic_bootFeature_4); - this.panel5.Controls.Add(this.pic_accuracy_4); - this.panel5.Controls.Add(this.pic_stability_4); - this.panel5.Controls.Add(this.pic_ageRate_3); - this.panel5.Controls.Add(this.pic_bootFeature_3); - this.panel5.Controls.Add(this.pic_accuracy_3); - this.panel5.Controls.Add(this.pic_stability_3); - this.panel5.Controls.Add(this.pic_ageRate_2); - this.panel5.Controls.Add(this.pic_bootFeature_2); - this.panel5.Controls.Add(this.pic_accuracy_2); - this.panel5.Controls.Add(this.pic_stability_2); - this.panel5.Controls.Add(this.pic_ageRate_1); - this.panel5.Controls.Add(this.pic_bootFeature_1); - this.panel5.Controls.Add(this.pic_accuracy_1); - this.panel5.Controls.Add(this.pic_stability_1); - this.panel5.Controls.Add(this.dataGridView_Channel); - this.panel5.Location = new System.Drawing.Point(6, 227); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1011, 420); - this.panel5.TabIndex = 4; - // - // pic_ageRate_5 - // - this.pic_ageRate_5.BackColor = System.Drawing.Color.White; - this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_5.Location = new System.Drawing.Point(733, 350); - this.pic_ageRate_5.Name = "pic_ageRate_5"; - this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_5.TabIndex = 336; - this.pic_ageRate_5.TabStop = false; - // - // pic_bootFeature_5 - // - this.pic_bootFeature_5.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_5.Location = new System.Drawing.Point(868, 350); - this.pic_bootFeature_5.Name = "pic_bootFeature_5"; - this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_5.TabIndex = 335; - this.pic_bootFeature_5.TabStop = false; - // - // pic_accuracy_5 - // - this.pic_accuracy_5.BackColor = System.Drawing.Color.White; - this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_5.Location = new System.Drawing.Point(797, 350); - this.pic_accuracy_5.Name = "pic_accuracy_5"; - this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_5.TabIndex = 334; - this.pic_accuracy_5.TabStop = false; - // - // pic_stability_5 - // - this.pic_stability_5.BackColor = System.Drawing.Color.White; - this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_5.Location = new System.Drawing.Point(937, 350); - this.pic_stability_5.Name = "pic_stability_5"; - this.pic_stability_5.Size = new System.Drawing.Size(16, 16); - this.pic_stability_5.TabIndex = 333; - this.pic_stability_5.TabStop = false; - // - // pic_ageRate_4 - // - this.pic_ageRate_4.BackColor = System.Drawing.Color.White; - this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_4.Location = new System.Drawing.Point(733, 276); - this.pic_ageRate_4.Name = "pic_ageRate_4"; - this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_4.TabIndex = 332; - this.pic_ageRate_4.TabStop = false; - // - // pic_bootFeature_4 - // - this.pic_bootFeature_4.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_4.Location = new System.Drawing.Point(868, 276); - this.pic_bootFeature_4.Name = "pic_bootFeature_4"; - this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_4.TabIndex = 331; - this.pic_bootFeature_4.TabStop = false; - // - // pic_accuracy_4 - // - this.pic_accuracy_4.BackColor = System.Drawing.Color.White; - this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_4.Location = new System.Drawing.Point(797, 276); - this.pic_accuracy_4.Name = "pic_accuracy_4"; - this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_4.TabIndex = 330; - this.pic_accuracy_4.TabStop = false; - // - // pic_stability_4 - // - this.pic_stability_4.BackColor = System.Drawing.Color.White; - this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_4.Location = new System.Drawing.Point(937, 276); - this.pic_stability_4.Name = "pic_stability_4"; - this.pic_stability_4.Size = new System.Drawing.Size(16, 16); - this.pic_stability_4.TabIndex = 329; - this.pic_stability_4.TabStop = false; - // - // pic_ageRate_3 - // - this.pic_ageRate_3.BackColor = System.Drawing.Color.White; - this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_3.Location = new System.Drawing.Point(733, 198); - this.pic_ageRate_3.Name = "pic_ageRate_3"; - this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_3.TabIndex = 328; - this.pic_ageRate_3.TabStop = false; - // - // pic_bootFeature_3 - // - this.pic_bootFeature_3.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_3.Location = new System.Drawing.Point(868, 198); - this.pic_bootFeature_3.Name = "pic_bootFeature_3"; - this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_3.TabIndex = 327; - this.pic_bootFeature_3.TabStop = false; - // - // pic_accuracy_3 - // - this.pic_accuracy_3.BackColor = System.Drawing.Color.White; - this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_3.Location = new System.Drawing.Point(797, 198); - this.pic_accuracy_3.Name = "pic_accuracy_3"; - this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_3.TabIndex = 326; - this.pic_accuracy_3.TabStop = false; - // - // pic_stability_3 - // - this.pic_stability_3.BackColor = System.Drawing.Color.White; - this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_3.Location = new System.Drawing.Point(937, 198); - this.pic_stability_3.Name = "pic_stability_3"; - this.pic_stability_3.Size = new System.Drawing.Size(16, 16); - this.pic_stability_3.TabIndex = 325; - this.pic_stability_3.TabStop = false; - // - // pic_ageRate_2 - // - this.pic_ageRate_2.BackColor = System.Drawing.Color.White; - this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_2.Location = new System.Drawing.Point(733, 132); - this.pic_ageRate_2.Name = "pic_ageRate_2"; - this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_2.TabIndex = 324; - this.pic_ageRate_2.TabStop = false; - // - // pic_bootFeature_2 - // - this.pic_bootFeature_2.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_2.Location = new System.Drawing.Point(868, 132); - this.pic_bootFeature_2.Name = "pic_bootFeature_2"; - this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_2.TabIndex = 323; - this.pic_bootFeature_2.TabStop = false; - // - // pic_accuracy_2 - // - this.pic_accuracy_2.BackColor = System.Drawing.Color.White; - this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_2.Location = new System.Drawing.Point(797, 132); - this.pic_accuracy_2.Name = "pic_accuracy_2"; - this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_2.TabIndex = 322; - this.pic_accuracy_2.TabStop = false; - // - // pic_stability_2 - // - this.pic_stability_2.BackColor = System.Drawing.Color.White; - this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_2.Location = new System.Drawing.Point(937, 132); - this.pic_stability_2.Name = "pic_stability_2"; - this.pic_stability_2.Size = new System.Drawing.Size(16, 16); - this.pic_stability_2.TabIndex = 321; - this.pic_stability_2.TabStop = false; - // - // pic_ageRate_1 - // - this.pic_ageRate_1.BackColor = System.Drawing.Color.White; - this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pic_ageRate_1.Location = new System.Drawing.Point(733, 66); - this.pic_ageRate_1.Name = "pic_ageRate_1"; - this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); - this.pic_ageRate_1.TabIndex = 320; - this.pic_ageRate_1.TabStop = false; - // - // pic_bootFeature_1 - // - this.pic_bootFeature_1.BackColor = System.Drawing.Color.White; - this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_bootFeature_1.Location = new System.Drawing.Point(868, 66); - this.pic_bootFeature_1.Name = "pic_bootFeature_1"; - this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); - this.pic_bootFeature_1.TabIndex = 319; - this.pic_bootFeature_1.TabStop = false; - // - // pic_accuracy_1 - // - this.pic_accuracy_1.BackColor = System.Drawing.Color.White; - this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_accuracy_1.Location = new System.Drawing.Point(797, 66); - this.pic_accuracy_1.Name = "pic_accuracy_1"; - this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); - this.pic_accuracy_1.TabIndex = 318; - this.pic_accuracy_1.TabStop = false; - // - // pic_stability_1 - // - this.pic_stability_1.BackColor = System.Drawing.Color.White; - this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pic_stability_1.Location = new System.Drawing.Point(937, 66); - this.pic_stability_1.Name = "pic_stability_1"; - this.pic_stability_1.Size = new System.Drawing.Size(16, 16); - this.pic_stability_1.TabIndex = 317; - this.pic_stability_1.TabStop = false; - // - // dataGridView_Channel - // - this.dataGridView_Channel.AllowUserToAddRows = false; - this.dataGridView_Channel.AllowUserToDeleteRows = false; - this.dataGridView_Channel.AllowUserToResizeColumns = false; - this.dataGridView_Channel.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Channel.ColumnHeadersHeight = 30; - this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Channel.Location = new System.Drawing.Point(15, 17); - this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Channel.MultiSelect = false; - this.dataGridView_Channel.Name = "dataGridView_Channel"; - this.dataGridView_Channel.RowHeadersVisible = false; - this.dataGridView_Channel.RowHeadersWidth = 30; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.dataGridView_Channel.RowTemplate.Height = 74; - this.dataGridView_Channel.Size = new System.Drawing.Size(974, 377); - this.dataGridView_Channel.TabIndex = 0; - this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tableChannel_CellDoubleClick); - this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); - // - // panel4 - // - this.panel4.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; - this.panel4.Controls.Add(this.labelNodata); - this.panel4.Controls.Add(this.btnNext); - this.panel4.Controls.Add(this.btnPre); - this.panel4.Controls.Add(this.textBoxPage); - this.panel4.Controls.Add(this.label_pageInfo); - this.panel4.Controls.Add(this.tableToBeTested); - this.panel4.Location = new System.Drawing.Point(230, 5); - this.panel4.Margin = new System.Windows.Forms.Padding(0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(784, 222); - this.panel4.TabIndex = 3; + this.panel_toTestDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_tested; + this.panel_toTestDev.Controls.Add(this.labelNodata); + this.panel_toTestDev.Controls.Add(this.btnNext); + this.panel_toTestDev.Controls.Add(this.btnPre); + this.panel_toTestDev.Controls.Add(this.textBoxPage); + this.panel_toTestDev.Controls.Add(this.label_pageInfo); + this.panel_toTestDev.Controls.Add(this.tableToBeTested); + this.panel_toTestDev.Location = new System.Drawing.Point(230, 5); + this.panel_toTestDev.Margin = new System.Windows.Forms.Padding(0); + this.panel_toTestDev.Name = "panel_toTestDev"; + this.panel_toTestDev.Size = new System.Drawing.Size(784, 222); + this.panel_toTestDev.TabIndex = 3; // // labelNodata // @@ -453,13 +187,13 @@ this.tableToBeTested.AllowUserToDeleteRows = false; this.tableToBeTested.AllowUserToResizeColumns = false; this.tableToBeTested.AllowUserToResizeRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.tableToBeTested.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.tableToBeTested.BackgroundColor = System.Drawing.Color.White; this.tableToBeTested.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -472,13 +206,13 @@ this.tableToBeTested.Name = "tableToBeTested"; this.tableToBeTested.RowHeadersVisible = false; this.tableToBeTested.RowHeadersWidth = 40; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.tableToBeTested.RowsDefaultCellStyle = dataGridViewCellStyle2; this.tableToBeTested.RowTemplate.DefaultCellStyle.NullValue = "-"; this.tableToBeTested.RowTemplate.Height = 32; this.tableToBeTested.Size = new System.Drawing.Size(764, 167); @@ -504,7 +238,7 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(95, 124); + this.label1.Location = new System.Drawing.Point(99, 128); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(67, 25); this.label1.TabIndex = 3; @@ -516,7 +250,7 @@ this.label_clockStatus.BackColor = System.Drawing.Color.Transparent; this.label_clockStatus.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.label_clockStatus.ForeColor = System.Drawing.Color.Gray; - this.label_clockStatus.Location = new System.Drawing.Point(96, 69); + this.label_clockStatus.Location = new System.Drawing.Point(100, 73); this.label_clockStatus.Name = "label_clockStatus"; this.label_clockStatus.Size = new System.Drawing.Size(65, 25); this.label_clockStatus.TabIndex = 2; @@ -527,7 +261,7 @@ // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(23, 124); + this.label3.Location = new System.Drawing.Point(27, 128); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(67, 25); this.label3.TabIndex = 1; @@ -538,7 +272,7 @@ // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(25, 69); + this.label2.Location = new System.Drawing.Point(29, 73); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 25); this.label2.TabIndex = 1; @@ -557,44 +291,373 @@ this.labelBase.Text = "基本信息"; this.labelBase.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel_channelList + // + this.panel_channelList.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_channel; + this.panel_channelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel_channelList.Controls.Add(this.panel5); + this.panel_channelList.Controls.Add(this.panel4); + this.panel_channelList.Controls.Add(this.panel3); + this.panel_channelList.Controls.Add(this.panel2); + this.panel_channelList.Controls.Add(this.panel1); + this.panel_channelList.Controls.Add(this.dataGridView_Channel); + this.panel_channelList.Location = new System.Drawing.Point(11, 227); + this.panel_channelList.Name = "panel_channelList"; + this.panel_channelList.Size = new System.Drawing.Size(1004, 420); + this.panel_channelList.TabIndex = 4; + // + // panel5 + // + this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel5.Controls.Add(this.pic_ageRate_5); + this.panel5.Controls.Add(this.pic_stability_5); + this.panel5.Controls.Add(this.pic_accuracy_5); + this.panel5.Controls.Add(this.pic_bootFeature_5); + this.panel5.Location = new System.Drawing.Point(715, 358); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(250, 30); + this.panel5.TabIndex = 341; + // + // pic_ageRate_5 + // + this.pic_ageRate_5.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_5.Location = new System.Drawing.Point(151, 9); + this.pic_ageRate_5.Name = "pic_ageRate_5"; + this.pic_ageRate_5.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_5.TabIndex = 336; + this.pic_ageRate_5.TabStop = false; + // + // pic_stability_5 + // + this.pic_stability_5.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_5.Location = new System.Drawing.Point(85, 9); + this.pic_stability_5.Name = "pic_stability_5"; + this.pic_stability_5.Size = new System.Drawing.Size(16, 16); + this.pic_stability_5.TabIndex = 333; + this.pic_stability_5.TabStop = false; + // + // pic_accuracy_5 + // + this.pic_accuracy_5.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_5.Location = new System.Drawing.Point(224, 9); + this.pic_accuracy_5.Name = "pic_accuracy_5"; + this.pic_accuracy_5.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_5.TabIndex = 334; + this.pic_accuracy_5.TabStop = false; + // + // pic_bootFeature_5 + // + this.pic_bootFeature_5.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_5.Location = new System.Drawing.Point(9, 9); + this.pic_bootFeature_5.Name = "pic_bootFeature_5"; + this.pic_bootFeature_5.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_5.TabIndex = 335; + this.pic_bootFeature_5.TabStop = false; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel4.Controls.Add(this.pic_ageRate_4); + this.panel4.Controls.Add(this.pic_stability_4); + this.panel4.Controls.Add(this.pic_accuracy_4); + this.panel4.Controls.Add(this.pic_bootFeature_4); + this.panel4.Location = new System.Drawing.Point(715, 284); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(250, 30); + this.panel4.TabIndex = 340; + // + // pic_ageRate_4 + // + this.pic_ageRate_4.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_4.Location = new System.Drawing.Point(151, 10); + this.pic_ageRate_4.Name = "pic_ageRate_4"; + this.pic_ageRate_4.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_4.TabIndex = 332; + this.pic_ageRate_4.TabStop = false; + // + // pic_stability_4 + // + this.pic_stability_4.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_stability_4.Location = new System.Drawing.Point(85, 10); + this.pic_stability_4.Name = "pic_stability_4"; + this.pic_stability_4.Size = new System.Drawing.Size(16, 16); + this.pic_stability_4.TabIndex = 329; + this.pic_stability_4.TabStop = false; + // + // pic_accuracy_4 + // + this.pic_accuracy_4.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_4.Location = new System.Drawing.Point(224, 10); + this.pic_accuracy_4.Name = "pic_accuracy_4"; + this.pic_accuracy_4.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_4.TabIndex = 330; + this.pic_accuracy_4.TabStop = false; + // + // pic_bootFeature_4 + // + this.pic_bootFeature_4.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_4.Location = new System.Drawing.Point(9, 10); + this.pic_bootFeature_4.Name = "pic_bootFeature_4"; + this.pic_bootFeature_4.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_4.TabIndex = 331; + this.pic_bootFeature_4.TabStop = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel3.Controls.Add(this.pic_ageRate_3); + this.panel3.Controls.Add(this.pic_stability_3); + this.panel3.Controls.Add(this.pic_accuracy_3); + this.panel3.Controls.Add(this.pic_bootFeature_3); + this.panel3.Location = new System.Drawing.Point(715, 210); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 30); + this.panel3.TabIndex = 339; + // + // pic_ageRate_3 + // + this.pic_ageRate_3.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_3.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_3.Name = "pic_ageRate_3"; + this.pic_ageRate_3.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_3.TabIndex = 328; + this.pic_ageRate_3.TabStop = false; + // + // pic_stability_3 + // + this.pic_stability_3.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_3.Location = new System.Drawing.Point(85, 8); + this.pic_stability_3.Name = "pic_stability_3"; + this.pic_stability_3.Size = new System.Drawing.Size(16, 16); + this.pic_stability_3.TabIndex = 325; + this.pic_stability_3.TabStop = false; + // + // pic_accuracy_3 + // + this.pic_accuracy_3.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_3.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_3.Name = "pic_accuracy_3"; + this.pic_accuracy_3.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_3.TabIndex = 326; + this.pic_accuracy_3.TabStop = false; + // + // pic_bootFeature_3 + // + this.pic_bootFeature_3.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_3.Location = new System.Drawing.Point(8, 8); + this.pic_bootFeature_3.Name = "pic_bootFeature_3"; + this.pic_bootFeature_3.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_3.TabIndex = 327; + this.pic_bootFeature_3.TabStop = false; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel2.Controls.Add(this.pic_ageRate_2); + this.panel2.Controls.Add(this.pic_stability_2); + this.panel2.Controls.Add(this.pic_accuracy_2); + this.panel2.Controls.Add(this.pic_bootFeature_2); + this.panel2.Location = new System.Drawing.Point(715, 136); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(250, 30); + this.panel2.TabIndex = 338; + // + // pic_ageRate_2 + // + this.pic_ageRate_2.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_2.Location = new System.Drawing.Point(151, 7); + this.pic_ageRate_2.Name = "pic_ageRate_2"; + this.pic_ageRate_2.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_2.TabIndex = 324; + this.pic_ageRate_2.TabStop = false; + // + // pic_stability_2 + // + this.pic_stability_2.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_2.Location = new System.Drawing.Point(85, 7); + this.pic_stability_2.Name = "pic_stability_2"; + this.pic_stability_2.Size = new System.Drawing.Size(16, 16); + this.pic_stability_2.TabIndex = 321; + this.pic_stability_2.TabStop = false; + // + // pic_accuracy_2 + // + this.pic_accuracy_2.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_2.Location = new System.Drawing.Point(224, 7); + this.pic_accuracy_2.Name = "pic_accuracy_2"; + this.pic_accuracy_2.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_2.TabIndex = 322; + this.pic_accuracy_2.TabStop = false; + // + // pic_bootFeature_2 + // + this.pic_bootFeature_2.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_2.Location = new System.Drawing.Point(8, 7); + this.pic_bootFeature_2.Name = "pic_bootFeature_2"; + this.pic_bootFeature_2.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_2.TabIndex = 323; + this.pic_bootFeature_2.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + this.panel1.Controls.Add(this.pic_ageRate_1); + this.panel1.Controls.Add(this.pic_stability_1); + this.panel1.Controls.Add(this.pic_accuracy_1); + this.panel1.Controls.Add(this.pic_bootFeature_1); + this.panel1.Location = new System.Drawing.Point(715, 62); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(250, 30); + this.panel1.TabIndex = 337; + // + // pic_ageRate_1 + // + this.pic_ageRate_1.BackColor = System.Drawing.Color.Transparent; + this.pic_ageRate_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pic_ageRate_1.Location = new System.Drawing.Point(151, 8); + this.pic_ageRate_1.Name = "pic_ageRate_1"; + this.pic_ageRate_1.Size = new System.Drawing.Size(16, 16); + this.pic_ageRate_1.TabIndex = 320; + this.pic_ageRate_1.TabStop = false; + // + // pic_stability_1 + // + this.pic_stability_1.BackColor = System.Drawing.Color.Transparent; + this.pic_stability_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_stability_1.Location = new System.Drawing.Point(85, 8); + this.pic_stability_1.Name = "pic_stability_1"; + this.pic_stability_1.Size = new System.Drawing.Size(16, 16); + this.pic_stability_1.TabIndex = 317; + this.pic_stability_1.TabStop = false; + // + // pic_accuracy_1 + // + this.pic_accuracy_1.BackColor = System.Drawing.Color.Transparent; + this.pic_accuracy_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_accuracy_1.Location = new System.Drawing.Point(224, 8); + this.pic_accuracy_1.Name = "pic_accuracy_1"; + this.pic_accuracy_1.Size = new System.Drawing.Size(16, 16); + this.pic_accuracy_1.TabIndex = 318; + this.pic_accuracy_1.TabStop = false; + // + // pic_bootFeature_1 + // + this.pic_bootFeature_1.BackColor = System.Drawing.Color.Transparent; + this.pic_bootFeature_1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pic_bootFeature_1.Location = new System.Drawing.Point(7, 8); + this.pic_bootFeature_1.Name = "pic_bootFeature_1"; + this.pic_bootFeature_1.Size = new System.Drawing.Size(16, 16); + this.pic_bootFeature_1.TabIndex = 319; + this.pic_bootFeature_1.TabStop = false; + // + // dataGridView_Channel + // + this.dataGridView_Channel.AllowUserToAddRows = false; + this.dataGridView_Channel.AllowUserToDeleteRows = false; + this.dataGridView_Channel.AllowUserToResizeColumns = false; + this.dataGridView_Channel.AllowUserToResizeRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView_Channel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView_Channel.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Channel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Channel.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Channel.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; + this.dataGridView_Channel.ColumnHeadersHeight = 30; + this.dataGridView_Channel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Channel.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView_Channel.Location = new System.Drawing.Point(10, 10); + this.dataGridView_Channel.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Channel.MultiSelect = false; + this.dataGridView_Channel.Name = "dataGridView_Channel"; + this.dataGridView_Channel.RowHeadersVisible = false; + this.dataGridView_Channel.RowHeadersWidth = 30; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.dataGridView_Channel.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dataGridView_Channel.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; + this.dataGridView_Channel.RowTemplate.Height = 74; + this.dataGridView_Channel.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView_Channel.Size = new System.Drawing.Size(984, 400); + this.dataGridView_Channel.TabIndex = 0; + this.dataGridView_Channel.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Channel_CellDoubleClick); + this.dataGridView_Channel.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView_Channel_RowPostPaint); + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - this.Controls.Add(this.panel4); + this.Controls.Add(this.panel_toTestDev); this.Controls.Add(this.panelBase); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel_channelList); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1024, 654); this.Load += new System.EventHandler(this.HomeCtrlForm_Load); - this.panel5.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + this.panel_toTestDev.ResumeLayout(false); + this.panel_toTestDev.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tableToBeTested)).EndInit(); this.panelBase.ResumeLayout(false); + this.panel_channelList.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_5)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_4)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_3)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_2)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pic_ageRate_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_stability_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_accuracy_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pic_bootFeature_1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Channel)).EndInit(); this.ResumeLayout(false); } @@ -602,8 +665,8 @@ #endregion private System.Windows.Forms.Panel panelBase; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel_toTestDev; + private System.Windows.Forms.Panel panel_channelList; private System.Windows.Forms.Label labelBase; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -636,5 +699,10 @@ private System.Windows.Forms.PictureBox pic_stability_2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label_clockStatus; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; } } diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index c959008..c14c9e0 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -5,6 +5,7 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; +using DevComponents.DotNetBar.Controls; using System; using System.Collections.Generic; using System.Data; @@ -20,6 +21,7 @@ { public partial class HomeCtrlForm : UserControl { + public static HomeCtrlForm homeCtrlForm; int totalCount = 0; int currentPage = 1; int pageCount = 0; @@ -27,11 +29,24 @@ DataTable devToBeTestedTable = null; DataTable channelsTable = null; DeviceService deviceService = new DeviceServiceImpl(); + List listChannelStatus = new List(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + + + public static SerialPort frePort_1 = new SerialPort(); + public static SerialPort frePort_2 = new SerialPort(); + public static SerialPort frePort_3 = new SerialPort(); + public static SerialPort frePort_4 = new SerialPort(); + public static SerialPort frePort_5 = new SerialPort(); + public static SerialPort clockPort = new SerialPort(); + public static SerialPort satellitePort = new SerialPort(); private string[] portNames = null; private List serialPorts; private byte[] portBuffer; + public static List channelFreeList = new List(); System.Timers.Timer timerPort; //计时器，每1s中读取一次串口数据 @@ -44,7 +59,7 @@ public HomeCtrlForm() { InitializeComponent(); - + homeCtrlForm = this; } private void HomeCtrlForm_Load(object sender, EventArgs e) @@ -58,11 +73,6 @@ // 初始化各通道样式 InitTableChannel(); LoadChannelStatus(); - - pic_stability_1.BackColor = Color.FromArgb(201, 203, 208); - pic_accuracy_1.BackColor = Color.FromArgb(201, 203, 208); - pic_bootFeature_1.BackColor = Color.FromArgb(201, 203, 208); - pic_ageRate_1.BackColor = Color.FromArgb(201, 203, 208); } #region 待测仪器列表 @@ -90,7 +100,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器名称", - Location = new Point(0, 0), + Location = new Point(20, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevName); @@ -105,7 +115,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器类型", - Location = new Point(100, 0), + Location = new Point(160, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevType); @@ -120,7 +130,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "仪器编号", - Location = new Point(200, 0), + Location = new Point(300, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colDevNo); @@ -135,7 +145,7 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户名称", - Location = new Point(300, 0), + Location = new Point(440, 0), Size = new Size(100, 32) }; tableToBeTested.Controls.Add(colCustomName); @@ -150,41 +160,14 @@ BackColor = titleBackColor, AutoSize = false, Text = "客户单位", - Location = new Point(400, 0), + Location = new Point(600, 0), Size = new Size(120, 32) }; tableToBeTested.Controls.Add(colCustomComp); colCustomComp.BringToFront(); - // 开始时间 - Label colStartTime = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "开始时间", - Location = new Point(520, 0), - Size = new Size(144, 32) - }; - tableToBeTested.Controls.Add(colStartTime); - colStartTime.BringToFront(); - - // 通道号 - Label colChannelNo = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "通道号", - Location = new Point(664, 0), - Size = new Size(100, 32) - }; - tableToBeTested.Controls.Add(colChannelNo); - colChannelNo.BringToFront(); + + totalCount = 0; currentPage = 1; @@ -197,10 +180,8 @@ devToBeTestedTable.Columns.Add("devCode", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerName", Type.GetType("System.String")); devToBeTestedTable.Columns.Add("customerDev", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("startTime", Type.GetType("System.String")); - devToBeTestedTable.Columns.Add("channelNo", Type.GetType("System.String")); } - private void LoadDevToBeTested() + public void LoadDevToBeTested() { devToBeTestedTable.Rows.Clear(); // 获取数据 @@ -218,14 +199,9 @@ pageCount++; setPageLabel(); - - //devToBeTested = DataHelper.ConvertToDataTable(queryList); - //int i = 0; foreach (DeviceDto device in queryList) { - //int index = (currentPage - 1) * limitCount + i + 1; - devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev, "", device.Channel); - //i++; + devToBeTestedTable.Rows.Add(device.Id, device.DevName, device.DevTypeName, device.DevCode, device.CustomerName, device.CustomerDev); } //tableToBeTested.Columns[0].Visible = false; //tableToBeTested.Columns[0].Visible = false; @@ -237,13 +213,11 @@ tableToBeTested.Columns[0].Visible = false; // width=984px - tableToBeTested.Columns[1].Width = 100; - tableToBeTested.Columns[2].Width = 100; - tableToBeTested.Columns[3].Width = 100; - tableToBeTested.Columns[4].Width = 100; - tableToBeTested.Columns[5].Width = 120; - tableToBeTested.Columns[6].Width = 144; - tableToBeTested.Columns[7].Width = 100; + tableToBeTested.Columns[1].Width = 140; + tableToBeTested.Columns[2].Width = 140; + tableToBeTested.Columns[3].Width = 140; + tableToBeTested.Columns[4].Width = 140; + tableToBeTested.Columns[5].Width = 200; tableToBeTested.Columns[0].ReadOnly = true; tableToBeTested.Columns[1].ReadOnly = true; @@ -251,8 +225,6 @@ tableToBeTested.Columns[3].ReadOnly = true; tableToBeTested.Columns[4].ReadOnly = true; tableToBeTested.Columns[5].ReadOnly = true; - tableToBeTested.Columns[6].ReadOnly = true; - tableToBeTested.Columns[7].ReadOnly = true; } @@ -262,15 +234,6 @@ labelNodata.Visible = true; } - - - - - //devToBeTested.Rows.Add("SF2001-1", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-2", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-3", "通用计数器", "00001", "203", "203", DateTime.Now); - //devToBeTested.Rows.Add("SF2001-4", "通用计数器", "00001", "203", "203", DateTime.Now); - } private void tableToBeTested_CellDoubleClick(object sender, DataGridViewCellEventArgs e) @@ -280,13 +243,25 @@ SetDevTestDlg devTestDlg = new SetDevTestDlg(); + devTestDlg.deviceId = Convert.ToInt32(tableToBeTested.Rows[rowIndex].Cells[0].Value); devTestDlg.text_customerDev.Text = tableToBeTested.Rows[rowIndex].Cells[5].Value.ToString(); devTestDlg.text_devName.Text = tableToBeTested.Rows[rowIndex].Cells[1].Value.ToString(); devTestDlg.text_devCode.Text = tableToBeTested.Rows[rowIndex].Cells[3].Value.ToString(); devTestDlg.text_customerName.Text = tableToBeTested.Rows[rowIndex].Cells[4].Value.ToString(); devTestDlg.text_devType.Text = tableToBeTested.Rows[rowIndex].Cells[2].Value.ToString(); - if (tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString() != "") devTestDlg.timePicker_startTime.Value = Convert.ToDateTime(tableToBeTested.Rows[rowIndex].Cells[6].Value.ToString()); + ((ComboBox)devTestDlg.Controls.Find("comboBox_channelNo", true)[0]).DataSource = channelFreeList; + if (channelFreeList.Count > 0) + { + devTestDlg.Controls.Find("groupBox2", true)[0].Enabled = true; + devTestDlg.Controls.Find("btnSave", true)[0].Enabled = true; + devTestDlg.Controls.Find("timePicker_startTime", true)[0].Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + ((TextBoxX)devTestDlg.Controls.Find("text_channelNo", true)[0]).WatermarkText = "无空闲通道"; + } + devTestDlg.HideMaskAction += () => { this.HideMask(); @@ -341,7 +316,7 @@ tableHeader.BackColor = titleBackColor; dataGridView_Channel.Controls.Add(tableHeader); - // 通道号 + // 通道 Label colChannelNo = new Label { Font = titleFont, @@ -349,7 +324,7 @@ TextAlign = ContentAlignment.MiddleCenter, BackColor = titleBackColor, AutoSize = false, - Text = "通道号", + Text = "通道", Location = new Point(0, 0), Size = new Size(50, 30) }; @@ -455,7 +430,8 @@ BackColor = titleBackColor, AutoSize = false, Text = "开机特性", - Location = new Point(824, 0), + Location = new Point(684, 0), + Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStartup); @@ -470,29 +446,12 @@ BackColor = titleBackColor, AutoSize = false, Text = "稳定度", - Location = new Point(684, 0), + Location = new Point(759, 0), Size = new Size(75, 30) }; dataGridView_Channel.Controls.Add(colStablility); colStablility.BringToFront(); - // 频率准确度 - Label colAccuracy = new Label - { - Font = titleFont, - ForeColor = Color.White, - TextAlign = ContentAlignment.MiddleCenter, - BackColor = titleBackColor, - AutoSize = false, - Text = "准确度", - Location = new Point(759, 0), - Size = new Size(75, 30) - }; - dataGridView_Channel.Controls.Add(colAccuracy); - colAccuracy.BringToFront(); - - - // 日老化率 Label colAgingRate = new Label { @@ -502,20 +461,38 @@ BackColor = titleBackColor, AutoSize = false, Text = "日老化率", + Location = new Point(824, 0), + Size = new Size(75, 30) + }; + + // 频率准确度 + Label colAccuracy = new Label + { + Font = titleFont, + ForeColor = Color.White, + TextAlign = ContentAlignment.MiddleCenter, + BackColor = titleBackColor, + AutoSize = false, + Text = "准确度", Location = new Point(899, 0), Size = new Size(75, 30) }; + dataGridView_Channel.Controls.Add(colAccuracy); + colAccuracy.BringToFront(); + + + dataGridView_Channel.Controls.Add(colAgingRate); colAgingRate.BringToFront(); } - private void LoadChannelStatus() + public void LoadChannelStatus() { channelsTable = new DataTable(); - + channelsTable.Columns.Add("channelNo", Type.GetType("System.String")); channelsTable.Columns.Add("devName", Type.GetType("System.String")); - channelsTable.Columns.Add("devNo", Type.GetType("System.String")); + channelsTable.Columns.Add("devCode", Type.GetType("System.String")); channelsTable.Columns.Add("customName", Type.GetType("System.String")); channelsTable.Columns.Add("startTime", Type.GetType("System.DateTime")); channelsTable.Columns.Add("endTime", Type.GetType("System.DateTime")); @@ -524,25 +501,72 @@ channelsTable.Columns.Add("stablility", Type.GetType("System.String")); channelsTable.Columns.Add("accuracy", Type.GetType("System.String")); channelsTable.Columns.Add("agingRate", Type.GetType("System.String")); + channelsTable.Columns.Add("deviceId", Type.GetType("System.Int32")); + //channelsTable.Columns.Add("devType", Type.GetType("System.String")); + //channelsTable.Columns.Add("devModel", Type.GetType("System.String")); + //channelsTable.Columns.Add("customCom", Type.GetType("System.String")); - - channelsTable.Rows.Add("1", "通用计数器", "00001", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("2", "通用计数器", "00002", "李涛", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("3", "", "", "", null, null, "空闲", "", "", "", ""); - channelsTable.Rows.Add("4", "通用计数器", "00003", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - channelsTable.Rows.Add("5", "通用计数器", "000016", "航天203", DateTime.Now, DateTime.Now, "占用", "", "", "", ""); - - foreach (DataRow row in channelsTable.Rows) + listChannelStatus = deviceService.getDeviceByChannel(); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelsTable.Rows.Add(channelsTable.NewRow()); + channelFreeList.Clear(); + channelFreeList.Add("1"); + channelFreeList.Add("2"); + channelFreeList.Add("3"); + channelFreeList.Add("4"); + channelFreeList.Add("5"); + + foreach (DeviceView device in listChannelStatus) { - //if() + channelFreeList.Remove(device.Channel); + int index = Convert.ToInt32(device.Channel) - 1; + channelsTable.Rows[index]["channelNo"] = device.Channel; + channelsTable.Rows[index]["devName"] = device.DevName; + channelsTable.Rows[index]["devCode"] = device.DevCode; + channelsTable.Rows[index]["customName"] = device.CustomerName; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["endTime"] = device.EndTime; + channelsTable.Rows[index]["startTime"] = device.StartTime; + channelsTable.Rows[index]["channelStatus"] = "占用"; + channelsTable.Rows[index]["deviceId"] = device.Id; + if (device.Stability.Equals("-3")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Stability.Equals("-2")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Stability.Equals("-1")) this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_stability_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.Accuracy.Equals("-3")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.Accuracy.Equals("-2")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.Accuracy.Equals("-1")) this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_accuracy_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.AgeRate.Equals("-3")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.AgeRate.Equals("-2")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.AgeRate.Equals("-1")) this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_ageRate_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + if (device.BootFeature.Equals("-3")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.line; + else if (device.BootFeature.Equals("-2")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_gray; + else if (device.BootFeature.Equals("-1")) this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_orange; + else this.Controls.Find("pic_bootFeature_" + device.Channel, true)[0].BackgroundImage = Properties.Resources.dot_green; + + } + + foreach (string no in channelFreeList) + { + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelNo"] = no; + channelsTable.Rows[Convert.ToInt32(no) - 1]["channelStatus"] = "空闲"; + } + dataGridView_Channel.DataSource = channelsTable; - - - pic_accuracy_1.Image = (Image)Properties.Resources.dot_green; // width=764px + dataGridView_Channel.Columns[11].Visible = false; + //dataGridView_Channel.Columns[12].Visible = false; dataGridView_Channel.Columns[0].Width = 50; dataGridView_Channel.Columns[1].Width = 110; dataGridView_Channel.Columns[2].Width = 110; @@ -565,23 +589,73 @@ dataGridView_Channel.Columns[7].ReadOnly = true; dataGridView_Channel.Columns[8].ReadOnly = true; dataGridView_Channel.Columns[9].ReadOnly = true; - dataGridView_Channel.Columns[10].ReadOnly = true; + dataGridView_Channel.Columns[10].ReadOnly = true; } private void dataGridView_Channel_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - dataGridView_Channel.Rows[2].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + { + dataGridView_Channel.ClearSelection(); + + int channelNo = e.RowIndex + 1; + if (channelFreeList.Contains(channelNo + "")) + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = false; + } + else + { + dataGridView_Channel.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.FromArgb(201, 203, 208); + panel_channelList.Controls.Find("panel" + channelNo, true)[0].Visible = true; + } + foreach (string no in channelFreeList) + { + dataGridView_Channel.Rows[Convert.ToInt32(no) - 1].DefaultCellStyle.BackColor = Color.FromArgb(232, 234, 238); + panel_channelList.Controls.Find("panel" + no, true)[0].Visible = false; + } } - private void tableChannel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + private void dataGridView_Channel_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int rowIndex = tableToBeTested.CurrentCell.RowIndex; - int colIndex = tableToBeTested.CurrentCell.ColumnIndex; + int rowIndex = dataGridView_Channel.CurrentCell.RowIndex; + int colIndex = dataGridView_Channel.CurrentCell.ColumnIndex; + if (dataGridView_Channel.Rows[rowIndex].Cells[6].Value.ToString().Equals("占用")) + { + if (MessageBox.Show("该通道有正在检测的仪器，确定要停止检测？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + int deviceId = (int)dataGridView_Channel.Rows[rowIndex].Cells[11].Value; + DateTime startTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[4].Value; + DateTime endTime = (DateTime)dataGridView_Channel.Rows[rowIndex].Cells[5].Value; + if (MessageBox.Show("删除之前是否保存此次检测的数据？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + == DialogResult.Yes) + { + detectionItemService.stopDetection(deviceId, startTime, endTime,true); + } + else + { + detectionItemService.stopDetection(deviceId, startTime, endTime, false); + } + LoadChannelStatus(); + LoadDevToBeTested(); + return; + } + else + { + return; + } + } SetDevChannelDlg channelDlg = new SetDevChannelDlg(rowIndex+1); + //channelDlg.deviceId = Convert.ToInt32(dataGridView_Channel.Rows[rowIndex].Cells[11].Value); + //channelDlg.text_devCode.Text = dataGridView_Channel.Rows[rowIndex].Cells[2].Value.ToString(); + //channelDlg.text_devName.Text = dataGridView_Channel.Rows[rowIndex].Cells[1].Value.ToString(); + //channelDlg.text_devType.Text = dataGridView_Channel.Rows[rowIndex].Cells[12].Value.ToString(); + //channelDlg.text_devModel.Text = dataGridView_Channel.Rows[rowIndex].Cells[13].Value.ToString(); + //channelDlg.text_customerDev.Text = dataGridView_Channel.Rows[rowIndex].Cells[14].Value.ToString(); + //channelDlg.text_customerName.Text = dataGridView_Channel.Rows[rowIndex].Cells[3].Value.ToString(); channelDlg.HideMaskAction += () => { this.HideMask(); @@ -609,23 +683,68 @@ } } + private void openPortsAndReceive() + { + // 检测数据串口 + string portName = ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[0]; + int bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel1").ToString().Split(' ')[1]); + frePort_1 = portOpen(portName, bandRate); + if (frePort_1 == null) return; + + portName = ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel2").ToString().Split(' ')[1]); + frePort_2 = portOpen(portName, bandRate); + if (frePort_2 == null) return; + + portName = ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel3").ToString().Split(' ')[1]); + frePort_3 = portOpen(portName, bandRate); + if (frePort_3 == null) return; + + portName = ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel4").ToString().Split(' ')[1]); + frePort_4 = portOpen(portName, bandRate); + if (frePort_4 == null) return; + + portName = ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("channel5").ToString().Split(' ')[1]); + frePort_5 = portOpen(portName, bandRate); + if (frePort_5 == null) return; + + // 原子钟串口 + portName = ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("clock").ToString().Split(' ')[1]); + clockPort = portOpen(portName, bandRate); + if (clockPort == null) return; + + // 接收机串口 + portName = ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[0]; + bandRate = Convert.ToInt32(ConfigHelper.GetAppConfig("satellite").ToString().Split(' ')[1]); + satellitePort = portOpen(portName, bandRate); + if (satellitePort == null) return; + + label_clockStatus.Text = getClockData(clockPort); + getSatelliteData(satellitePort); + + } - SerialPort port = new SerialPort(); - private void portOpen() + + private SerialPort portOpen(string portName, int bandRate) { try { + SerialPort port = new SerialPort(); // 搜索串口 string[] names = SerialPort.GetPortNames(); - if (names.Length == 0) + if (names.Length == 0 || Array.IndexOf(names, portName) == -1 ) { - MessageBox.Show("没有搜索到串口！"); - return; + MessageBox.Show("没有搜索到串口" + portName + "！"); + return null; } // 设置串口参数 port.PortName = names[0]; - port.BaudRate = 115200; + port.BaudRate = bandRate; port.Parity = Parity.None; port.DataBits = 8; port.StopBits = StopBits.One; @@ -640,160 +759,188 @@ } if (port.IsOpen) { - // 开启接收串口数据线程 - timerPort = new System.Timers.Timer(); - timerPort.Interval = 1000; //设置计时器事件间隔执行时间 - timerPort.Elapsed += new System.Timers.ElapsedEventHandler(PortReceiveData); - timerPort.Enabled = true; - timerPort.Start(); - LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "开始接收串口数据"); + return port; } + + return null; } catch(Exception ex) { MessageBox.Show("错误","打开串口失败！"); LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开串口失败！"+ ex.Message); + return null; } } - - private void PortReceiveData(object sender, ElapsedEventArgs e) + // 获取检测数据 + public string getFrequencyData(SerialPort port) { - // 原子钟数据存放区 - byte[] receivedClock = new byte[96]; - // 卫星信号存放区 - byte[] receivedGPS = new byte[1024]; + string received = ""; + if (ConfigHelper.GetAppConfig("deviceType").ToString().Equals("1")) + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if (data.StartsWith("$") && data.EndsWith("")) + { + received = data.Split(' ')[0].Replace("$", "") + "." + data.Split(' ')[1].Replace(".", "").TrimEnd('0'); + break; + } + } + count++; + } + } + else + { + int count = 0; + while (count < 11) + { + int readLen = port.BytesToRead; + if (readLen > 0) + { + byte[] buffer = new byte[readLen]; + port.Read(buffer, 0, readLen);// 接收数据到buffer里面 + string data = Encoding.ASCII.GetString(buffer); + if ((data.StartsWith("0") || data.StartsWith("1") || data.StartsWith("2") || data.StartsWith("3")) && data.EndsWith("\r\n")) + { + received = data.Split(' ')[2]; + break; + } + } + count++; + } + } + return received; + } + + // 获取铷钟数据 + public string getClockData(SerialPort port) + { + byte[] clockData = new byte[94]; + + string clockStatus = ""; + int offset = 0; - int dataType = 0; - int gsvTotal = 0; // GSV卫星数据的总条数 - bool clockEnd = false; - bool gsvEnd = false; - bool rmcEnd = false; - while (true) + + int count = 0; + int count2 = 0; + while (count<11) { // 获取接收缓冲区长度 int Readlen = port.BytesToRead; - + // 接收到数据 if (Readlen > 0) { byte[] buffer = new byte[Readlen]; - // 接收数据到buffer里面 - port.Read(buffer, 0, Readlen); - + + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + // 判断接收到的数据 string data = Encoding.ASCII.GetString(buffer); - if (data.StartsWith("$") && data.Length > 2) - { - // 原子钟信号 - if (data.Substring(1).StartsWith("D") || data.Substring(1).StartsWith("A")) - { - dataType = 1; - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - } - + if (data.StartsWith("$")) + { + Array.Copy(buffer, 0, clockData, offset, Readlen); offset = offset + Readlen; + if (Readlen == 94) + { + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + break; + } + else + { + while (count2 < 60) + { + Readlen = port.BytesToRead; + if (Readlen > 0) + { + buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + Array.Copy(buffer, 0, clockData, offset, Readlen); + data = Encoding.ASCII.GetString(clockData); + string clockStatusCode = data.Split(',')[9]; + switch (clockStatusCode) + { + case "1": clockStatus = "预热"; break; + case "2": clockStatus = "自由运动"; break; + case "3": clockStatus = "捕获"; break; + case "4": clockStatus = "快锁"; break; + case "5": clockStatus = "慢锁"; break; + case "7": clockStatus = "保持"; break; + default: break; + } + + offset = offset + Readlen; + if (offset == 94) break; + } + count2++; + } + } + + break; } + } + count++; + } + return clockStatus; + + } + + // 获取卫星数据 + public void getSatelliteData(SerialPort port) + { + // RMC + string strRMC = ""; + int offset = 0;// GSV卫星数据的总条数 + + // GSV + byte[] dataGSV = new byte[1024]; + List strGSVList = new List(); + + int count = 0; + while (count < 10) + { + // 获取接收缓冲区长度 + int Readlen = port.BytesToRead; + + if (Readlen > 0) + { + byte[] buffer = new byte[Readlen]; + port.Read(buffer, 0, Readlen);// 接收数据到buffer里面 + + string data = Encoding.ASCII.GetString(buffer); + // RMC卫星信号，用于获取卫星状态 if (data.Contains("RMC")) { - dataType = 2; - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; + strRMC = data; } // GSV卫星信号，用于展示时间、日期、画卫星图等 - if (data.Contains("GSV") && data.Length > 7) + if (data.Contains("GSV")) { - dataType = 3; - gsvTotal = Convert.ToInt32(data.Substring(7, 1)); - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - } - if (dataType == 1) - { - // 原子钟信号接收完毕 - if (offset == 96) - { - clockEnd = true; - dataType = 0; - break; - } - - else - { - Array.Copy(buffer, 0, receivedClock, offset, Readlen); - offset = offset + Readlen; - } - } - if (dataType == 2) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // RMC信号接收完毕 - if (data.EndsWith("\r\n")) - { - rmcEnd = true; - dataType = 0; - break; - } - } - if (dataType == 3) - { - Array.Copy(buffer, 0, receivedGPS, offset, Readlen); - offset = offset + Readlen; - - // GSV信号接收完毕 - if (gsvTotal == Convert.ToInt32(data.Substring(9, 1))) - { - gsvEnd = true; - dataType = 0; - break; - } - } - - } - } - - new Thread(() => - { - // 解析原子钟信号 - if (clockEnd) - { - string dataClock = Encoding.ASCII.GetString(receivedClock); - switch (dataClock.Substring(50, 1)) - { - case "1": label_clockStatus.Text = "预热"; break; - case "2": label_clockStatus.Text = "自由运行"; break; - case "3": label_clockStatus.Text = "捕获"; break; - case "4": label_clockStatus.Text = "快锁"; break; - case "5": label_clockStatus.Text = "慢锁"; break; - case "7": label_clockStatus.Text = "保持"; break; - default: break; + strGSVList.Add(data); } } - - // 解析rmc信号 - if (rmcEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - // 解析gsv信号 - if (gsvEnd) - { - string dataGPS = Encoding.ASCII.GetString(receivedGPS); - - - - } - - }).Start(); - + } } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs index eb543f0..fab6451 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.Designer.cs @@ -34,11 +34,10 @@ this.label3 = new System.Windows.Forms.Label(); this.check_startNow = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); - this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.comboBoxEx1 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.text_customerDev = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.text_devName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -50,9 +49,14 @@ this.label9 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.text_devCode = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_toTestDevList = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.dateTimeInput2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); + this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); @@ -62,17 +66,17 @@ this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.radio_1s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_100s = new System.Windows.Forms.RadioButton(); this.btnCancelSetChannel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).BeginInit(); this.groupBox3.SuspendLayout(); this.SuspendLayout(); // @@ -83,7 +87,7 @@ this.panel1.Controls.Add(this.label3); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(637, 32); this.panel1.TabIndex = 10; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -95,7 +99,7 @@ this.btnExitChannel.FlatAppearance.BorderSize = 0; this.btnExitChannel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitChannel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitChannel.Location = new System.Drawing.Point(570, 5); + this.btnExitChannel.Location = new System.Drawing.Point(602, 5); this.btnExitChannel.Margin = new System.Windows.Forms.Padding(0); this.btnExitChannel.Name = "btnExitChannel"; this.btnExitChannel.Size = new System.Drawing.Size(20, 20); @@ -112,26 +116,26 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(155, 23); this.label3.TabIndex = 0; - this.label3.Text = "设置仪器检测项目"; + this.label3.Text = "添加通道检测仪器"; // // check_startNow // this.check_startNow.AutoSize = true; this.check_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.check_startNow.Location = new System.Drawing.Point(499, 383); + this.check_startNow.Location = new System.Drawing.Point(495, 413); this.check_startNow.Name = "check_startNow"; this.check_startNow.Size = new System.Drawing.Size(84, 24); this.check_startNow.TabIndex = 9; this.check_startNow.Text = "立即开始"; this.check_startNow.UseVisualStyleBackColor = true; + this.check_startNow.CheckedChanged += new System.EventHandler(this.check_startNow_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.text_devType); + this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.btn_downChannelList); - this.groupBox1.Controls.Add(this.text_channelNo); - this.groupBox1.Controls.Add(this.comboBoxEx1); this.groupBox1.Controls.Add(this.text_customerDev); - this.groupBox1.Controls.Add(this.text_devCode); this.groupBox1.Controls.Add(this.text_customerName); this.groupBox1.Controls.Add(this.text_devModel); this.groupBox1.Controls.Add(this.text_devName); @@ -143,12 +147,46 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.text_devCode); + this.groupBox1.Controls.Add(this.cbBox_toTestDevList); this.groupBox1.Location = new System.Drawing.Point(10, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 172); + this.groupBox1.Size = new System.Drawing.Size(616, 172); this.groupBox1.TabIndex = 14; this.groupBox1.TabStop = false; // + // text_devType + // + this.text_devType.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.ForeColor = System.Drawing.Color.DarkGray; + this.text_devType.Location = new System.Drawing.Point(415, 54); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.ReadOnly = true; + this.text_devType.Size = new System.Drawing.Size(150, 27); + this.text_devType.TabIndex = 345; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.ForeColor = System.Drawing.Color.OrangeRed; + this.label13.Location = new System.Drawing.Point(326, 21); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 21); + this.label13.TabIndex = 344; + this.label13.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -165,46 +203,17 @@ this.btn_downChannelList.TabIndex = 35; this.btn_downChannelList.Text = "﹀"; this.btn_downChannelList.UseVisualStyleBackColor = false; - // - // text_channelNo - // - // - // - // - this.text_channelNo.Border.Class = "TextBoxBorder"; - this.text_channelNo.Border.CornerDiameter = 5; - this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(415, 15); - this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); - this.text_channelNo.Name = "text_channelNo"; - this.text_channelNo.PreventEnterBeep = true; - this.text_channelNo.ReadOnly = true; - this.text_channelNo.Size = new System.Drawing.Size(150, 27); - this.text_channelNo.TabIndex = 36; - // - // comboBoxEx1 - // - this.comboBoxEx1.DisplayMember = "Text"; - this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxEx1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 18; - this.comboBoxEx1.Location = new System.Drawing.Point(415, 18); - this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(150, 24); - this.comboBoxEx1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBoxEx1.TabIndex = 24; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; this.text_customerDev.Location = new System.Drawing.Point(415, 91); @@ -215,34 +224,15 @@ this.text_customerDev.Size = new System.Drawing.Size(150, 27); this.text_customerDev.TabIndex = 18; // - // text_devCode - // - // - // - // - this.text_devCode.Border.Class = "TextBoxBorder"; - this.text_devCode.Border.CornerDiameter = 5; - this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; - this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(415, 54); - this.text_devCode.Margin = new System.Windows.Forms.Padding(0); - this.text_devCode.Name = "text_devCode"; - this.text_devCode.PreventEnterBeep = true; - this.text_devCode.ReadOnly = true; - this.text_devCode.Size = new System.Drawing.Size(150, 27); - this.text_devCode.TabIndex = 19; - // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; this.text_customerName.Location = new System.Drawing.Point(125, 132); @@ -255,13 +245,13 @@ // // text_devModel // + this.text_devModel.BackColor = System.Drawing.Color.White; // // // this.text_devModel.Border.Class = "TextBoxBorder"; this.text_devModel.Border.CornerDiameter = 5; this.text_devModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devModel.Enabled = false; this.text_devModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devModel.ForeColor = System.Drawing.Color.DarkGray; this.text_devModel.Location = new System.Drawing.Point(125, 93); @@ -274,13 +264,13 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; this.text_devName.Location = new System.Drawing.Point(125, 54); @@ -293,13 +283,13 @@ // // textBox_channelNo // + this.textBox_channelNo.BackColor = System.Drawing.Color.White; // // // this.textBox_channelNo.Border.Class = "TextBoxBorder"; this.textBox_channelNo.Border.CornerDiameter = 5; this.textBox_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBox_channelNo.Enabled = false; this.textBox_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.textBox_channelNo.ForeColor = System.Drawing.Color.DarkGray; this.textBox_channelNo.Location = new System.Drawing.Point(125, 17); @@ -330,7 +320,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); this.label8.TabIndex = 12; - this.label8.Text = "仪器编号"; + this.label8.Text = "仪器类型"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label4 @@ -388,10 +378,46 @@ this.label1.Text = "通道号"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // text_devCode + // + this.text_devCode.BackColor = System.Drawing.Color.White; + // + // + // + this.text_devCode.Border.Class = "TextBoxBorder"; + this.text_devCode.Border.CornerDiameter = 5; + this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devCode.Location = new System.Drawing.Point(415, 15); + this.text_devCode.Margin = new System.Windows.Forms.Padding(0); + this.text_devCode.Name = "text_devCode"; + this.text_devCode.PreventEnterBeep = true; + this.text_devCode.ReadOnly = true; + this.text_devCode.Size = new System.Drawing.Size(150, 27); + this.text_devCode.TabIndex = 36; + this.text_devCode.TextChanged += new System.EventHandler(this.text_devCode_TextChanged); + // + // cbBox_toTestDevList + // + this.cbBox_toTestDevList.DisplayMember = "Text"; + this.cbBox_toTestDevList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_toTestDevList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_toTestDevList.FormattingEnabled = true; + this.cbBox_toTestDevList.ItemHeight = 18; + this.cbBox_toTestDevList.Location = new System.Drawing.Point(415, 18); + this.cbBox_toTestDevList.Name = "cbBox_toTestDevList"; + this.cbBox_toTestDevList.Size = new System.Drawing.Size(150, 24); + this.cbBox_toTestDevList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_toTestDevList.TabIndex = 24; + this.cbBox_toTestDevList.SelectedIndexChanged += new System.EventHandler(this.cbBox_toTestDevList_SelectedIndexChanged); + // // groupBox2 // - this.groupBox2.Controls.Add(this.dateTimeInput2); - this.groupBox2.Controls.Add(this.dateTimeInput1); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.timePicker_endTime); + this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); this.groupBox2.Controls.Add(this.checkBox_bootFeature); this.groupBox2.Controls.Add(this.checkBox_accuracy); @@ -401,148 +427,192 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Location = new System.Drawing.Point(9, 206); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(617, 128); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; // - // dateTimeInput2 + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(8, 91); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 349; + this.label15.Text = "*"; + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Enabled = false; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(126, 50); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 346; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + this.checkBox_count.CheckedChanged += new System.EventHandler(this.checkBox_count_CheckedChanged); + // + // label14 + // + this.label14.AutoSize = true; + this.label14.BackColor = System.Drawing.Color.Transparent; + this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.ForeColor = System.Drawing.Color.OrangeRed; + this.label14.Location = new System.Drawing.Point(37, 20); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(17, 21); + this.label14.TabIndex = 345; + this.label14.Text = "*"; + // + // timePicker_endTime // // // // - this.dateTimeInput2.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput2.ButtonDropDown.Visible = true; - this.dateTimeInput2.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput2.IsPopupCalendarOpen = false; - this.dateTimeInput2.Location = new System.Drawing.Point(395, 57); + this.timePicker_endTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_endTime.ButtonDropDown.Visible = true; + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_endTime.IsPopupCalendarOpen = false; + this.timePicker_endTime.Location = new System.Drawing.Point(416, 90); // // // // // // - this.dateTimeInput2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput2.MonthCalendar.ClearButtonVisible = true; + this.timePicker_endTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_endTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput2.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_endTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_endTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput2.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput2.Name = "dateTimeInput2"; - this.dateTimeInput2.ShowUpDown = true; - this.dateTimeInput2.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput2.TabIndex = 20; - this.dateTimeInput2.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_endTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_endTime.Name = "timePicker_endTime"; + this.timePicker_endTime.ShowUpDown = true; + this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_endTime.TabIndex = 20; + this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // - // dateTimeInput1 + // timePicker_startTime // // // // - this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dateTimeInput1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; - this.dateTimeInput1.IsPopupCalendarOpen = false; - this.dateTimeInput1.Location = new System.Drawing.Point(115, 57); + this.timePicker_startTime.BackgroundStyle.Class = "DateTimeInputBackground"; + this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.timePicker_startTime.ButtonDropDown.Visible = true; + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.timePicker_startTime.IsPopupCalendarOpen = false; + this.timePicker_startTime.Location = new System.Drawing.Point(124, 90); // // // // // // - this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true; + this.timePicker_startTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + this.timePicker_startTime.MonthCalendar.ClearButtonVisible = true; // // // - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); - this.dateTimeInput1.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; + this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; // // // - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; - this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.ShowUpDown = true; - this.dateTimeInput1.Size = new System.Drawing.Size(180, 23); - this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dateTimeInput1.TabIndex = 21; - this.dateTimeInput1.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; + this.timePicker_startTime.Name = "timePicker_startTime"; + this.timePicker_startTime.ShowUpDown = true; + this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.timePicker_startTime.TabIndex = 21; + this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 20); + this.checkBox_ageRate.Location = new System.Drawing.Point(479, 20); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 20); + this.checkBox_bootFeature.Location = new System.Drawing.Point(360, 20); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 20); + this.checkBox_accuracy.Location = new System.Drawing.Point(244, 20); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 20); + this.checkBox_stability.Location = new System.Drawing.Point(126, 20); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -553,7 +623,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(285, 55); + this.label7.Location = new System.Drawing.Point(306, 88); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(100, 27); @@ -564,7 +634,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 55); + this.label6.Location = new System.Drawing.Point(16, 87); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(100, 27); @@ -575,7 +645,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Location = new System.Drawing.Point(16, 17); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -585,72 +655,80 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label12); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(9, 307); + this.groupBox3.Location = new System.Drawing.Point(9, 340); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 54); + this.groupBox3.Size = new System.Drawing.Size(617, 54); this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 17); + this.label12.Location = new System.Drawing.Point(10, 17); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.Size = new System.Drawing.Size(107, 27); this.label12.TabIndex = 10; - this.label12.Text = "频率稳定度"; + this.label12.Text = "稳定度采样时间"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox_100s + // radio_1s // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 19); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(126, 20); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 15; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; // - // checkBox_20s + // radio_10s // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 19); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(244, 19); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 16; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; // - // checkBox_10s + // radio_20s // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 19); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(360, 20); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 17; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; // - // checkBox_1s + // radio_100s // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 19); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(479, 19); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 18; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; // // btnCancelSetChannel // @@ -664,7 +742,7 @@ this.btnCancelSetChannel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetChannel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetChannel.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetChannel.Location = new System.Drawing.Point(310, 379); + this.btnCancelSetChannel.Location = new System.Drawing.Point(336, 409); this.btnCancelSetChannel.Name = "btnCancelSetChannel"; this.btnCancelSetChannel.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetChannel.PressForeColor = System.Drawing.Color.White; @@ -687,7 +765,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 379); + this.btnSave.Location = new System.Drawing.Point(176, 409); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,7 +780,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 430); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 465); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -718,10 +797,11 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.timePicker_startTime)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.ResumeLayout(false); @@ -738,12 +818,7 @@ private RoundButton btnCancelSetChannel; private System.Windows.Forms.CheckBox check_startNow; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; - private DevComponents.DotNetBar.Controls.TextBoxX text_devCode; - private DevComponents.DotNetBar.Controls.TextBoxX text_customerName; - private DevComponents.DotNetBar.Controls.TextBoxX text_devModel; - private DevComponents.DotNetBar.Controls.TextBoxX text_devName; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_toTestDevList; private DevComponents.DotNetBar.Controls.TextBoxX textBox_channelNo; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; @@ -753,7 +828,7 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox2; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; private System.Windows.Forms.CheckBox checkBox_bootFeature; private System.Windows.Forms.CheckBox checkBox_accuracy; @@ -763,12 +838,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private System.Windows.Forms.Button btn_downChannelList; - private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - public DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1; + public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.CheckBox checkBox_count; + public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerDev; + public DevComponents.DotNetBar.Controls.TextBoxX text_customerName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devModel; + public DevComponents.DotNetBar.Controls.TextBoxX text_devName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index 910970c..861fcff 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -1,4 +1,8 @@ -using System; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -22,6 +26,12 @@ } #endregion + public int deviceId = -1; + DeviceService deviceService = new DeviceServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + DateTime endTimeBySystem = new DateTime(); + public Action HideMaskAction { get; @@ -33,6 +43,13 @@ InitializeComponent(); textBox_channelNo.Text = channelNo.ToString(); + timePicker_startTime.Value = DateTime.Now; + + List listToTest = deviceService.search("", "", "", "", "", "1"); + foreach (DeviceDto deviceDto in listToTest) + { + cbBox_toTestDevList.Items.Add(deviceDto.DevCode); + } } private void btnExitChannel_Click(object sender, EventArgs e) @@ -50,11 +67,153 @@ { groupBox3.Enabled = false; } + getEndTime(); } private void btnSave_Click(object sender, EventArgs e) { + if (text_devCode.Text.Equals("")) + { + MessageBox.Show("请选择待检仪器！"); + return; + } + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (check_startNow.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) { stability = "-1";} + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if(radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, textBox_channelNo.Text); + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); + this.HideMaskAction(); + } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_toTestDevList.DroppedDown = true; + } + + private void text_devCode_TextChanged(object sender, EventArgs e) + { + + } + + private void cbBox_toTestDevList_SelectedIndexChanged(object sender, EventArgs e) + { + text_devCode.Text = cbBox_toTestDevList.SelectedItem.ToString(); + List list = deviceService.search("", text_devCode.Text.Trim(), "", "", "", ""); + DeviceDto deviceDto = list[0]; + deviceId = deviceDto.Id; + text_devCode.Text = deviceDto.DevCode; + text_devName.Text = deviceDto.DevName; + text_devType.Text = deviceDto.DevTypeName; + text_devModel.Text = deviceDto.DevModel; + text_customerDev.Text = deviceDto.CustomerDev; + text_customerName.Text = deviceDto.CustomerName; + + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; + + } + + // 选择开始时间 + private void timePicker_startTime_ValueChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void check_startNow_CheckedChanged(object sender, EventArgs e) + { + if (check_startNow.Checked) + { + timePicker_startTime.Value = DateTime.Now; + } + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_count_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } } } } diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs index 6c69d99..3dd891a 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.Designer.cs @@ -32,8 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.label11 = new System.Windows.Forms.Label(); - this.checkBox9 = new System.Windows.Forms.CheckBox(); + this.checkBox_now = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label7 = new System.Windows.Forms.Label(); this.btn_downChannelList = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text_customerName = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -54,6 +55,8 @@ this.comboItem4 = new DevComponents.Editors.ComboItem(); this.comboItem5 = new DevComponents.Editors.ComboItem(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.label10 = new System.Windows.Forms.Label(); this.timePicker_endTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.timePicker_startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); @@ -61,14 +64,15 @@ this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radio_100s = new System.Windows.Forms.RadioButton(); + this.radio_20s = new System.Windows.Forms.RadioButton(); + this.radio_10s = new System.Windows.Forms.RadioButton(); + this.radio_1s = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox_100s = new System.Windows.Forms.CheckBox(); - this.checkBox_20s = new System.Windows.Forms.CheckBox(); - this.checkBox_10s = new System.Windows.Forms.CheckBox(); - this.checkBox_1s = new System.Windows.Forms.CheckBox(); this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); @@ -86,7 +90,7 @@ this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(639, 32); this.panel1.TabIndex = 11; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -98,7 +102,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(603, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -117,19 +121,21 @@ this.label11.TabIndex = 0; this.label11.Text = "设置仪器检测项目"; // - // checkBox9 + // checkBox_now // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(504, 344); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 15; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; + this.checkBox_now.AutoSize = true; + this.checkBox_now.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_now.Location = new System.Drawing.Point(489, 384); + this.checkBox_now.Name = "checkBox_now"; + this.checkBox_now.Size = new System.Drawing.Size(84, 24); + this.checkBox_now.TabIndex = 15; + this.checkBox_now.Text = "立即开始"; + this.checkBox_now.UseVisualStyleBackColor = true; + this.checkBox_now.CheckedChanged += new System.EventHandler(this.checkBox_now_CheckedChanged); // // groupBox1 // + this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.btn_downChannelList); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.text_customerName); @@ -145,10 +151,23 @@ this.groupBox1.Controls.Add(this.text_channelNo); this.groupBox1.Location = new System.Drawing.Point(10, 32); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 134); + this.groupBox1.Size = new System.Drawing.Size(619, 134); this.groupBox1.TabIndex = 18; this.groupBox1.TabStop = false; // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.OrangeRed; + this.label7.Location = new System.Drawing.Point(324, 98); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 21); + this.label7.TabIndex = 344; + this.label7.Text = "*"; + // // btn_downChannelList // this.btn_downChannelList.BackColor = System.Drawing.Color.Transparent; @@ -157,7 +176,7 @@ this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btn_downChannelList.Location = new System.Drawing.Point(531, 96); + this.btn_downChannelList.Location = new System.Drawing.Point(542, 96); this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); this.btn_downChannelList.Name = "btn_downChannelList"; this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); @@ -170,7 +189,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(291, 94); + this.label4.Location = new System.Drawing.Point(302, 94); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 27); @@ -180,16 +199,16 @@ // // text_customerName // + this.text_customerName.BackColor = System.Drawing.Color.White; // // // this.text_customerName.Border.Class = "TextBoxBorder"; this.text_customerName.Border.CornerDiameter = 5; this.text_customerName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerName.Enabled = false; this.text_customerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerName.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerName.Location = new System.Drawing.Point(111, 94); + this.text_customerName.Location = new System.Drawing.Point(122, 94); this.text_customerName.Margin = new System.Windows.Forms.Padding(0); this.text_customerName.Name = "text_customerName"; this.text_customerName.PreventEnterBeep = true; @@ -200,7 +219,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1, 94); + this.label2.Location = new System.Drawing.Point(12, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 27); @@ -210,16 +229,16 @@ // // text_customerDev // + this.text_customerDev.BackColor = System.Drawing.Color.White; // // // this.text_customerDev.Border.Class = "TextBoxBorder"; this.text_customerDev.Border.CornerDiameter = 5; this.text_customerDev.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_customerDev.Enabled = false; this.text_customerDev.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_customerDev.ForeColor = System.Drawing.Color.DarkGray; - this.text_customerDev.Location = new System.Drawing.Point(401, 57); + this.text_customerDev.Location = new System.Drawing.Point(412, 57); this.text_customerDev.Margin = new System.Windows.Forms.Padding(0); this.text_customerDev.Name = "text_customerDev"; this.text_customerDev.PreventEnterBeep = true; @@ -229,16 +248,16 @@ // // text_devType // + this.text_devType.BackColor = System.Drawing.Color.White; // // // this.text_devType.Border.Class = "TextBoxBorder"; this.text_devType.Border.CornerDiameter = 5; this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devType.Enabled = false; this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devType.ForeColor = System.Drawing.Color.DarkGray; - this.text_devType.Location = new System.Drawing.Point(111, 57); + this.text_devType.Location = new System.Drawing.Point(122, 57); this.text_devType.Margin = new System.Windows.Forms.Padding(0); this.text_devType.Name = "text_devType"; this.text_devType.PreventEnterBeep = true; @@ -249,7 +268,7 @@ // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(291, 57); + this.label1.Location = new System.Drawing.Point(302, 57); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 27); @@ -260,7 +279,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(1, 57); + this.label9.Location = new System.Drawing.Point(12, 57); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(100, 27); @@ -270,16 +289,16 @@ // // text_devCode // + this.text_devCode.BackColor = System.Drawing.Color.White; // // // this.text_devCode.Border.Class = "TextBoxBorder"; this.text_devCode.Border.CornerDiameter = 5; this.text_devCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devCode.Enabled = false; this.text_devCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devCode.ForeColor = System.Drawing.Color.DarkGray; - this.text_devCode.Location = new System.Drawing.Point(401, 20); + this.text_devCode.Location = new System.Drawing.Point(412, 20); this.text_devCode.Margin = new System.Windows.Forms.Padding(0); this.text_devCode.Name = "text_devCode"; this.text_devCode.PreventEnterBeep = true; @@ -289,16 +308,16 @@ // // text_devName // + this.text_devName.BackColor = System.Drawing.Color.White; // // // this.text_devName.Border.Class = "TextBoxBorder"; this.text_devName.Border.CornerDiameter = 5; this.text_devName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.text_devName.Enabled = false; this.text_devName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.text_devName.ForeColor = System.Drawing.Color.DarkGray; - this.text_devName.Location = new System.Drawing.Point(111, 20); + this.text_devName.Location = new System.Drawing.Point(122, 20); this.text_devName.Margin = new System.Windows.Forms.Padding(0); this.text_devName.Name = "text_devName"; this.text_devName.PreventEnterBeep = true; @@ -310,7 +329,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(291, 20); + this.label8.Location = new System.Drawing.Point(302, 20); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(100, 27); @@ -321,7 +340,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1, 20); + this.label5.Location = new System.Drawing.Point(12, 20); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(100, 27); @@ -331,6 +350,7 @@ // // text_channelNo // + this.text_channelNo.BackColor = System.Drawing.Color.White; // // // @@ -338,7 +358,7 @@ this.text_channelNo.Border.CornerDiameter = 5; this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.text_channelNo.Location = new System.Drawing.Point(401, 94); + this.text_channelNo.Location = new System.Drawing.Point(412, 94); this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); this.text_channelNo.Name = "text_channelNo"; this.text_channelNo.PreventEnterBeep = true; @@ -359,9 +379,9 @@ this.comboItem3, this.comboItem4, this.comboItem5}); - this.comboBox_channelNo.Location = new System.Drawing.Point(415, 128); + this.comboBox_channelNo.Location = new System.Drawing.Point(428, 128); this.comboBox_channelNo.Name = "comboBox_channelNo"; - this.comboBox_channelNo.Size = new System.Drawing.Size(142, 24); + this.comboBox_channelNo.Size = new System.Drawing.Size(135, 24); this.comboBox_channelNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.comboBox_channelNo.TabIndex = 35; this.comboBox_channelNo.SelectedIndexChanged += new System.EventHandler(this.comboBox_channelNo_SelectedIndexChanged); @@ -388,6 +408,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.checkBox_count); + this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.timePicker_endTime); this.groupBox2.Controls.Add(this.timePicker_startTime); this.groupBox2.Controls.Add(this.checkBox_ageRate); @@ -395,15 +417,40 @@ this.groupBox2.Controls.Add(this.checkBox_accuracy); this.groupBox2.Controls.Add(this.checkBox_stability); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.label12); this.groupBox2.Location = new System.Drawing.Point(10, 167); this.groupBox2.Margin = new System.Windows.Forms.Padding(0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 100); + this.groupBox2.Size = new System.Drawing.Size(619, 129); this.groupBox2.TabIndex = 36; this.groupBox2.TabStop = false; // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(124, 59); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 347; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.OrangeRed; + this.label10.Location = new System.Drawing.Point(34, 24); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(17, 21); + this.label10.TabIndex = 345; + this.label10.Text = "*"; + // // timePicker_endTime // // @@ -413,11 +460,11 @@ this.timePicker_endTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_endTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_endTime.ButtonDropDown.Visible = true; - this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_endTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_endTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_endTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_endTime.IsPopupCalendarOpen = false; - this.timePicker_endTime.Location = new System.Drawing.Point(397, 60); + this.timePicker_endTime.Location = new System.Drawing.Point(414, 89); // // // @@ -449,11 +496,10 @@ this.timePicker_endTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_endTime.Name = "timePicker_endTime"; this.timePicker_endTime.ShowUpDown = true; - this.timePicker_endTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_endTime.Size = new System.Drawing.Size(175, 23); this.timePicker_endTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_endTime.TabIndex = 20; - this.timePicker_endTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); - this.timePicker_endTime.Click += new System.EventHandler(this.timePicker_endTime_Click); + this.timePicker_endTime.ValueChanged += new System.EventHandler(this.timePicker_endTime_ValueChanged); // // timePicker_startTime // @@ -464,11 +510,12 @@ this.timePicker_startTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.timePicker_startTime.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.timePicker_startTime.ButtonDropDown.Visible = true; - this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm"; - this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.timePicker_startTime.CustomFormat = "yyyy-MM-dd HH:mm:ss"; + this.timePicker_startTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.timePicker_startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.timePicker_startTime.IsPopupCalendarOpen = false; - this.timePicker_startTime.Location = new System.Drawing.Point(115, 60); + this.timePicker_startTime.Location = new System.Drawing.Point(122, 90); + this.timePicker_startTime.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -488,8 +535,9 @@ this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; this.timePicker_startTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 3, 1, 0, 0, 0, 0); + this.timePicker_startTime.MonthCalendar.DisplayMonth = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); this.timePicker_startTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + this.timePicker_startTime.MonthCalendar.MinDate = new System.DateTime(2021, 4, 2, 0, 0, 0, 0); // // // @@ -497,53 +545,57 @@ this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.timePicker_startTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.timePicker_startTime.MonthCalendar.SelectionRange = new System.Windows.Forms.SelectionRange(new System.DateTime(((long)(0))), new System.DateTime(2021, 4, 2, 0, 0, 0, 0)); this.timePicker_startTime.MonthCalendar.TodayButtonVisible = true; this.timePicker_startTime.Name = "timePicker_startTime"; this.timePicker_startTime.ShowUpDown = true; - this.timePicker_startTime.Size = new System.Drawing.Size(180, 23); + this.timePicker_startTime.Size = new System.Drawing.Size(177, 23); this.timePicker_startTime.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.timePicker_startTime.TabIndex = 21; - this.timePicker_startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); + this.timePicker_startTime.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H; this.timePicker_startTime.ValueChanged += new System.EventHandler(this.timePicker_startTime_ValueChanged); // // checkBox_ageRate // this.checkBox_ageRate.AutoSize = true; this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_ageRate.Location = new System.Drawing.Point(425, 23); + this.checkBox_ageRate.Location = new System.Drawing.Point(476, 24); this.checkBox_ageRate.Name = "checkBox_ageRate"; this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); this.checkBox_ageRate.TabIndex = 19; this.checkBox_ageRate.Text = "日老化率"; this.checkBox_ageRate.UseVisualStyleBackColor = true; + this.checkBox_ageRate.CheckedChanged += new System.EventHandler(this.checkBox_ageRate_CheckedChanged); // // checkBox_bootFeature // this.checkBox_bootFeature.AutoSize = true; this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_bootFeature.Location = new System.Drawing.Point(331, 23); + this.checkBox_bootFeature.Location = new System.Drawing.Point(366, 24); this.checkBox_bootFeature.Name = "checkBox_bootFeature"; this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); this.checkBox_bootFeature.TabIndex = 18; this.checkBox_bootFeature.Text = "开机特性"; this.checkBox_bootFeature.UseVisualStyleBackColor = true; + this.checkBox_bootFeature.CheckedChanged += new System.EventHandler(this.checkBox_bootFeature_CheckedChanged); // // checkBox_accuracy // this.checkBox_accuracy.AutoSize = true; this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_accuracy.Location = new System.Drawing.Point(223, 23); + this.checkBox_accuracy.Location = new System.Drawing.Point(241, 23); this.checkBox_accuracy.Name = "checkBox_accuracy"; this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); this.checkBox_accuracy.TabIndex = 16; this.checkBox_accuracy.Text = "频率准确度"; this.checkBox_accuracy.UseVisualStyleBackColor = true; + this.checkBox_accuracy.CheckedChanged += new System.EventHandler(this.checkBox_accuracy_CheckedChanged); // // checkBox_stability // this.checkBox_stability.AutoSize = true; this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_stability.Location = new System.Drawing.Point(115, 23); + this.checkBox_stability.Location = new System.Drawing.Point(124, 23); this.checkBox_stability.Name = "checkBox_stability"; this.checkBox_stability.Size = new System.Drawing.Size(98, 24); this.checkBox_stability.TabIndex = 17; @@ -554,7 +606,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(292, 58); + this.label3.Location = new System.Drawing.Point(306, 87); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -562,21 +614,10 @@ this.label3.Text = "预计结束时间"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // label12 - // - this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 58); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(100, 27); - this.label12.TabIndex = 14; - this.label12.Text = "测量开始时间"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 21); + this.label13.Location = new System.Drawing.Point(14, 21); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -584,73 +625,106 @@ this.label13.Text = "检测项目"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.ForeColor = System.Drawing.Color.OrangeRed; + this.label15.Location = new System.Drawing.Point(7, 90); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(17, 21); + this.label15.TabIndex = 348; + this.label15.Text = "*"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(21, 86); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(100, 27); + this.label12.TabIndex = 14; + this.label12.Text = "测量开始时间"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // groupBox3 // + this.groupBox3.Controls.Add(this.radio_100s); + this.groupBox3.Controls.Add(this.radio_20s); + this.groupBox3.Controls.Add(this.radio_10s); + this.groupBox3.Controls.Add(this.radio_1s); this.groupBox3.Controls.Add(this.label6); - this.groupBox3.Controls.Add(this.checkBox_100s); - this.groupBox3.Controls.Add(this.checkBox_20s); - this.groupBox3.Controls.Add(this.checkBox_10s); - this.groupBox3.Controls.Add(this.checkBox_1s); - this.groupBox3.Location = new System.Drawing.Point(10, 268); + this.groupBox3.Enabled = false; + this.groupBox3.Location = new System.Drawing.Point(10, 299); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(580, 56); + this.groupBox3.Size = new System.Drawing.Size(619, 56); this.groupBox3.TabIndex = 37; this.groupBox3.TabStop = false; // + // radio_100s + // + this.radio_100s.AutoSize = true; + this.radio_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_100s.Location = new System.Drawing.Point(477, 20); + this.radio_100s.Name = "radio_100s"; + this.radio_100s.Size = new System.Drawing.Size(57, 24); + this.radio_100s.TabIndex = 22; + this.radio_100s.TabStop = true; + this.radio_100s.Tag = "100"; + this.radio_100s.Text = "100s"; + this.radio_100s.UseVisualStyleBackColor = true; + // + // radio_20s + // + this.radio_20s.AutoSize = true; + this.radio_20s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_20s.Location = new System.Drawing.Point(358, 21); + this.radio_20s.Name = "radio_20s"; + this.radio_20s.Size = new System.Drawing.Size(49, 24); + this.radio_20s.TabIndex = 21; + this.radio_20s.TabStop = true; + this.radio_20s.Tag = "20"; + this.radio_20s.Text = "20s"; + this.radio_20s.UseVisualStyleBackColor = true; + // + // radio_10s + // + this.radio_10s.AutoSize = true; + this.radio_10s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_10s.Location = new System.Drawing.Point(242, 20); + this.radio_10s.Name = "radio_10s"; + this.radio_10s.Size = new System.Drawing.Size(49, 24); + this.radio_10s.TabIndex = 20; + this.radio_10s.TabStop = true; + this.radio_10s.Tag = "10"; + this.radio_10s.Text = "10s"; + this.radio_10s.UseVisualStyleBackColor = true; + // + // radio_1s + // + this.radio_1s.AutoSize = true; + this.radio_1s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radio_1s.Location = new System.Drawing.Point(124, 21); + this.radio_1s.Name = "radio_1s"; + this.radio_1s.Size = new System.Drawing.Size(41, 24); + this.radio_1s.TabIndex = 19; + this.radio_1s.TabStop = true; + this.radio_1s.Tag = "1"; + this.radio_1s.Text = "1s"; + this.radio_1s.UseVisualStyleBackColor = true; + // // label6 // this.label6.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(5, 19); + this.label6.Location = new System.Drawing.Point(11, 20); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(100, 27); + this.label6.Size = new System.Drawing.Size(110, 27); this.label6.TabIndex = 10; - this.label6.Text = "频率稳定度"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // checkBox_100s - // - this.checkBox_100s.AutoSize = true; - this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.checkBox_100s.Location = new System.Drawing.Point(425, 21); - this.checkBox_100s.Name = "checkBox_100s"; - this.checkBox_100s.Size = new System.Drawing.Size(60, 24); - this.checkBox_100s.TabIndex = 11; - this.checkBox_100s.Text = "100S"; - this.checkBox_100s.UseVisualStyleBackColor = true; - // - // checkBox_20s - // - this.checkBox_20s.AutoSize = true; - this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_20s.Location = new System.Drawing.Point(331, 21); - this.checkBox_20s.Name = "checkBox_20s"; - this.checkBox_20s.Size = new System.Drawing.Size(52, 24); - this.checkBox_20s.TabIndex = 12; - this.checkBox_20s.Text = "20S"; - this.checkBox_20s.UseVisualStyleBackColor = true; - // - // checkBox_10s - // - this.checkBox_10s.AutoSize = true; - this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_10s.Location = new System.Drawing.Point(223, 21); - this.checkBox_10s.Name = "checkBox_10s"; - this.checkBox_10s.Size = new System.Drawing.Size(52, 24); - this.checkBox_10s.TabIndex = 13; - this.checkBox_10s.Text = "10S"; - this.checkBox_10s.UseVisualStyleBackColor = true; - // - // checkBox_1s - // - this.checkBox_1s.AutoSize = true; - this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox_1s.Location = new System.Drawing.Point(115, 21); - this.checkBox_1s.Name = "checkBox_1s"; - this.checkBox_1s.Size = new System.Drawing.Size(44, 24); - this.checkBox_1s.TabIndex = 14; - this.checkBox_1s.Text = "1S"; - this.checkBox_1s.UseVisualStyleBackColor = true; + this.label6.Text = "稳定度采样时间"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // btnCancelSetDev // @@ -664,7 +738,7 @@ this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(310, 342); + this.btnCancelSetDev.Location = new System.Drawing.Point(326, 380); this.btnCancelSetDev.Name = "btnCancelSetDev"; this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; @@ -677,6 +751,7 @@ // // btnSave // + this.btnSave.Enabled = false; this.btnSave.EnterBackColor = System.Drawing.Color.Blue; this.btnSave.EnterForeColor = System.Drawing.Color.White; this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -687,7 +762,7 @@ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(150, 342); + this.btnSave.Location = new System.Drawing.Point(166, 380); this.btnSave.Name = "btnSave"; this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; this.btnSave.PressForeColor = System.Drawing.Color.White; @@ -702,11 +777,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 392); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(638, 430); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_now); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); @@ -720,6 +796,7 @@ this.Text = "设置仪器检测项目"; this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.timePicker_endTime)).EndInit(); @@ -735,7 +812,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBox9; + private System.Windows.Forms.CheckBox checkBox_now; private RoundButton btnCancelSetDev; private RoundButton btnSave; private System.Windows.Forms.GroupBox groupBox1; @@ -747,7 +824,6 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; private System.Windows.Forms.GroupBox groupBox2; private DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_endTime; private System.Windows.Forms.CheckBox checkBox_ageRate; @@ -759,10 +835,6 @@ private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox_100s; - private System.Windows.Forms.CheckBox checkBox_20s; - private System.Windows.Forms.CheckBox checkBox_10s; - private System.Windows.Forms.CheckBox checkBox_1s; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem comboItem2; private DevComponents.Editors.ComboItem comboItem3; @@ -774,5 +846,14 @@ public DevComponents.DotNetBar.Controls.TextBoxX text_devCode; public DevComponents.DotNetBar.Controls.TextBoxX text_devName; public DevComponents.Editors.DateTimeAdv.DateTimeInput timePicker_startTime; + public DevComponents.DotNetBar.Controls.ComboBoxEx comboBox_channelNo; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox checkBox_count; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.RadioButton radio_100s; + private System.Windows.Forms.RadioButton radio_20s; + private System.Windows.Forms.RadioButton radio_10s; + private System.Windows.Forms.RadioButton radio_1s; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/home/SetDevTestDlg.cs b/RbFreqStandMeasure/home/SetDevTestDlg.cs index 0e89d15..673d28c 100644 --- a/RbFreqStandMeasure/home/SetDevTestDlg.cs +++ b/RbFreqStandMeasure/home/SetDevTestDlg.cs @@ -1,4 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl; using System; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -7,6 +9,11 @@ { public partial class SetDevTestDlg : Form { + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + public int deviceId = -1; + + DateTime endTimeBySystem = new DateTime(); + #region 无边框拖动效果/最小化窗口/关闭窗口 [DllImport("user32.dll")]//拖动无窗体的控件 public static extern bool ReleaseCapture(); @@ -33,19 +40,63 @@ { InitializeComponent(); - groupBox3.Enabled = false; - + if (text_devType.Text.Equals("计数器")) checkBox_count.Enabled = true; + else checkBox_count.Enabled = false; } // 开始检测 private void btnSave_Click(object sender, EventArgs e) { - if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + if (text_channelNo.Text.Equals("")) { - MessageBox.Show("请选择频率稳定度！"); + MessageBox.Show("请选择通道！"); return; } - MessageBox.Show("已添加开始检测"); + if (checkBox_stability.Checked && !radio_1s.Checked && !radio_10s.Checked && !radio_20s.Checked && !radio_100s.Checked) + { + MessageBox.Show("请选择频率稳定度采样时间！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + + string stability = "-3"; + string accuracy = "-3"; + string bootFeature = "-3"; + string ageRate = "-3"; + string interval = ""; + if (checkBox_now.Checked || timePicker_startTime.Value == DateTime.Now) + { + if (checkBox_stability.Checked) stability = "-1"; + if (checkBox_accuracy.Checked) accuracy = "-1"; + if (checkBox_bootFeature.Checked) bootFeature = "-1"; + if (checkBox_ageRate.Checked) ageRate = "-1"; + } + else + { + if (checkBox_stability.Checked) stability = "-2"; + if (checkBox_accuracy.Checked) accuracy = "-2"; + if (checkBox_bootFeature.Checked) bootFeature = "-2"; + if (checkBox_ageRate.Checked) ageRate = "-2"; + } + + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) interval = "1"; + else if (radio_10s.Checked) interval = "10"; + else if (radio_20s.Checked) interval = "20"; + else if (radio_100s.Checked) interval = "100"; + } + + + detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval, text_channelNo.Text); + + this.HideMaskAction(); + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + HomeCtrlForm.homeCtrlForm.LoadDevToBeTested(); } private void btnExitDev_Click(object sender, EventArgs e) @@ -75,17 +126,75 @@ { groupBox3.Enabled = false; } + + getEndTime(); } // 选择开始时间后，自动计算结束时间 private void timePicker_startTime_ValueChanged(object sender, EventArgs e) { - + getEndTime(); } - //选择结束时间后，与自动计算的结束时间进行对比 - private void timePicker_endTime_Click(object sender, EventArgs e) - { + + private void checkBox_now_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_now.Checked) + { + timePicker_startTime.Value = DateTime.Now; + timePicker_endTime.Text = timePicker_startTime.Value.AddDays(7).ToString("yyyy-MM-dd HH:mm:ss"); + } + } + + private void btn_downStartTime_Click(object sender, EventArgs e) + { + timePicker_startTime.ShowUpDown = true; + } + + private void getEndTime() + { + if (checkBox_ageRate.Checked) endTimeBySystem = timePicker_startTime.Value.AddDays(7); + else + { + if (checkBox_bootFeature.Checked) endTimeBySystem = timePicker_startTime.Value.AddHours(7); + else + { + if (checkBox_stability.Checked) + { + if (radio_1s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 1); + else if (radio_10s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 10); + else if (radio_20s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 20); + else if (radio_100s.Checked) endTimeBySystem = timePicker_startTime.Value.AddSeconds(100 * 100); + } + else endTimeBySystem = DateTime.Now; + } + } + + timePicker_endTime.Value = endTimeBySystem; + } + + private void timePicker_endTime_ValueChanged(object sender, EventArgs e) + { + if (timePicker_endTime.Value < endTimeBySystem) + { + MessageBox.Show("选择的结束时间无效，因为早于检测项目需要的时间！"); + timePicker_endTime.Value = endTimeBySystem; + } + } + + private void checkBox_accuracy_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_bootFeature_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); + } + + private void checkBox_ageRate_CheckedChanged(object sender, EventArgs e) + { + getEndTime(); } } } diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs index 9157e65..d5ff4fa 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -29,19 +29,17 @@ /// private void InitializeComponent() { - this.checkBox9 = new System.Windows.Forms.CheckBox(); - this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.checkBox_startNow = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.channel1 = new DevComponents.Editors.ComboItem(); - this.channel2 = new DevComponents.Editors.ComboItem(); - this.channel3 = new DevComponents.Editors.ComboItem(); - this.channel4 = new DevComponents.Editors.ComboItem(); - this.channel5 = new DevComponents.Editors.ComboItem(); + this.btn_downTypeList = new System.Windows.Forms.Button(); + this.text_devType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label7 = new System.Windows.Forms.Label(); + this.btn_downChannelList = new System.Windows.Forms.Button(); + this.text_channelNo = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.cbBox_channelFree = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label4 = new System.Windows.Forms.Label(); this.inputCustName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label2 = new System.Windows.Forms.Label(); @@ -53,22 +51,31 @@ this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.cbBox_devType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.channel1 = new DevComponents.Editors.ComboItem(); + this.channel2 = new DevComponents.Editors.ComboItem(); + this.channel3 = new DevComponents.Editors.ComboItem(); + this.channel4 = new DevComponents.Editors.ComboItem(); + this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox_count = new System.Windows.Forms.CheckBox(); + this.checkBox_ageRate = new System.Windows.Forms.CheckBox(); + this.checkBox_bootFeature = new System.Windows.Forms.CheckBox(); + this.checkBox_accuracy = new System.Windows.Forms.CheckBox(); + this.checkBox_stability = new System.Windows.Forms.CheckBox(); this.endTimeEst = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.startTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.checkBox10 = new System.Windows.Forms.CheckBox(); - this.checkBox11 = new System.Windows.Forms.CheckBox(); - this.checkBox12 = new System.Windows.Forms.CheckBox(); - this.checkBox13 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox_100s = new System.Windows.Forms.CheckBox(); + this.checkBox_20s = new System.Windows.Forms.CheckBox(); + this.checkBox_10s = new System.Windows.Forms.CheckBox(); + this.checkBox_1s = new System.Windows.Forms.CheckBox(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnCancelSetDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -77,62 +84,18 @@ this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // checkBox9 + // checkBox_startNow // - this.checkBox9.AutoSize = true; - this.checkBox9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox9.Location = new System.Drawing.Point(491, 355); - this.checkBox9.Name = "checkBox9"; - this.checkBox9.Size = new System.Drawing.Size(84, 24); - this.checkBox9.TabIndex = 19; - this.checkBox9.Text = "立即开始"; - this.checkBox9.UseVisualStyleBackColor = true; - // - // btnSave - // - this.btnSave.EnterBackColor = System.Drawing.Color.Blue; - this.btnSave.EnterForeColor = System.Drawing.Color.White; - this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnSave.FlatAppearance.BorderSize = 0; - this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); - this.btnSave.HoverForeColor = System.Drawing.Color.White; - this.btnSave.Location = new System.Drawing.Point(141, 351); - this.btnSave.Name = "btnSave"; - this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnSave.PressForeColor = System.Drawing.Color.White; - this.btnSave.Radius = 5; - this.btnSave.Size = new System.Drawing.Size(120, 30); - this.btnSave.TabIndex = 17; - this.btnSave.Text = "开始检测"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // btnCancelSetDev - // - this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; - this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btnCancelSetDev.FlatAppearance.BorderSize = 0; - this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Location = new System.Drawing.Point(301, 351); - this.btnCancelSetDev.Name = "btnCancelSetDev"; - this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; - this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; - this.btnCancelSetDev.Radius = 5; - this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); - this.btnCancelSetDev.TabIndex = 18; - this.btnCancelSetDev.Text = "取消"; - this.btnCancelSetDev.UseVisualStyleBackColor = true; - this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.checkBox_startNow.AutoSize = true; + this.checkBox_startNow.Enabled = false; + this.checkBox_startNow.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_startNow.Location = new System.Drawing.Point(500, 429); + this.checkBox_startNow.Name = "checkBox_startNow"; + this.checkBox_startNow.Size = new System.Drawing.Size(84, 24); + this.checkBox_startNow.TabIndex = 19; + this.checkBox_startNow.Text = "立即开始"; + this.checkBox_startNow.UseVisualStyleBackColor = true; + this.checkBox_startNow.CheckedChanged += new System.EventHandler(this.checkBox_startNow_CheckedChanged); // // panel1 // @@ -141,7 +104,7 @@ this.panel1.Controls.Add(this.labelTitle); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 32); + this.panel1.Size = new System.Drawing.Size(640, 32); this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // @@ -153,7 +116,7 @@ this.btnExitDev.FlatAppearance.BorderSize = 0; this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(570, 5); + this.btnExitDev.Location = new System.Drawing.Point(610, 5); this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); this.btnExitDev.Name = "btnExitDev"; this.btnExitDev.Size = new System.Drawing.Size(20, 20); @@ -174,7 +137,12 @@ // // groupBox4 // - this.groupBox4.Controls.Add(this.channelFree); + this.groupBox4.Controls.Add(this.btn_downTypeList); + this.groupBox4.Controls.Add(this.text_devType); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.btn_downChannelList); + this.groupBox4.Controls.Add(this.text_channelNo); + this.groupBox4.Controls.Add(this.cbBox_channelFree); this.groupBox4.Controls.Add(this.label4); this.groupBox4.Controls.Add(this.inputCustName); this.groupBox4.Controls.Add(this.label2); @@ -186,57 +154,116 @@ this.groupBox4.Controls.Add(this.inputDevName); this.groupBox4.Controls.Add(this.label8); this.groupBox4.Controls.Add(this.label5); + this.groupBox4.Controls.Add(this.cbBox_devType); this.groupBox4.Location = new System.Drawing.Point(10, 33); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(580, 140); + this.groupBox4.Size = new System.Drawing.Size(617, 175); this.groupBox4.TabIndex = 38; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // - // channelFree + // btn_downTypeList // - this.channelFree.DisplayMember = "Text"; - this.channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.channelFree.FormattingEnabled = true; - this.channelFree.ItemHeight = 18; - this.channelFree.Location = new System.Drawing.Point(400, 97); - this.channelFree.Name = "channelFree"; - this.channelFree.Size = new System.Drawing.Size(150, 24); - this.channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.channelFree.TabIndex = 41; + this.btn_downTypeList.BackColor = System.Drawing.Color.White; + this.btn_downTypeList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downTypeList.FlatAppearance.BorderSize = 0; + this.btn_downTypeList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downTypeList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downTypeList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downTypeList.Location = new System.Drawing.Point(541, 59); + this.btn_downTypeList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downTypeList.Name = "btn_downTypeList"; + this.btn_downTypeList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downTypeList.Size = new System.Drawing.Size(18, 23); + this.btn_downTypeList.TabIndex = 52; + this.btn_downTypeList.Text = "﹀"; + this.btn_downTypeList.UseVisualStyleBackColor = false; + this.btn_downTypeList.Click += new System.EventHandler(this.btn_downTypeList_Click); // - // channel1 + // text_devType // - this.channel1.Text = "通道1"; - this.channel1.Value = "1"; // - // channel2 // - this.channel2.Text = "通道2"; - this.channel2.Value = "2"; // - // channel3 + this.text_devType.Border.Class = "TextBoxBorder"; + this.text_devType.Border.CornerDiameter = 5; + this.text_devType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_devType.Location = new System.Drawing.Point(400, 57); + this.text_devType.Margin = new System.Windows.Forms.Padding(0); + this.text_devType.Name = "text_devType"; + this.text_devType.PreventEnterBeep = true; + this.text_devType.Size = new System.Drawing.Size(162, 27); + this.text_devType.TabIndex = 50; // - this.channel3.Text = "通道3"; - this.channel3.Value = "3"; + // label7 // - // channel4 + this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(314, 57); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(76, 27); + this.label7.TabIndex = 51; + this.label7.Text = "仪器类型"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - this.channel4.Text = "通道4"; - this.channel4.Value = "4"; + // btn_downChannelList // - // channel5 + this.btn_downChannelList.BackColor = System.Drawing.Color.White; + this.btn_downChannelList.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_downChannelList.FlatAppearance.BorderSize = 0; + this.btn_downChannelList.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_downChannelList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_downChannelList.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btn_downChannelList.Location = new System.Drawing.Point(249, 138); + this.btn_downChannelList.Margin = new System.Windows.Forms.Padding(0); + this.btn_downChannelList.Name = "btn_downChannelList"; + this.btn_downChannelList.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); + this.btn_downChannelList.Size = new System.Drawing.Size(17, 23); + this.btn_downChannelList.TabIndex = 48; + this.btn_downChannelList.Text = "﹀"; + this.btn_downChannelList.UseVisualStyleBackColor = false; + this.btn_downChannelList.Click += new System.EventHandler(this.btn_downChannelList_Click); // - this.channel5.Text = "通道5"; - this.channel5.Value = "5"; + // text_channelNo + // + this.text_channelNo.BackColor = System.Drawing.Color.White; + // + // + // + this.text_channelNo.Border.Class = "TextBoxBorder"; + this.text_channelNo.Border.CornerDiameter = 5; + this.text_channelNo.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.text_channelNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.text_channelNo.Location = new System.Drawing.Point(110, 136); + this.text_channelNo.Margin = new System.Windows.Forms.Padding(0); + this.text_channelNo.Name = "text_channelNo"; + this.text_channelNo.PreventEnterBeep = true; + this.text_channelNo.ReadOnly = true; + this.text_channelNo.Size = new System.Drawing.Size(162, 27); + this.text_channelNo.TabIndex = 49; + // + // cbBox_channelFree + // + this.cbBox_channelFree.DisplayMember = "Text"; + this.cbBox_channelFree.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_channelFree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_channelFree.FormattingEnabled = true; + this.cbBox_channelFree.ItemHeight = 18; + this.cbBox_channelFree.Location = new System.Drawing.Point(110, 136); + this.cbBox_channelFree.Name = "cbBox_channelFree"; + this.cbBox_channelFree.Size = new System.Drawing.Size(150, 24); + this.cbBox_channelFree.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_channelFree.TabIndex = 41; + this.cbBox_channelFree.SelectedIndexChanged += new System.EventHandler(this.cbBox_channelFree_SelectedIndexChanged); // // label4 // this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(290, 94); + this.label4.Location = new System.Drawing.Point(13, 136); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); + this.label4.Size = new System.Drawing.Size(86, 27); this.label4.TabIndex = 47; this.label4.Text = "选择通道"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -250,17 +277,17 @@ this.inputCustName.Border.CornerDiameter = 5; this.inputCustName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustName.Location = new System.Drawing.Point(110, 94); + this.inputCustName.Location = new System.Drawing.Point(401, 94); this.inputCustName.Margin = new System.Windows.Forms.Padding(0); this.inputCustName.Name = "inputCustName"; this.inputCustName.PreventEnterBeep = true; - this.inputCustName.Size = new System.Drawing.Size(150, 27); + this.inputCustName.Size = new System.Drawing.Size(162, 27); this.inputCustName.TabIndex = 40; // // label2 // this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(20, 94); + this.label2.Location = new System.Drawing.Point(310, 94); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(80, 27); @@ -277,11 +304,11 @@ this.inputCustComp.Border.CornerDiameter = 5; this.inputCustComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.inputCustComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustComp.Location = new System.Drawing.Point(400, 57); + this.inputCustComp.Location = new System.Drawing.Point(110, 98); this.inputCustComp.Margin = new System.Windows.Forms.Padding(0); this.inputCustComp.Name = "inputCustComp"; this.inputCustComp.PreventEnterBeep = true; - this.inputCustComp.Size = new System.Drawing.Size(150, 27); + this.inputCustComp.Size = new System.Drawing.Size(162, 27); this.inputCustComp.TabIndex = 39; // // inputDevModel @@ -297,16 +324,16 @@ this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); this.inputDevModel.Name = "inputDevModel"; this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 27); + this.inputDevModel.Size = new System.Drawing.Size(162, 27); this.inputDevModel.TabIndex = 38; // // label1 // this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(290, 57); + this.label1.Location = new System.Drawing.Point(9, 98); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); + this.label1.Size = new System.Drawing.Size(91, 27); this.label1.TabIndex = 45; this.label1.Text = "送检单位"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -335,7 +362,7 @@ this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); this.inputDevCode.Name = "inputDevCode"; this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 27); + this.inputDevCode.Size = new System.Drawing.Size(162, 27); this.inputDevCode.TabIndex = 37; // // inputDevName @@ -351,7 +378,7 @@ this.inputDevName.Margin = new System.Windows.Forms.Padding(0); this.inputDevName.Name = "inputDevName"; this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 27); + this.inputDevName.Size = new System.Drawing.Size(162, 27); this.inputDevName.TabIndex = 36; // // label8 @@ -376,22 +403,120 @@ this.label5.Text = "仪器名称"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // cbBox_devType + // + this.cbBox_devType.DisplayMember = "Text"; + this.cbBox_devType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbBox_devType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.cbBox_devType.FormattingEnabled = true; + this.cbBox_devType.ItemHeight = 18; + this.cbBox_devType.Location = new System.Drawing.Point(402, 59); + this.cbBox_devType.Name = "cbBox_devType"; + this.cbBox_devType.Size = new System.Drawing.Size(158, 24); + this.cbBox_devType.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbBox_devType.TabIndex = 54; + this.cbBox_devType.SelectedIndexChanged += new System.EventHandler(this.cbBox_devType_SelectedIndexChanged); + // + // channel1 + // + this.channel1.Text = "通道1"; + this.channel1.Value = "1"; + // + // channel2 + // + this.channel2.Text = "通道2"; + this.channel2.Value = "2"; + // + // channel3 + // + this.channel3.Text = "通道3"; + this.channel3.Value = "3"; + // + // channel4 + // + this.channel4.Text = "通道4"; + this.channel4.Value = "4"; + // + // channel5 + // + this.channel5.Text = "通道5"; + this.channel5.Value = "5"; + // // groupBox1 // + this.groupBox1.Controls.Add(this.checkBox_count); + this.groupBox1.Controls.Add(this.checkBox_ageRate); + this.groupBox1.Controls.Add(this.checkBox_bootFeature); + this.groupBox1.Controls.Add(this.checkBox_accuracy); + this.groupBox1.Controls.Add(this.checkBox_stability); this.groupBox1.Controls.Add(this.endTimeEst); this.groupBox1.Controls.Add(this.startTime); - this.groupBox1.Controls.Add(this.checkBox10); - this.groupBox1.Controls.Add(this.checkBox11); - this.groupBox1.Controls.Add(this.checkBox12); - this.groupBox1.Controls.Add(this.checkBox13); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label12); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(10, 174); + this.groupBox1.Enabled = false; + this.groupBox1.Location = new System.Drawing.Point(10, 212); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(580, 98); + this.groupBox1.Size = new System.Drawing.Size(617, 140); this.groupBox1.TabIndex = 39; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // checkBox_count + // + this.checkBox_count.AutoSize = true; + this.checkBox_count.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_count.Location = new System.Drawing.Point(114, 55); + this.checkBox_count.Name = "checkBox_count"; + this.checkBox_count.Size = new System.Drawing.Size(182, 24); + this.checkBox_count.TabIndex = 351; + this.checkBox_count.Text = "频率计数器范围及灵敏度"; + this.checkBox_count.UseVisualStyleBackColor = true; + // + // checkBox_ageRate + // + this.checkBox_ageRate.AutoSize = true; + this.checkBox_ageRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_ageRate.Location = new System.Drawing.Point(467, 25); + this.checkBox_ageRate.Name = "checkBox_ageRate"; + this.checkBox_ageRate.Size = new System.Drawing.Size(84, 24); + this.checkBox_ageRate.TabIndex = 350; + this.checkBox_ageRate.Text = "日老化率"; + this.checkBox_ageRate.UseVisualStyleBackColor = true; + // + // checkBox_bootFeature + // + this.checkBox_bootFeature.AutoSize = true; + this.checkBox_bootFeature.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_bootFeature.Location = new System.Drawing.Point(348, 25); + this.checkBox_bootFeature.Name = "checkBox_bootFeature"; + this.checkBox_bootFeature.Size = new System.Drawing.Size(84, 24); + this.checkBox_bootFeature.TabIndex = 349; + this.checkBox_bootFeature.Text = "开机特性"; + this.checkBox_bootFeature.UseVisualStyleBackColor = true; + // + // checkBox_accuracy + // + this.checkBox_accuracy.AutoSize = true; + this.checkBox_accuracy.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_accuracy.Location = new System.Drawing.Point(232, 25); + this.checkBox_accuracy.Name = "checkBox_accuracy"; + this.checkBox_accuracy.Size = new System.Drawing.Size(98, 24); + this.checkBox_accuracy.TabIndex = 347; + this.checkBox_accuracy.Text = "频率准确度"; + this.checkBox_accuracy.UseVisualStyleBackColor = true; + // + // checkBox_stability + // + this.checkBox_stability.AutoSize = true; + this.checkBox_stability.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_stability.Location = new System.Drawing.Point(114, 25); + this.checkBox_stability.Name = "checkBox_stability"; + this.checkBox_stability.Size = new System.Drawing.Size(98, 24); + this.checkBox_stability.TabIndex = 348; + this.checkBox_stability.Text = "频率稳定度"; + this.checkBox_stability.UseVisualStyleBackColor = true; + this.checkBox_stability.CheckedChanged += new System.EventHandler(this.checkBox_stability_CheckedChanged); // // endTimeEst // @@ -406,7 +531,7 @@ this.endTimeEst.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.endTimeEst.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.endTimeEst.IsPopupCalendarOpen = false; - this.endTimeEst.Location = new System.Drawing.Point(395, 57); + this.endTimeEst.Location = new System.Drawing.Point(395, 94); // // // @@ -456,7 +581,7 @@ this.startTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); this.startTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.startTime.IsPopupCalendarOpen = false; - this.startTime.Location = new System.Drawing.Point(115, 57); + this.startTime.Location = new System.Drawing.Point(107, 94); // // // @@ -493,54 +618,10 @@ this.startTime.TabIndex = 43; this.startTime.Value = new System.DateTime(2021, 3, 24, 15, 59, 31, 0); // - // checkBox10 - // - this.checkBox10.AutoSize = true; - this.checkBox10.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox10.Location = new System.Drawing.Point(425, 20); - this.checkBox10.Name = "checkBox10"; - this.checkBox10.Size = new System.Drawing.Size(84, 24); - this.checkBox10.TabIndex = 42; - this.checkBox10.Text = "日老化率"; - this.checkBox10.UseVisualStyleBackColor = true; - // - // checkBox11 - // - this.checkBox11.AutoSize = true; - this.checkBox11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox11.Location = new System.Drawing.Point(331, 20); - this.checkBox11.Name = "checkBox11"; - this.checkBox11.Size = new System.Drawing.Size(84, 24); - this.checkBox11.TabIndex = 41; - this.checkBox11.Text = "开机特性"; - this.checkBox11.UseVisualStyleBackColor = true; - // - // checkBox12 - // - this.checkBox12.AutoSize = true; - this.checkBox12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox12.Location = new System.Drawing.Point(223, 20); - this.checkBox12.Name = "checkBox12"; - this.checkBox12.Size = new System.Drawing.Size(98, 24); - this.checkBox12.TabIndex = 39; - this.checkBox12.Text = "频率准确度"; - this.checkBox12.UseVisualStyleBackColor = true; - // - // checkBox13 - // - this.checkBox13.AutoSize = true; - this.checkBox13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox13.Location = new System.Drawing.Point(115, 20); - this.checkBox13.Name = "checkBox13"; - this.checkBox13.Size = new System.Drawing.Size(98, 24); - this.checkBox13.TabIndex = 38; - this.checkBox13.Text = "频率稳定度"; - this.checkBox13.UseVisualStyleBackColor = true; - // // label3 // this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(290, 55); + this.label3.Location = new System.Drawing.Point(290, 92); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(100, 27); @@ -551,7 +632,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(5, 55); + this.label12.Location = new System.Drawing.Point(5, 92); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(100, 27); @@ -562,7 +643,7 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(5, 18); + this.label13.Location = new System.Drawing.Point(5, 23); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(100, 27); @@ -573,13 +654,14 @@ // groupBox2 // this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.checkBox1); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.checkBox3); - this.groupBox2.Controls.Add(this.checkBox4); - this.groupBox2.Location = new System.Drawing.Point(9, 278); + this.groupBox2.Controls.Add(this.checkBox_100s); + this.groupBox2.Controls.Add(this.checkBox_20s); + this.groupBox2.Controls.Add(this.checkBox_10s); + this.groupBox2.Controls.Add(this.checkBox_1s); + this.groupBox2.Enabled = false; + this.groupBox2.Location = new System.Drawing.Point(9, 353); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(580, 53); + this.groupBox2.Size = new System.Drawing.Size(618, 53); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; // @@ -594,60 +676,107 @@ this.label6.Text = "频率稳定度"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // checkBox1 + // checkBox_100s // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox1.Location = new System.Drawing.Point(425, 19); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(60, 24); - this.checkBox1.TabIndex = 42; - this.checkBox1.Text = "100S"; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox_100s.AutoSize = true; + this.checkBox_100s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_100s.Location = new System.Drawing.Point(468, 19); + this.checkBox_100s.Name = "checkBox_100s"; + this.checkBox_100s.Size = new System.Drawing.Size(60, 24); + this.checkBox_100s.TabIndex = 42; + this.checkBox_100s.Text = "100S"; + this.checkBox_100s.UseVisualStyleBackColor = true; // - // checkBox2 + // checkBox_20s // - this.checkBox2.AutoSize = true; - this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox2.Location = new System.Drawing.Point(331, 19); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(52, 24); - this.checkBox2.TabIndex = 41; - this.checkBox2.Text = "20S"; - this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox_20s.AutoSize = true; + this.checkBox_20s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_20s.Location = new System.Drawing.Point(349, 19); + this.checkBox_20s.Name = "checkBox_20s"; + this.checkBox_20s.Size = new System.Drawing.Size(52, 24); + this.checkBox_20s.TabIndex = 41; + this.checkBox_20s.Text = "20S"; + this.checkBox_20s.UseVisualStyleBackColor = true; // - // checkBox3 + // checkBox_10s // - this.checkBox3.AutoSize = true; - this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox3.Location = new System.Drawing.Point(223, 19); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(52, 24); - this.checkBox3.TabIndex = 40; - this.checkBox3.Text = "10S"; - this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox_10s.AutoSize = true; + this.checkBox_10s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_10s.Location = new System.Drawing.Point(233, 19); + this.checkBox_10s.Name = "checkBox_10s"; + this.checkBox_10s.Size = new System.Drawing.Size(52, 24); + this.checkBox_10s.TabIndex = 40; + this.checkBox_10s.Text = "10S"; + this.checkBox_10s.UseVisualStyleBackColor = true; // - // checkBox4 + // checkBox_1s // - this.checkBox4.AutoSize = true; - this.checkBox4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.checkBox4.Location = new System.Drawing.Point(115, 19); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(44, 24); - this.checkBox4.TabIndex = 39; - this.checkBox4.Text = "1S"; - this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox_1s.AutoSize = true; + this.checkBox_1s.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.checkBox_1s.Location = new System.Drawing.Point(115, 19); + this.checkBox_1s.Name = "checkBox_1s"; + this.checkBox_1s.Size = new System.Drawing.Size(44, 24); + this.checkBox_1s.TabIndex = 39; + this.checkBox_1s.Text = "1S"; + this.checkBox_1s.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(150, 425); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(120, 30); + this.btnSave.TabIndex = 17; + this.btnSave.Text = "开始检测"; + this.btnSave.UseVisualStyleBackColor = true; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // btnCancelSetDev + // + this.btnCancelSetDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancelSetDev.EnterForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancelSetDev.FlatAppearance.BorderSize = 0; + this.btnCancelSetDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancelSetDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancelSetDev.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSetDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancelSetDev.HoverForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Location = new System.Drawing.Point(310, 425); + this.btnCancelSetDev.Name = "btnCancelSetDev"; + this.btnCancelSetDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancelSetDev.PressForeColor = System.Drawing.Color.White; + this.btnCancelSetDev.Radius = 5; + this.btnCancelSetDev.Size = new System.Drawing.Size(120, 30); + this.btnCancelSetDev.TabIndex = 18; + this.btnCancelSetDev.Text = "取消"; + this.btnCancelSetDev.UseVisualStyleBackColor = true; + this.btnCancelSetDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); // // AddDevDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 407); + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(642, 483); this.ControlBox = false; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox4); - this.Controls.Add(this.checkBox9); + this.Controls.Add(this.checkBox_startNow); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnCancelSetDev); this.Controls.Add(this.panel1); @@ -669,24 +798,16 @@ } #endregion - - private System.Windows.Forms.CheckBox checkBox9; - private RoundButton btnSave; private RoundButton btnCancelSetDev; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnExitDev; private System.Windows.Forms.Label labelTitle; private System.Windows.Forms.GroupBox groupBox4; - private DevComponents.DotNetBar.Controls.ComboBoxEx channelFree; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_channelFree; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustName; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; - private DevComponents.DotNetBar.Controls.TextBoxX inputDevName; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label5; private DevComponents.Editors.ComboItem channel1; @@ -695,20 +816,34 @@ private DevComponents.Editors.ComboItem channel4; private DevComponents.Editors.ComboItem channel5; private System.Windows.Forms.GroupBox groupBox1; - private DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; - private DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; - private System.Windows.Forms.CheckBox checkBox10; - private System.Windows.Forms.CheckBox checkBox11; - private System.Windows.Forms.CheckBox checkBox12; - private System.Windows.Forms.CheckBox checkBox13; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; + public DevComponents.DotNetBar.Controls.TextBoxX text_channelNo; + private System.Windows.Forms.Button btn_downTypeList; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbBox_devType; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustName; + public DevComponents.DotNetBar.Controls.TextBoxX inputCustComp; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevModel; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevCode; + public DevComponents.DotNetBar.Controls.TextBoxX inputDevName; + public DevComponents.DotNetBar.Controls.TextBoxX text_devType; + public System.Windows.Forms.CheckBox checkBox_startNow; + public DevComponents.Editors.DateTimeAdv.DateTimeInput endTimeEst; + public DevComponents.Editors.DateTimeAdv.DateTimeInput startTime; + public System.Windows.Forms.CheckBox checkBox_100s; + public System.Windows.Forms.CheckBox checkBox_20s; + public System.Windows.Forms.CheckBox checkBox_10s; + public System.Windows.Forms.CheckBox checkBox_1s; + public System.Windows.Forms.CheckBox checkBox_count; + public System.Windows.Forms.CheckBox checkBox_ageRate; + public System.Windows.Forms.CheckBox checkBox_bootFeature; + public System.Windows.Forms.CheckBox checkBox_accuracy; + public System.Windows.Forms.CheckBox checkBox_stability; + public System.Windows.Forms.Button btn_downChannelList; + public RoundButton btnSave; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs index 652c6b4..a2dbf38 100644 --- a/RbFreqStandMeasure/info/AddDevDlg.cs +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -27,6 +27,10 @@ } #endregion + DictService dictService = new DictServiceImpl(); + DetectionItemService detectionItemService = new DetectionItemServiceImpl(); + + public Action HideMaskAction { get; @@ -37,7 +41,21 @@ { InitializeComponent(); - ((ComboBoxEx)this.Controls.Find("channelFree", true)[0]).SelectedIndex = 0; + cbBox_devType.DataSource = dictService.getTypeListByCodeType("devType"); + btnSave.Text = "添加仪器"; + if (HomeCtrlForm.channelFreeList.Count > 0) + { + cbBox_channelFree.Items.Add(""); + foreach (string item in HomeCtrlForm.channelFreeList) + { + cbBox_channelFree.Items.Add(item); + } + } + else + { + text_channelNo.WatermarkText = "无空闲通道可选"; + + } } // 关闭对话框 @@ -49,6 +67,19 @@ // 添加并开始检测 private void btnSave_Click(object sender, EventArgs e) { + if (text_channelNo.Text.Trim() != "") + { + if (checkBox_stability.Checked && !checkBox_1s.Checked && !checkBox_10s.Checked && !checkBox_20s.Checked && !checkBox_100s.Checked) + { + MessageBox.Show("请选择频率稳定度！"); + return; + } + if (!checkBox_accuracy.Checked && !checkBox_stability.Checked && !checkBox_ageRate.Checked && !checkBox_bootFeature.Checked && !checkBox_count.Checked) + { + MessageBox.Show("请选择检测项目！"); + return; + } + } // 取得输入框的参数 string devName = ((TextBoxX) this.Controls.Find("inputDevName", true)[0]).Text; string devCode = ((TextBoxX) this.Controls.Find("inputDevCode", true)[0]).Text; @@ -56,7 +87,7 @@ string devCustomComp = ((TextBoxX)this.Controls.Find("inputCustComp", true)[0]).Text; string devCustomName = ((TextBoxX)this.Controls.Find("inputCustName", true)[0]).Text; - ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("channelFree", true)[0]; + ComboBoxEx channels = (ComboBoxEx)this.Controls.Find("cbBox_channelFree", true)[0]; string channelNo = (string)((ComboItem)channels.SelectedItem).Value; // 初始化数据访问接口 @@ -64,13 +95,80 @@ int id = devService.add(devName, devCode, "1", devModel, devCustomComp, devCustomName, channelNo); if (id >= 0) { + if (btnSave.Text.Equals("添加并开始检测")) + { + //detectionItemService.add(deviceId, timePicker_startTime.Value, timePicker_endTime.Value, stability, accuracy, bootFeature, ageRate, interval); + // 重新加载首页的通道状态 + HomeCtrlForm.homeCtrlForm.LoadChannelStatus(); + } // 添加成功，继续保存检测项目和开始时间 this.HideMaskAction(); + } else { LogHelper.WriteErrorLog(this.GetType(), "添加设备[" + devName + "]失败"); } } + + private void btn_downChannelList_Click(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = true; + } + + private void groupBox4_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void groupBox1_Enter(object sender, EventArgs e) + { + cbBox_channelFree.DroppedDown = false; + cbBox_devType.DroppedDown = false; + } + + private void btn_downTypeList_Click(object sender, EventArgs e) + { + cbBox_devType.DroppedDown = true; + } + + private void checkBox_startNow_CheckedChanged(object sender, EventArgs e) + { + startTime.Value = DateTime.Now; + } + + private void cbBox_devType_SelectedIndexChanged(object sender, EventArgs e) + { + text_devType.Text = cbBox_devType.SelectedItem.ToString(); + } + + private void cbBox_channelFree_SelectedIndexChanged(object sender, EventArgs e) + { + text_channelNo.Text = cbBox_channelFree.SelectedItem.ToString(); + + if (text_channelNo.Text != "") + { + btnSave.Text = "添加并开始检测"; + checkBox_startNow.Enabled = true; + groupBox1.Enabled = true; + } + else + { + btnSave.Text = "添加仪器"; + groupBox1.Enabled = false; checkBox_startNow.Enabled = false; + } + } + + private void checkBox13_CheckedChanged(object sender, EventArgs e) + { + + } + + private void checkBox_stability_CheckedChanged(object sender, EventArgs e) + { + if (checkBox_stability.Checked) groupBox2.Enabled = true; + else groupBox2.Enabled = false; + } } } diff --git a/RbFreqStandMeasure/info/DetailDlg.Designer.cs b/RbFreqStandMeasure/info/DetailDlg.Designer.cs index 05ffc1f..eeded9f 100644 --- a/RbFreqStandMeasure/info/DetailDlg.Designer.cs +++ b/RbFreqStandMeasure/info/DetailDlg.Designer.cs @@ -29,9 +29,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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(); this.panel1 = new System.Windows.Forms.Panel(); + this.btnExitDev = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); this.channel1 = new DevComponents.Editors.ComboItem(); this.channel2 = new DevComponents.Editors.ComboItem(); @@ -39,32 +40,32 @@ this.channel4 = new DevComponents.Editors.ComboItem(); this.channel5 = new DevComponents.Editors.ComboItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.dataGridView_Data = new System.Windows.Forms.DataGridView(); - this.btn_accurary = new System.Windows.Forms.Button(); - this.btn_bootFeature = new System.Windows.Forms.Button(); this.btn_ageRate = new System.Windows.Forms.Button(); + this.btn_bootFeature = new System.Windows.Forms.Button(); + this.btn_accurary = new System.Windows.Forms.Button(); + this.btn_stability = new System.Windows.Forms.Button(); + this.dataGridView_Data = new System.Windows.Forms.DataGridView(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label_endTime = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.label_customerComp = new System.Windows.Forms.Label(); + this.label_devCode = new System.Windows.Forms.Label(); this.label_customerName = new System.Windows.Forms.Label(); this.label_devModel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.label_startTime = new System.Windows.Forms.Label(); - this.label_customerComp = new System.Windows.Forms.Label(); - this.label_devCode = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnExitDev = new System.Windows.Forms.Button(); - this.btn_stability = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.button1 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).BeginInit(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -78,6 +79,22 @@ this.panel1.TabIndex = 18; this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); // + // btnExitDev + // + this.btnExitDev.BackColor = System.Drawing.Color.Transparent; + this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; + this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnExitDev.FlatAppearance.BorderSize = 0; + this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.btnExitDev.Location = new System.Drawing.Point(869, 5); + this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); + this.btnExitDev.Name = "btnExitDev"; + this.btnExitDev.Size = new System.Drawing.Size(20, 20); + this.btnExitDev.TabIndex = 2; + this.btnExitDev.UseVisualStyleBackColor = false; + this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // // labelTitle // this.labelTitle.BackColor = System.Drawing.Color.Transparent; @@ -116,6 +133,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.btn_ageRate); this.groupBox1.Controls.Add(this.btn_bootFeature); this.groupBox1.Controls.Add(this.btn_accurary); @@ -123,278 +141,39 @@ this.groupBox1.Controls.Add(this.dataGridView_Data); this.groupBox1.Location = new System.Drawing.Point(8, 39); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(298, 493); + this.groupBox1.Size = new System.Drawing.Size(439, 493); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // - // dataGridView_Data - // - this.dataGridView_Data.AllowUserToAddRows = false; - this.dataGridView_Data.AllowUserToDeleteRows = false; - this.dataGridView_Data.AllowUserToResizeColumns = false; - this.dataGridView_Data.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; - this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.dataGridView_Data.ColumnHeadersHeight = 40; - this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dataGridView_Data.Location = new System.Drawing.Point(5, 14); - this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); - this.dataGridView_Data.Name = "dataGridView_Data"; - this.dataGridView_Data.ReadOnly = true; - this.dataGridView_Data.RowHeadersVisible = false; - this.dataGridView_Data.RowHeadersWidth = 30; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.NullValue = "-"; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView_Data.RowTemplate.Height = 44; - this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView_Data.Size = new System.Drawing.Size(289, 429); - this.dataGridView_Data.TabIndex = 3; - // - // btn_accurary - // - this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_accurary.Location = new System.Drawing.Point(79, 446); - this.btn_accurary.Name = "btn_accurary"; - this.btn_accurary.Size = new System.Drawing.Size(79, 31); - this.btn_accurary.TabIndex = 5; - this.btn_accurary.Text = "频率准确度"; - this.btn_accurary.UseVisualStyleBackColor = true; - // - // btn_bootFeature - // - this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_bootFeature.Location = new System.Drawing.Point(154, 446); - this.btn_bootFeature.Name = "btn_bootFeature"; - this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); - this.btn_bootFeature.TabIndex = 6; - this.btn_bootFeature.Text = "开机特性"; - this.btn_bootFeature.UseVisualStyleBackColor = true; - // // btn_ageRate // this.btn_ageRate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_ageRate.Location = new System.Drawing.Point(222, 446); + this.btn_ageRate.Location = new System.Drawing.Point(240, 446); this.btn_ageRate.Name = "btn_ageRate"; this.btn_ageRate.Size = new System.Drawing.Size(75, 31); this.btn_ageRate.TabIndex = 7; this.btn_ageRate.Text = "日老化率"; this.btn_ageRate.UseVisualStyleBackColor = true; // - // groupBox2 + // btn_bootFeature // - this.groupBox2.Controls.Add(this.label_startTime); - this.groupBox2.Controls.Add(this.label_customerComp); - this.groupBox2.Controls.Add(this.label_devCode); - this.groupBox2.Controls.Add(this.label_endTime); - this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Controls.Add(this.label_customerName); - this.groupBox2.Controls.Add(this.label_devModel); - this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox2.Location = new System.Drawing.Point(316, 39); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(570, 128); - this.groupBox2.TabIndex = 0; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "仪器基本信息"; + this.btn_bootFeature.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_bootFeature.Location = new System.Drawing.Point(161, 446); + this.btn_bootFeature.Name = "btn_bootFeature"; + this.btn_bootFeature.Size = new System.Drawing.Size(80, 31); + this.btn_bootFeature.TabIndex = 6; + this.btn_bootFeature.Text = "开机特性"; + this.btn_bootFeature.UseVisualStyleBackColor = true; // - // label_endTime + // btn_accurary // - this.label_endTime.BackColor = System.Drawing.Color.Transparent; - this.label_endTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_endTime.Location = new System.Drawing.Point(154, 93); - this.label_endTime.Margin = new System.Windows.Forms.Padding(0); - this.label_endTime.Name = "label_endTime"; - this.label_endTime.Size = new System.Drawing.Size(83, 27); - this.label_endTime.TabIndex = 78; - this.label_endTime.Text = "仪器名称："; - this.label_endTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(54, 93); - this.label3.Margin = new System.Windows.Forms.Padding(0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(100, 27); - this.label3.TabIndex = 77; - this.label3.Text = "结束时间："; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerName - // - this.label_customerName.BackColor = System.Drawing.Color.Transparent; - this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerName.Location = new System.Drawing.Point(154, 57); - this.label_customerName.Margin = new System.Windows.Forms.Padding(0); - this.label_customerName.Name = "label_customerName"; - this.label_customerName.Size = new System.Drawing.Size(83, 27); - this.label_customerName.TabIndex = 76; - this.label_customerName.Text = "仪器名称："; - this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devModel - // - this.label_devModel.BackColor = System.Drawing.Color.Transparent; - this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devModel.Location = new System.Drawing.Point(154, 25); - this.label_devModel.Margin = new System.Windows.Forms.Padding(0); - this.label_devModel.Name = "label_devModel"; - this.label_devModel.Size = new System.Drawing.Size(83, 27); - this.label_devModel.TabIndex = 75; - this.label_devModel.Text = "仪器名称："; - this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(327, 93); - this.label4.Margin = new System.Windows.Forms.Padding(0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(100, 27); - this.label4.TabIndex = 73; - this.label4.Text = "开始时间："; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(74, 57); - this.label2.Margin = new System.Windows.Forms.Padding(0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 27); - this.label2.TabIndex = 72; - this.label2.Text = "联系人："; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(327, 59); - this.label1.Margin = new System.Windows.Forms.Padding(0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 27); - this.label1.TabIndex = 71; - this.label1.Text = "送检单位："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(67, 25); - this.label9.Margin = new System.Windows.Forms.Padding(0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 27); - this.label9.TabIndex = 70; - this.label9.Text = "仪器型号："; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(327, 25); - this.label8.Margin = new System.Windows.Forms.Padding(0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(100, 27); - this.label8.TabIndex = 69; - this.label8.Text = "仪器编号："; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_startTime - // - this.label_startTime.BackColor = System.Drawing.Color.Transparent; - this.label_startTime.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_startTime.Location = new System.Drawing.Point(427, 93); - this.label_startTime.Margin = new System.Windows.Forms.Padding(0); - this.label_startTime.Name = "label_startTime"; - this.label_startTime.Size = new System.Drawing.Size(83, 27); - this.label_startTime.TabIndex = 81; - this.label_startTime.Text = "仪器名称："; - this.label_startTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_customerComp - // - this.label_customerComp.BackColor = System.Drawing.Color.Transparent; - this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_customerComp.Location = new System.Drawing.Point(427, 59); - this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); - this.label_customerComp.Name = "label_customerComp"; - this.label_customerComp.Size = new System.Drawing.Size(83, 27); - this.label_customerComp.TabIndex = 80; - this.label_customerComp.Text = "仪器名称："; - this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label_devCode - // - this.label_devCode.BackColor = System.Drawing.Color.Transparent; - this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.label_devCode.Location = new System.Drawing.Point(427, 25); - this.label_devCode.Margin = new System.Windows.Forms.Padding(0); - this.label_devCode.Name = "label_devCode"; - this.label_devCode.Size = new System.Drawing.Size(83, 27); - this.label_devCode.TabIndex = 79; - this.label_devCode.Text = "仪器名称："; - this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.panel2); - this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.groupBox3.Location = new System.Drawing.Point(316, 173); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(570, 359); - this.groupBox3.TabIndex = 19; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "频率稳定度"; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(6, 25); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(558, 328); - this.panel2.TabIndex = 0; - // - // btnExitDev - // - this.btnExitDev.BackColor = System.Drawing.Color.Transparent; - this.btnExitDev.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.icon_exit; - this.btnExitDev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnExitDev.FlatAppearance.BorderSize = 0; - this.btnExitDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnExitDev.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnExitDev.Location = new System.Drawing.Point(799, 5); - this.btnExitDev.Margin = new System.Windows.Forms.Padding(0); - this.btnExitDev.Name = "btnExitDev"; - this.btnExitDev.Size = new System.Drawing.Size(20, 20); - this.btnExitDev.TabIndex = 2; - this.btnExitDev.UseVisualStyleBackColor = false; - this.btnExitDev.Click += new System.EventHandler(this.btnAddDevCancel_Click); + this.btn_accurary.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_accurary.Location = new System.Drawing.Point(83, 446); + this.btn_accurary.Name = "btn_accurary"; + this.btn_accurary.Size = new System.Drawing.Size(79, 31); + this.btn_accurary.TabIndex = 5; + this.btn_accurary.Text = "频率准确度"; + this.btn_accurary.UseVisualStyleBackColor = true; // // btn_stability // @@ -406,12 +185,212 @@ this.btn_stability.Text = "频率稳定度"; this.btn_stability.UseVisualStyleBackColor = true; // + // dataGridView_Data + // + this.dataGridView_Data.AllowUserToAddRows = false; + this.dataGridView_Data.AllowUserToDeleteRows = false; + this.dataGridView_Data.AllowUserToResizeColumns = false; + this.dataGridView_Data.AllowUserToResizeRows = false; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + this.dataGridView_Data.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_Data.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_Data.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_Data.ColumnHeadersHeight = 40; + this.dataGridView_Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_Data.Location = new System.Drawing.Point(6, 14); + this.dataGridView_Data.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_Data.Name = "dataGridView_Data"; + this.dataGridView_Data.ReadOnly = true; + this.dataGridView_Data.RowHeadersVisible = false; + this.dataGridView_Data.RowHeadersWidth = 30; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.NullValue = "-"; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView_Data.RowsDefaultCellStyle = dataGridViewCellStyle8; + this.dataGridView_Data.RowTemplate.Height = 44; + this.dataGridView_Data.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_Data.Size = new System.Drawing.Size(425, 429); + this.dataGridView_Data.TabIndex = 3; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label_customerComp); + this.groupBox2.Controls.Add(this.label_devCode); + this.groupBox2.Controls.Add(this.label_customerName); + this.groupBox2.Controls.Add(this.label_devModel); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox2.Location = new System.Drawing.Point(453, 39); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(433, 105); + this.groupBox2.TabIndex = 0; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "仪器基本信息"; + // + // label_customerComp + // + this.label_customerComp.BackColor = System.Drawing.Color.Transparent; + this.label_customerComp.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerComp.Location = new System.Drawing.Point(319, 64); + this.label_customerComp.Margin = new System.Windows.Forms.Padding(0); + this.label_customerComp.Name = "label_customerComp"; + this.label_customerComp.Size = new System.Drawing.Size(111, 27); + this.label_customerComp.TabIndex = 80; + this.label_customerComp.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devCode + // + this.label_devCode.BackColor = System.Drawing.Color.Transparent; + this.label_devCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devCode.Location = new System.Drawing.Point(319, 30); + this.label_devCode.Margin = new System.Windows.Forms.Padding(0); + this.label_devCode.Name = "label_devCode"; + this.label_devCode.Size = new System.Drawing.Size(111, 27); + this.label_devCode.TabIndex = 79; + this.label_devCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_customerName + // + this.label_customerName.BackColor = System.Drawing.Color.Transparent; + this.label_customerName.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_customerName.Location = new System.Drawing.Point(98, 62); + this.label_customerName.Margin = new System.Windows.Forms.Padding(0); + this.label_customerName.Name = "label_customerName"; + this.label_customerName.Size = new System.Drawing.Size(83, 27); + this.label_customerName.TabIndex = 76; + this.label_customerName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label_devModel + // + this.label_devModel.BackColor = System.Drawing.Color.Transparent; + this.label_devModel.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label_devModel.Location = new System.Drawing.Point(98, 30); + this.label_devModel.Margin = new System.Windows.Forms.Padding(0); + this.label_devModel.Name = "label_devModel"; + this.label_devModel.Size = new System.Drawing.Size(83, 27); + this.label_devModel.TabIndex = 75; + this.label_devModel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(18, 62); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(80, 27); + this.label2.TabIndex = 72; + this.label2.Text = "联系人："; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(234, 64); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(85, 27); + this.label1.TabIndex = 71; + this.label1.Text = "送检单位："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Transparent; + this.label9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(11, 30); + this.label9.Margin = new System.Windows.Forms.Padding(0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(87, 27); + this.label9.TabIndex = 70; + this.label9.Text = "仪器型号："; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.Transparent; + this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(238, 30); + this.label8.Margin = new System.Windows.Forms.Padding(0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(81, 27); + this.label8.TabIndex = 69; + this.label8.Text = "仪器编号："; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.panel2); + this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox3.Location = new System.Drawing.Point(453, 288); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(433, 244); + this.groupBox3.TabIndex = 19; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "频率稳定度"; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(14, 29); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(405, 199); + this.panel2.TabIndex = 0; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.dataGridView1); + this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.groupBox4.Location = new System.Drawing.Point(453, 150); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(433, 132); + this.groupBox4.TabIndex = 81; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "检测记录"; + // + // dataGridView1 + // + this.dataGridView1.BackgroundColor = System.Drawing.Color.White; + this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Location = new System.Drawing.Point(12, 24); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(407, 101); + this.dataGridView1.TabIndex = 0; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button1.Location = new System.Drawing.Point(314, 446); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(125, 31); + this.button1.TabIndex = 8; + this.button1.Text = "计数器范围及灵敏度"; + this.button1.UseVisualStyleBackColor = true; + // // DetailDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(898, 546); this.ControlBox = false; + this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -425,6 +404,8 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Data)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } @@ -444,14 +425,10 @@ private System.Windows.Forms.Button btn_accurary; private System.Windows.Forms.DataGridView dataGridView_Data; private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label_startTime; private System.Windows.Forms.Label label_customerComp; private System.Windows.Forms.Label label_devCode; - private System.Windows.Forms.Label label_endTime; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label_customerName; private System.Windows.Forms.Label label_devModel; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; @@ -459,5 +436,8 @@ private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btn_stability; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index 93c641f..dff1a64 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -39,14 +39,22 @@ this.btnNext = new System.Windows.Forms.Button(); this.btnPre = new System.Windows.Forms.Button(); this.labelCurrentPage = new System.Windows.Forms.Label(); - this.tableDevList = new System.Windows.Forms.DataGridView(); + this.dataGridView_DevList = new System.Windows.Forms.DataGridView(); this.panel2 = new System.Windows.Forms.Panel(); + this.btn_downDevStatus = new System.Windows.Forms.Button(); + this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.comboBox_DevStatus = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.All = new DevComponents.Editors.ComboItem(); this.toBeTested = new DevComponents.Editors.ComboItem(); this.testing = new DevComponents.Editors.ComboItem(); this.tested = new DevComponents.Editors.ComboItem(); this.labelDevStatus = new System.Windows.Forms.Label(); + this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.inputDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevModel = new DevComponents.DotNetBar.Controls.TextBoxX(); this.inputDevCode = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -57,18 +65,10 @@ this.inputCustomComp = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelCustomComp = new System.Windows.Forms.Label(); this.labelDevName = new System.Windows.Forms.Label(); - this.inputDevStatus = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btn_downDevStatus = new System.Windows.Forms.Button(); - this.btnExport = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDetail = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnAdd = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnDelete = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnEdit = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.btnQuery = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.panel1.SuspendLayout(); this.panelNodata.SuspendLayout(); this.panelPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).BeginInit(); this.panel2.SuspendLayout(); this.SuspendLayout(); // @@ -77,7 +77,7 @@ this.panel1.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_dev_list; this.panel1.Controls.Add(this.panelNodata); this.panel1.Controls.Add(this.panelPage); - this.panel1.Controls.Add(this.tableDevList); + this.panel1.Controls.Add(this.dataGridView_DevList); this.panel1.Controls.Add(this.panel2); this.panel1.Location = new System.Drawing.Point(10, 5); this.panel1.Margin = new System.Windows.Forms.Padding(0); @@ -164,31 +164,31 @@ this.labelCurrentPage.TabIndex = 315; this.labelCurrentPage.Text = "1"; // - // tableDevList + // dataGridView_DevList // - this.tableDevList.AllowUserToAddRows = false; - this.tableDevList.AllowUserToDeleteRows = false; - this.tableDevList.AllowUserToResizeColumns = false; - this.tableDevList.AllowUserToResizeRows = false; + this.dataGridView_DevList.AllowUserToAddRows = false; + this.dataGridView_DevList.AllowUserToDeleteRows = false; + this.dataGridView_DevList.AllowUserToResizeColumns = false; + this.dataGridView_DevList.AllowUserToResizeRows = false; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(234)))), ((int)(((byte)(238))))); dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(203)))), ((int)(((byte)(208))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.tableDevList.BackgroundColor = System.Drawing.Color.White; - this.tableDevList.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.tableDevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - this.tableDevList.ColumnHeadersHeight = 40; - this.tableDevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.tableDevList.Location = new System.Drawing.Point(20, 100); - this.tableDevList.Margin = new System.Windows.Forms.Padding(0); - this.tableDevList.Name = "tableDevList"; - this.tableDevList.ReadOnly = true; - this.tableDevList.RowHeadersVisible = false; - this.tableDevList.RowHeadersWidth = 30; + this.dataGridView_DevList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView_DevList.BackgroundColor = System.Drawing.Color.White; + this.dataGridView_DevList.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView_DevList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + this.dataGridView_DevList.ColumnHeadersHeight = 40; + this.dataGridView_DevList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView_DevList.Location = new System.Drawing.Point(20, 100); + this.dataGridView_DevList.Margin = new System.Windows.Forms.Padding(0); + this.dataGridView_DevList.Name = "dataGridView_DevList"; + this.dataGridView_DevList.ReadOnly = true; + this.dataGridView_DevList.RowHeadersVisible = false; + this.dataGridView_DevList.RowHeadersWidth = 30; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); @@ -197,11 +197,11 @@ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tableDevList.RowsDefaultCellStyle = dataGridViewCellStyle2; - this.tableDevList.RowTemplate.Height = 44; - this.tableDevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.tableDevList.Size = new System.Drawing.Size(964, 480); - this.tableDevList.TabIndex = 2; + this.dataGridView_DevList.RowsDefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView_DevList.RowTemplate.Height = 44; + this.dataGridView_DevList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView_DevList.Size = new System.Drawing.Size(964, 480); + this.dataGridView_DevList.TabIndex = 2; // // panel2 // @@ -231,245 +231,6 @@ this.panel2.Size = new System.Drawing.Size(964, 80); this.panel2.TabIndex = 1; // - // comboBox_DevStatus - // - this.comboBox_DevStatus.DisplayMember = "Text"; - this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.comboBox_DevStatus.FormattingEnabled = true; - this.comboBox_DevStatus.ItemHeight = 20; - this.comboBox_DevStatus.Items.AddRange(new object[] { - this.All, - this.toBeTested, - this.testing, - this.tested}); - this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); - this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); - this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); - this.comboBox_DevStatus.Name = "comboBox_DevStatus"; - this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 26); - this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.comboBox_DevStatus.TabIndex = 2; - this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); - // - // All - // - this.All.Text = "全部"; - // - // toBeTested - // - this.toBeTested.Text = "待检测"; - this.toBeTested.Value = "1"; - // - // testing - // - this.testing.Text = "检测中"; - this.testing.Value = "2"; - // - // tested - // - this.tested.Text = "已检测"; - this.tested.Value = "3"; - // - // labelDevStatus - // - this.labelDevStatus.AutoSize = true; - this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; - this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevStatus.Location = new System.Drawing.Point(480, 45); - this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.labelDevStatus.Name = "labelDevStatus"; - this.labelDevStatus.Size = new System.Drawing.Size(74, 21); - this.labelDevStatus.TabIndex = 11; - this.labelDevStatus.Text = "仪器状态"; - // - // inputDevName - // - // - // - // - this.inputDevName.Border.Class = "TextBoxBorder"; - this.inputDevName.Border.CornerDiameter = 5; - this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevName.Location = new System.Drawing.Point(80, 3); - this.inputDevName.Margin = new System.Windows.Forms.Padding(0); - this.inputDevName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevName.Name = "inputDevName"; - this.inputDevName.PreventEnterBeep = true; - this.inputDevName.Size = new System.Drawing.Size(150, 26); - this.inputDevName.TabIndex = 9; - this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevName.WatermarkText = "请输入仪器名称"; - // - // inputDevModel - // - // - // - // - this.inputDevModel.Border.Class = "TextBoxBorder"; - this.inputDevModel.Border.CornerDiameter = 5; - this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevModel.Location = new System.Drawing.Point(320, 3); - this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); - this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevModel.Name = "inputDevModel"; - this.inputDevModel.PreventEnterBeep = true; - this.inputDevModel.Size = new System.Drawing.Size(150, 26); - this.inputDevModel.TabIndex = 8; - this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevModel.WatermarkText = "请输入仪器型号"; - // - // inputDevCode - // - // - // - // - this.inputDevCode.Border.Class = "TextBoxBorder"; - this.inputDevCode.Border.CornerDiameter = 5; - this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevCode.Location = new System.Drawing.Point(560, 3); - this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); - this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevCode.Name = "inputDevCode"; - this.inputDevCode.PreventEnterBeep = true; - this.inputDevCode.Size = new System.Drawing.Size(150, 26); - this.inputDevCode.TabIndex = 7; - this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevCode.WatermarkText = "请输入仪器编号"; - // - // inputCustomName - // - // - // - // - this.inputCustomName.Border.Class = "TextBoxBorder"; - this.inputCustomName.Border.CornerDiameter = 5; - this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomName.Location = new System.Drawing.Point(320, 43); - this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomName.Name = "inputCustomName"; - this.inputCustomName.PreventEnterBeep = true; - this.inputCustomName.Size = new System.Drawing.Size(150, 26); - this.inputCustomName.TabIndex = 6; - this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomName.WatermarkText = "请输入联系人"; - // - // labelCustomName - // - this.labelCustomName.BackColor = System.Drawing.Color.Transparent; - this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomName.Location = new System.Drawing.Point(240, 45); - this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomName.Name = "labelCustomName"; - this.labelCustomName.Size = new System.Drawing.Size(74, 21); - this.labelCustomName.TabIndex = 5; - this.labelCustomName.Text = "联系人"; - this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // labelDevNo - // - this.labelDevNo.AutoSize = true; - this.labelDevNo.BackColor = System.Drawing.Color.Transparent; - this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevNo.Location = new System.Drawing.Point(480, 5); - this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); - this.labelDevNo.Name = "labelDevNo"; - this.labelDevNo.Size = new System.Drawing.Size(74, 21); - this.labelDevNo.TabIndex = 4; - this.labelDevNo.Text = "仪器编号"; - // - // labelDevModel - // - this.labelDevModel.AutoSize = true; - this.labelDevModel.BackColor = System.Drawing.Color.Transparent; - this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevModel.Location = new System.Drawing.Point(240, 5); - this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); - this.labelDevModel.Name = "labelDevModel"; - this.labelDevModel.Size = new System.Drawing.Size(74, 21); - this.labelDevModel.TabIndex = 4; - this.labelDevModel.Text = "仪器型号"; - // - // inputCustomComp - // - // - // - // - this.inputCustomComp.Border.Class = "TextBoxBorder"; - this.inputCustomComp.Border.CornerDiameter = 5; - this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputCustomComp.Border.MaximumHeight = 26; - this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputCustomComp.Location = new System.Drawing.Point(80, 43); - this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 26); - this.inputCustomComp.Name = "inputCustomComp"; - this.inputCustomComp.PreventEnterBeep = true; - this.inputCustomComp.Size = new System.Drawing.Size(150, 26); - this.inputCustomComp.TabIndex = 3; - this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; - this.inputCustomComp.WatermarkText = "请输入送检单位名称"; - // - // labelCustomComp - // - this.labelCustomComp.AutoSize = true; - this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; - this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelCustomComp.Location = new System.Drawing.Point(0, 45); - this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); - this.labelCustomComp.Name = "labelCustomComp"; - this.labelCustomComp.Size = new System.Drawing.Size(74, 21); - this.labelCustomComp.TabIndex = 0; - this.labelCustomComp.Text = "送检单位"; - // - // labelDevName - // - this.labelDevName.AutoSize = true; - this.labelDevName.BackColor = System.Drawing.Color.Transparent; - this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - this.labelDevName.Location = new System.Drawing.Point(0, 5); - this.labelDevName.Margin = new System.Windows.Forms.Padding(0); - this.labelDevName.Name = "labelDevName"; - this.labelDevName.Size = new System.Drawing.Size(74, 21); - this.labelDevName.TabIndex = 0; - this.labelDevName.Text = "仪器名称"; - // - // inputDevStatus - // - // - // - // - this.inputDevStatus.Border.Class = "TextBoxBorder"; - this.inputDevStatus.Border.CornerDiameter = 5; - this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); - this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.inputDevStatus.Location = new System.Drawing.Point(560, 43); - this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 26); - this.inputDevStatus.Name = "inputDevStatus"; - this.inputDevStatus.PreventEnterBeep = true; - this.inputDevStatus.Size = new System.Drawing.Size(150, 26); - this.inputDevStatus.TabIndex = 15; - this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; - this.inputDevStatus.WatermarkText = "请选择仪器状态"; - // // btn_downDevStatus // this.btn_downDevStatus.BackColor = System.Drawing.Color.Transparent; @@ -488,6 +249,26 @@ this.btn_downDevStatus.UseVisualStyleBackColor = false; this.btn_downDevStatus.Click += new System.EventHandler(this.btn_downDevStatus_Click); // + // inputDevStatus + // + // + // + // + this.inputDevStatus.Border.Class = "TextBoxBorder"; + this.inputDevStatus.Border.CornerDiameter = 5; + this.inputDevStatus.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevStatus.Location = new System.Drawing.Point(560, 42); + this.inputDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.inputDevStatus.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevStatus.Name = "inputDevStatus"; + this.inputDevStatus.PreventEnterBeep = true; + this.inputDevStatus.Size = new System.Drawing.Size(150, 28); + this.inputDevStatus.TabIndex = 15; + this.inputDevStatus.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevStatus.WatermarkText = "请选择仪器状态"; + // // btnExport // this.btnExport.EnterBackColor = System.Drawing.Color.Blue; @@ -607,6 +388,59 @@ this.btnEdit.UseVisualStyleBackColor = true; this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click); // + // comboBox_DevStatus + // + this.comboBox_DevStatus.DisplayMember = "Text"; + this.comboBox_DevStatus.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.comboBox_DevStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.comboBox_DevStatus.FormattingEnabled = true; + this.comboBox_DevStatus.ItemHeight = 21; + this.comboBox_DevStatus.Items.AddRange(new object[] { + this.All, + this.toBeTested, + this.testing, + this.tested}); + this.comboBox_DevStatus.Location = new System.Drawing.Point(560, 43); + this.comboBox_DevStatus.Margin = new System.Windows.Forms.Padding(0); + this.comboBox_DevStatus.MaximumSize = new System.Drawing.Size(150, 0); + this.comboBox_DevStatus.Name = "comboBox_DevStatus"; + this.comboBox_DevStatus.Size = new System.Drawing.Size(150, 27); + this.comboBox_DevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.comboBox_DevStatus.TabIndex = 2; + this.comboBox_DevStatus.SelectedIndexChanged += new System.EventHandler(this.comboBox_DevStatus_SelectedIndexChanged); + // + // All + // + this.All.Text = "全部"; + // + // toBeTested + // + this.toBeTested.Text = "待检测"; + this.toBeTested.Value = "1"; + // + // testing + // + this.testing.Text = "检测中"; + this.testing.Value = "2"; + // + // tested + // + this.tested.Text = "已检测"; + this.tested.Value = "3"; + // + // labelDevStatus + // + this.labelDevStatus.AutoSize = true; + this.labelDevStatus.BackColor = System.Drawing.Color.Transparent; + this.labelDevStatus.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevStatus.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevStatus.Location = new System.Drawing.Point(480, 45); + this.labelDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.labelDevStatus.Name = "labelDevStatus"; + this.labelDevStatus.Size = new System.Drawing.Size(74, 21); + this.labelDevStatus.TabIndex = 11; + this.labelDevStatus.Text = "仪器状态"; + // // btnQuery // this.btnQuery.EnterBackColor = System.Drawing.Color.Blue; @@ -631,6 +465,172 @@ this.btnQuery.UseVisualStyleBackColor = true; this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click); // + // inputDevName + // + // + // + // + this.inputDevName.Border.Class = "TextBoxBorder"; + this.inputDevName.Border.CornerDiameter = 5; + this.inputDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevName.Location = new System.Drawing.Point(80, 3); + this.inputDevName.Margin = new System.Windows.Forms.Padding(0); + this.inputDevName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevName.Name = "inputDevName"; + this.inputDevName.PreventEnterBeep = true; + this.inputDevName.Size = new System.Drawing.Size(150, 28); + this.inputDevName.TabIndex = 9; + this.inputDevName.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevName.WatermarkText = "请输入仪器名称"; + // + // inputDevModel + // + // + // + // + this.inputDevModel.Border.Class = "TextBoxBorder"; + this.inputDevModel.Border.CornerDiameter = 5; + this.inputDevModel.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevModel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevModel.Location = new System.Drawing.Point(320, 3); + this.inputDevModel.Margin = new System.Windows.Forms.Padding(0); + this.inputDevModel.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevModel.Name = "inputDevModel"; + this.inputDevModel.PreventEnterBeep = true; + this.inputDevModel.Size = new System.Drawing.Size(150, 28); + this.inputDevModel.TabIndex = 8; + this.inputDevModel.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevModel.WatermarkText = "请输入仪器型号"; + // + // inputDevCode + // + // + // + // + this.inputDevCode.Border.Class = "TextBoxBorder"; + this.inputDevCode.Border.CornerDiameter = 5; + this.inputDevCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputDevCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputDevCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputDevCode.Location = new System.Drawing.Point(560, 3); + this.inputDevCode.Margin = new System.Windows.Forms.Padding(0); + this.inputDevCode.MaximumSize = new System.Drawing.Size(150, 28); + this.inputDevCode.Name = "inputDevCode"; + this.inputDevCode.PreventEnterBeep = true; + this.inputDevCode.Size = new System.Drawing.Size(150, 28); + this.inputDevCode.TabIndex = 7; + this.inputDevCode.WatermarkColor = System.Drawing.Color.Silver; + this.inputDevCode.WatermarkText = "请输入仪器编号"; + // + // inputCustomName + // + // + // + // + this.inputCustomName.Border.Class = "TextBoxBorder"; + this.inputCustomName.Border.CornerDiameter = 5; + this.inputCustomName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomName.Location = new System.Drawing.Point(320, 43); + this.inputCustomName.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomName.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomName.Name = "inputCustomName"; + this.inputCustomName.PreventEnterBeep = true; + this.inputCustomName.Size = new System.Drawing.Size(150, 28); + this.inputCustomName.TabIndex = 6; + this.inputCustomName.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomName.WatermarkText = "请输入联系人"; + // + // labelCustomName + // + this.labelCustomName.BackColor = System.Drawing.Color.Transparent; + this.labelCustomName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomName.Location = new System.Drawing.Point(240, 45); + this.labelCustomName.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomName.Name = "labelCustomName"; + this.labelCustomName.Size = new System.Drawing.Size(74, 21); + this.labelCustomName.TabIndex = 5; + this.labelCustomName.Text = "联系人"; + this.labelCustomName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // labelDevNo + // + this.labelDevNo.AutoSize = true; + this.labelDevNo.BackColor = System.Drawing.Color.Transparent; + this.labelDevNo.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevNo.Location = new System.Drawing.Point(480, 5); + this.labelDevNo.Margin = new System.Windows.Forms.Padding(0); + this.labelDevNo.Name = "labelDevNo"; + this.labelDevNo.Size = new System.Drawing.Size(74, 21); + this.labelDevNo.TabIndex = 4; + this.labelDevNo.Text = "仪器编号"; + // + // labelDevModel + // + this.labelDevModel.AutoSize = true; + this.labelDevModel.BackColor = System.Drawing.Color.Transparent; + this.labelDevModel.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevModel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevModel.Location = new System.Drawing.Point(240, 5); + this.labelDevModel.Margin = new System.Windows.Forms.Padding(0); + this.labelDevModel.Name = "labelDevModel"; + this.labelDevModel.Size = new System.Drawing.Size(74, 21); + this.labelDevModel.TabIndex = 4; + this.labelDevModel.Text = "仪器型号"; + // + // inputCustomComp + // + // + // + // + this.inputCustomComp.Border.Class = "TextBoxBorder"; + this.inputCustomComp.Border.CornerDiameter = 5; + this.inputCustomComp.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.inputCustomComp.Border.MaximumHeight = 26; + this.inputCustomComp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.inputCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.inputCustomComp.Location = new System.Drawing.Point(80, 43); + this.inputCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.inputCustomComp.MaximumSize = new System.Drawing.Size(150, 28); + this.inputCustomComp.Name = "inputCustomComp"; + this.inputCustomComp.PreventEnterBeep = true; + this.inputCustomComp.Size = new System.Drawing.Size(150, 28); + this.inputCustomComp.TabIndex = 3; + this.inputCustomComp.WatermarkColor = System.Drawing.Color.Silver; + this.inputCustomComp.WatermarkText = "请输入送检单位名称"; + // + // labelCustomComp + // + this.labelCustomComp.AutoSize = true; + this.labelCustomComp.BackColor = System.Drawing.Color.Transparent; + this.labelCustomComp.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelCustomComp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelCustomComp.Location = new System.Drawing.Point(0, 45); + this.labelCustomComp.Margin = new System.Windows.Forms.Padding(0); + this.labelCustomComp.Name = "labelCustomComp"; + this.labelCustomComp.Size = new System.Drawing.Size(74, 21); + this.labelCustomComp.TabIndex = 0; + this.labelCustomComp.Text = "送检单位"; + // + // labelDevName + // + this.labelDevName.AutoSize = true; + this.labelDevName.BackColor = System.Drawing.Color.Transparent; + this.labelDevName.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134))); + this.labelDevName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + this.labelDevName.Location = new System.Drawing.Point(0, 5); + this.labelDevName.Margin = new System.Windows.Forms.Padding(0); + this.labelDevName.Name = "labelDevName"; + this.labelDevName.Size = new System.Drawing.Size(74, 21); + this.labelDevName.TabIndex = 0; + this.labelDevName.Text = "仪器名称"; + // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -644,7 +644,7 @@ this.panelNodata.ResumeLayout(false); this.panelPage.ResumeLayout(false); this.panelPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tableDevList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView_DevList)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); this.ResumeLayout(false); @@ -677,7 +677,7 @@ private RoundButton btnDelete; private RoundButton btnDetail; private RoundButton btnExport; - private System.Windows.Forms.DataGridView tableDevList; + private System.Windows.Forms.DataGridView dataGridView_DevList; private System.Windows.Forms.Button btnNext; private System.Windows.Forms.Button btnPre; private System.Windows.Forms.Label labelPageCount; diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 1ac72dc..93262a9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -51,8 +51,8 @@ private void InitTableDevList() { - tableDevList.Columns.Clear(); - tableDevList.Rows.Clear(); + dataGridView_DevList.Columns.Clear(); + dataGridView_DevList.Rows.Clear(); // 添加标题栏 Panel tableHeader = new Panel @@ -62,7 +62,7 @@ Location = new Point(0, 0) }; tableHeader.BackColor = titleBackColor; - tableDevList.Controls.Add(tableHeader); + dataGridView_DevList.Controls.Add(tableHeader); // 序号 Label colNo = new Label { @@ -75,7 +75,7 @@ Location = new Point(0, 0), Size = new Size(80, 40) }; - tableDevList.Controls.Add(colNo); + dataGridView_DevList.Controls.Add(colNo); colNo.BringToFront(); // 登记时间 @@ -90,7 +90,7 @@ Location = new Point(80, 0), Size = new Size(164, 40) }; - tableDevList.Controls.Add(colRegTime); + dataGridView_DevList.Controls.Add(colRegTime); colRegTime.BringToFront(); // 仪器名称 @@ -105,7 +105,7 @@ Location = new Point(244, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevName); + dataGridView_DevList.Controls.Add(colDevName); colDevName.BringToFront(); // 仪器型号 @@ -120,7 +120,7 @@ Location = new Point(364, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevType); + dataGridView_DevList.Controls.Add(colDevType); colDevType.BringToFront(); // 仪器编号 @@ -135,7 +135,7 @@ Location = new Point(484, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevNo); + dataGridView_DevList.Controls.Add(colDevNo); colDevNo.BringToFront(); // 客户名称 @@ -150,7 +150,7 @@ Location = new Point(604, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colCustomName); + dataGridView_DevList.Controls.Add(colCustomName); colCustomName.BringToFront(); // 设备状态 @@ -165,7 +165,7 @@ Location = new Point(724, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colDevStatus); + dataGridView_DevList.Controls.Add(colDevStatus); colDevStatus.BringToFront(); // 通道号 @@ -180,7 +180,7 @@ Location = new Point(844, 0), Size = new Size(120, 40) }; - tableDevList.Controls.Add(colChannelNo); + dataGridView_DevList.Controls.Add(colChannelNo); colChannelNo.BringToFront(); } @@ -198,6 +198,7 @@ devList.Columns.Add("status", Type.GetType("System.String")); devList.Columns.Add("channelNo", Type.GetType("System.String")); devList.Columns.Add("id", Type.GetType("System.Int32")); + devList.Columns.Add("customerDev", Type.GetType("System.String")); // 分页查询数据库 string devName = ""; @@ -252,7 +253,7 @@ foreach ( DeviceDto device in queryList ) { int index = (page-1) * limitCount + i + 1; - devList.Rows.Add(index, device.RegTime, device.DevName, device.DevModel, device.DevCode, device.CustomerName, device.StatusName, device.Channel, device.Id); + devList.Rows.Add(index, device.RegTime, device.DevName, device.DevModel, device.DevCode, device.CustomerName, device.StatusName, device.Channel, device.Id, device.CustomerDev); i++; } @@ -265,30 +266,31 @@ this.Controls.Find("panelPage", true)[0].Hide(); } - tableDevList.DataSource = devList; + dataGridView_DevList.DataSource = devList; // width=964px - tableDevList.Columns[0].Width = 80; - tableDevList.Columns[1].Width = 164; - tableDevList.Columns[2].Width = 120; - tableDevList.Columns[3].Width = 120; - tableDevList.Columns[4].Width = 120; - tableDevList.Columns[5].Width = 120; - tableDevList.Columns[6].Width = 120; - tableDevList.Columns[7].Width = 120; - tableDevList.Columns[8].Width = 0; + dataGridView_DevList.Columns[0].Width = 80; + dataGridView_DevList.Columns[1].Width = 164; + dataGridView_DevList.Columns[2].Width = 120; + dataGridView_DevList.Columns[3].Width = 120; + dataGridView_DevList.Columns[4].Width = 120; + dataGridView_DevList.Columns[5].Width = 120; + dataGridView_DevList.Columns[6].Width = 120; + dataGridView_DevList.Columns[7].Width = 120; + dataGridView_DevList.Columns[8].Width = 0; - tableDevList.Columns[8].Visible = false; // id不显示 + dataGridView_DevList.Columns[8].Visible = false; // id不显示 + dataGridView_DevList.Columns[9].Visible = false; // id不显示 - tableDevList.Columns[0].ReadOnly = true; - tableDevList.Columns[1].ReadOnly = true; - tableDevList.Columns[2].ReadOnly = true; - tableDevList.Columns[3].ReadOnly = true; - tableDevList.Columns[4].ReadOnly = true; - tableDevList.Columns[5].ReadOnly = true; - tableDevList.Columns[6].ReadOnly = true; - tableDevList.Columns[7].ReadOnly = true; - tableDevList.Columns[8].ReadOnly = true; + dataGridView_DevList.Columns[0].ReadOnly = true; + dataGridView_DevList.Columns[1].ReadOnly = true; + dataGridView_DevList.Columns[2].ReadOnly = true; + dataGridView_DevList.Columns[3].ReadOnly = true; + dataGridView_DevList.Columns[4].ReadOnly = true; + dataGridView_DevList.Columns[5].ReadOnly = true; + dataGridView_DevList.Columns[6].ReadOnly = true; + dataGridView_DevList.Columns[7].ReadOnly = true; + dataGridView_DevList.Columns[8].ReadOnly = true; } private int GetTotalCount(JObject condition) @@ -372,7 +374,7 @@ string devCode = inputDevCode.Text; string customComp = inputCustomComp.Text; string customName = inputCustomName.Text; - ComboBoxEx statusSelect = (ComboBoxEx)this.Controls.Find("inputDevStatus", true)[0]; + ComboBoxEx statusSelect = (ComboBoxEx)this.Controls.Find("comboBox_DevStatus", true)[0]; string devStatus = (string)((ComboItem)statusSelect.SelectedItem).Value; condition.RemoveAll(); @@ -442,16 +444,14 @@ private void btnDetail_Click(object sender, EventArgs e) { - int rowIndex = tableDevList.CurrentRow.Index; - int id = (int)tableDevList.Rows[rowIndex].Cells[8].Value; - MessageBox.Show(id.ToString()); + int rowIndex = dataGridView_DevList.CurrentRow.Index; + int id = (int)dataGridView_DevList.Rows[rowIndex].Cells[8].Value; DetailDlg detailDlg = new DetailDlg(); - detailDlg.Controls.Find("label_devName", true)[0].Text = tableDevList.Rows[rowIndex].Cells[2].Value.ToString(); - detailDlg.Controls.Find("label_devModel", true)[0].Text = tableDevList.Rows[rowIndex].Cells[3].Value.ToString(); - detailDlg.Controls.Find("label_devCode", true)[0].Text = tableDevList.Rows[rowIndex].Cells[4].Value.ToString(); - detailDlg.Controls.Find("label_customerComp", true)[0].Text = tableDevList.Rows[rowIndex].Cells[5].Value.ToString(); - detailDlg.Controls.Find("label_customerName", true)[0].Text = tableDevList.Rows[rowIndex].Cells[5].Value.ToString(); + detailDlg.Controls.Find("label_devModel", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[3].Value.ToString(); + detailDlg.Controls.Find("label_devCode", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[4].Value.ToString(); + detailDlg.Controls.Find("label_customerComp", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[9].Value.ToString(); + detailDlg.Controls.Find("label_customerName", true)[0].Text = dataGridView_DevList.Rows[rowIndex].Cells[5].Value.ToString(); detailDlg.HideMaskAction += () => { @@ -464,18 +464,27 @@ private void btnEdit_Click(object sender, EventArgs e) { - int rowIndex = tableDevList.CurrentRow.Index; - int id = (int)tableDevList.Rows[rowIndex].Cells[8].Value; - string devName = (string)tableDevList.Rows[rowIndex].Cells[2].Value; - string devModel = (string)tableDevList.Rows[rowIndex].Cells[3].Value; - string devCode = (string)tableDevList.Rows[rowIndex].Cells[4].Value; + int rowIndex = dataGridView_DevList.CurrentRow.Index; + int id = (int)dataGridView_DevList.Rows[rowIndex].Cells[8].Value; + string devName = (string)dataGridView_DevList.Rows[rowIndex].Cells[2].Value; + string devModel = (string)dataGridView_DevList.Rows[rowIndex].Cells[3].Value; + string devCode = (string)dataGridView_DevList.Rows[rowIndex].Cells[4].Value; AddDevDlg editDlg = new AddDevDlg(); - editDlg.Controls.Find("labelTitle", true)[0].Text = "修改送检仪器"; + editDlg.Controls.Find("labelTitle", true)[0].Text = "修改仪器"; editDlg.Controls.Find("inputDevName", true)[0].Text = devName; editDlg.Controls.Find("inputDevModel", true)[0].Text = devModel; editDlg.Controls.Find("inputDevCode", true)[0].Text = devCode; - + editDlg.text_devType.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[2].Value; + editDlg.inputCustComp.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[9].Value; + editDlg.inputCustName.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[5].Value; + editDlg.text_channelNo.Text = (string)dataGridView_DevList.Rows[rowIndex].Cells[7].Value; + editDlg.btnSave.Text = "保存"; + if (((string)dataGridView_DevList.Rows[rowIndex].Cells[6].Value).Equals("检测中")) + { + editDlg.btn_downChannelList.Enabled = false; + editDlg.text_channelNo.ReadOnly = true; + } editDlg.HideMaskAction += () => { this.HideMask(); @@ -492,16 +501,22 @@ private void comboBox_DevStatus_SelectedIndexChanged(object sender, EventArgs e) { - inputDevStatus.Text = comboBox_DevStatus.SelectedText; + inputDevStatus.Text = comboBox_DevStatus.SelectedItem.ToString(); } private void btnDelete_Click(object sender, EventArgs e) { + if (((string)dataGridView_DevList.Rows[dataGridView_DevList.CurrentRow.Index].Cells[6].Value).Equals("检测中")) + { + MessageBox.Show("该仪器在检测中，无法删除！"); + return; + } if (MessageBox.Show("确认删除选中仪器？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - + deviceService.delete(Convert.ToInt32(dataGridView_DevList.Rows[dataGridView_DevList.CurrentRow.Index].Cells[8].Value)); MessageBox.Show("删除成功", "提示"); + LoadDevList(condition); } } } diff --git a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs index 8152f83..cb453d7 100644 --- a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs @@ -41,29 +41,6 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); - this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.textBoxX5 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label8 = new System.Windows.Forms.Label(); - this.textBoxX6 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label9 = new System.Windows.Forms.Label(); - this.textBoxX7 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label13 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.textBoxX9 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.textBoxX10 = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label18 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.textBoxX11 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label12 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); @@ -74,12 +51,35 @@ this.label22 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.textBoxX13 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.textBoxX9 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label16 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.textBoxX10 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.textBoxX11 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label11 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.textBoxX7 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label8 = new System.Windows.Forms.Label(); + this.textBoxX6 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.textBoxX5 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label5 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // label2 @@ -259,304 +259,6 @@ this.tabPage2.Text = "计数器程控检定"; this.tabPage2.UseVisualStyleBackColor = true; // - // groupBox1 - // - this.groupBox1.Controls.Add(this.label11); - this.groupBox1.Controls.Add(this.label10); - this.groupBox1.Controls.Add(this.label9); - this.groupBox1.Controls.Add(this.textBoxX7); - this.groupBox1.Controls.Add(this.label8); - this.groupBox1.Controls.Add(this.textBoxX6); - this.groupBox1.Controls.Add(this.label6); - this.groupBox1.Controls.Add(this.label7); - this.groupBox1.Controls.Add(this.textBoxX5); - this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textBoxX1); - this.groupBox1.Location = new System.Drawing.Point(31, 18); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(904, 162); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "电平参数"; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(64, 45); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(125, 30); - this.label1.TabIndex = 6; - this.label1.Text = "信号源输出延时："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX1 - // - // - // - // - this.textBoxX1.Border.Class = "TextBoxBorder"; - this.textBoxX1.Border.CornerDiameter = 5; - this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX1.Location = new System.Drawing.Point(195, 45); - this.textBoxX1.Name = "textBoxX1"; - this.textBoxX1.PreventEnterBeep = true; - this.textBoxX1.Size = new System.Drawing.Size(168, 29); - this.textBoxX1.TabIndex = 5; - // - // label5 - // - this.label5.BackColor = System.Drawing.Color.Transparent; - this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(372, 43); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(45, 30); - this.label5.TabIndex = 7; - this.label5.Text = "ms"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label6 - // - this.label6.BackColor = System.Drawing.Color.Transparent; - this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(786, 39); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(45, 30); - this.label6.TabIndex = 10; - this.label6.Text = "V"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label7 - // - this.label7.BackColor = System.Drawing.Color.Transparent; - this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(444, 41); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(159, 30); - this.label7.TabIndex = 9; - this.label7.Text = "信号源初始电平："; - this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX5 - // - // - // - // - this.textBoxX5.Border.Class = "TextBoxBorder"; - this.textBoxX5.Border.CornerDiameter = 5; - this.textBoxX5.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX5.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX5.Location = new System.Drawing.Point(609, 41); - this.textBoxX5.Name = "textBoxX5"; - this.textBoxX5.PreventEnterBeep = true; - this.textBoxX5.Size = new System.Drawing.Size(168, 29); - this.textBoxX5.TabIndex = 8; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(30, 97); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(159, 30); - this.label8.TabIndex = 12; - this.label8.Text = "信号源电平增加值："; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX6 - // - // - // - // - this.textBoxX6.Border.Class = "TextBoxBorder"; - this.textBoxX6.Border.CornerDiameter = 5; - this.textBoxX6.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX6.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX6.Location = new System.Drawing.Point(195, 97); - this.textBoxX6.Name = "textBoxX6"; - this.textBoxX6.PreventEnterBeep = true; - this.textBoxX6.Size = new System.Drawing.Size(168, 29); - this.textBoxX6.TabIndex = 11; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(444, 97); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(159, 30); - this.label9.TabIndex = 14; - this.label9.Text = "输出电平警告值："; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX7 - // - // - // - // - this.textBoxX7.Border.Class = "TextBoxBorder"; - this.textBoxX7.Border.CornerDiameter = 5; - this.textBoxX7.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX7.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX7.Location = new System.Drawing.Point(609, 97); - this.textBoxX7.Name = "textBoxX7"; - this.textBoxX7.PreventEnterBeep = true; - this.textBoxX7.Size = new System.Drawing.Size(168, 29); - this.textBoxX7.TabIndex = 13; - // - // label10 - // - this.label10.BackColor = System.Drawing.Color.Transparent; - this.label10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(372, 97); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(45, 30); - this.label10.TabIndex = 15; - this.label10.Text = "V"; - this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label11 - // - this.label11.BackColor = System.Drawing.Color.Transparent; - this.label11.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(786, 97); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(45, 30); - this.label11.TabIndex = 16; - this.label11.Text = "V"; - this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.label13); - this.groupBox2.Controls.Add(this.label15); - this.groupBox2.Controls.Add(this.textBoxX9); - this.groupBox2.Controls.Add(this.label16); - this.groupBox2.Controls.Add(this.label17); - this.groupBox2.Controls.Add(this.textBoxX10); - this.groupBox2.Controls.Add(this.label18); - this.groupBox2.Controls.Add(this.label19); - this.groupBox2.Controls.Add(this.textBoxX11); - this.groupBox2.Location = new System.Drawing.Point(31, 194); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(904, 162); - this.groupBox2.TabIndex = 17; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "频率灵敏度"; - // - // label13 - // - this.label13.BackColor = System.Drawing.Color.Transparent; - this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(372, 97); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(45, 30); - this.label13.TabIndex = 15; - this.label13.Text = "V"; - this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label15 - // - this.label15.BackColor = System.Drawing.Color.Transparent; - this.label15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(30, 97); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(159, 30); - this.label15.TabIndex = 12; - this.label15.Text = "测量误差电平增加值："; - this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX9 - // - // - // - // - this.textBoxX9.Border.Class = "TextBoxBorder"; - this.textBoxX9.Border.CornerDiameter = 5; - this.textBoxX9.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX9.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX9.Location = new System.Drawing.Point(195, 97); - this.textBoxX9.Name = "textBoxX9"; - this.textBoxX9.PreventEnterBeep = true; - this.textBoxX9.Size = new System.Drawing.Size(168, 29); - this.textBoxX9.TabIndex = 11; - // - // label16 - // - this.label16.BackColor = System.Drawing.Color.Transparent; - this.label16.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(786, 39); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(45, 30); - this.label16.TabIndex = 10; - this.label16.Text = "V"; - this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label17 - // - this.label17.BackColor = System.Drawing.Color.Transparent; - this.label17.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(444, 41); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(159, 30); - this.label17.TabIndex = 9; - this.label17.Text = "频率差值>80MHz："; - this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX10 - // - // - // - // - this.textBoxX10.Border.Class = "TextBoxBorder"; - this.textBoxX10.Border.CornerDiameter = 5; - this.textBoxX10.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX10.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX10.Location = new System.Drawing.Point(609, 41); - this.textBoxX10.Name = "textBoxX10"; - this.textBoxX10.PreventEnterBeep = true; - this.textBoxX10.Size = new System.Drawing.Size(168, 29); - this.textBoxX10.TabIndex = 8; - // - // label18 - // - this.label18.BackColor = System.Drawing.Color.Transparent; - this.label18.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(372, 43); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(45, 30); - this.label18.TabIndex = 7; - this.label18.Text = "Hz"; - this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label19 - // - this.label19.BackColor = System.Drawing.Color.Transparent; - this.label19.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(34, 45); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(155, 30); - this.label19.TabIndex = 6; - this.label19.Text = "频率差值<=80MHz："; - this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxX11 - // - // - // - // - this.textBoxX11.Border.Class = "TextBoxBorder"; - this.textBoxX11.Border.CornerDiameter = 5; - this.textBoxX11.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.textBoxX11.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBoxX11.Location = new System.Drawing.Point(195, 45); - this.textBoxX11.Name = "textBoxX11"; - this.textBoxX11.PreventEnterBeep = true; - this.textBoxX11.Size = new System.Drawing.Size(168, 29); - this.textBoxX11.TabIndex = 5; - // // groupBox3 // this.groupBox3.Controls.Add(this.label12); @@ -686,6 +388,304 @@ this.textBoxX13.Size = new System.Drawing.Size(168, 29); this.textBoxX13.TabIndex = 5; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label13); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.textBoxX9); + this.groupBox2.Controls.Add(this.label16); + this.groupBox2.Controls.Add(this.label17); + this.groupBox2.Controls.Add(this.textBoxX10); + this.groupBox2.Controls.Add(this.label18); + this.groupBox2.Controls.Add(this.label19); + this.groupBox2.Controls.Add(this.textBoxX11); + this.groupBox2.Location = new System.Drawing.Point(31, 194); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(904, 162); + this.groupBox2.TabIndex = 17; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "频率灵敏度"; + // + // label13 + // + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.Location = new System.Drawing.Point(372, 97); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(45, 30); + this.label13.TabIndex = 15; + this.label13.Text = "V"; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label15 + // + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(30, 97); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(159, 30); + this.label15.TabIndex = 12; + this.label15.Text = "测量误差电平增加值："; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX9 + // + // + // + // + this.textBoxX9.Border.Class = "TextBoxBorder"; + this.textBoxX9.Border.CornerDiameter = 5; + this.textBoxX9.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX9.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX9.Location = new System.Drawing.Point(195, 97); + this.textBoxX9.Name = "textBoxX9"; + this.textBoxX9.PreventEnterBeep = true; + this.textBoxX9.Size = new System.Drawing.Size(168, 29); + this.textBoxX9.TabIndex = 11; + // + // label16 + // + this.label16.BackColor = System.Drawing.Color.Transparent; + this.label16.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label16.Location = new System.Drawing.Point(786, 39); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(45, 30); + this.label16.TabIndex = 10; + this.label16.Text = "Hz"; + this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label17 + // + this.label17.BackColor = System.Drawing.Color.Transparent; + this.label17.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label17.Location = new System.Drawing.Point(444, 41); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(159, 30); + this.label17.TabIndex = 9; + this.label17.Text = "频率差值>80MHz："; + this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX10 + // + // + // + // + this.textBoxX10.Border.Class = "TextBoxBorder"; + this.textBoxX10.Border.CornerDiameter = 5; + this.textBoxX10.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX10.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX10.Location = new System.Drawing.Point(609, 41); + this.textBoxX10.Name = "textBoxX10"; + this.textBoxX10.PreventEnterBeep = true; + this.textBoxX10.Size = new System.Drawing.Size(168, 29); + this.textBoxX10.TabIndex = 8; + // + // label18 + // + this.label18.BackColor = System.Drawing.Color.Transparent; + this.label18.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label18.Location = new System.Drawing.Point(372, 43); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(45, 30); + this.label18.TabIndex = 7; + this.label18.Text = "Hz"; + this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label19 + // + this.label19.BackColor = System.Drawing.Color.Transparent; + this.label19.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label19.Location = new System.Drawing.Point(34, 45); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(155, 30); + this.label19.TabIndex = 6; + this.label19.Text = "频率差值<=80MHz："; + this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX11 + // + // + // + // + this.textBoxX11.Border.Class = "TextBoxBorder"; + this.textBoxX11.Border.CornerDiameter = 5; + this.textBoxX11.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX11.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX11.Location = new System.Drawing.Point(195, 45); + this.textBoxX11.Name = "textBoxX11"; + this.textBoxX11.PreventEnterBeep = true; + this.textBoxX11.Size = new System.Drawing.Size(168, 29); + this.textBoxX11.TabIndex = 5; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label11); + this.groupBox1.Controls.Add(this.label10); + this.groupBox1.Controls.Add(this.label9); + this.groupBox1.Controls.Add(this.textBoxX7); + this.groupBox1.Controls.Add(this.label8); + this.groupBox1.Controls.Add(this.textBoxX6); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label7); + this.groupBox1.Controls.Add(this.textBoxX5); + this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.textBoxX1); + this.groupBox1.Location = new System.Drawing.Point(31, 18); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(904, 162); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "电平参数"; + // + // label11 + // + this.label11.BackColor = System.Drawing.Color.Transparent; + this.label11.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label11.Location = new System.Drawing.Point(786, 97); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(45, 30); + this.label11.TabIndex = 16; + this.label11.Text = "V"; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label10 + // + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.Location = new System.Drawing.Point(372, 97); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(45, 30); + this.label10.TabIndex = 15; + this.label10.Text = "V"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Transparent; + this.label9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(444, 97); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(159, 30); + this.label9.TabIndex = 14; + this.label9.Text = "输出电平警告值："; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX7 + // + // + // + // + this.textBoxX7.Border.Class = "TextBoxBorder"; + this.textBoxX7.Border.CornerDiameter = 5; + this.textBoxX7.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX7.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX7.Location = new System.Drawing.Point(609, 97); + this.textBoxX7.Name = "textBoxX7"; + this.textBoxX7.PreventEnterBeep = true; + this.textBoxX7.Size = new System.Drawing.Size(168, 29); + this.textBoxX7.TabIndex = 13; + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.Transparent; + this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(30, 97); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(159, 30); + this.label8.TabIndex = 12; + this.label8.Text = "信号源电平增加值："; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX6 + // + // + // + // + this.textBoxX6.Border.Class = "TextBoxBorder"; + this.textBoxX6.Border.CornerDiameter = 5; + this.textBoxX6.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX6.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX6.Location = new System.Drawing.Point(195, 97); + this.textBoxX6.Name = "textBoxX6"; + this.textBoxX6.PreventEnterBeep = true; + this.textBoxX6.Size = new System.Drawing.Size(168, 29); + this.textBoxX6.TabIndex = 11; + // + // label6 + // + this.label6.BackColor = System.Drawing.Color.Transparent; + this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(786, 39); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(45, 30); + this.label6.TabIndex = 10; + this.label6.Text = "V"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label7 + // + this.label7.BackColor = System.Drawing.Color.Transparent; + this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(444, 41); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(159, 30); + this.label7.TabIndex = 9; + this.label7.Text = "信号源初始电平："; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX5 + // + // + // + // + this.textBoxX5.Border.Class = "TextBoxBorder"; + this.textBoxX5.Border.CornerDiameter = 5; + this.textBoxX5.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX5.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX5.Location = new System.Drawing.Point(609, 41); + this.textBoxX5.Name = "textBoxX5"; + this.textBoxX5.PreventEnterBeep = true; + this.textBoxX5.Size = new System.Drawing.Size(168, 29); + this.textBoxX5.TabIndex = 8; + // + // label5 + // + this.label5.BackColor = System.Drawing.Color.Transparent; + this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(372, 43); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(45, 30); + this.label5.TabIndex = 7; + this.label5.Text = "ms"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(64, 45); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(125, 30); + this.label1.TabIndex = 6; + this.label1.Text = "信号源输出延时："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerDiameter = 5; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX1.Location = new System.Drawing.Point(195, 45); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(168, 29); + this.textBoxX1.TabIndex = 5; + // // SettingCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -701,9 +701,9 @@ this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/RbFreqStandMeasure/tools/DataHelper.cs b/RbFreqStandMeasure/tools/DataHelper.cs index 62f3a7c..9a044d5 100644 --- a/RbFreqStandMeasure/tools/DataHelper.cs +++ b/RbFreqStandMeasure/tools/DataHelper.cs @@ -10,6 +10,7 @@ { static class DataHelper { + public static T DataRowToModel(DataRow row) { T t = default(T);