Skip to content

G
GC_Branch
Commit 4b7b7ca4 authored by 周磊's avatar 周磊
Browse files
Options

1.基于1.9.1进行修改.版本变更至1.9.9 

2.辅助工具增加阀1~阀4和RL11RL12调试,顺便把之前的校标.校零合并进来
3.方法界面标题栏增加文件路径信息
4.修复免登录一些bug
5.仪器配置写入时,若出现错误则写入默认值(之前只是对缓存赋予默认值,没有写入到本地)
6.向第三方传输数据由之前的原始数据改为处理后数据(与本软件绘图数据同步)
7.反控功能提取为单独类(与进样器通用)
8.增加限制,用户登录后不可再进行"登录"
9.修复在线版本,超级管理员下不会自动登出的问题
10.修复XC报警倒计时并非在弹窗提示后开始的bug,顺便弹窗增加"不再提示"的选项
11.修复联机成功后还在搜索设备的bug
12.在线版本联机搜索前插入10秒休眠,解决HMI还没有完全加载完联机失败的问题
13.
parent 997ae3dd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 21306 additions and 22508 deletions
GcDevicePc.sln
View file @ 4b7b7ca4
......@@ -7,14 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GcDevicePc", "GcDevicePc\Gc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedSpace", "SharedSpace\SharedSpace.csproj", "{5498F944-5721-461B-B07F-3105EF0BF643}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocsMonitor", "VocsMonitor\VocsMonitor\VocsMonitor.csproj", "{25AB743D-235C-4F11-96C3-2356AC90BF81}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "VocAnalyzer", "VocAnalyzer\VocAnalyzer.vdproj", "{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplerCounterControl", "SamplerCounterControl\SamplerCounterControl.csproj", "{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsControlLibrary_PopUp", "WindowsFormsControlLibrary_PopUp\WindowsFormsControlLibrary_PopUp.csproj", "{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vocdll", "vocdll", "{17288597-04A1-40BD-8E6C-1E83CBD1A523}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CKVocAlgorithm", "gcdevicepc_nmoc8-16\CKVocAlgorithm\CKVocAlgorithm.csproj", "{EEF7E2F6-A048-4577-B925-A145A4E48384}"
......@@ -64,54 +56,6 @@ Global
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|x86.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|x86.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|x86.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Any CPU.Build.0 = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|x86.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|x86.Build.0 = Release|Any CPU
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Debug|Any CPU.ActiveCfg = Debug
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Debug|Any CPU.Build.0 = Debug
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Debug|Mixed Platforms.ActiveCfg = Debug
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Debug|Mixed Platforms.Build.0 = Debug
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Debug|x86.ActiveCfg = Debug
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Debug|x86.Build.0 = Debug
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Release|Any CPU.ActiveCfg = Release
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Release|Any CPU.Build.0 = Release
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Release|Mixed Platforms.ActiveCfg = Release
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Release|Mixed Platforms.Build.0 = Release
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Release|x86.ActiveCfg = Release
{9A8B92E2-7CFA-43AE-8EC6-561827F41EF4}.Release|x86.Build.0 = Release
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Debug|x86.ActiveCfg = Debug|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Debug|x86.Build.0 = Debug|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Release|Any CPU.Build.0 = Release|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Release|x86.ActiveCfg = Release|Any CPU
{AD1C51CD-86B5-416B-9708-0EA7C2414EDC}.Release|x86.Build.0 = Release|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Debug|x86.ActiveCfg = Debug|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Debug|x86.Build.0 = Debug|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Release|Any CPU.Build.0 = Release|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Release|x86.ActiveCfg = Release|Any CPU
{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}.Release|x86.Build.0 = Release|Any CPU
{EEF7E2F6-A048-4577-B925-A145A4E48384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEF7E2F6-A048-4577-B925-A145A4E48384}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEF7E2F6-A048-4577-B925-A145A4E48384}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
......
GcDevicePc/App.config
View file @ 4b7b7ca4
......@@ -38,6 +38,8 @@
<level value="INFO"/>
<appender-ref ref="TempDebugRollingLog"/>
</logger>
<logger name="AntiControlLog">
<level value="INFO"/>
<appender-ref ref="AntiControlRollingLog"/>
......@@ -134,6 +136,8 @@
</filter>
</appender>
</log4net>
</configuration>
GcDevicePc/AppInit.cs
View file @ 4b7b7ca4
......@@ -839,20 +839,29 @@ namespace GcDevicePc
if (File.Exists(filename))
{
string section = "信号";
gCMethodConfig.signal.u16ChannelA = (ushort)iniFile.ReadInteger(section, "通道A");
gCMethodConfig.signal.u16ChannelB = (ushort)iniFile.ReadInteger(section, "通道B");
ushort.TryParse(iniFile.ReadString(section, "通道A"),out gCMethodConfig.signal.u16ChannelA );
ushort.TryParse(iniFile.ReadString(section, "通道B"),out gCMethodConfig.signal.u16ChannelB);
// gCMethodConfig.signal.u16ChannelA = (ushort)iniFile.ReadString(section, "通道A");
// gCMethodConfig.signal.u16ChannelB = (ushort)iniFile.ReadString(section, "通道B");
if (iniFile.SectionExists(section))
{
}
for (int i = 0; i < 8; i++)
{
gCMethodConfig.signal.uDetA[i] = (ushort)iniFile.ReadInteger(section, "通道A检测器" + (i + 1).ToString());
gCMethodConfig.signal.uDetB[i] = (ushort)iniFile.ReadInteger(section, "通道B检测器" + (i + 1).ToString());
ushort.TryParse( iniFile.ReadString(section, "通道A检测器" + (i + 1)),out gCMethodConfig.signal.uDetA[i]);
ushort.TryParse(iniFile.ReadString(section, "通道B检测器" + (i + 1)) ,out gCMethodConfig.signal.uDetB[i]);
//gCMethodConfig.signal.uDetA[i] = (ushort)iniFile.ReadInteger(section, "通道A检测器" + (i + 1).ToString());
//gCMethodConfig.signal.uDetB[i] = (ushort)iniFile.ReadInteger(section, "通道B检测器" + (i + 1).ToString());
}
for (int i = 0; i < 8; i++)
{
gCMethodConfig.signal.u16DetTimeLengthA[i] = (ushort)iniFile.ReadInteger(section, "通道A检测时间" + (i + 1).ToString());
gCMethodConfig.signal.u16DetTimeLengthB[i] = (ushort)iniFile.ReadInteger(section, "通道B检测时间" + (i + 1).ToString());
ushort.TryParse(iniFile.ReadString(section, "通道A检测时间" + (i + 1)),out gCMethodConfig.signal.u16DetTimeLengthA[i]);
ushort.TryParse(iniFile.ReadString(section, "通道B检测时间" + (i + 1)),out gCMethodConfig.signal.u16DetTimeLengthB[i]);
//gCMethodConfig.signal.u16DetTimeLengthA[i] = (ushort)iniFile.ReadInteger(section, "通道A检测时间" + (i + 1).ToString());
//gCMethodConfig.signal.u16DetTimeLengthB[i] = (ushort)iniFile.ReadInteger(section, "通道B检测时间" + (i + 1).ToString());
}
}
......
GcDevicePc/CK_UI/LandIn.Designer.cs
View file @ 4b7b7ca4
......@@ -36,6 +36,7 @@
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.PasswordFree = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// label1
......@@ -59,7 +60,6 @@
this.textBox2.Name = "textBox2";
this.textBox2.UseSystemPasswordChar = true;
this.textBox2.Click += new System.EventHandler(this.textBox2_Click);
this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged);
//
// button1
//
......@@ -84,10 +84,18 @@
this.PasswordFree.UseVisualStyleBackColor = true;
this.PasswordFree.CheckedChanged += new System.EventHandler(this.PasswordFree_CheckedChanged);
//
// checkBox1
//
resources.ApplyResources(this.checkBox1, "checkBox1");
this.checkBox1.Name = "checkBox1";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// LandIn
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.checkBox1);
this.Controls.Add(this.PasswordFree);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
......@@ -111,5 +119,6 @@
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.CheckBox PasswordFree;
private System.Windows.Forms.CheckBox checkBox1;
}
}
\ No newline at end of file
GcDevicePc/CK_UI/LandIn.cs
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/CK_UI/LandIn.resx
View file @ 4b7b7ca4
......@@ -147,7 +147,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
......@@ -177,7 +177,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>105, 35</value>
......@@ -198,7 +198,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>105, 72</value>
......@@ -219,13 +219,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textBox2.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="button1.Font" type="System.Drawing.Font, System.Drawing">
<value>宋体, 12pt, style=Bold</value>
</data>
<data name="button1.Location" type="System.Drawing.Point, System.Drawing">
<value>43, 116</value>
<value>43, 125</value>
</data>
<data name="button1.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 39</value>
......@@ -246,13 +246,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="button2.Font" type="System.Drawing.Font, System.Drawing">
<value>宋体, 12pt, style=Bold</value>
</data>
<data name="button2.Location" type="System.Drawing.Point, System.Drawing">
<value>152, 116</value>
<value>152, 125</value>
</data>
<data name="button2.Size" type="System.Drawing.Size, System.Drawing">
<value>77, 39</value>
......@@ -273,7 +273,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;button2.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="PasswordFree.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
......@@ -304,11 +304,38 @@
<value>$this</value>
</data>
<data name="&gt;&gt;PasswordFree.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="checkBox1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="checkBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>97, 99</value>
</data>
<data name="checkBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 16</value>
</data>
<data name="checkBox1.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="checkBox1.Text" xml:space="preserve">
<value>显示密码</value>
</data>
<data name="&gt;&gt;checkBox1.Name" xml:space="preserve">
<value>checkBox1</value>
</data>
<data name="&gt;&gt;checkBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;checkBox1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;checkBox1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>en</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
......
GcDevicePc/Common/Log.cs
View file @ 4b7b7ca4
......@@ -31,6 +31,7 @@ namespace GcDevicePc.Common
if(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.info_log)
debugInfo.Info(msg);
}
/// <summary>
/// 记录温控debug信息(全局记录)
/// </summary>
......
GcDevicePc/ConfigDlg/InjPortDlg.Designer.cs
View file @ 4b7b7ca4
......@@ -81,7 +81,6 @@
this.InjPortBox.Name = "InjPortBox";
this.InjPortBox.Size = new System.Drawing.Size(82, 20);
this.InjPortBox.TabIndex = 1;
this.InjPortBox.SelectedIndexChanged += new System.EventHandler(this.InjPortBox_SelectedIndexChanged);
//
// cBox加热器
//
......
GcDevicePc/ConfigMethod/MethodMain.Designer.cs
View file @ 4b7b7ca4
......@@ -31,12 +31,12 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MethodMain));
this.paneltitle = new System.Windows.Forms.Panel();
this.label_MethodName = new System.Windows.Forms.Label();
this.maxbth = new System.Windows.Forms.Button();
this.closebth = new System.Windows.Forms.Button();
this.mixbth = new System.Windows.Forms.Button();
this.panelmain = new System.Windows.Forms.Panel();
this.tabmain = new GcDevicePc.ConfigMethod.TabContorlEx();
//this.tabmain = new GcDevicePc.ConfigMethod.TabContorlEx(this.components);
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabPage3 = new System.Windows.Forms.TabPage();
......@@ -46,7 +46,6 @@
this.tabPage7 = new System.Windows.Forms.TabPage();
this.tabPage8 = new System.Windows.Forms.TabPage();
this.methodimages = new System.Windows.Forms.ImageList();
//this.methodimages = new System.Windows.Forms.ImageList(this.components);
this.panelright = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.savebth = new System.Windows.Forms.Button();
......@@ -55,8 +54,6 @@
this.panelbottom = new System.Windows.Forms.Panel();
this.EnglishImageList1 = new System.Windows.Forms.ImageList();
this.ChaineseImageList1 = new System.Windows.Forms.ImageList();
//this.EnglishImageList1 = new System.Windows.Forms.ImageList(this.components);
//this.ChaineseImageList1 = new System.Windows.Forms.ImageList(this.components);
this.paneltitle.SuspendLayout();
this.panelmain.SuspendLayout();
this.tabmain.SuspendLayout();
......@@ -67,6 +64,7 @@
// paneltitle
//
this.paneltitle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(217)))), ((int)(((byte)(240)))));
this.paneltitle.Controls.Add(this.label_MethodName);
this.paneltitle.Controls.Add(this.maxbth);
this.paneltitle.Controls.Add(this.closebth);
this.paneltitle.Controls.Add(this.mixbth);
......@@ -76,6 +74,12 @@
this.paneltitle.MouseMove += new System.Windows.Forms.MouseEventHandler(this.paneltitle_MouseMove);
this.paneltitle.MouseUp += new System.Windows.Forms.MouseEventHandler(this.paneltitle_MouseUp);
//
// label_MethodName
//
resources.ApplyResources(this.label_MethodName, "label_MethodName");
this.label_MethodName.Name = "label_MethodName";
this.label_MethodName.MouseHover += new System.EventHandler(this.label_MethodName_MouseHover);
//
// maxbth
//
this.maxbth.BackColor = System.Drawing.Color.Silver;
......@@ -271,6 +275,7 @@
this.EnglishImageList1.Images.SetKeyName(21, "检测器.png");
this.EnglishImageList1.Images.SetKeyName(22, "信号.png");
this.EnglishImageList1.Images.SetKeyName(23, "辅助.png");
//this.EnglishImageList1.Images.SetKeyName(24, "");
//
// ChaineseImageList1
//
......@@ -312,9 +317,9 @@
this.Controls.Add(this.paneltitle);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "MethodMain";
this.TopMost = true;
this.Load += new System.EventHandler(this.MethodMain_Load);
this.paneltitle.ResumeLayout(false);
this.paneltitle.PerformLayout();
this.panelmain.ResumeLayout(false);
this.tabmain.ResumeLayout(false);
this.panelright.ResumeLayout(false);
......@@ -348,5 +353,6 @@
private System.Windows.Forms.ImageList EnglishImageList1;
private System.Windows.Forms.ImageList ChaineseImageList1;
private System.Windows.Forms.Button savebth;
private System.Windows.Forms.Label label_MethodName;
}
}
\ No newline at end of file
GcDevicePc/ConfigMethod/MethodMain.cs
View file @ 4b7b7ca4
......@@ -238,6 +238,13 @@ namespace GcDevicePc.ConfigMethod
//m_iPPIP.reflashContent();
//m_iPSPL.reflashContent();
//m_iPVAL.reflashContent();
label_MethodName.Text=this.gcmethodconfig.savefilename;
int len=label_MethodName.Text.Length;
if (label_MethodName.Text.Length>96)
{
label_MethodName.Text=label_MethodName.Text.Substring(0,96)+"...";
}
Console.WriteLine(len);
}
private void MethodMain_Load(object sender, EventArgs e)
{
......@@ -583,5 +590,10 @@ namespace GcDevicePc.ConfigMethod
{
// StartForm._mMainForm.Activate();
}
private void label_MethodName_MouseHover(object sender, EventArgs e)
{
tip.Show(this.gcmethodconfig.savefilename,this.label_MethodName);
}
}
}
GcDevicePc/ConfigMethod/MethodMain.resx
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/GCBuffer/HWConfig.cs
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/GcDevicePc.csproj
View file @ 4b7b7ca4
......@@ -180,6 +180,24 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\..\TTControl\CounterControl.cs">
<Link>TTControl\CounterControl.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\UniversalPopUpWindow.cs">
<Link>TTControl\UniversalPopUpWindow.cs</Link>
<SubType>Form</SubType>
</Compile>
<Compile Include="..\..\..\..\TTControl\UserControl_PopUp.cs">
<Link>TTControl\UserControl_PopUp.cs</Link>
<SubType>UserControl</SubType>
</Compile>
<Compile Include="..\..\..\..\TTControl\UserControl_PopUp.designer.cs">
<Link>TTControl\UserControl_PopUp.designer.cs</Link>
<DependentUpon>UserControl_PopUp.cs</DependentUpon>
</Compile>
<Compile Include="..\..\..\..\TTControl\WindowsAPI.cs">
<Link>TTControl\WindowsAPI.cs</Link>
</Compile>
<Compile Include="AboutForm.cs">
<SubType>Form</SubType>
</Compile>
......@@ -770,6 +788,10 @@
<Compile Include="WaitForm.Designer.cs">
<DependentUpon>WaitForm.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="..\..\..\..\TTControl\UserControl_PopUp.resx">
<Link>TTControl\UserControl_PopUp.resx</Link>
<DependentUpon>UserControl_PopUp.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="AboutForm.en.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
<SubType>Designer</SubType>
......
GcDevicePc/MDIBase.Designer.cs
View file @ 4b7b7ca4
......@@ -81,7 +81,6 @@
this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker();
this.timerWorker = new System.Windows.Forms.Timer(this.components);
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.userControl_PopUp1 = new WindowsFormsControlLibrary_PopUp.UserControl_PopUp();
this.menuStrip.SuspendLayout();
this.statusStrip.SuspendLayout();
this.SuspendLayout();
......@@ -434,17 +433,10 @@
this.timer2.Interval = 1000;
this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
//
// userControl_PopUp1
//
resources.ApplyResources(this.userControl_PopUp1, "userControl_PopUp1");
this.userControl_PopUp1.Name = "userControl_PopUp1";
this.userControl_PopUp1.PopUpMsg = "cs2";
//
// MDIBase
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.userControl_PopUp1);
this.Controls.Add(this.statusStrip);
this.Controls.Add(this.menuStrip);
this.DoubleBuffered = true;
......@@ -518,7 +510,6 @@
private System.Windows.Forms.ToolStripStatusLabel MacToolStripStatusLabel1;
private System.Windows.Forms.ToolStripMenuItem sysconfigpSec;
private System.Windows.Forms.ToolStripStatusLabel tool_CounterControlStatus;
private WindowsFormsControlLibrary_PopUp.UserControl_PopUp userControl_PopUp1;
}
}
......
GcDevicePc/MDIBase.cs
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/MDIBase.resx
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/ProThread/CKvocUpdataSum.cs
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/ProThread/GcDataTh.cs
View file @ 4b7b7ca4
......@@ -290,26 +290,26 @@ namespace GcDevicePc.ProThread
#endregion
// public static ArrayList channelSum = new ArrayList() {channelA_A,channelA_B,channelA_C,channelB_A,channelB_B,channelB_C };
#region 是否向第三方工作站（HL3000和ZB2040）传输所有信号值（具体传输频率在各自senddata子类中）
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
{
lock (globaldata.channelA_A)
{
Thread.Sleep(1);
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
//{
// lock (globaldata.channelA_A)
// {
// Thread.Sleep(1);
if (globaldata.channelA_A.Count < globaldata.MAX_ARRAY_LEN)
{
globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
}
}
lock (globaldata.channelB_A)
{
Thread.Sleep(1);
if (globaldata.channelB_A.Count < globaldata.MAX_ARRAY_LEN)
{
globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
}
}
}
// if (globaldata.channelA_A.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
// }
// }
// lock (globaldata.channelB_A)
// {
// Thread.Sleep(1);
// if (globaldata.channelB_A.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
// }
// }
//}
#endregion
......@@ -392,25 +392,25 @@ namespace GcDevicePc.ProThread
{
globaldata.m_signalbuffer.Save_Port2.Add(globaldata.m_signalbuffer.Channel2_Port);
}
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
{
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
//{
lock (globaldata.channelA_B)
{
Thread.Sleep(1);
if (globaldata.channelA_B.Count < globaldata.MAX_ARRAY_LEN)
{
globaldata.channelA_B.Add((long)(fidv[i] * 1000000));
}
}
lock (globaldata.channelB_B)
{
if (globaldata.channelB_B.Count < globaldata.MAX_ARRAY_LEN)
{
globaldata.channelB_B.Add((long)(fidv[i] * 1000000));
}
}
}
// lock (globaldata.channelA_B)
// {
// Thread.Sleep(1);
// if (globaldata.channelA_B.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelA_B.Add((long)(fidv[i] * 1000000));
// }
// }
// lock (globaldata.channelB_B)
// {
// if (globaldata.channelB_B.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelB_B.Add((long)(fidv[i] * 1000000));
// }
// }
//}
}
}
}
......@@ -486,27 +486,27 @@ namespace GcDevicePc.ProThread
{
globaldata.m_signalbuffer.Save_Port3.Add(globaldata.m_signalbuffer.Channel3_Port);
}
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
{
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
//{
lock (globaldata.channelA_C)
{
Thread.Sleep(1);
if (globaldata.channelA_C.Count < globaldata.MAX_ARRAY_LEN)
{
globaldata.channelA_C.Add((long)(fidv[i] * 1000000));
}
}
lock (globaldata.channelB_C)
{
Thread.Sleep(1);
if (globaldata.channelB_C.Count < globaldata.MAX_ARRAY_LEN)
{
globaldata.channelB_C.Add((long)(fidv[i] * 1000000));
}
}
// lock (globaldata.channelA_C)
// {
// Thread.Sleep(1);
// if (globaldata.channelA_C.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelA_C.Add((long)(fidv[i] * 1000000));
// }
// }
// lock (globaldata.channelB_C)
// {
// Thread.Sleep(1);
// if (globaldata.channelB_C.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelB_C.Add((long)(fidv[i] * 1000000));
// }
// }
}
//}
}
}
......@@ -1391,6 +1391,9 @@ namespace GcDevicePc.ProThread
#region HMI状态通道状态
ManualResetEvent channelmre = new ManualResetEvent(false);
/// <summary>
/// 开始检测器数据获取线程
/// </summary>
public void ChannelDataStart()
{
if (channelmre != null)
......@@ -1402,7 +1405,9 @@ namespace GcDevicePc.ProThread
t_GetChannelData.Start();
}
/// <summary>
/// 停止检测器数据获取线程
/// </summary>
public void ChannelDataStop()
{
channelmre.Set();
......
GcDevicePc/ProThread/HMIControl.cs
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/ProThread/HMISearch.cs
View file @ 4b7b7ca4
......@@ -278,6 +278,7 @@ namespace GcDevicePc.ProThread
ushort countDown = (ushort)(usSearchTime / 10);//限定时间,用于倒计时判定
while (countDown > 0)
{
for (int i = 0; i < _localip.Count; i++)
{
sLocalIPIndex = i;
......@@ -312,8 +313,8 @@ namespace GcDevicePc.ProThread
if (DoRecvDataCallBack(recvBytes, iReadBytes) == true)
{
IsOnline = true;
continue;
// break;
// continue;
break;
} // continue;
if (countDown > 2 || countDown == 2)
{
......
GcDevicePc/ProThread/SendDataToSum.cs
View file @ 4b7b7ca4
......@@ -66,7 +66,7 @@ namespace GcDevicePc.ProThread
switch (CurStationType)
{
case StationType.ZB: GcSendDataToZB(data1, data2, data3); break;
case StationType.HW: GcSendDataToHW(data1, data2, data3); break;
case StationType.HW: GcSendDataToHW(data1, data2, data3);break;
}
}//依据工作站类型调用不同的dll
......
GcDevicePc/Program.cs
View file @ 4b7b7ca4
using GcDevicePc.DrawUI;
using Microsoft.Win32;
using SpaceM;
using System;
using System.Diagnostics;
using System.Globalization;
using System.Threading;
using System.Windows.Forms;
......@@ -13,6 +15,13 @@ namespace GcDevicePc
[STAThread]
static void Main()
{
#region 用于记录未响应前一些信息,还未测试,没有找到主动触发未响应的方法
//Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
//添加非UI上的异常.
//AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
#endregion
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
#if ENABLE_DOUBLEST_STARTUP
......@@ -68,5 +77,36 @@ namespace GcDevicePc
#endif
}
/// <summary>
/// 用于记录未响应前一些信息,还未测试,没有找到主动触发未响应的方法
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
try
{
Exception ex = (Exception)e.ExceptionObject;
WriteLog(ex.Message + "\n\nStack Trace:\n" + ex.StackTrace);
}
catch (Exception exc)
{
try
{
MessageBox.Show(" Error",
" Could not write the error to the log. Reason: "
+ exc.Message, MessageBoxButtons.OK, MessageBoxIcon.Stop);
}
finally
{
Application.Exit();
}
}
}
static void WriteLog(string str)
{
Trace.WriteLine(str);
}
}
}
GcDevicePc/StartForm.cs
View file @ 4b7b7ca4
......@@ -111,7 +111,10 @@ namespace GcDevicePc
offlinebth.Visible = true;
offlinebth.Enabled = true;
}
/// <summary>
/// startup.ini操作
/// </summary>
INIOperation ini_startup ;
public StartForm()
{
InitializeComponent();
......@@ -131,8 +134,8 @@ namespace GcDevicePc
#else
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
#endif
INIOperation ini = new INIOperation(file);
string strStartLog = ini.INIGetStringValue("StartUp", "开机界面",null);
ini_startup = new INIOperation(file);
string strStartLog = ini_startup.INIGetStringValue("StartUp", "开机界面",null);
int usStartLogIndex = 0;
if(int.TryParse(strStartLog,out usStartLogIndex) == true && usStartLogIndex == 1)
......@@ -167,9 +170,8 @@ namespace GcDevicePc
//_mMainForm = new MDIBase();
StartFormbgWorker.CancelAsync();
this.ShowInTaskbar=false;
Hide();
_mMainForm.Show();
this.Hide();
}
}
......@@ -208,13 +210,8 @@ namespace GcDevicePc
_appInitInfo = bEnglishLanguage == false ? "检测本地网络":"Detect local network";
globaldata.m_appinit.LocalNetworkCheck();
_appInitInfo = bEnglishLanguage == false ? "搜寻设备": "Search For Equipment";
#if Use_English_Folder
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\Startup\\startup.ini");
#else
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
#endif
INIOperation test = new INIOperation(file);
string strSearch = test.INIGetStringValue("NetWorkConfig", "MAC地址", null);
string strSearch = ini_startup.INIGetStringValue("NetWorkConfig", "MAC地址", null);
bool bCanFindBindHMI = false;
bool bShowBindOver = false;
SearchHMIThread.Start(); //启动线程
......@@ -297,6 +294,8 @@ namespace GcDevicePc
_appInitInfo = ret ? (bEnglishLanguage == false ? "同步GC配置完成" : "Synchronous GC configuration completed") : (bEnglishLanguage == false ? "同步GC配置失败": "Synchronization configuration failed");
_appInitInfo = bEnglishLanguage == false ? "加载配置完成" : "Loading Configuration";
globaldata.m_appinit.InitAppDefaultConfig();
//窗体控件预加载
}
private void StartFormbgWorker_DoWork(object sender, DoWorkEventArgs e)
......@@ -348,9 +347,8 @@ namespace GcDevicePc
#else
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
#endif
INIOperation test = new INIOperation(file);
test.INIWriteValue(file, "NetWorkConfig", "MAC地址", ((globaldata.DeviceInfo)globaldata.DeviceList[HMIMACComboBox1.SelectedIndex]).MacAddr);
test.INIWriteValue(file, "NetWorkConfig", "网口", ((globaldata.DeviceInfo)globaldata.DeviceList[HMIMACComboBox1.SelectedIndex]).AdaptName);
ini_startup.INIWriteValue(file, "NetWorkConfig", "MAC地址", ((globaldata.DeviceInfo)globaldata.DeviceList[HMIMACComboBox1.SelectedIndex]).MacAddr);
ini_startup.INIWriteValue(file, "NetWorkConfig", "网口", ((globaldata.DeviceInfo)globaldata.DeviceList[HMIMACComboBox1.SelectedIndex]).AdaptName);
}
catch
{
......@@ -359,7 +357,12 @@ namespace GcDevicePc
private void vSearch_HMI_Poll()
{
// Thread.Sleep(10000); //延时10S等待HMI开机,改为用户指定(选项)
if (ini_startup.INIGetStringValue("Version", "VersionType","0")=="1")
{
//在线仪器延时10S等待HMI开机,有时候HMI未启动,PC启动出现搜索不到
Thread.Sleep(10000);
}
HMISearch mysearch = new HMISearch(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.hmimac);
// mysearch.bSearch_Bind_HMI();
bStartSearchOK = true;
......@@ -383,5 +386,7 @@ namespace GcDevicePc
{
System.Environment.Exit(0);
}
}
}
GcDevicePc/StartForm.resx
View file @ 4b7b7ca4
......@@ -520,9 +520,6 @@
AAA=
</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
......
GcDevicePc/SysConfigSecondary.cs
View file @ 4b7b7ca4
......@@ -549,7 +549,6 @@ namespace GcDevicePc
WaitForm form;
private void Button1_Click(object sender, EventArgs e)
{
MDIBase.Get_Set_CounterControl();
Task.Run(() => { SaveSetting(); });
backgroundWorker1.DoWork += new DoWorkEventHandler(backgroundWorker1_DoWork);
this.backgroundWorker1.RunWorkerAsync(); //运行backgroundWorker组件
......@@ -1191,5 +1190,19 @@ namespace GcDevicePc
{
ToolTip1.Show("触发进样器的开始或停止", comboBox_FollowStop, 3000);
}
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
if ( checkBox1.Checked)
{
this.textBox2.UseSystemPasswordChar = false;
this.textBox3.UseSystemPasswordChar = false;
}
else
{
this.textBox2.UseSystemPasswordChar = true;
this.textBox3.UseSystemPasswordChar = true;
}
}
}
}
GcDevicePc/SysConfigSecondary.en.resx
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/SysConfigSecondary.resx
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/auxtool.Designer.cs
View file @ 4b7b7ca4
......@@ -61,17 +61,21 @@
this.button_CloudBox = new System.Windows.Forms.Button();
this.btn_TempTrend = new System.Windows.Forms.Button();
this.fidfire = new System.Windows.Forms.Timer(this.components);
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.ToolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.button_Send = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button();
this.button8 = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
......@@ -141,6 +145,14 @@
//
// groupBox8
//
this.groupBox8.Controls.Add(this.button2);
this.groupBox8.Controls.Add(this.button7);
this.groupBox8.Controls.Add(this.button1);
this.groupBox8.Controls.Add(this.button8);
this.groupBox8.Controls.Add(this.button3);
this.groupBox8.Controls.Add(this.button4);
this.groupBox8.Controls.Add(this.button5);
this.groupBox8.Controls.Add(this.button6);
this.groupBox8.Controls.Add(this.hair_a2);
this.groupBox8.Controls.Add(this.hair_h2);
this.groupBox8.Controls.Add(this.hair_a1);
......@@ -293,18 +305,11 @@
this.fidfire.Interval = 1000;
this.fidfire.Tick += new System.EventHandler(this.fidfire_Tick);
//
// groupBox6
//
this.groupBox6.Controls.Add(this.button2);
this.groupBox6.Controls.Add(this.button1);
resources.ApplyResources(this.groupBox6, "groupBox6");
this.groupBox6.Name = "groupBox6";
this.groupBox6.TabStop = false;
//
// button2
//
resources.ApplyResources(this.button2, "button2");
this.button2.Name = "button2";
this.button2.Tag = "0";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.Button2_Click);
//
......@@ -312,6 +317,7 @@
//
resources.ApplyResources(this.button1, "button1");
this.button1.Name = "button1";
this.button1.Tag = "0";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.Button1_Click);
//
......@@ -351,12 +357,53 @@
this.button_Send.UseVisualStyleBackColor = true;
this.button_Send.Click += new System.EventHandler(this.button_Send_Click);
//
// button3
//
resources.ApplyResources(this.button3, "button3");
this.button3.Name = "button3";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// button4
//
resources.ApplyResources(this.button4, "button4");
this.button4.Name = "button4";
this.button4.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// button5
//
resources.ApplyResources(this.button5, "button5");
this.button5.Name = "button5";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// button6
//
resources.ApplyResources(this.button6, "button6");
this.button6.Name = "button6";
this.button6.UseVisualStyleBackColor = true;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// button7
//
resources.ApplyResources(this.button7, "button7");
this.button7.Name = "button7";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
// button8
//
resources.ApplyResources(this.button8, "button8");
this.button8.Name = "button8";
this.button8.UseVisualStyleBackColor = true;
this.button8.Click += new System.EventHandler(this.button8_Click);
//
// auxtool
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox8);
this.Controls.Add(this.groupBox1);
......@@ -371,7 +418,6 @@
this.groupBox8.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.groupBox6.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.ResumeLayout(false);
......@@ -407,7 +453,6 @@
private System.Windows.Forms.TextBox tcddac1;
private System.Windows.Forms.Button fireupbtnI;
private System.Windows.Forms.Timer fidfire;
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.ToolTip ToolTip1;
......@@ -417,5 +462,11 @@
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button button_Send;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button button8;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button button5;
private System.Windows.Forms.Button button6;
}
}
\ No newline at end of file
GcDevicePc/auxtool.cs
View file @ 4b7b7ca4
......@@ -14,6 +14,7 @@ using System.Globalization;
using GcDevicePc.DrawUI;
using System.Net.Sockets;
using System.Net;
using GcDevicePc.ProThread;
namespace GcDevicePc
{
......@@ -25,8 +26,8 @@ namespace GcDevicePc
public delegate void TCD_SW(ushort port);
public delegate void TCD_SetDAC(ushort port, ushort val);
public delegate void HAir_SW(int val);
public delegate void Adjust_SW(int val);
public delegate void DelALLSwitch(SwitchAddress switchAddress, ushort uActiveIntervention);
//public delegate void Adjust_SW(int val);
public partial class auxtool : Form
{
//private string HmiIP = null;
......@@ -212,25 +213,25 @@ namespace GcDevicePc
}
}
public event HAir_SW hairsw;
public event DelALLSwitch delALLSwitch;
private void hair_h1_Click(object sender, EventArgs e)
{
hairsw(1);
delALLSwitch(SwitchAddress.ValH2_1_Add, 0);
}
private void hair_a1_Click(object sender, EventArgs e)
{
hairsw(2);
delALLSwitch(SwitchAddress.ValAIR_1_Add, 0);
}
private void hair_h2_Click(object sender, EventArgs e)
{
hairsw(3);
delALLSwitch(SwitchAddress.ValH2_2_Add, 0);
}
private void hair_a2_Click(object sender, EventArgs e)
{
hairsw(4);
delALLSwitch(SwitchAddress.ValAIR_2_Add, 0);
}
public event TCD_SetDAC gctcd_setdac;
......@@ -568,16 +569,51 @@ namespace GcDevicePc
{
fidfire.Stop();
}
public event Adjust_SW adsw;
//public event Adjust_SW adsw;
/// <summary>
/// 校标
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Button1_Click(object sender, EventArgs e)
{
adsw(1);
if (button1.Tag.ToString() == "0")
{
button1.Tag = "1";
//只开启RL11,关闭RL12
delALLSwitch(SwitchAddress.ValRL11_Add, 1);
delALLSwitch(SwitchAddress.ValRL12_Add, 2);
}
else
{
button1.Tag = "0";
//全关
delALLSwitch(SwitchAddress.ValRL11_Add, 2);
delALLSwitch(SwitchAddress.ValRL12_Add, 2);
}
}
/// <summary>
/// 校零
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Button2_Click(object sender, EventArgs e)
{
adsw(0);
if (button2.Tag.ToString() == "0")
{
button2.Tag = "1";
//开启RL11,RL12
delALLSwitch(SwitchAddress.ValRL11_Add, 1);
delALLSwitch(SwitchAddress.ValRL12_Add, 1);
}
else
{
button2.Tag = "0";
//全关
delALLSwitch(SwitchAddress.ValRL11_Add, 2);
delALLSwitch(SwitchAddress.ValRL12_Add, 2);
}
}
private double lastnum;
......@@ -681,11 +717,11 @@ namespace GcDevicePc
else
ToolTip1.Show("TCD reference setting:\nN2 70mA\nAr 100mA\nH2 100mA\nHe 100mA", lab_tcdHelp, 10000);
}
TempTrend temp ;
TempTrend temp;
private void btn_TempTrend_Click(object sender, EventArgs e)
{
if (temp==null||temp.IsDisposed)
if (temp == null || temp.IsDisposed)
{
temp = new TempTrend();
temp.Show();
......@@ -768,5 +804,59 @@ namespace GcDevicePc
}
#endregion
/// <summary>
/// 开关阀1
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button6_Click(object sender, EventArgs e)
{
delALLSwitch(SwitchAddress.Val1_Add, 0);
}
/// <summary>
/// 开关阀2
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button4_Click(object sender, EventArgs e)
{
delALLSwitch(SwitchAddress.Val2_Add, 0);
}
/// <summary>
/// 开关阀3
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button5_Click(object sender, EventArgs e)
{
delALLSwitch(SwitchAddress.Val3_Add, 0);
}
/// <summary>
/// 开关阀4
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button3_Click(object sender, EventArgs e)
{
delALLSwitch(SwitchAddress.Val4_Add, 0);
}
/// <summary>
/// 开关RL11阀
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button7_Click(object sender, EventArgs e)
{
delALLSwitch(SwitchAddress.ValRL11_Add, 0);
}
/// <summary>
/// 开关RL12阀
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button8_Click(object sender, EventArgs e)
{
delALLSwitch(SwitchAddress.ValRL12_Add, 0);
}
}
}
GcDevicePc/auxtool.resx
View file @ 4b7b7ca4
This diff is collapsed.
GcDevicePc/globaldata.cs
View file @ 4b7b7ca4
......@@ -53,6 +53,9 @@ namespace GcDevicePc
//Modbus地址
public static ushort tempstart = 100;
public static ushort statusstart = 124;
/// <summary>
/// 阀起始地址
/// </summary>
public static ushort valusstatus = 16;
public static ushort detstatus = 3;
public static ushort hmistatus = 144;
......@@ -115,13 +118,13 @@ namespace GcDevicePc
public static long channel_C = 0;
public static ArrayList channelA_A = new ArrayList();
public static ArrayList channelA_B = new ArrayList();
public static ArrayList channelA_C = new ArrayList();
public static ArrayList channelA_A ;
public static ArrayList channelA_B ;
public static ArrayList channelA_C ;
public static ArrayList channelB_A = new ArrayList();
public static ArrayList channelB_B = new ArrayList();
public static ArrayList channelB_C = new ArrayList();
public static ArrayList channelB_A ;
public static ArrayList channelB_B ;
public static ArrayList channelB_C ;
//public static RingBufferManager m_rsbuffer = new RingBufferManager(100000);
/// <summary>
/// 是否停止了系统(停止=true)
......
VocsSetup/GC_Config/GC_DataPro/ExteCfg.config
View file @ 4b7b7ca4
......@@ -3,9 +3,9 @@
<PARAMETER>
<DEBUG>True</DEBUG>
<fid>True</fid>
<file1>D:\work\色谱\Vocs\VocsSetup\GC_Config\GC_Set\Running Table\六路测试2</file1>
<file2>D:\work\色谱\Vocs\VocsSetup\GC_Config\GC_Set\Running Table\六路测试2</file2>
<file3>D:\work\色谱\Vocs\VocsSetup\GC_Config\GC_Set\Running Table\六路测试2</file3>
<file1>D:\work\色谱\Vocs20220915-1.9.9\Vocs\VocsSetup\GC_Config\GC_Set\Running Table\单氢焰</file1>
<file2>D:\work\色谱\Vocs20220915-1.9.9\Vocs\VocsSetup\GC_Config\GC_Set\Running Table\单氢焰</file2>
<file3>D:\work\色谱\Vocs20220915-1.9.9\Vocs\VocsSetup\GC_Config\GC_Set\Running Table\单氢焰</file3>
<adjust1>3</adjust1>
<adjust2>3</adjust2>
<adjust3>0</adjust3>
......@@ -28,10 +28,6 @@
<name>NMHC</name>
<vlue>1</vlue>
</NMHCcfgSave>
<AutoMessage>
<name>NMHC</name>
<vlue>1</vlue>
</AutoMessage>
<AutoMessage>
<name>CH4</name>
<vlue>1</vlue>
......
VocsSetup/GC_Config/GC_DataPro/SpectralDefault.comp
View file @ 4b7b7ca4
[SYSINFO]
ECOUNT=3
ECOUNT=2
COEF=1
[ENTITY0]
ETXT=0,THC,0,0,0,0,255,0,0,100000,1,0,0
ETXT=0,NMHC,0,0,0,0,255,0,0,100000,1,0,0,0
[ENTITY1]
ETXT=0,CH4,0.02,0.1,0,0,255,0,0,100000,1,0,0
ETXT=0,CH4,1,1,0,0,255,0,0,100000,1,0,0,0
[ENTITY2]
ETXT=0,NMHC,0.9,1.3,0,0,255,0,0,100000,1,0,0
VocsSetup/GC_Config/GC_Set/Startup/startup.ini
View file @ 4b7b7ca4
[NetWorkConfig]
MAC地址=F8:02:78:60:0D:5D
MAC地址=F8:02:78:60:0F:40
网口=以太网 2
搜索时间=60
[StartUp]
自启动=0
打开系统=0
运行类型=0
Forceintegral=1
Forceintegral=0
space=500
Datetime=1
TdName=TVOC5.7
......@@ -16,26 +16,26 @@ TdName=TVOC5.7
历史数据=D:\work\Vocs\VocsSetup\GC_Config\GC_Set\Historical Data
分级文件夹=0
[Logs]
InfoLog=0
ErrLog=0
HmiLog=0
InfoLog=1
ErrLog=1
HmiLog=1
[Version]
VersionType=1
VersionType=0
AppName=色谱
[User]
Name=admin
Password=123456
[SendData]
Thirdparty=1
Foreign=1
Foreign=2
SendType=Routine
[SaveData]
ZBSaveData=0
ZBSaveData=1
[Email]
邮件地址=tetvoc@126.com
[反控]
反控模式=关闭反控
反控模式=被控
反控进程名称=SmartSampler
开始停止触发=触发开始和停止
[NMHC]
......
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ 4b7b7ca4
......@@ -8,7 +8,7 @@ Count3=FALSE
[O2CpdCount]
O2value=21
[免登录]
锚点日期=2022/8/26
锚点日期=2022/9/21
勾选类型=2
[TempTrend]
启用网格X=FALSE
......
VocsSetup/GC_Control/GcDevicePc.exe.config
View file @ 4b7b7ca4
......@@ -38,6 +38,8 @@
<level value="INFO"/>
<appender-ref ref="TempDebugRollingLog"/>
</logger>
<logger name="AntiControlLog">
<level value="INFO"/>
<appender-ref ref="AntiControlRollingLog"/>
......@@ -134,6 +136,8 @@
</filter>
</appender>
</log4net>
</configuration>
VocsSetup/GC_User/Operation Log/ErrLog/ErrLog.txt
View file @ 4b7b7ca4
......@@ -471,3 +471,41 @@ NOT NULL constraint failed: EntityRecord.time
在 System.Data.SQLite.SQLiteCommand.ExecuteNonQuery(CommandBehavior behavior)
在 System.Data.SQLite.SQLiteCommand.ExecuteNonQuery()
在 SQLiteOperate.VOCSqlite.InsertTran(List`1 data) 位置 C:\Users\a\Desktop\色谱仪\新建文件夹\gcdevicepc_nmoc8-16\SQLiteOperate\VOCSqlite.cs:行号 128
【2022-08-26 09:30:38】SQLite error (1299): abort at 12 in [insert into EntityRecord values(@id,@time, @name, @value,@area)]: NOT NULL constraint failed: EntityRecord.time
【2022-08-26 09:30:39】System.Data.SQLite.SQLiteException (0x80004005): constraint failed
NOT NULL constraint failed: EntityRecord.time
在 System.Data.SQLite.SQLite3.Reset(SQLiteStatement stmt)
在 System.Data.SQLite.SQLite3.Step(SQLiteStatement stmt)
在 System.Data.SQLite.SQLiteDataReader.NextResult()
在 System.Data.SQLite.SQLiteDataReader..ctor(SQLiteCommand cmd, CommandBehavior behave)
在 System.Data.SQLite.SQLiteCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.SQLite.SQLiteCommand.ExecuteNonQuery(CommandBehavior behavior)
在 System.Data.SQLite.SQLiteCommand.ExecuteNonQuery()
在 SQLiteOperate.VOCSqlite.InsertTran(List`1 data) 位置 D:\work\色谱\Vocs20220403(修改新的绘图之前)\Vocs\gcdevicepc_nmoc8-16\SQLiteOperate\VOCSqlite.cs:行号 130
2022-08-29 09:01:10System.InvalidOperationException: 此 BackgroundWorker 当前正忙，无法同时运行多个任务。
在 System.ComponentModel.BackgroundWorker.RunWorkerAsync(Object argument)
在 System.ComponentModel.BackgroundWorker.RunWorkerAsync()
在 SpaceM.SpaceThread.Monitor() 位置 D:\work\色谱\Vocs20220826-1.9.8(原1.9.1基础上修改,拟定供在线使用,带有nmhc直测功能)\Vocs\gcdevicepc_nmoc8-16\SpaceM\SpaceThread.cs:行号 103
【2022-09-07 18:39:18】SQLite error (5): database is locked
【2022-09-07 23:19:08】SQLite error (5): database is locked
【2022-09-08 09:52:18】SQLite error (5): database is locked
【2022-09-09 13:30:42】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.AddPointList(List`1 list) 位置 D:\work\色谱\Vocs20220826-1.9.8\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2489
在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220826-1.9.8\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1194
【2022-09-15 13:10:42】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.AddPointList(List`1 list) 位置 D:\work\色谱\Vocs20220826-1.9.8\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2489
在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220826-1.9.8\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1203
【2022-09-20 16:01:14】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.AddPointList(List`1 list) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2489
在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1203
【2022-09-20 16:01:14】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.AddPointList(List`1 list) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2489
在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1203
【2022-09-20 16:27:35】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.AddPointList(List`1 list) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2489
在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1203
【2022-09-20 16:27:35】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.AddPointList(List`1 list) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2489
在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1203
【2022-09-21 10:31:29】SQLite error (5): database is locked
【2022-09-21 10:31:29】SQLite error (5): database is locked
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