Commit 0d5cddc5 authored by wangwanxh@sina.com's avatar wangwanxh@sina.com

4-28

parent 64091552
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
<runtime> <runtime>
<legacyUnhandledExceptionPolicy enabled="true"/> <legacyUnhandledExceptionPolicy enabled="true"/>
</runtime> </runtime>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdjustFrom));
this.SuspendLayout(); this.SuspendLayout();
// //
// AdjustFrom // AdjustFrom
...@@ -36,9 +35,7 @@ ...@@ -36,9 +35,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(722, 382); this.ClientSize = new System.Drawing.Size(722, 382);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "AdjustFrom"; this.Name = "AdjustFrom";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "校准"; this.Text = "校准";
this.ResumeLayout(false); this.ResumeLayout(false);
......
...@@ -27,7 +27,7 @@ namespace GcDevicePc ...@@ -27,7 +27,7 @@ namespace GcDevicePc
this.Controls.Add(adjust); this.Controls.Add(adjust);
} }
public new void Show() public void Show()
{ {
base.Show(); base.Show();
if (adjust != null) if (adjust != null)
......
...@@ -117,171 +117,4 @@ ...@@ -117,171 +117,4 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApItECKiPQRioj
0M0qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9DNKiPQRiki
0QIpItFOKSLR7Ski0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR7Ski0U4pItPZKSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki09kpItT9KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P0oIdb/KCHW/ygh1v8oIdb/KCHV+Skh
1acpIdVAKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSHVJikh1UgpIdWnKCHV+Sgh1v8oIdb/KCHW/ygh1v8oIdf/KCHX/ygh
1/8oIdf/KCHXrSkh1ioAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApIdYqKCHXrSgh1/8oIdf/KCHX/ygh
1/8oINj/KCDY/ygg2P8oINj/KCHYZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCHYZigg
2P8oINj/KCDY/ygg2P8nINr/JyDa/ycg2v8nINr/JyDZWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAJyDZWCcg2v8nINr/JyDa/ycg2v8nINv/JyDb/ycg2/8nINv/JyDbXAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAJyDbXCcg2/8nINv/JyDb/ycg2/8nH93/Jx/d/ycf3f8nH93/Jx/dXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/dXCcf3f8nH93/Jx/d/ycf3f8nH97/Jx/e/ycf
3v8nH97/Jx/eXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/eXCcf3v8nH97/Jx/e/ycf
3v8nH9//Jx/f/ycf3/8nH9//Jx/fXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/fXCcf
3/8nH9//Jx/f/ycf3/8mH+H/Jh/h/yYf4f8mH+H/Jh/hXCcg6/8nIOv/JyDr/ycg6/8nIOv/JyDr/ycg
6/8mIOv/Jh/r/ygi7GInIewEJyHsECYg67smH+v/JiDr/ycg6/8nIOv/JyDr/ycg6/8mH+v/Jh/r/yom
7A4oIuy/JyDr/ych7P8mH+v/Jh7q/yYf680lHeo8JR7q/yYe6v8mHur/JR3q/yUd6v8lHer/JBzq/yQc
6v8kHOr/Jh/hXCYf4f8mH+H/Jh/h/yYf4f8mHuL/Jh7i/yYe4v8mHuL/Jh7iXCkm7J8pJuyrKSbsqykm
7KspJuyrKSbsqykl7K0rKOzjKyjs/yso7M0tLO0ULSrsPCoo7NkrKOz9Kifszykl7KsqJuyrKSbsqykl
7K0rKeztKyjs/zM17kAvLu25LSrt/ysm7N0nIOnfJx/o/ycg6b8mHuk8JyDq9ygg6v8nH+rjJh7qxSYe
660mHuurJR3rqyQd66skHeufJh7iXCYe4v8mHuL/Jh7i/yYe4v8mHuT/Jh7k/yYe5P8mHuT/Jh7kXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMO1wMDHt9y8w7f80OO46MjTtcC8w7fswMe3nLi7tTAAA
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
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAPUbvXD1G7/89Ru//PUbv/z1G7/8/Su//P0rv/z9K7/8/Su//P0rvXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0rvXD9K7/8/Su//P0rv/z9K7/9DT+//Q0/v/0NP
7/9DT+//Q0/vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0/vXENP7/9DT+//Q0/v/0NP
7/9GVPD/RlTw/0ZU8P9GVPD/RlTwXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARlTwXEZU
8P9GVPD/RlTw/0ZU8P9JWfD/SVnw/0lZ8P9JWfD/SVrwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAASVrwWElZ8P9JWfD/SVnw/0lZ8P9MX/H/TF/x/0xf8f9MXvH/TWHxZgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAATWHxZkxe8f9MX/H/TF/x/0xf8f9PY/H/T2Px/09j8f9PY/H/T2LxrVBl
8SpTafEGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8QZQZfEqT2LxrU9j8f9PY/H/T2Px/09j8f9SaPH/Umjx/1Jo
8f9SaPH/Umjx+VFo8aNTafFcU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8VxRaPGjUmjx+VJo8f9SaPH/Umjx/1Jo
8f9UbfL9VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v1XcfLZV3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8tlZdfJOWnby7Vp28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby7Vl18k5ZdfICXXnzRl17881dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9de/PNXXnzRll18gIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
AAD///////8AAMAAAAAAAwAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA//////AAAAH/////+AAAA//
////8AAAD//////wAAAP//////AAAA//////8AAAD//////wAAAP//////AAAAgDgCBAEAAACAGAIEAQ
AAAP+Z8ER/AAAA/4H4RH8AAAD/gfhk/wAAAP/D/OT/AAAA/8P85P8AAAD/4//k/wAAAP/n/+X/AAAA//
//5f8AAAD////l/wAAAP///+H/AAAA////4f8AAAD////h/wAAAP///+P/AAAA////4/8AAAD//////w
AAAP//////AAAA//////8AAAD//////wAAAP//////AAAA//////8AAAB//////gAAAD/////8AAAAAA
AAAAAAAAAAAAAAAAAACAAAAAAAEAAMAAAAAAAwAA////////AAD///////8AAP///////wAA////////
AAA=
</value>
</data>
</root> </root>
\ No newline at end of file
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistChartForm));
this.SuspendLayout(); this.SuspendLayout();
// //
// HistChartForm // HistChartForm
...@@ -36,9 +35,7 @@ ...@@ -36,9 +35,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(722, 382); this.ClientSize = new System.Drawing.Size(722, 382);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "HistChartForm"; this.Name = "HistChartForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "历史图谱"; this.Text = "历史图谱";
this.ResumeLayout(false); this.ResumeLayout(false);
......
...@@ -27,7 +27,7 @@ namespace GcDevicePc ...@@ -27,7 +27,7 @@ namespace GcDevicePc
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.Controls.Add(adjust); this.Controls.Add(adjust);
} }
public new void Show() public void Show()
{ {
base.Show(); base.Show();
if (adjust != null) if (adjust != null)
......
...@@ -117,171 +117,4 @@ ...@@ -117,171 +117,4 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApItECKiPQRioj
0M0qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9DNKiPQRiki
0QIpItFOKSLR7Ski0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR7Ski0U4pItPZKSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki09kpItT9KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P0oIdb/KCHW/ygh1v8oIdb/KCHV+Skh
1acpIdVAKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSHVJikh1UgpIdWnKCHV+Sgh1v8oIdb/KCHW/ygh1v8oIdf/KCHX/ygh
1/8oIdf/KCHXrSkh1ioAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApIdYqKCHXrSgh1/8oIdf/KCHX/ygh
1/8oINj/KCDY/ygg2P8oINj/KCHYZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCHYZigg
2P8oINj/KCDY/ygg2P8nINr/JyDa/ycg2v8nINr/JyDZWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAJyDZWCcg2v8nINr/JyDa/ycg2v8nINv/JyDb/ycg2/8nINv/JyDbXAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAJyDbXCcg2/8nINv/JyDb/ycg2/8nH93/Jx/d/ycf3f8nH93/Jx/dXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/dXCcf3f8nH93/Jx/d/ycf3f8nH97/Jx/e/ycf
3v8nH97/Jx/eXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/eXCcf3v8nH97/Jx/e/ycf
3v8nH9//Jx/f/ycf3/8nH9//Jx/fXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/fXCcf
3/8nH9//Jx/f/ycf3/8mH+H/Jh/h/yYf4f8mH+H/Jh/hXCcg6/8nIOv/JyDr/ycg6/8nIOv/JyDr/ycg
6/8mIOv/Jh/r/ygi7GInIewEJyHsECYg67smH+v/JiDr/ycg6/8nIOv/JyDr/ycg6/8mH+v/Jh/r/yom
7A4oIuy/JyDr/ych7P8mH+v/Jh7q/yYf680lHeo8JR7q/yYe6v8mHur/JR3q/yUd6v8lHer/JBzq/yQc
6v8kHOr/Jh/hXCYf4f8mH+H/Jh/h/yYf4f8mHuL/Jh7i/yYe4v8mHuL/Jh7iXCkm7J8pJuyrKSbsqykm
7KspJuyrKSbsqykl7K0rKOzjKyjs/yso7M0tLO0ULSrsPCoo7NkrKOz9Kifszykl7KsqJuyrKSbsqykl
7K0rKeztKyjs/zM17kAvLu25LSrt/ysm7N0nIOnfJx/o/ycg6b8mHuk8JyDq9ygg6v8nH+rjJh7qxSYe
660mHuurJR3rqyQd66skHeufJh7iXCYe4v8mHuL/Jh7i/yYe4v8mHuT/Jh7k/yYe5P8mHuT/Jh7kXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMO1wMDHt9y8w7f80OO46MjTtcC8w7fswMe3nLi7tTAAA
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
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAPUbvXD1G7/89Ru//PUbv/z1G7/8/Su//P0rv/z9K7/8/Su//P0rvXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0rvXD9K7/8/Su//P0rv/z9K7/9DT+//Q0/v/0NP
7/9DT+//Q0/vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0/vXENP7/9DT+//Q0/v/0NP
7/9GVPD/RlTw/0ZU8P9GVPD/RlTwXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARlTwXEZU
8P9GVPD/RlTw/0ZU8P9JWfD/SVnw/0lZ8P9JWfD/SVrwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAASVrwWElZ8P9JWfD/SVnw/0lZ8P9MX/H/TF/x/0xf8f9MXvH/TWHxZgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAATWHxZkxe8f9MX/H/TF/x/0xf8f9PY/H/T2Px/09j8f9PY/H/T2LxrVBl
8SpTafEGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8QZQZfEqT2LxrU9j8f9PY/H/T2Px/09j8f9SaPH/Umjx/1Jo
8f9SaPH/Umjx+VFo8aNTafFcU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8VxRaPGjUmjx+VJo8f9SaPH/Umjx/1Jo
8f9UbfL9VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v1XcfLZV3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8tlZdfJOWnby7Vp28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby7Vl18k5ZdfICXXnzRl17881dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9de/PNXXnzRll18gIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
AAD///////8AAMAAAAAAAwAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA//////AAAAH/////+AAAA//
////8AAAD//////wAAAP//////AAAA//////8AAAD//////wAAAP//////AAAAgDgCBAEAAACAGAIEAQ
AAAP+Z8ER/AAAA/4H4RH8AAAD/gfhk/wAAAP/D/OT/AAAA/8P85P8AAAD/4//k/wAAAP/n/+X/AAAA//
//5f8AAAD////l/wAAAP///+H/AAAA////4f8AAAD////h/wAAAP///+P/AAAA////4/8AAAD//////w
AAAP//////AAAA//////8AAAD//////wAAAP//////AAAA//////8AAAB//////gAAAD/////8AAAAAA
AAAAAAAAAAAAAAAAAACAAAAAAAEAAMAAAAAAAwAA////////AAD///////8AAP///////wAA////////
AAA=
</value>
</data>
</root> </root>
\ No newline at end of file
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.labelStart = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -52,6 +53,7 @@ ...@@ -52,6 +53,7 @@
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.labelStart);
this.groupBox1.Controls.Add(this.textBoxport); this.groupBox1.Controls.Add(this.textBoxport);
this.groupBox1.Controls.Add(this.label6); this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.progressBarRun); this.groupBox1.Controls.Add(this.progressBarRun);
...@@ -93,9 +95,9 @@ ...@@ -93,9 +95,9 @@
// progressBarRun // progressBarRun
// //
this.progressBarRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.progressBarRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.progressBarRun.Location = new System.Drawing.Point(445, 29); this.progressBarRun.Location = new System.Drawing.Point(447, 76);
this.progressBarRun.Name = "progressBarRun"; this.progressBarRun.Name = "progressBarRun";
this.progressBarRun.Size = new System.Drawing.Size(132, 68); this.progressBarRun.Size = new System.Drawing.Size(132, 21);
this.progressBarRun.TabIndex = 10; this.progressBarRun.TabIndex = 10;
// //
// textBoxRun // textBoxRun
...@@ -194,6 +196,14 @@ ...@@ -194,6 +196,14 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// labelStart
//
this.labelStart.AutoSize = true;
this.labelStart.Location = new System.Drawing.Point(480, 35);
this.labelStart.Name = "labelStart";
this.labelStart.Size = new System.Drawing.Size(0, 12);
this.labelStart.TabIndex = 13;
//
// InfoBarUser // InfoBarUser
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -224,5 +234,6 @@ ...@@ -224,5 +234,6 @@
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.TextBox textBoxport; private System.Windows.Forms.TextBox textBoxport;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label labelStart;
} }
} }
...@@ -29,6 +29,7 @@ namespace GcDevicePc.CK_UI ...@@ -29,6 +29,7 @@ namespace GcDevicePc.CK_UI
Color zcolor = Color.White; Color zcolor = Color.White;
Color waringcolor = Color.Coral; Color waringcolor = Color.Coral;
//前进样口 //前进样口
if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp == 0.0f)
...@@ -39,7 +40,8 @@ namespace GcDevicePc.CK_UI ...@@ -39,7 +40,8 @@ namespace GcDevicePc.CK_UI
else else
{ {
textBoxport.Text = globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp.ToString("#0.00")+"℃"; textBoxport.Text = globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp.ToString("#0.00")+"℃";
if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp <= globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp)
if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp - globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp) <= 0.1)
{ {
textBoxport.BackColor = zcolor; textBoxport.BackColor = zcolor;
...@@ -62,7 +64,8 @@ namespace GcDevicePc.CK_UI ...@@ -62,7 +64,8 @@ namespace GcDevicePc.CK_UI
else else
{ {
textBoven.Text =globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp.ToString("#0.00")+"℃"; textBoven.Text =globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp.ToString("#0.00")+"℃";
if (globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp <= globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp)
if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp- globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp)<=0.1)
{ {
textBoven.BackColor = zcolor; textBoven.BackColor = zcolor;
...@@ -82,7 +85,7 @@ namespace GcDevicePc.CK_UI ...@@ -82,7 +85,7 @@ namespace GcDevicePc.CK_UI
else else
{ {
textBmanifold.Text = globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1.ToString("#0.00") + "℃"; textBmanifold.Text = globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1.ToString("#0.00") + "℃";
if (globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1 <= globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1) if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1 - globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1)<=0.1)
{ {
textBmanifold.BackColor = zcolor; textBmanifold.BackColor = zcolor;
...@@ -101,8 +104,8 @@ namespace GcDevicePc.CK_UI ...@@ -101,8 +104,8 @@ namespace GcDevicePc.CK_UI
else else
{ {
textBmanifold.Text = globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.00") + "℃"; textBFid.Text = globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.00") + "℃";
if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp <= globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp) if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp- globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp)<=0.1)
{ {
textBFid.BackColor = zcolor; textBFid.BackColor = zcolor;
...@@ -172,11 +175,84 @@ namespace GcDevicePc.CK_UI ...@@ -172,11 +175,84 @@ namespace GcDevicePc.CK_UI
{ {
progressBarRun.Value = 0; progressBarRun.Value = 0;
} }
string strtext=null;
Color bkcolor=Color.Wheat;
setStatus(ref strtext, ref bkcolor);
labelStart.Text = strtext;
labelStart.BackColor = bkcolor;
}catch(Exception ex) }catch(Exception ex)
{ {
Trace.Write(ex); Trace.Write(ex);
} }
} }
private void setStatus(ref string status_text, ref Color bkcolor)
{
try
{
ushort flag = 10;
if(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue)
{
flag = globaldata.m_hmibuffer.gcinfo.methodstatus; //获取系统状态
}
if(globaldata.m_hmibuffer.gcinfo.hmioffline)
{
flag = 9;
}
bkcolor = Color.Wheat;
switch (flag)
{
case 0:
case 1:
status_text = "空闲中...";
break;
case 2:
status_text = "仪器平衡中...";
break;
case 3:
status_text = "已就绪...";
break;
case 4:
case 5:
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 1)
status_text = "方法运行中...";
else if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 2)
status_text = "方法运行中...";
else if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 3)
status_text = "方法运行中...";
else
status_text = "方法运行中...";
break;
case 6:
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 1)
status_text = "后处理...";
break;
case 7:
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 1)
status_text = "后处理完毕...";
break;
case 8:
status_text = "信号稳定中...";
break;
case 9:
status_text = "设备断开";
bkcolor = Color.LightCoral;
break;
default:
status_text = "设备连接";
break;
}
}
catch(Exception ex)
{
Trace.Write(ex);
}
}
} }
} }
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LandIn));
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox();
...@@ -108,9 +107,7 @@ ...@@ -108,9 +107,7 @@
this.Controls.Add(this.textBox1); this.Controls.Add(this.textBox1);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "LandIn"; this.Name = "LandIn";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "登录"; this.Text = "登录";
this.Load += new System.EventHandler(this.LandIn_Load); this.Load += new System.EventHandler(this.LandIn_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
......
...@@ -11,10 +11,8 @@ namespace GcDevicePc.CK_UI ...@@ -11,10 +11,8 @@ namespace GcDevicePc.CK_UI
{ {
public partial class LandIn : Form public partial class LandIn : Form
{ {
private string user = ""; private string user = "admin";
public static bool Island = false; public static bool Island = false;
private CKVocAnalyzer.NumForm form = null;
public LandIn() public LandIn()
{ {
InitializeComponent(); InitializeComponent();
...@@ -26,12 +24,6 @@ namespace GcDevicePc.CK_UI ...@@ -26,12 +24,6 @@ namespace GcDevicePc.CK_UI
if (textBox1.Text == user && textBox2.Text == strpw) if (textBox1.Text == user && textBox2.Text == strpw)
{ {
Island = true; Island = true;
if (form != null || !form.IsDisposed)
{
form.Hide();
}
} }
else else
{ {
...@@ -42,7 +34,6 @@ namespace GcDevicePc.CK_UI ...@@ -42,7 +34,6 @@ namespace GcDevicePc.CK_UI
private void button2_Click(object sender, EventArgs e) //放弃 private void button2_Click(object sender, EventArgs e) //放弃
{ {
Island = false; Island = false;
} }
private void LandIn_Load(object sender, EventArgs e) private void LandIn_Load(object sender, EventArgs e)
...@@ -52,14 +43,9 @@ namespace GcDevicePc.CK_UI ...@@ -52,14 +43,9 @@ namespace GcDevicePc.CK_UI
private void textBox2_Click(object sender, EventArgs e) private void textBox2_Click(object sender, EventArgs e)
{ {
if (form == null || form.IsDisposed) CKVocAnalyzer.NumForm form = CKVocAnalyzer.NumForm.GetInstance((TextBox)sender);// new CKVocAnalyzer.NumForm((TextBox)sender);
{
form = new CKVocAnalyzer.NumForm((TextBox)sender); form.Show();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LandIn));
form.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
form.Show();
}
} }
} }
} }
...@@ -117,171 +117,4 @@ ...@@ -117,171 +117,4 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApItECKiPQRioj
0M0qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9DNKiPQRiki
0QIpItFOKSLR7Ski0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR7Ski0U4pItPZKSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki09kpItT9KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P0oIdb/KCHW/ygh1v8oIdb/KCHV+Skh
1acpIdVAKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSHVJikh1UgpIdWnKCHV+Sgh1v8oIdb/KCHW/ygh1v8oIdf/KCHX/ygh
1/8oIdf/KCHXrSkh1ioAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApIdYqKCHXrSgh1/8oIdf/KCHX/ygh
1/8oINj/KCDY/ygg2P8oINj/KCHYZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCHYZigg
2P8oINj/KCDY/ygg2P8nINr/JyDa/ycg2v8nINr/JyDZWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAJyDZWCcg2v8nINr/JyDa/ycg2v8nINv/JyDb/ycg2/8nINv/JyDbXAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAJyDbXCcg2/8nINv/JyDb/ycg2/8nH93/Jx/d/ycf3f8nH93/Jx/dXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/dXCcf3f8nH93/Jx/d/ycf3f8nH97/Jx/e/ycf
3v8nH97/Jx/eXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/eXCcf3v8nH97/Jx/e/ycf
3v8nH9//Jx/f/ycf3/8nH9//Jx/fXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/fXCcf
3/8nH9//Jx/f/ycf3/8mH+H/Jh/h/yYf4f8mH+H/Jh/hXCcg6/8nIOv/JyDr/ycg6/8nIOv/JyDr/ycg
6/8mIOv/Jh/r/ygi7GInIewEJyHsECYg67smH+v/JiDr/ycg6/8nIOv/JyDr/ycg6/8mH+v/Jh/r/yom
7A4oIuy/JyDr/ych7P8mH+v/Jh7q/yYf680lHeo8JR7q/yYe6v8mHur/JR3q/yUd6v8lHer/JBzq/yQc
6v8kHOr/Jh/hXCYf4f8mH+H/Jh/h/yYf4f8mHuL/Jh7i/yYe4v8mHuL/Jh7iXCkm7J8pJuyrKSbsqykm
7KspJuyrKSbsqykl7K0rKOzjKyjs/yso7M0tLO0ULSrsPCoo7NkrKOz9Kifszykl7KsqJuyrKSbsqykl
7K0rKeztKyjs/zM17kAvLu25LSrt/ysm7N0nIOnfJx/o/ycg6b8mHuk8JyDq9ygg6v8nH+rjJh7qxSYe
660mHuurJR3rqyQd66skHeufJh7iXCYe4v8mHuL/Jh7i/yYe4v8mHuT/Jh7k/yYe5P8mHuT/Jh7kXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMO1wMDHt9y8w7f80OO46MjTtcC8w7fswMe3nLi7tTAAA
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
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAPUbvXD1G7/89Ru//PUbv/z1G7/8/Su//P0rv/z9K7/8/Su//P0rvXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0rvXD9K7/8/Su//P0rv/z9K7/9DT+//Q0/v/0NP
7/9DT+//Q0/vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0/vXENP7/9DT+//Q0/v/0NP
7/9GVPD/RlTw/0ZU8P9GVPD/RlTwXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARlTwXEZU
8P9GVPD/RlTw/0ZU8P9JWfD/SVnw/0lZ8P9JWfD/SVrwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAASVrwWElZ8P9JWfD/SVnw/0lZ8P9MX/H/TF/x/0xf8f9MXvH/TWHxZgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAATWHxZkxe8f9MX/H/TF/x/0xf8f9PY/H/T2Px/09j8f9PY/H/T2LxrVBl
8SpTafEGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8QZQZfEqT2LxrU9j8f9PY/H/T2Px/09j8f9SaPH/Umjx/1Jo
8f9SaPH/Umjx+VFo8aNTafFcU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8VxRaPGjUmjx+VJo8f9SaPH/Umjx/1Jo
8f9UbfL9VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v1XcfLZV3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8tlZdfJOWnby7Vp28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby7Vl18k5ZdfICXXnzRl17881dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9de/PNXXnzRll18gIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
AAD///////8AAMAAAAAAAwAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA//////AAAAH/////+AAAA//
////8AAAD//////wAAAP//////AAAA//////8AAAD//////wAAAP//////AAAAgDgCBAEAAACAGAIEAQ
AAAP+Z8ER/AAAA/4H4RH8AAAD/gfhk/wAAAP/D/OT/AAAA/8P85P8AAAD/4//k/wAAAP/n/+X/AAAA//
//5f8AAAD////l/wAAAP///+H/AAAA////4f8AAAD////h/wAAAP///+P/AAAA////4/8AAAD//////w
AAAP//////AAAA//////8AAAD//////wAAAP//////AAAA//////8AAAB//////gAAAD/////8AAAAAA
AAAAAAAAAAAAAAAAAACAAAAAAAEAAMAAAAAAAwAA////////AAD///////8AAP///////wAA////////
AAA=
</value>
</data>
</root> </root>
\ No newline at end of file
...@@ -37,6 +37,12 @@ ...@@ -37,6 +37,12 @@
this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox();
this.textBox3 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.textBox6 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.textBox5 = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.textBox4 = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -72,7 +78,7 @@ ...@@ -72,7 +78,7 @@
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(42, 117); this.label3.Location = new System.Drawing.Point(42, 102);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(54, 21); this.label3.Size = new System.Drawing.Size(54, 21);
this.label3.TabIndex = 3; this.label3.TabIndex = 3;
...@@ -82,7 +88,7 @@ ...@@ -82,7 +88,7 @@
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(42, 188); this.label4.Location = new System.Drawing.Point(42, 167);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(54, 21); this.label4.Size = new System.Drawing.Size(54, 21);
this.label4.TabIndex = 4; this.label4.TabIndex = 4;
...@@ -91,7 +97,7 @@ ...@@ -91,7 +97,7 @@
// textBox1 // textBox1
// //
this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox1.Location = new System.Drawing.Point(6, 73); this.textBox1.Location = new System.Drawing.Point(6, 67);
this.textBox1.Name = "textBox1"; this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(116, 29); this.textBox1.Size = new System.Drawing.Size(116, 29);
this.textBox1.TabIndex = 5; this.textBox1.TabIndex = 5;
...@@ -99,7 +105,7 @@ ...@@ -99,7 +105,7 @@
// textBox2 // textBox2
// //
this.textBox2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.textBox2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox2.Location = new System.Drawing.Point(6, 144); this.textBox2.Location = new System.Drawing.Point(6, 131);
this.textBox2.Name = "textBox2"; this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(116, 29); this.textBox2.Size = new System.Drawing.Size(116, 29);
this.textBox2.TabIndex = 6; this.textBox2.TabIndex = 6;
...@@ -107,7 +113,7 @@ ...@@ -107,7 +113,7 @@
// textBox3 // textBox3
// //
this.textBox3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.textBox3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox3.Location = new System.Drawing.Point(6, 215); this.textBox3.Location = new System.Drawing.Point(6, 194);
this.textBox3.Name = "textBox3"; this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(116, 29); this.textBox3.Size = new System.Drawing.Size(116, 29);
this.textBox3.TabIndex = 7; this.textBox3.TabIndex = 7;
...@@ -115,6 +121,12 @@ ...@@ -115,6 +121,12 @@
// groupBox1 // groupBox1
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.textBox6);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.textBox5);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.textBox4);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.textBox1); this.groupBox1.Controls.Add(this.textBox1);
this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.textBox3);
this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label2);
...@@ -122,13 +134,67 @@ ...@@ -122,13 +134,67 @@
this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(598, 15); this.groupBox1.Location = new System.Drawing.Point(598, 13);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(131, 273); this.groupBox1.Size = new System.Drawing.Size(131, 413);
this.groupBox1.TabIndex = 8; this.groupBox1.TabIndex = 8;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "结果(ppm)"; this.groupBox1.Text = "结果(ppm)";
// //
// textBox6
//
this.textBox6.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox6.Location = new System.Drawing.Point(6, 376);
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(116, 29);
this.textBox6.TabIndex = 14;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(30, 352);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(76, 21);
this.label6.TabIndex = 13;
this.label6.Text = "二甲苯";
//
// textBox5
//
this.textBox5.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox5.Location = new System.Drawing.Point(6, 316);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(116, 29);
this.textBox5.TabIndex = 12;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(38, 290);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(54, 21);
this.label5.TabIndex = 11;
this.label5.Text = "甲苯";
//
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox4.Location = new System.Drawing.Point(6, 255);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(116, 29);
this.textBox4.TabIndex = 10;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(46, 231);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(32, 21);
this.label1.TabIndex = 9;
this.label1.Text = "苯";
//
// timer1 // timer1
// //
this.timer1.Enabled = true; this.timer1.Enabled = true;
...@@ -161,6 +227,12 @@ ...@@ -161,6 +227,12 @@
private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.TextBox textBox6;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.Label label1;
} }
} }
...@@ -18,9 +18,17 @@ namespace GcDevicePc.CK_UI ...@@ -18,9 +18,17 @@ namespace GcDevicePc.CK_UI
PointPairList listNmoc = new PointPairList(); PointPairList listNmoc = new PointPairList();
PointPairList listTHC = new PointPairList(); PointPairList listTHC = new PointPairList();
PointPairList listCH4 = new PointPairList(); PointPairList listCH4 = new PointPairList();
PointPairList listben = new PointPairList(); //苯
PointPairList listjiaben = new PointPairList();//甲苯
PointPairList listerjiaben = new PointPairList();//二甲苯
GraphPane myPaneNmoc ; GraphPane myPaneNmoc ;
GraphPane myPaneThc ; GraphPane myPaneThc ;
GraphPane myPaneCh4 ; GraphPane myPaneCh4 ;
GraphPane myPaneben;
GraphPane myPanejiaben;
GraphPane myPaneerjiaben;
public int Systemtype { get; set; }
public UserCtl() public UserCtl()
{ {
InitializeComponent(); InitializeComponent();
...@@ -28,11 +36,38 @@ namespace GcDevicePc.CK_UI ...@@ -28,11 +36,38 @@ namespace GcDevicePc.CK_UI
private void UserCtl_Load(object sender, EventArgs e) private void UserCtl_Load(object sender, EventArgs e)
{ {
InitZedgrap(zedGraphControl1);
data();
datadisp(); switch (Systemtype)
{
default: //非甲烷总烃
InitZedgrap(zedGraphControl1);
data();
datadisp();
UIVisible(false);
break;
case 1:
InitZedgrapben(zedGraphControl1);
data2();
datadisp2();
break;
}
} }
private void UIVisible(bool visible)
{
label1.Visible = visible;
textBox4.Visible = visible;
textBox5.Visible = visible;
textBox6.Visible = visible;
label5.Visible = visible;
label6.Visible = visible;
}
private void InitZedgrap(ZedGraphControl zedgraph) private void InitZedgrap(ZedGraphControl zedgraph)
{ {
try try
...@@ -69,12 +104,7 @@ namespace GcDevicePc.CK_UI ...@@ -69,12 +104,7 @@ namespace GcDevicePc.CK_UI
ZedGraphControl z1 = zedgraph; ZedGraphControl z1 = zedgraph;
mster.SetLayout(g, PaneLayout.SingleColumn); mster.SetLayout(g, PaneLayout.SingleColumn);
z1.AxisChange(); z1.AxisChange();
//z1.IsAutoScrollRange = true;
//z1.IsShowHScrollBar = true;
//z1.IsShowVScrollBar = true;
//z1.IsSynchronizeXAxes = true;
} }
...@@ -87,6 +117,70 @@ namespace GcDevicePc.CK_UI ...@@ -87,6 +117,70 @@ namespace GcDevicePc.CK_UI
Trace.Write(ex); Trace.Write(ex);
} }
} }
private void InitZedgrapben(ZedGraphControl zedgraph)
{
try
{
mster = zedgraph.MasterPane;
mster.Fill = new Fill(Color.White, Color.FromArgb(220, 220, 255), 45.0f);
mster.PaneList.Clear();
mster.Title.IsVisible = true;
mster.Title.Text = "12小时趋势图";
mster.Margin.All = 10;
mster.InnerPaneGap = 0;
//zedgraph.GraphPane.XAxis.CrossAuto = true;
//zedgraph.GraphPane.YAxis.CrossAuto = true;
rotator = new ColorSymbolRotator();
myPaneNmoc = new GraphPane(new Rectangle(40, 40, 600, 400),
"",
"",
"");
myPaneThc = new GraphPane(new Rectangle(40, 40, 600, 400),
"",
"",
"");
myPaneCh4 = new GraphPane(new Rectangle(40, 40, 600, 400),
"",
"",
"");
myPaneben = new GraphPane(new Rectangle(40, 40, 600, 400),
"",
"",
"");
myPanejiaben = new GraphPane(new Rectangle(40, 40, 600, 400),
"",
"",
"");
myPaneerjiaben = new GraphPane(new Rectangle(40, 40, 600, 400),
"",
"",
"");
setpane(myPaneNmoc, "NMOC");
setpane(myPaneThc, "THC");
setpane(myPaneCh4, "CH4");
setpane(myPaneben, "苯");
setpane(myPanejiaben, "甲苯");
setpane(myPaneerjiaben, "二甲苯");
using (Graphics g = zedgraph.CreateGraphics())
{
ZedGraphControl z1 = zedgraph;
mster.SetLayout(g, PaneLayout.SingleColumn);
z1.AxisChange();
}
zedgraph.AxisChange();
}
catch (Exception ex)
{
Trace.Write(ex);
}
}
private void setpane(GraphPane myPaneT, string text) private void setpane(GraphPane myPaneT, string text)
{ {
try try
...@@ -183,6 +277,91 @@ namespace GcDevicePc.CK_UI ...@@ -183,6 +277,91 @@ namespace GcDevicePc.CK_UI
} }
// zedgraph.AxisChange(); // zedgraph.AxisChange();
} }
private void datadisp2() //苯系物
{
try
{
if (myPaneNmoc == null || myPaneCh4 == null || myPaneThc == null || myPaneben == null || myPanejiaben == null || myPaneerjiaben == null || listNmoc.Count < 1 || listCH4.Count < 1 || listTHC.Count < 1 || listben.Count < 1 || listjiaben.Count < 1 || listerjiaben.Count < 1)
{
return;
}
textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString() + "ppm";
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y, 2).ToString() + "ppm";
textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y, 2).ToString() + "ppm";
textBox4.Text = Math.Round(listNmoc[listben.Count - 1].Y, 2).ToString() + "ppm";
textBox5.Text = Math.Round(listTHC[listjiaben.Count - 1].Y, 2).ToString() + "ppm";
textBox6.Text = Math.Round(listCH4[listerjiaben.Count - 1].Y, 2).ToString() + "ppm";
mster.PaneList.Clear();
myPaneCh4.CurveList.Clear();
myPaneNmoc.CurveList.Clear();
myPaneThc.CurveList.Clear();
myPaneben.CurveList.Clear();
myPanejiaben.CurveList.Clear();
myPaneerjiaben.CurveList.Clear();
//DateTime dt = DateTime.Now;
//double minx = (double)new XDate(dt.AddHours(-5));
//double maxx = (double)new XDate(dt);
//myPaneNmoc.XAxis.Scale.Min = listNmoc[0].X-100;
//myPaneNmoc.XAxis.Scale.Max = listNmoc[listNmoc.Count - 1].X+1000;
//myPaneNmoc.XAxis.Scale.Min = minx;
//myPaneNmoc.XAxis.Scale.Max = maxx;
myPaneNmoc.XAxis.CrossAuto = true;
myPaneNmoc.YAxis.CrossAuto = true;
LineItem myCurve = myPaneNmoc.AddCurve("",
listNmoc, rotator.NextColor, SymbolType.None);
myCurve.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneNmoc);
// myPaneThc.XAxis.Scale.Min = minx;
// myPaneThc.XAxis.Scale.Max = maxx;
myPaneThc.XAxis.CrossAuto = true;
myPaneThc.YAxis.CrossAuto = true;
LineItem myCurve1 = myPaneThc.AddCurve("",
listTHC, rotator.NextColor, SymbolType.None);
myCurve1.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneThc);
// myPaneCh4.XAxis.Scale.Min = minx;
// myPaneCh4.XAxis.Scale.Max = maxx;
myPaneCh4.XAxis.CrossAuto = true;
myPaneCh4.YAxis.CrossAuto = true;
LineItem myCurve2 = myPaneCh4.AddCurve("",
listCH4, rotator.NextColor, SymbolType.None);
myCurve2.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneCh4);
myPaneben.XAxis.CrossAuto = true;
myPaneben.YAxis.CrossAuto = true;
LineItem myCurve3 = myPaneben.AddCurve("",
listben, rotator.NextColor, SymbolType.None);
myCurve3.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneben);
myPanejiaben.XAxis.CrossAuto = true;
myPanejiaben.YAxis.CrossAuto = true;
LineItem myCurve4 = myPanejiaben.AddCurve("",
listjiaben, rotator.NextColor, SymbolType.None);
myCurve4.Symbol.Fill = new Fill(Color.White);
mster.Add(myPanejiaben);
myPaneerjiaben.XAxis.CrossAuto = true;
myPaneerjiaben.YAxis.CrossAuto = true;
LineItem myCurve5 = myPaneerjiaben.AddCurve("",
listerjiaben, rotator.NextColor, SymbolType.None);
myCurve5.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneerjiaben);
zedGraphControl1.AxisChange();
zedGraphControl1.Refresh();
}
catch (Exception ex)
{
Trace.Write(ex);
}
// zedgraph.AxisChange();
}
private void data() private void data()
{ {
try try
...@@ -246,11 +425,90 @@ namespace GcDevicePc.CK_UI ...@@ -246,11 +425,90 @@ namespace GcDevicePc.CK_UI
} }
} }
private void data2()
{
try
{
SQLiteOperate.VOCSqlite sql = new SQLiteOperate.VOCSqlite(CKVocAnalyzer.GlobalCKV.DataBasePath);
sql.open();
DateTime dt = DateTime.Now;
string start = dt.AddHours(-12).ToString("yyyy-MM-dd HH:mm:ss");
string end = dt.ToString("yyyy-MM-dd HH:mm:ss");
sql.selectTimes(start, end);
sql.close();
if (sql.ReturnData == null)
{
return;
}
listNmoc.Clear();
listCH4.Clear();
listTHC.Clear();
listben.Clear();
listjiaben.Clear();
listerjiaben.Clear();
for (int i = 0; i < sql.ReturnData.Count; ++i)
{
double times = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
double v = sql.ReturnData[i].value;
if (sql.ReturnData[i].name == "NMOC")
{
listNmoc.Add(times, v);
}
if (sql.ReturnData[i].name == "THC")
{
listTHC.Add(times, v);
}
if (sql.ReturnData[i].name == "CH4")
{
listCH4.Add(times, v);
}
if (sql.ReturnData[i].name == "苯")
{
listben.Add(times, v);
}
if (sql.ReturnData[i].name == "甲苯")
{
listjiaben.Add(times, v);
}
if (sql.ReturnData[i].name == "二甲苯")
{
listerjiaben.Add(times, v);
}
}
}
catch (Exception ex)
{
Trace.Write(ex);
}
}
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
switch (Systemtype)
{
default: //非甲烷总烃
data();
datadisp();
UIVisible(false);
break;
case 1:
data2();
datadisp2();
break;
}
data();
datadisp();
} }
} }
} }
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.Diagnostics;
namespace GcDevicePc.CK_UI
{
public partial class UserCtlAuto : UserControl
{
public UserCtlAuto()
{
InitializeComponent();
}
private void UserCtlAuto_Load(object sender, EventArgs e)
{
}
}
}
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WaveTotalForm));
this.SuspendLayout(); this.SuspendLayout();
// //
// WaveTotalForm // WaveTotalForm
...@@ -36,9 +35,7 @@ ...@@ -36,9 +35,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(592, 325); this.ClientSize = new System.Drawing.Size(592, 325);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "WaveTotalForm"; this.Name = "WaveTotalForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "浓度查询"; this.Text = "浓度查询";
this.ResumeLayout(false); this.ResumeLayout(false);
......
...@@ -28,7 +28,7 @@ namespace GcDevicePc ...@@ -28,7 +28,7 @@ namespace GcDevicePc
} }
public new void Show() public void Show()
{ {
base.Show(); base.Show();
if (total != null) if (total != null)
......
...@@ -117,171 +117,4 @@ ...@@ -117,171 +117,4 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApItECKiPQRioj
0M0qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9DNKiPQRiki
0QIpItFOKSLR7Ski0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR7Ski0U4pItPZKSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki09kpItT9KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P0oIdb/KCHW/ygh1v8oIdb/KCHV+Skh
1acpIdVAKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSHVJikh1UgpIdWnKCHV+Sgh1v8oIdb/KCHW/ygh1v8oIdf/KCHX/ygh
1/8oIdf/KCHXrSkh1ioAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApIdYqKCHXrSgh1/8oIdf/KCHX/ygh
1/8oINj/KCDY/ygg2P8oINj/KCHYZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCHYZigg
2P8oINj/KCDY/ygg2P8nINr/JyDa/ycg2v8nINr/JyDZWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAJyDZWCcg2v8nINr/JyDa/ycg2v8nINv/JyDb/ycg2/8nINv/JyDbXAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAJyDbXCcg2/8nINv/JyDb/ycg2/8nH93/Jx/d/ycf3f8nH93/Jx/dXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/dXCcf3f8nH93/Jx/d/ycf3f8nH97/Jx/e/ycf
3v8nH97/Jx/eXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/eXCcf3v8nH97/Jx/e/ycf
3v8nH9//Jx/f/ycf3/8nH9//Jx/fXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/fXCcf
3/8nH9//Jx/f/ycf3/8mH+H/Jh/h/yYf4f8mH+H/Jh/hXCcg6/8nIOv/JyDr/ycg6/8nIOv/JyDr/ycg
6/8mIOv/Jh/r/ygi7GInIewEJyHsECYg67smH+v/JiDr/ycg6/8nIOv/JyDr/ycg6/8mH+v/Jh/r/yom
7A4oIuy/JyDr/ych7P8mH+v/Jh7q/yYf680lHeo8JR7q/yYe6v8mHur/JR3q/yUd6v8lHer/JBzq/yQc
6v8kHOr/Jh/hXCYf4f8mH+H/Jh/h/yYf4f8mHuL/Jh7i/yYe4v8mHuL/Jh7iXCkm7J8pJuyrKSbsqykm
7KspJuyrKSbsqykl7K0rKOzjKyjs/yso7M0tLO0ULSrsPCoo7NkrKOz9Kifszykl7KsqJuyrKSbsqykl
7K0rKeztKyjs/zM17kAvLu25LSrt/ysm7N0nIOnfJx/o/ycg6b8mHuk8JyDq9ygg6v8nH+rjJh7qxSYe
660mHuurJR3rqyQd66skHeufJh7iXCYe4v8mHuL/Jh7i/yYe4v8mHuT/Jh7k/yYe5P8mHuT/Jh7kXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMO1wMDHt9y8w7f80OO46MjTtcC8w7fswMe3nLi7tTAAA
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
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAPUbvXD1G7/89Ru//PUbv/z1G7/8/Su//P0rv/z9K7/8/Su//P0rvXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0rvXD9K7/8/Su//P0rv/z9K7/9DT+//Q0/v/0NP
7/9DT+//Q0/vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0/vXENP7/9DT+//Q0/v/0NP
7/9GVPD/RlTw/0ZU8P9GVPD/RlTwXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARlTwXEZU
8P9GVPD/RlTw/0ZU8P9JWfD/SVnw/0lZ8P9JWfD/SVrwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAASVrwWElZ8P9JWfD/SVnw/0lZ8P9MX/H/TF/x/0xf8f9MXvH/TWHxZgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAATWHxZkxe8f9MX/H/TF/x/0xf8f9PY/H/T2Px/09j8f9PY/H/T2LxrVBl
8SpTafEGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8QZQZfEqT2LxrU9j8f9PY/H/T2Px/09j8f9SaPH/Umjx/1Jo
8f9SaPH/Umjx+VFo8aNTafFcU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8VxRaPGjUmjx+VJo8f9SaPH/Umjx/1Jo
8f9UbfL9VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v1XcfLZV3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8tlZdfJOWnby7Vp28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby7Vl18k5ZdfICXXnzRl17881dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9de/PNXXnzRll18gIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
AAD///////8AAMAAAAAAAwAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA//////AAAAH/////+AAAA//
////8AAAD//////wAAAP//////AAAA//////8AAAD//////wAAAP//////AAAAgDgCBAEAAACAGAIEAQ
AAAP+Z8ER/AAAA/4H4RH8AAAD/gfhk/wAAAP/D/OT/AAAA/8P85P8AAAD/4//k/wAAAP/n/+X/AAAA//
//5f8AAAD////l/wAAAP///+H/AAAA////4f8AAAD////h/wAAAP///+P/AAAA////4/8AAAD//////w
AAAP//////AAAA//////8AAAD//////wAAAP//////AAAA//////8AAAB//////gAAAD/////8AAAAAA
AAAAAAAAAAAAAAAAAACAAAAAAAEAAMAAAAAAAwAA////////AAD///////8AAP///////wAA////////
AAA=
</value>
</data>
</root> </root>
\ No newline at end of file
...@@ -28,21 +28,12 @@ ...@@ -28,21 +28,12 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.infoBarUser1 = new GcDevicePc.CK_UI.InfoBarUser();
this.userCtl1 = new GcDevicePc.CK_UI.UserCtl(); this.userCtl1 = new GcDevicePc.CK_UI.UserCtl();
this.buttonFID = new System.Windows.Forms.Button(); this.buttonFID = new System.Windows.Forms.Button();
this.buttonauto = new System.Windows.Forms.Button(); this.buttonauto = new System.Windows.Forms.Button();
this.infoBarUser1 = new GcDevicePc.CK_UI.InfoBarUser();
this.SuspendLayout(); this.SuspendLayout();
// //
// infoBarUser1
//
this.infoBarUser1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.infoBarUser1.Location = new System.Drawing.Point(0, 497);
this.infoBarUser1.Name = "infoBarUser1";
this.infoBarUser1.Size = new System.Drawing.Size(614, 130);
this.infoBarUser1.TabIndex = 1;
//
// userCtl1 // userCtl1
// //
this.userCtl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.userCtl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
...@@ -51,12 +42,14 @@ ...@@ -51,12 +42,14 @@
this.userCtl1.Location = new System.Drawing.Point(0, 16); this.userCtl1.Location = new System.Drawing.Point(0, 16);
this.userCtl1.Name = "userCtl1"; this.userCtl1.Name = "userCtl1";
this.userCtl1.Size = new System.Drawing.Size(758, 468); this.userCtl1.Size = new System.Drawing.Size(758, 468);
this.userCtl1.Systemtype = 0;
this.userCtl1.TabIndex = 0; this.userCtl1.TabIndex = 0;
// //
// buttonFID // buttonFID
// //
this.buttonFID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonFID.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.buttonFID.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.buttonFID.Location = new System.Drawing.Point(642, 506); this.buttonFID.Location = new System.Drawing.Point(642, 525);
this.buttonFID.Name = "buttonFID"; this.buttonFID.Name = "buttonFID";
this.buttonFID.Size = new System.Drawing.Size(89, 34); this.buttonFID.Size = new System.Drawing.Size(89, 34);
this.buttonFID.TabIndex = 2; this.buttonFID.TabIndex = 2;
...@@ -66,22 +59,32 @@ ...@@ -66,22 +59,32 @@
// //
// buttonauto // buttonauto
// //
this.buttonauto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonauto.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.buttonauto.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.buttonauto.Location = new System.Drawing.Point(642, 562); this.buttonauto.Location = new System.Drawing.Point(642, 571);
this.buttonauto.Name = "buttonauto"; this.buttonauto.Name = "buttonauto";
this.buttonauto.Size = new System.Drawing.Size(89, 34); this.buttonauto.Size = new System.Drawing.Size(89, 34);
this.buttonauto.TabIndex = 3; this.buttonauto.TabIndex = 3;
this.buttonauto.Text = "自动校准"; this.buttonauto.Text = "自动校准";
this.buttonauto.UseVisualStyleBackColor = true; this.buttonauto.UseVisualStyleBackColor = true;
this.buttonauto.Click += new System.EventHandler(this.buttonauto_Click);
//
// infoBarUser1
//
this.infoBarUser1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.infoBarUser1.Location = new System.Drawing.Point(1, 494);
this.infoBarUser1.Name = "infoBarUser1";
this.infoBarUser1.Size = new System.Drawing.Size(613, 137);
this.infoBarUser1.TabIndex = 4;
// //
// FormUser // FormUser
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(770, 639); this.ClientSize = new System.Drawing.Size(770, 639);
this.Controls.Add(this.infoBarUser1);
this.Controls.Add(this.buttonauto); this.Controls.Add(this.buttonauto);
this.Controls.Add(this.buttonFID); this.Controls.Add(this.buttonFID);
this.Controls.Add(this.infoBarUser1);
this.Controls.Add(this.userCtl1); this.Controls.Add(this.userCtl1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FormUser"; this.Name = "FormUser";
...@@ -89,7 +92,6 @@ ...@@ -89,7 +92,6 @@
this.Activated += new System.EventHandler(this.FormUser_Activated); this.Activated += new System.EventHandler(this.FormUser_Activated);
this.Deactivate += new System.EventHandler(this.FormUser_Deactivate); this.Deactivate += new System.EventHandler(this.FormUser_Deactivate);
this.Load += new System.EventHandler(this.FormUser_Load); this.Load += new System.EventHandler(this.FormUser_Load);
this.Resize += new System.EventHandler(this.FormUser_Resize);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -97,9 +99,10 @@ ...@@ -97,9 +99,10 @@
#endregion #endregion
private CK_UI.UserCtl userCtl1; private CK_UI.UserCtl userCtl1;
private CK_UI.InfoBarUser infoBarUser1; // private CK_UI.InfoBarUser infoBarUser1;
private System.Windows.Forms.Button buttonFID; private System.Windows.Forms.Button buttonFID;
private System.Windows.Forms.Button buttonauto; private System.Windows.Forms.Button buttonauto;
private CK_UI.InfoBarUser infoBarUser1;
} }
} }
\ No newline at end of file
...@@ -34,19 +34,22 @@ namespace GcDevicePc ...@@ -34,19 +34,22 @@ namespace GcDevicePc
// MessageBox.Show("停用"); // MessageBox.Show("停用");
// Console.WriteLine("停用"); // Console.WriteLine("停用");
} }
public event Fireport autofire; public event Fireport autofire;
//点火操作
private void buttonFID_Click(object sender, EventArgs e) private void buttonFID_Click(object sender, EventArgs e)
{ {
autofire(0,10,5); if (globaldata.m_dpbuffer.ShowList.showDet.fDetStatue != 2)
autofire(0, 10, 5);
else
MessageBox.Show("点火操作禁止,FID已经点火成功");
} }
//自动校准
private void FormUser_Resize(object sender, EventArgs e) private void buttonauto_Click(object sender, EventArgs e)
{ {
this.buttonFID.Location = new Point(this.infoBarUser1.Width + 50, this.infoBarUser1.Location.Y + 10); CKVocAnalyzer.AutoAdjust auto = new CKVocAnalyzer.AutoAdjust();
auto.Show();
this.buttonauto.Location = new Point(this.infoBarUser1.Width + 50, this.infoBarUser1.Location.Y + 80);
} }
} }
} }
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<Reference Include="Ini.Net, Version=1.0.5531.18665, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Ini.Net, Version=1.0.5531.18665, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ini.net.1.1.0\lib\net20\Ini.Net.dll</HintPath> <HintPath>..\packages\ini.net.1.1.0\lib\net20\Ini.Net.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="LogOperate"> <Reference Include="LogOperate">
...@@ -111,6 +111,9 @@ ...@@ -111,6 +111,9 @@
<Reference Include="ModbusLib"> <Reference Include="ModbusLib">
<HintPath>..\dll\ModbusLib.dll</HintPath> <HintPath>..\dll\ModbusLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="SpaceM">
<HintPath>..\dll\SpaceM.dll</HintPath>
</Reference>
<Reference Include="SQLite.Designer"> <Reference Include="SQLite.Designer">
<HintPath>..\dll\SQLite.Designer.dll</HintPath> <HintPath>..\dll\SQLite.Designer.dll</HintPath>
</Reference> </Reference>
...@@ -124,7 +127,6 @@ ...@@ -124,7 +127,6 @@
<Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
......
...@@ -46,27 +46,28 @@ ...@@ -46,27 +46,28 @@
this.MethodBrowseMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MethodBrowseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.GCConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GCConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigCreateSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigShowSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigSendSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.窗口ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.窗口ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.HistoryDataMenu = new System.Windows.Forms.ToolStripMenuItem(); this.HistoryDataMenu = new System.Windows.Forms.ToolStripMenuItem();
this.CalibrationMenu = new System.Windows.Forms.ToolStripMenuItem(); this.CalibrationMenu = new System.Windows.Forms.ToolStripMenuItem();
this.HistoryPicMenu = new System.Windows.Forms.ToolStripMenuItem(); this.HistoryPicMenu = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip = new System.Windows.Forms.StatusStrip(); this.statusStrip = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabelusertime = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelusertime = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabeSystme = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabelText = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelText = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker();
this.ConfigCreateSubMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.参数设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigShowSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigSendSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip.SuspendLayout(); this.menuStrip.SuspendLayout();
this.statusStrip.SuspendLayout(); this.statusStrip.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// menuStrip // menuStrip
// //
this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.用户管理ToolStripMenuItem, this.用户管理ToolStripMenuItem,
this.系统ToolStripMenuItem, this.系统ToolStripMenuItem,
...@@ -74,7 +75,8 @@ ...@@ -74,7 +75,8 @@
this.窗口ToolStripMenuItem}); this.窗口ToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip"; this.menuStrip.Name = "menuStrip";
this.menuStrip.Size = new System.Drawing.Size(748, 25); this.menuStrip.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
this.menuStrip.Size = new System.Drawing.Size(997, 28);
this.menuStrip.TabIndex = 0; this.menuStrip.TabIndex = 0;
this.menuStrip.Text = "MenuStrip"; this.menuStrip.Text = "MenuStrip";
// //
...@@ -84,20 +86,20 @@ ...@@ -84,20 +86,20 @@
this.UserLoginMenu, this.UserLoginMenu,
this.UserLogoutMenu}); this.UserLogoutMenu});
this.用户管理ToolStripMenuItem.Name = "用户管理ToolStripMenuItem"; this.用户管理ToolStripMenuItem.Name = "用户管理ToolStripMenuItem";
this.用户管理ToolStripMenuItem.Size = new System.Drawing.Size(68, 21); this.用户管理ToolStripMenuItem.Size = new System.Drawing.Size(81, 24);
this.用户管理ToolStripMenuItem.Text = "用户管理"; this.用户管理ToolStripMenuItem.Text = "用户管理";
// //
// UserLoginMenu // UserLoginMenu
// //
this.UserLoginMenu.Name = "UserLoginMenu"; this.UserLoginMenu.Name = "UserLoginMenu";
this.UserLoginMenu.Size = new System.Drawing.Size(124, 22); this.UserLoginMenu.Size = new System.Drawing.Size(144, 26);
this.UserLoginMenu.Text = "用户登录"; this.UserLoginMenu.Text = "用户登录";
this.UserLoginMenu.Click += new System.EventHandler(this.UserLoginMenu_Click); this.UserLoginMenu.Click += new System.EventHandler(this.UserLoginMenu_Click);
// //
// UserLogoutMenu // UserLogoutMenu
// //
this.UserLogoutMenu.Name = "UserLogoutMenu"; this.UserLogoutMenu.Name = "UserLogoutMenu";
this.UserLogoutMenu.Size = new System.Drawing.Size(124, 22); this.UserLogoutMenu.Size = new System.Drawing.Size(144, 26);
this.UserLogoutMenu.Text = "用户注销"; this.UserLogoutMenu.Text = "用户注销";
this.UserLogoutMenu.Click += new System.EventHandler(this.UserLogoutMenu_Click); this.UserLogoutMenu.Click += new System.EventHandler(this.UserLogoutMenu_Click);
// //
...@@ -106,29 +108,30 @@ ...@@ -106,29 +108,30 @@
this.系统ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.系统ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SystemStartMenu, this.SystemStartMenu,
this.SystemStopMenu, this.SystemStopMenu,
this.AuxToolMenu}); this.AuxToolMenu,
this.参数设置ToolStripMenuItem});
this.系统ToolStripMenuItem.Name = "系统ToolStripMenuItem"; this.系统ToolStripMenuItem.Name = "系统ToolStripMenuItem";
this.系统ToolStripMenuItem.Size = new System.Drawing.Size(44, 21); this.系统ToolStripMenuItem.Size = new System.Drawing.Size(51, 24);
this.系统ToolStripMenuItem.Text = "系统"; this.系统ToolStripMenuItem.Text = "系统";
// //
// SystemStartMenu // SystemStartMenu
// //
this.SystemStartMenu.Name = "SystemStartMenu"; this.SystemStartMenu.Name = "SystemStartMenu";
this.SystemStartMenu.Size = new System.Drawing.Size(124, 22); this.SystemStartMenu.Size = new System.Drawing.Size(181, 26);
this.SystemStartMenu.Text = "系统开启"; this.SystemStartMenu.Text = "系统开启";
this.SystemStartMenu.Click += new System.EventHandler(this.SystemStartMenu_Click); this.SystemStartMenu.Click += new System.EventHandler(this.SystemStartMenu_Click);
// //
// SystemStopMenu // SystemStopMenu
// //
this.SystemStopMenu.Name = "SystemStopMenu"; this.SystemStopMenu.Name = "SystemStopMenu";
this.SystemStopMenu.Size = new System.Drawing.Size(124, 22); this.SystemStopMenu.Size = new System.Drawing.Size(181, 26);
this.SystemStopMenu.Text = "系统关闭"; this.SystemStopMenu.Text = "系统关闭";
this.SystemStopMenu.Click += new System.EventHandler(this.SystemStopMenu_Click); this.SystemStopMenu.Click += new System.EventHandler(this.SystemStopMenu_Click);
// //
// AuxToolMenu // AuxToolMenu
// //
this.AuxToolMenu.Name = "AuxToolMenu"; this.AuxToolMenu.Name = "AuxToolMenu";
this.AuxToolMenu.Size = new System.Drawing.Size(124, 22); this.AuxToolMenu.Size = new System.Drawing.Size(181, 26);
this.AuxToolMenu.Text = "辅助工具"; this.AuxToolMenu.Text = "辅助工具";
this.AuxToolMenu.Click += new System.EventHandler(this.AuxToolMenu_Click); this.AuxToolMenu.Click += new System.EventHandler(this.AuxToolMenu_Click);
// //
...@@ -143,48 +146,48 @@ ...@@ -143,48 +146,48 @@
this.toolStripSeparator1, this.toolStripSeparator1,
this.GCConfigMenuItem}); this.GCConfigMenuItem});
this.运行ToolStripMenuItem.Name = "运行ToolStripMenuItem"; this.运行ToolStripMenuItem.Name = "运行ToolStripMenuItem";
this.运行ToolStripMenuItem.Size = new System.Drawing.Size(44, 21); this.运行ToolStripMenuItem.Size = new System.Drawing.Size(51, 24);
this.运行ToolStripMenuItem.Text = "设置"; this.运行ToolStripMenuItem.Text = "设置";
// //
// NetWorkMenu // NetWorkMenu
// //
this.NetWorkMenu.Name = "NetWorkMenu"; this.NetWorkMenu.Name = "NetWorkMenu";
this.NetWorkMenu.Size = new System.Drawing.Size(180, 22); this.NetWorkMenu.Size = new System.Drawing.Size(174, 26);
this.NetWorkMenu.Text = "网络配置"; this.NetWorkMenu.Text = "网络配置";
this.NetWorkMenu.Click += new System.EventHandler(this.NetWorkMenu_Click); this.NetWorkMenu.Click += new System.EventHandler(this.NetWorkMenu_Click);
// //
// MethodBatMenu // MethodBatMenu
// //
this.MethodBatMenu.Name = "MethodBatMenu"; this.MethodBatMenu.Name = "MethodBatMenu";
this.MethodBatMenu.Size = new System.Drawing.Size(180, 22); this.MethodBatMenu.Size = new System.Drawing.Size(174, 26);
this.MethodBatMenu.Text = "方法批处理"; this.MethodBatMenu.Text = "方法批处理";
this.MethodBatMenu.Click += new System.EventHandler(this.MethodBatMenu_Click); this.MethodBatMenu.Click += new System.EventHandler(this.MethodBatMenu_Click);
// //
// NewMethodMenu // NewMethodMenu
// //
this.NewMethodMenu.Name = "NewMethodMenu"; this.NewMethodMenu.Name = "NewMethodMenu";
this.NewMethodMenu.Size = new System.Drawing.Size(180, 22); this.NewMethodMenu.Size = new System.Drawing.Size(174, 26);
this.NewMethodMenu.Text = "新建方法"; this.NewMethodMenu.Text = "新建方法";
this.NewMethodMenu.Click += new System.EventHandler(this.NewMethodMenu_Click); this.NewMethodMenu.Click += new System.EventHandler(this.NewMethodMenu_Click);
// //
// OpenMethodMenu // OpenMethodMenu
// //
this.OpenMethodMenu.Name = "OpenMethodMenu"; this.OpenMethodMenu.Name = "OpenMethodMenu";
this.OpenMethodMenu.Size = new System.Drawing.Size(180, 22); this.OpenMethodMenu.Size = new System.Drawing.Size(174, 26);
this.OpenMethodMenu.Text = "打开方法文件"; this.OpenMethodMenu.Text = "打开方法文件";
this.OpenMethodMenu.Click += new System.EventHandler(this.OpenMethodMenu_Click); this.OpenMethodMenu.Click += new System.EventHandler(this.OpenMethodMenu_Click);
// //
// MethodBrowseMenuItem // MethodBrowseMenuItem
// //
this.MethodBrowseMenuItem.Name = "MethodBrowseMenuItem"; this.MethodBrowseMenuItem.Name = "MethodBrowseMenuItem";
this.MethodBrowseMenuItem.Size = new System.Drawing.Size(180, 22); this.MethodBrowseMenuItem.Size = new System.Drawing.Size(174, 26);
this.MethodBrowseMenuItem.Text = "方法查阅"; this.MethodBrowseMenuItem.Text = "方法查阅";
this.MethodBrowseMenuItem.Click += new System.EventHandler(this.MethodBrowseMenuItem_Click); this.MethodBrowseMenuItem.Click += new System.EventHandler(this.MethodBrowseMenuItem_Click);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(171, 6);
// //
// GCConfigMenuItem // GCConfigMenuItem
// //
...@@ -193,9 +196,30 @@ ...@@ -193,9 +196,30 @@
this.ConfigShowSubMenuItem, this.ConfigShowSubMenuItem,
this.ConfigSendSubMenuItem}); this.ConfigSendSubMenuItem});
this.GCConfigMenuItem.Name = "GCConfigMenuItem"; this.GCConfigMenuItem.Name = "GCConfigMenuItem";
this.GCConfigMenuItem.Size = new System.Drawing.Size(180, 22); this.GCConfigMenuItem.Size = new System.Drawing.Size(174, 26);
this.GCConfigMenuItem.Text = "仪器配置"; this.GCConfigMenuItem.Text = "仪器配置";
// //
// ConfigCreateSubMenuItem
//
this.ConfigCreateSubMenuItem.Name = "ConfigCreateSubMenuItem";
this.ConfigCreateSubMenuItem.Size = new System.Drawing.Size(144, 26);
this.ConfigCreateSubMenuItem.Text = "配置创建";
this.ConfigCreateSubMenuItem.Click += new System.EventHandler(this.ConfigCreateSubMenuItem_Click);
//
// ConfigShowSubMenuItem
//
this.ConfigShowSubMenuItem.Name = "ConfigShowSubMenuItem";
this.ConfigShowSubMenuItem.Size = new System.Drawing.Size(144, 26);
this.ConfigShowSubMenuItem.Text = "配置查看";
this.ConfigShowSubMenuItem.Click += new System.EventHandler(this.ConfigShowSubMenuItem_Click);
//
// ConfigSendSubMenuItem
//
this.ConfigSendSubMenuItem.Name = "ConfigSendSubMenuItem";
this.ConfigSendSubMenuItem.Size = new System.Drawing.Size(144, 26);
this.ConfigSendSubMenuItem.Text = "配置发送";
this.ConfigSendSubMenuItem.Click += new System.EventHandler(this.ConfigSendSubMenuItem_Click);
//
// 窗口ToolStripMenuItem // 窗口ToolStripMenuItem
// //
this.窗口ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.窗口ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
...@@ -203,39 +227,40 @@ ...@@ -203,39 +227,40 @@
this.CalibrationMenu, this.CalibrationMenu,
this.HistoryPicMenu}); this.HistoryPicMenu});
this.窗口ToolStripMenuItem.Name = "窗口ToolStripMenuItem"; this.窗口ToolStripMenuItem.Name = "窗口ToolStripMenuItem";
this.窗口ToolStripMenuItem.Size = new System.Drawing.Size(68, 21); this.窗口ToolStripMenuItem.Size = new System.Drawing.Size(81, 24);
this.窗口ToolStripMenuItem.Text = "数据查看"; this.窗口ToolStripMenuItem.Text = "数据查看";
// //
// HistoryDataMenu // HistoryDataMenu
// //
this.HistoryDataMenu.Name = "HistoryDataMenu"; this.HistoryDataMenu.Name = "HistoryDataMenu";
this.HistoryDataMenu.Size = new System.Drawing.Size(148, 22); this.HistoryDataMenu.Size = new System.Drawing.Size(174, 26);
this.HistoryDataMenu.Text = "历史数据查询"; this.HistoryDataMenu.Text = "历史数据查询";
this.HistoryDataMenu.Click += new System.EventHandler(this.HistoryDataMenu_Click); this.HistoryDataMenu.Click += new System.EventHandler(this.HistoryDataMenu_Click);
// //
// CalibrationMenu // CalibrationMenu
// //
this.CalibrationMenu.Name = "CalibrationMenu"; this.CalibrationMenu.Name = "CalibrationMenu";
this.CalibrationMenu.Size = new System.Drawing.Size(148, 22); this.CalibrationMenu.Size = new System.Drawing.Size(174, 26);
this.CalibrationMenu.Text = "校准查看"; this.CalibrationMenu.Text = "校准查看";
this.CalibrationMenu.Click += new System.EventHandler(this.CalibrationMenu_Click); this.CalibrationMenu.Click += new System.EventHandler(this.CalibrationMenu_Click);
// //
// HistoryPicMenu // HistoryPicMenu
// //
this.HistoryPicMenu.Name = "HistoryPicMenu"; this.HistoryPicMenu.Name = "HistoryPicMenu";
this.HistoryPicMenu.Size = new System.Drawing.Size(148, 22); this.HistoryPicMenu.Size = new System.Drawing.Size(174, 26);
this.HistoryPicMenu.Text = "历史谱图"; this.HistoryPicMenu.Text = "历史谱图";
this.HistoryPicMenu.Click += new System.EventHandler(this.HistoryPicMenu_Click); this.HistoryPicMenu.Click += new System.EventHandler(this.HistoryPicMenu_Click);
// //
// statusStrip // statusStrip
// //
this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabelusertime, this.toolStripStatusLabelusertime,
this.toolStripStatusLabeSystme,
this.toolStripStatusLabelText}); this.toolStripStatusLabelText});
this.statusStrip.Location = new System.Drawing.Point(0, 493); this.statusStrip.Location = new System.Drawing.Point(0, 620);
this.statusStrip.Name = "statusStrip"; this.statusStrip.Name = "statusStrip";
this.statusStrip.Size = new System.Drawing.Size(748, 26); this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
this.statusStrip.Size = new System.Drawing.Size(997, 29);
this.statusStrip.TabIndex = 2; this.statusStrip.TabIndex = 2;
this.statusStrip.Text = "StatusStrip"; this.statusStrip.Text = "StatusStrip";
// //
...@@ -244,22 +269,14 @@ ...@@ -244,22 +269,14 @@
this.toolStripStatusLabelusertime.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right))); this.toolStripStatusLabelusertime.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.toolStripStatusLabelusertime.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.toolStripStatusLabelusertime.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolStripStatusLabelusertime.Name = "toolStripStatusLabelusertime"; this.toolStripStatusLabelusertime.Name = "toolStripStatusLabelusertime";
this.toolStripStatusLabelusertime.Size = new System.Drawing.Size(135, 21); this.toolStripStatusLabelusertime.Size = new System.Drawing.Size(171, 24);
this.toolStripStatusLabelusertime.Text = "toolStripStatusLabel1"; this.toolStripStatusLabelusertime.Text = "toolStripStatusLabel1";
// //
// toolStripStatusLabeSystme
//
this.toolStripStatusLabeSystme.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.toolStripStatusLabeSystme.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolStripStatusLabeSystme.Name = "toolStripStatusLabeSystme";
this.toolStripStatusLabeSystme.Size = new System.Drawing.Size(36, 21);
this.toolStripStatusLabeSystme.Text = "状态";
//
// toolStripStatusLabelText // toolStripStatusLabelText
// //
this.toolStripStatusLabelText.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right))); this.toolStripStatusLabelText.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.toolStripStatusLabelText.Name = "toolStripStatusLabelText"; this.toolStripStatusLabelText.Name = "toolStripStatusLabelText";
this.toolStripStatusLabelText.Size = new System.Drawing.Size(135, 21); this.toolStripStatusLabelText.Size = new System.Drawing.Size(171, 24);
this.toolStripStatusLabelText.Text = "toolStripStatusLabel1"; this.toolStripStatusLabelText.Text = "toolStripStatusLabel1";
// //
// timer1 // timer1
...@@ -282,38 +299,25 @@ ...@@ -282,38 +299,25 @@
this.backgroundWorker2.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker2_DoWork); this.backgroundWorker2.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker2_DoWork);
this.backgroundWorker2.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker2_RunWorkerCompleted); this.backgroundWorker2.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker2_RunWorkerCompleted);
// //
// ConfigCreateSubMenuItem // 参数设置ToolStripMenuItem
// //
this.ConfigCreateSubMenuItem.Name = "ConfigCreateSubMenuItem"; this.参数设置ToolStripMenuItem.Name = "参数设置ToolStripMenuItem";
this.ConfigCreateSubMenuItem.Size = new System.Drawing.Size(180, 22); this.参数设置ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
this.ConfigCreateSubMenuItem.Text = "配置创建"; this.参数设置ToolStripMenuItem.Text = "参数设置";
this.ConfigCreateSubMenuItem.Click += new System.EventHandler(this.ConfigCreateSubMenuItem_Click); this.参数设置ToolStripMenuItem.Click += new System.EventHandler(this.参数设置ToolStripMenuItem_Click);
//
// ConfigShowSubMenuItem
//
this.ConfigShowSubMenuItem.Name = "ConfigShowSubMenuItem";
this.ConfigShowSubMenuItem.Size = new System.Drawing.Size(180, 22);
this.ConfigShowSubMenuItem.Text = "配置查看";
this.ConfigShowSubMenuItem.Click += new System.EventHandler(this.ConfigShowSubMenuItem_Click);
//
// ConfigSendSubMenuItem
//
this.ConfigSendSubMenuItem.Name = "ConfigSendSubMenuItem";
this.ConfigSendSubMenuItem.Size = new System.Drawing.Size(180, 22);
this.ConfigSendSubMenuItem.Text = "配置发送";
this.ConfigSendSubMenuItem.Click += new System.EventHandler(this.ConfigSendSubMenuItem_Click);
// //
// MDIBase // MDIBase
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(748, 519); this.ClientSize = new System.Drawing.Size(997, 649);
this.Controls.Add(this.statusStrip); this.Controls.Add(this.statusStrip);
this.Controls.Add(this.menuStrip); this.Controls.Add(this.menuStrip);
this.DoubleBuffered = true; this.DoubleBuffered = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.IsMdiContainer = true; this.IsMdiContainer = true;
this.MainMenuStrip = this.menuStrip; this.MainMenuStrip = this.menuStrip;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MDIBase"; this.Name = "MDIBase";
this.Text = "MDIBase"; this.Text = "MDIBase";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MDIBase_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MDIBase_FormClosing);
...@@ -331,7 +335,6 @@ ...@@ -331,7 +335,6 @@
private System.Windows.Forms.MenuStrip menuStrip; private System.Windows.Forms.MenuStrip menuStrip;
private System.Windows.Forms.StatusStrip statusStrip; private System.Windows.Forms.StatusStrip statusStrip;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabeSystme;
private System.Windows.Forms.ToolTip toolTip; private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.ToolStripMenuItem 用户管理ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 用户管理ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem UserLoginMenu; private System.Windows.Forms.ToolStripMenuItem UserLoginMenu;
...@@ -360,6 +363,7 @@ ...@@ -360,6 +363,7 @@
private System.Windows.Forms.ToolStripMenuItem ConfigCreateSubMenuItem; private System.Windows.Forms.ToolStripMenuItem ConfigCreateSubMenuItem;
private System.Windows.Forms.ToolStripMenuItem ConfigShowSubMenuItem; private System.Windows.Forms.ToolStripMenuItem ConfigShowSubMenuItem;
private System.Windows.Forms.ToolStripMenuItem ConfigSendSubMenuItem; private System.Windows.Forms.ToolStripMenuItem ConfigSendSubMenuItem;
private System.Windows.Forms.ToolStripMenuItem 参数设置ToolStripMenuItem;
} }
} }
......
...@@ -73,6 +73,9 @@ namespace GcDevicePc ...@@ -73,6 +73,9 @@ namespace GcDevicePc
LogOperate.LogInit.Instance.path = CKVocAnalyzer.GlobalCKV.FolderLog; LogOperate.LogInit.Instance.path = CKVocAnalyzer.GlobalCKV.FolderLog;
LogOperate.LogInit.Instance.Init(); LogOperate.LogInit.Instance.Init();
CKVocAnalyzer.GlobalCKV.tcpservice.tcpStart(CKVocAnalyzer.GlobalCKV.hostadd, CKVocAnalyzer.GlobalCKV.tcpport); CKVocAnalyzer.GlobalCKV.tcpservice.tcpStart(CKVocAnalyzer.GlobalCKV.hostadd, CKVocAnalyzer.GlobalCKV.tcpport);
//自动删除
SpaceM.SpaceThread sthread = new SpaceM.SpaceThread(CKVocAnalyzer.GlobalCKV.HistDataPath,CKVocAnalyzer.GlobalCKV.SpaceSize,CKVocAnalyzer.GlobalCKV.SpaceTimes);
sthread.SpaceStart();
Log.Info("System Init Success"); Log.Info("System Init Success");
} }
...@@ -125,7 +128,7 @@ namespace GcDevicePc ...@@ -125,7 +128,7 @@ namespace GcDevicePc
Formstr = "用户窗口"; Formstr = "用户窗口";
startTime = DateTime.Now; startTime = DateTime.Now;
toolStripStatusLabeSystme.Text = string.Format("状态:{0}", Formstr); // toolStripStatusLabeSystme.Text = string.Format("状态:{0}", Formstr);
timespan = System.DateTime.Now - startTime; timespan = System.DateTime.Now - startTime;
toolStripStatusLabelusertime.Text = string.Format("运行时间:{0}", timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒"); toolStripStatusLabelusertime.Text = string.Format("运行时间:{0}", timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒");
...@@ -273,23 +276,28 @@ namespace GcDevicePc ...@@ -273,23 +276,28 @@ namespace GcDevicePc
{ {
if (isbool) if (isbool)
{ {
NetWorkMenu.Enabled = true; NetWorkMenu.Visible = true;
MethodBrowseMenuItem.Enabled = true; MethodBrowseMenuItem.Visible = true;
NewMethodMenu.Enabled = true; NewMethodMenu.Visible = true;
OpenMethodMenu.Enabled = true; OpenMethodMenu.Visible = true;
MethodBrowseMenuItem.Enabled = true; MethodBrowseMenuItem.Visible = true;
CalibrationMenu.Enabled = true; CalibrationMenu.Visible = true;
GCConfigMenuItem.Enabled = true; GCConfigMenuItem.Visible = true;
AuxToolMenu.Visible = true;
参数设置ToolStripMenuItem.Visible = true;
}else }else
{ {
NetWorkMenu.Enabled = false; NetWorkMenu.Visible = false;
MethodBrowseMenuItem.Enabled = false; MethodBrowseMenuItem.Visible = false;
NewMethodMenu.Enabled = false; NewMethodMenu.Visible = false;
OpenMethodMenu.Enabled = false; OpenMethodMenu.Visible = false;
MethodBrowseMenuItem.Enabled = false; MethodBrowseMenuItem.Visible = false;
CalibrationMenu.Enabled = false; CalibrationMenu.Visible = false;
GCConfigMenuItem.Enabled = false; GCConfigMenuItem.Visible = false;
AuxToolMenu.Visible = false;
参数设置ToolStripMenuItem.Visible = false;
} }
} }
...@@ -306,8 +314,8 @@ namespace GcDevicePc ...@@ -306,8 +314,8 @@ namespace GcDevicePc
/// <param name="e"></param> /// <param name="e"></param>
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
this.Text = String.Format("VOCs在线监测-1.0.0.0 {0}",Formstr); this.Text = String.Format("VOCs在线监测-1.0.2.1 {0}",Formstr);
toolStripStatusLabeSystme.Text = String.Format("状态:{0}", statestr); // toolStripStatusLabeSystme.Text = String.Format("状态:{0}", statestr);
timespan = System.DateTime.Now - startTime; timespan = System.DateTime.Now - startTime;
toolStripStatusLabelusertime.Text = String.Format("运行时间:{0}", toolStripStatusLabelusertime.Text = String.Format("运行时间:{0}",
timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒"); timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒");
...@@ -1730,5 +1738,19 @@ namespace GcDevicePc ...@@ -1730,5 +1738,19 @@ namespace GcDevicePc
Log.Error(ex.Message); Log.Error(ex.Message);
} }
} }
private void 参数设置ToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
CKVocAnalyzer.SetInfoForm sf = new CKVocAnalyzer.SetInfoForm();
sf.Show();
}
catch(Exception ex)
{
Trace.Write(ex);
}
}
} }
} }
...@@ -19,7 +19,7 @@ namespace GcDevicePc.Properties { ...@@ -19,7 +19,7 @@ namespace GcDevicePc.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
// (以 /str 作为命令选项),或重新生成 VS 项目。 // (以 /str 作为命令选项),或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
...@@ -12,7 +12,7 @@ namespace GcDevicePc.Properties { ...@@ -12,7 +12,7 @@ namespace GcDevicePc.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
File added
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment