Skip to content

G
GC_Branch
Commit 8aecd92c authored by liu's avatar liu
Browse files
Options

辅助工具和选项界面有所修改

parent d6ea31fd
Show whitespace changes
Inline Side-by-side
Showing with 597 additions and 593 deletions
GcDevicePc/ConfigMethod/FID.Designer.cs
View file @ 8aecd92c
...@@ -266,15 +266,12 @@ ...@@ -266,15 +266,12 @@
// cBox加热器 // cBox加热器
// //
this.cBox加热器.AutoSize = true; this.cBox加热器.AutoSize = true;
this.cBox加热器.Checked = true;
this.cBox加热器.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBox加热器.Location = new System.Drawing.Point(64, 148); this.cBox加热器.Location = new System.Drawing.Point(64, 148);
this.cBox加热器.Name = "cBox加热器"; this.cBox加热器.Name = "cBox加热器";
this.cBox加热器.Size = new System.Drawing.Size(60, 16); this.cBox加热器.Size = new System.Drawing.Size(60, 16);
this.cBox加热器.TabIndex = 1; this.cBox加热器.TabIndex = 1;
this.cBox加热器.Text = "加热器"; this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true; this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
// //
// label16 // label16
// //
......
GcDevicePc/ConfigMethod/PortTab.Designer.cs
View file @ 8aecd92c
...@@ -106,15 +106,12 @@ ...@@ -106,15 +106,12 @@
// cBox加热器 // cBox加热器
// //
this.cBox加热器.AutoSize = true; this.cBox加热器.AutoSize = true;
this.cBox加热器.Checked = true;
this.cBox加热器.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBox加热器.Location = new System.Drawing.Point(27, 98); this.cBox加热器.Location = new System.Drawing.Point(27, 98);
this.cBox加热器.Name = "cBox加热器"; this.cBox加热器.Name = "cBox加热器";
this.cBox加热器.Size = new System.Drawing.Size(60, 16); this.cBox加热器.Size = new System.Drawing.Size(60, 16);
this.cBox加热器.TabIndex = 2; this.cBox加热器.TabIndex = 2;
this.cBox加热器.Text = "加热器"; this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true; this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
// //
// label2 // label2
// //
......
GcDevicePc/ConfigMethod/TCD.Designer.cs
View file @ 8aecd92c
...@@ -171,15 +171,12 @@ ...@@ -171,15 +171,12 @@
// cBox加热器 // cBox加热器
// //
this.cBox加热器.AutoSize = true; this.cBox加热器.AutoSize = true;
this.cBox加热器.Checked = true;
this.cBox加热器.CheckState = System.Windows.Forms.CheckState.Checked;
this.cBox加热器.Location = new System.Drawing.Point(51, 145); this.cBox加热器.Location = new System.Drawing.Point(51, 145);
this.cBox加热器.Name = "cBox加热器"; this.cBox加热器.Name = "cBox加热器";
this.cBox加热器.Size = new System.Drawing.Size(60, 16); this.cBox加热器.Size = new System.Drawing.Size(60, 16);
this.cBox加热器.TabIndex = 1; this.cBox加热器.TabIndex = 1;
this.cBox加热器.Text = "加热器"; this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true; this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
// //
// label描述 // label描述
// //
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.Designer.cs
View file @ 8aecd92c
...@@ -74,8 +74,6 @@ ...@@ -74,8 +74,6 @@
// cbHeater // cbHeater
// //
this.cbHeater.AutoSize = true; this.cbHeater.AutoSize = true;
this.cbHeater.Checked = true;
this.cbHeater.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbHeater.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cbHeater.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbHeater.Location = new System.Drawing.Point(99, 155); this.cbHeater.Location = new System.Drawing.Point(99, 155);
this.cbHeater.Name = "cbHeater"; this.cbHeater.Name = "cbHeater";
...@@ -83,7 +81,6 @@ ...@@ -83,7 +81,6 @@
this.cbHeater.TabIndex = 3; this.cbHeater.TabIndex = 3;
this.cbHeater.Text = "加热器"; this.cbHeater.Text = "加热器";
this.cbHeater.UseVisualStyleBackColor = true; this.cbHeater.UseVisualStyleBackColor = true;
this.cbHeater.Visible = false;
// //
// txtHeater // txtHeater
// //
......
GcDevicePc/DataState.cs
View file @ 8aecd92c
...@@ -1338,7 +1338,7 @@ namespace GcDevicePc ...@@ -1338,7 +1338,7 @@ namespace GcDevicePc
{ {
if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1) if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1)
{ {
if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp != 0.0f) //if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp != 0.0f)
{ {
tempshow = new ListViewItem(); tempshow = new ListViewItem();
if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD
......
GcDevicePc/GCBuffer/PCBuffer.cs
View file @ 8aecd92c
...@@ -157,14 +157,14 @@ namespace GcDevicePc.GCBuffer ...@@ -157,14 +157,14 @@ namespace GcDevicePc.GCBuffer
int dsf = ini.ReadInteger("SendData", "Thirdparty"); int dsf = ini.ReadInteger("SendData", "Thirdparty");
int dw = ini.ReadInteger("SendData", "Foreign"); int dw = ini.ReadInteger("SendData", "Foreign");
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData"); int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
int apname = ini.ReadInteger("AppName", "AName"); string apname = ini.ReadString("Version", "AppName");
int fi = ini.ReadInteger("StartUp", "Forceintegral"); int fi = ini.ReadInteger("StartUp", "Forceintegral");
globaldata.UserName = uname; globaldata.UserName = uname;
globaldata.UserPwd = upwd; globaldata.UserPwd = upwd;
globaldata.CurrentVersion = Version; globaldata.CurrentVersion = Version;
globaldata.Foreign = dw; globaldata.Foreign = dw;
globaldata.ZbDataSave = sdzb == 0 ? false : true; globaldata.ZbDataSave = sdzb == 0 ? false : true;
globaldata.AppName = apname == 0 ? "Vocs在线色谱软件" : "TetChrom色谱软件"; globaldata.AppName = apname;
gcpcinfo.pcworkinfo.hmimac = ini.ReadString("NetWorkConfig", "MAC地址"); gcpcinfo.pcworkinfo.hmimac = ini.ReadString("NetWorkConfig", "MAC地址");
CKVocAnalyzer.GlobalCKV.vocAlgorithm.Forceintegral = fi == 1 ? true : false; CKVocAnalyzer.GlobalCKV.vocAlgorithm.Forceintegral = fi == 1 ? true : false;
......
GcDevicePc/IniParam/IniOp.cs
View file @ 8aecd92c
...@@ -1084,6 +1084,5 @@ namespace GcDevicePc.IniParam ...@@ -1084,6 +1084,5 @@ namespace GcDevicePc.IniParam
return true; return true;
} }
}//class }//class
}//namespace }//namespace
GcDevicePc/MDIBase.cs
View file @ 8aecd92c
...@@ -1088,7 +1088,6 @@ namespace GcDevicePc ...@@ -1088,7 +1088,6 @@ namespace GcDevicePc
} }
catch catch
{ {
Log.Error("System Init Failed"); Log.Error("System Init Failed");
} }
...@@ -1726,7 +1725,7 @@ namespace GcDevicePc ...@@ -1726,7 +1725,7 @@ namespace GcDevicePc
try try
{ {
this.Dispose(); this.Dispose();
System.Diagnostics.Process.GetCurrentProcess().Kill(); Process.GetCurrentProcess().Kill();
} }
catch catch
{ {
...@@ -1782,7 +1781,7 @@ namespace GcDevicePc ...@@ -1782,7 +1781,7 @@ namespace GcDevicePc
try try
{ {
this.Dispose(); this.Dispose();
System.Diagnostics.Process.GetCurrentProcess().Kill(); Process.GetCurrentProcess().Kill();
} }
catch catch
{ {
......
GcDevicePc/MainForm.Designer.cs
View file @ 8aecd92c
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
this.ClientSize = new System.Drawing.Size(1008, 730); this.ClientSize = new System.Drawing.Size(1008, 730);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "MainForm"; this.Name = "MainForm";
this.Text = "Tetchrom色谱工作站-1.5.5 用户界面"; this.Text = "用户界面";
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
......
GcDevicePc/Program.cs
View file @ 8aecd92c
...@@ -12,7 +12,7 @@ namespace GcDevicePc ...@@ -12,7 +12,7 @@ namespace GcDevicePc
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
bool createNew; bool createNew;
//Application.Run(new Compound()); //Application.Run(new SysConfig());
{ {
using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew)) using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
{ {
......
GcDevicePc/SysConfig.Designer.cs
View file @ 8aecd92c
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
this.radioButton7 = new System.Windows.Forms.RadioButton(); this.radioButton7 = new System.Windows.Forms.RadioButton();
this.checkBox2 = new System.Windows.Forms.CheckBox(); this.checkBox2 = new System.Windows.Forms.CheckBox();
this.checkBox3 = new System.Windows.Forms.CheckBox(); this.checkBox3 = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.radioButton3 = new System.Windows.Forms.RadioButton(); this.radioButton3 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton(); this.radioButton2 = new System.Windows.Forms.RadioButton();
...@@ -42,43 +41,6 @@ ...@@ -42,43 +41,6 @@
this.radioButton6 = new System.Windows.Forms.RadioButton(); this.radioButton6 = new System.Windows.Forms.RadioButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.listBox1 = new System.Windows.Forms.ListBox(); this.listBox1 = new System.Windows.Forms.ListBox();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.textBox6 = new System.Windows.Forms.TextBox();
this.textBox5 = new System.Windows.Forms.TextBox();
this.textBox4 = new System.Windows.Forms.TextBox();
this.checkBox7 = new System.Windows.Forms.CheckBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
this.checkBox5 = new System.Windows.Forms.CheckBox();
this.checkBox4 = new System.Windows.Forms.CheckBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.permin = new System.Windows.Forms.CheckBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.runbat = new System.Windows.Forms.CheckBox();
this.runsingle = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.radioButton9 = new System.Windows.Forms.RadioButton();
this.radioButton8 = new System.Windows.Forms.RadioButton();
this.appstartup = new System.Windows.Forms.CheckBox();
this.panel3 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.textBox3 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.panel4 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.checkBox8 = new System.Windows.Forms.CheckBox();
this.panel5 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel();
this.groupBox8 = new System.Windows.Forms.GroupBox(); this.groupBox8 = new System.Windows.Forms.GroupBox();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
...@@ -107,27 +69,68 @@ ...@@ -107,27 +69,68 @@
this.label16 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.textBox3 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.textBox6 = new System.Windows.Forms.TextBox();
this.textBox5 = new System.Windows.Forms.TextBox();
this.textBox4 = new System.Windows.Forms.TextBox();
this.checkBox7 = new System.Windows.Forms.CheckBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
this.checkBox5 = new System.Windows.Forms.CheckBox();
this.checkBox4 = new System.Windows.Forms.CheckBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.checkBox8 = new System.Windows.Forms.CheckBox();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.permin = new System.Windows.Forms.CheckBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.runbat = new System.Windows.Forms.CheckBox();
this.runsingle = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.radioButton9 = new System.Windows.Forms.RadioButton();
this.radioButton8 = new System.Windows.Forms.RadioButton();
this.appstartup = new System.Windows.Forms.CheckBox();
this.panel4 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.groupBox12 = new System.Windows.Forms.GroupBox();
this.label19 = new System.Windows.Forms.Label();
this.textBox9 = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout(); this.splitContainer1.SuspendLayout();
this.panel5.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox9.SuspendLayout();
this.groupBox10.SuspendLayout();
this.panel6.SuspendLayout();
this.groupBox11.SuspendLayout();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
this.panel4.SuspendLayout(); this.panel4.SuspendLayout();
this.panel5.SuspendLayout(); this.groupBox12.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox9.SuspendLayout();
this.groupBox10.SuspendLayout();
this.panel6.SuspendLayout();
this.groupBox11.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// radioButton4 // radioButton4
...@@ -155,7 +158,7 @@ ...@@ -155,7 +158,7 @@
// checkBox2 // checkBox2
// //
this.checkBox2.AutoSize = true; this.checkBox2.AutoSize = true;
this.checkBox2.Location = new System.Drawing.Point(293, 20); this.checkBox2.Location = new System.Drawing.Point(195, 20);
this.checkBox2.Name = "checkBox2"; this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(72, 16); this.checkBox2.Size = new System.Drawing.Size(72, 16);
this.checkBox2.TabIndex = 2; this.checkBox2.TabIndex = 2;
...@@ -166,24 +169,13 @@ ...@@ -166,24 +169,13 @@
// checkBox3 // checkBox3
// //
this.checkBox3.AutoSize = true; this.checkBox3.AutoSize = true;
this.checkBox3.Location = new System.Drawing.Point(100, 20); this.checkBox3.Location = new System.Drawing.Point(20, 20);
this.checkBox3.Name = "checkBox3"; this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(84, 16); this.checkBox3.Size = new System.Drawing.Size(84, 16);
this.checkBox3.TabIndex = 1; this.checkBox3.TabIndex = 1;
this.checkBox3.Text = "ZB谱图保存"; this.checkBox3.Text = "ZB谱图保存";
this.checkBox3.UseVisualStyleBackColor = true; this.checkBox3.UseVisualStyleBackColor = true;
// //
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(11, 20);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(72, 16);
this.checkBox1.TabIndex = 0;
this.checkBox1.Text = "用户界面";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1_CheckedChanged);
//
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.radioButton3); this.groupBox1.Controls.Add(this.radioButton3);
...@@ -282,11 +274,11 @@ ...@@ -282,11 +274,11 @@
// //
// splitContainer1.Panel2 // splitContainer1.Panel2
// //
this.splitContainer1.Panel2.Controls.Add(this.panel5);
this.splitContainer1.Panel2.Controls.Add(this.panel6);
this.splitContainer1.Panel2.Controls.Add(this.panel3); this.splitContainer1.Panel2.Controls.Add(this.panel3);
this.splitContainer1.Panel2.Controls.Add(this.panel2); this.splitContainer1.Panel2.Controls.Add(this.panel2);
this.splitContainer1.Panel2.Controls.Add(this.panel1); this.splitContainer1.Panel2.Controls.Add(this.panel1);
this.splitContainer1.Panel2.Controls.Add(this.panel5);
this.splitContainer1.Panel2.Controls.Add(this.panel6);
this.splitContainer1.Size = new System.Drawing.Size(756, 372); this.splitContainer1.Size = new System.Drawing.Size(756, 372);
this.splitContainer1.SplitterDistance = 252; this.splitContainer1.SplitterDistance = 252;
this.splitContainer1.TabIndex = 2; this.splitContainer1.TabIndex = 2;
...@@ -314,243 +306,287 @@ ...@@ -314,243 +306,287 @@
this.listBox1.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListBox1_MeasureItem); this.listBox1.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListBox1_MeasureItem);
this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1_SelectedIndexChanged); this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1_SelectedIndexChanged);
// //
// panel1 // panel5
//
this.panel1.Controls.Add(this.groupBox6);
this.panel1.Controls.Add(this.groupBox5);
this.panel1.Controls.Add(this.groupBox7);
this.panel1.Controls.Add(this.groupBox3);
this.panel1.Controls.Add(this.groupBox4);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(498, 370);
this.panel1.TabIndex = 3;
// //
// groupBox6 this.panel5.Controls.Add(this.groupBox8);
this.panel5.Controls.Add(this.groupBox9);
this.panel5.Controls.Add(this.groupBox10);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(498, 370);
this.panel5.TabIndex = 3;
// //
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); // groupBox8
this.groupBox6.Controls.Add(this.label9);
this.groupBox6.Controls.Add(this.label8);
this.groupBox6.Controls.Add(this.label7);
this.groupBox6.Controls.Add(this.textBox6);
this.groupBox6.Controls.Add(this.textBox5);
this.groupBox6.Controls.Add(this.textBox4);
this.groupBox6.Controls.Add(this.checkBox7);
this.groupBox6.Controls.Add(this.checkBox6);
this.groupBox6.Controls.Add(this.checkBox5);
this.groupBox6.Controls.Add(this.checkBox4);
this.groupBox6.Location = new System.Drawing.Point(25, 246);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(448, 98);
this.groupBox6.TabIndex = 8;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "检测器";
// //
// label9 this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox8.Controls.Add(this.label10);
this.groupBox8.Controls.Add(this.label11);
this.groupBox8.Controls.Add(this.progressBar2);
this.groupBox8.Controls.Add(this.label12);
this.groupBox8.Controls.Add(this.firmwareupdate);
this.groupBox8.Location = new System.Drawing.Point(9, 259);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(476, 84);
this.groupBox8.TabIndex = 6;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "固件更新";
// //
this.label9.AutoSize = true; // label10
this.label9.Location = new System.Drawing.Point(186, 46);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(17, 12);
this.label9.TabIndex = 6;
this.label9.Text = "mA";
// //
// label8 this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(80, 25);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(0, 12);
this.label10.TabIndex = 4;
// //
this.label8.AutoSize = true; // label11
this.label8.Location = new System.Drawing.Point(186, 70);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(11, 12);
this.label8.TabIndex = 6;
this.label8.Text = "V";
// //
// label7 this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(427, 16);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(0, 12);
this.label11.TabIndex = 3;
// //
this.label7.AutoSize = true; // progressBar2
this.label7.Location = new System.Drawing.Point(415, 21);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(17, 12);
this.label7.TabIndex = 5;
this.label7.Text = "uA";
this.label7.Visible = false;
// //
// textBox6 this.progressBar2.Location = new System.Drawing.Point(73, 23);
this.progressBar2.Name = "progressBar2";
this.progressBar2.Size = new System.Drawing.Size(342, 16);
this.progressBar2.TabIndex = 2;
// //
this.textBox6.Location = new System.Drawing.Point(117, 40); // label12
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(63, 21);
this.textBox6.TabIndex = 4;
// //
// textBox5 this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(6, 23);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(65, 12);
this.label12.TabIndex = 1;
this.label12.Text = "更新进度：";
// //
this.textBox5.Location = new System.Drawing.Point(117, 64); // firmwareupdate
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(63, 21);
this.textBox5.TabIndex = 4;
// //
// textBox4 this.firmwareupdate.Location = new System.Drawing.Point(212, 55);
this.firmwareupdate.Name = "firmwareupdate";
this.firmwareupdate.Size = new System.Drawing.Size(75, 23);
this.firmwareupdate.TabIndex = 0;
this.firmwareupdate.Text = "一键更新";
this.firmwareupdate.UseVisualStyleBackColor = true;
this.firmwareupdate.Click += new System.EventHandler(this.firmwareupdate_Click);
// //
this.textBox4.Location = new System.Drawing.Point(346, 18); // groupBox9
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(63, 21);
this.textBox4.TabIndex = 4;
// //
// checkBox7 this.groupBox9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox9.Controls.Add(this.label13);
this.groupBox9.Controls.Add(this.progressBar1);
this.groupBox9.Controls.Add(this.updateinfo);
this.groupBox9.Controls.Add(this.updatebtn);
this.groupBox9.Controls.Add(this.chosenbtn);
this.groupBox9.Controls.Add(this.ProName);
this.groupBox9.Controls.Add(this.label14);
this.groupBox9.Location = new System.Drawing.Point(9, 141);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(476, 112);
this.groupBox9.TabIndex = 5;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "HMI更新";
// //
this.checkBox7.AutoSize = true; // label13
this.checkBox7.Location = new System.Drawing.Point(238, 23);
this.checkBox7.Name = "checkBox7";
this.checkBox7.Size = new System.Drawing.Size(102, 16);
this.checkBox7.TabIndex = 3;
this.checkBox7.Text = "ECD自动开基流";
this.checkBox7.UseVisualStyleBackColor = true;
// //
// checkBox6 this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(409, 66);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(0, 12);
this.label13.TabIndex = 6;
// //
this.checkBox6.AutoSize = true; // progressBar1
this.checkBox6.Location = new System.Drawing.Point(8, 69);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(90, 16);
this.checkBox6.TabIndex = 3;
this.checkBox6.Text = "自动开启PMT";
this.checkBox6.UseVisualStyleBackColor = true;
// //
// checkBox5 this.progressBar1.Location = new System.Drawing.Point(73, 87);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(342, 16);
this.progressBar1.TabIndex = 5;
// //
this.checkBox5.AutoSize = true; // updateinfo
this.checkBox5.Location = new System.Drawing.Point(8, 45);
this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(102, 16);
this.checkBox5.TabIndex = 3;
this.checkBox5.Text = "TCD自动开桥流";
this.checkBox5.UseVisualStyleBackColor = true;
// //
// checkBox4 this.updateinfo.AutoSize = true;
this.updateinfo.Location = new System.Drawing.Point(8, 87);
this.updateinfo.Name = "updateinfo";
this.updateinfo.Size = new System.Drawing.Size(59, 12);
this.updateinfo.TabIndex = 4;
this.updateinfo.Text = "更新进度:";
// //
this.checkBox4.AutoSize = true; // updatebtn
this.checkBox4.Location = new System.Drawing.Point(8, 23);
this.checkBox4.Name = "checkBox4";
this.checkBox4.Size = new System.Drawing.Size(72, 16);
this.checkBox4.TabIndex = 3;
this.checkBox4.Text = "自动点火";
this.checkBox4.UseVisualStyleBackColor = true;
// //
// groupBox5 this.updatebtn.Location = new System.Drawing.Point(278, 51);
this.updatebtn.Name = "updatebtn";
this.updatebtn.Size = new System.Drawing.Size(75, 23);
this.updatebtn.TabIndex = 3;
this.updatebtn.Text = "更新";
this.updatebtn.UseVisualStyleBackColor = true;
this.updatebtn.Click += new System.EventHandler(this.updatebtn_Click);
// //
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); // chosenbtn
this.groupBox5.Controls.Add(this.checkBox1);
this.groupBox5.Controls.Add(this.checkBox8);
this.groupBox5.Controls.Add(this.checkBox2);
this.groupBox5.Controls.Add(this.checkBox3);
this.groupBox5.Location = new System.Drawing.Point(22, 195);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(449, 45);
this.groupBox5.TabIndex = 7;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "杂项";
// //
// groupBox7 this.chosenbtn.Location = new System.Drawing.Point(139, 51);
this.chosenbtn.Name = "chosenbtn";
this.chosenbtn.Size = new System.Drawing.Size(75, 23);
this.chosenbtn.TabIndex = 2;
this.chosenbtn.Text = "选择";
this.chosenbtn.UseVisualStyleBackColor = true;
this.chosenbtn.Click += new System.EventHandler(this.chosenbtn_Click);
// //
this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); // ProName
this.groupBox7.Controls.Add(this.permin);
this.groupBox7.Location = new System.Drawing.Point(22, 142);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(449, 47);
this.groupBox7.TabIndex = 7;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "状态记录";
// //
// permin this.ProName.Location = new System.Drawing.Point(73, 24);
this.ProName.Name = "ProName";
this.ProName.Size = new System.Drawing.Size(342, 21);
this.ProName.TabIndex = 1;
// //
this.permin.AutoSize = true; // label14
this.permin.Location = new System.Drawing.Point(11, 18);
this.permin.Name = "permin";
this.permin.Size = new System.Drawing.Size(84, 16);
this.permin.TabIndex = 0;
this.permin.Text = "每分钟记录";
this.permin.UseVisualStyleBackColor = true;
// //
// groupBox3 this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(14, 27);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(53, 12);
this.label14.TabIndex = 0;
this.label14.Text = "请选择：";
// //
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); // groupBox10
this.groupBox3.Controls.Add(this.runbat);
this.groupBox3.Controls.Add(this.runsingle);
this.groupBox3.Location = new System.Drawing.Point(22, 87);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(449, 49);
this.groupBox3.TabIndex = 6;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "开机自动运行";
// //
// runbat this.groupBox10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox10.Controls.Add(this.hmilist);
this.groupBox10.Controls.Add(this.searchHMI);
this.groupBox10.Controls.Add(this.runbtn);
this.groupBox10.Controls.Add(this.CHmibtn);
this.groupBox10.Location = new System.Drawing.Point(9, 30);
this.groupBox10.Name = "groupBox10";
this.groupBox10.Size = new System.Drawing.Size(476, 105);
this.groupBox10.TabIndex = 4;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "程序启停";
// //
this.runbat.AutoSize = true; // hmilist
this.runbat.Location = new System.Drawing.Point(11, 20);
this.runbat.Name = "runbat";
this.runbat.Size = new System.Drawing.Size(60, 16);
this.runbat.TabIndex = 1;
this.runbat.Tag = "2";
this.runbat.Text = "批处理";
this.runbat.UseVisualStyleBackColor = true;
this.runbat.CheckedChanged += new System.EventHandler(this.Runbat_CheckedChanged);
// //
// runsingle this.hmilist.FormattingEnabled = true;
this.hmilist.Location = new System.Drawing.Point(71, 26);
this.hmilist.Name = "hmilist";
this.hmilist.Size = new System.Drawing.Size(125, 20);
this.hmilist.TabIndex = 3;
this.hmilist.Text = "请选择...";
this.hmilist.SelectedIndexChanged += new System.EventHandler(this.hmilist_SelectedIndexChanged);
// //
this.runsingle.AutoSize = true; // searchHMI
this.runsingle.Location = new System.Drawing.Point(182, 20);
this.runsingle.Name = "runsingle";
this.runsingle.Size = new System.Drawing.Size(72, 16);
this.runsingle.TabIndex = 0;
this.runsingle.Tag = "0";
this.runsingle.Text = "开启系统";
this.runsingle.UseVisualStyleBackColor = true;
this.runsingle.CheckedChanged += new System.EventHandler(this.Runsingle_CheckedChanged);
// //
// groupBox4 this.searchHMI.Location = new System.Drawing.Point(19, 24);
this.searchHMI.Name = "searchHMI";
this.searchHMI.Size = new System.Drawing.Size(46, 23);
this.searchHMI.TabIndex = 2;
this.searchHMI.Text = "搜索";
this.searchHMI.UseVisualStyleBackColor = true;
this.searchHMI.Click += new System.EventHandler(this.searchHMI_Click);
// //
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); // runbtn
this.groupBox4.Controls.Add(this.radioButton9);
this.groupBox4.Controls.Add(this.radioButton8);
this.groupBox4.Controls.Add(this.appstartup);
this.groupBox4.Location = new System.Drawing.Point(22, 34);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(449, 47);
this.groupBox4.TabIndex = 5;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "开机配置";
// //
// radioButton9 this.runbtn.Location = new System.Drawing.Point(202, 63);
this.runbtn.Name = "runbtn";
this.runbtn.Size = new System.Drawing.Size(161, 23);
this.runbtn.TabIndex = 1;
this.runbtn.Text = "打开HMI程序";
this.runbtn.UseVisualStyleBackColor = true;
this.runbtn.Click += new System.EventHandler(this.runbtn_Click);
// //
this.radioButton9.AutoSize = true; // CHmibtn
this.radioButton9.Location = new System.Drawing.Point(293, 18);
this.radioButton9.Name = "radioButton9";
this.radioButton9.Size = new System.Drawing.Size(119, 16);
this.radioButton9.TabIndex = 1;
this.radioButton9.TabStop = true;
this.radioButton9.Text = "TetChrom色谱软件";
this.radioButton9.UseVisualStyleBackColor = true;
// //
// radioButton8 this.CHmibtn.Location = new System.Drawing.Point(19, 63);
this.CHmibtn.Name = "CHmibtn";
this.CHmibtn.Size = new System.Drawing.Size(161, 23);
this.CHmibtn.TabIndex = 0;
this.CHmibtn.Text = "关闭HMI程序";
this.CHmibtn.UseVisualStyleBackColor = true;
this.CHmibtn.Click += new System.EventHandler(this.CHmibtn_Click);
// //
this.radioButton8.AutoSize = true; // panel6
this.radioButton8.Location = new System.Drawing.Point(137, 17);
this.radioButton8.Name = "radioButton8";
this.radioButton8.Size = new System.Drawing.Size(119, 16);
this.radioButton8.TabIndex = 1;
this.radioButton8.TabStop = true;
this.radioButton8.Text = "Vocs在线色谱软件";
this.radioButton8.UseVisualStyleBackColor = true;
// //
// appstartup this.panel6.Controls.Add(this.groupBox11);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(498, 370);
this.panel6.TabIndex = 4;
// //
this.appstartup.AutoSize = true; // groupBox11
this.appstartup.Location = new System.Drawing.Point(11, 20); //
this.appstartup.Name = "appstartup"; this.groupBox11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.appstartup.Size = new System.Drawing.Size(84, 16); this.groupBox11.Controls.Add(this.textBox7);
this.appstartup.TabIndex = 0; this.groupBox11.Controls.Add(this.textBox8);
this.appstartup.Text = "开机自启动"; this.groupBox11.Controls.Add(this.label15);
this.appstartup.UseVisualStyleBackColor = true; this.groupBox11.Controls.Add(this.label16);
this.groupBox11.Controls.Add(this.label17);
this.groupBox11.Controls.Add(this.label18);
this.groupBox11.Location = new System.Drawing.Point(34, 139);
this.groupBox11.Margin = new System.Windows.Forms.Padding(2);
this.groupBox11.Name = "groupBox11";
this.groupBox11.Padding = new System.Windows.Forms.Padding(2);
this.groupBox11.Size = new System.Drawing.Size(435, 67);
this.groupBox11.TabIndex = 13;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "历史数据";
//
// textBox7
//
this.textBox7.Location = new System.Drawing.Point(243, 33);
this.textBox7.Margin = new System.Windows.Forms.Padding(2);
this.textBox7.Name = "textBox7";
this.textBox7.Size = new System.Drawing.Size(76, 21);
this.textBox7.TabIndex = 5;
//
// textBox8
//
this.textBox8.Location = new System.Drawing.Point(64, 33);
this.textBox8.Margin = new System.Windows.Forms.Padding(2);
this.textBox8.Name = "textBox8";
this.textBox8.Size = new System.Drawing.Size(76, 21);
this.textBox8.TabIndex = 4;
//
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(324, 37);
this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(17, 12);
this.label15.TabIndex = 3;
this.label15.Text = "月";
//
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(194, 38);
this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(53, 12);
this.label16.TabIndex = 2;
this.label16.Text = "保存期限";
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(146, 37);
this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(17, 12);
this.label17.TabIndex = 1;
this.label17.Text = "MB";
//
// label18
//
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(9, 38);
this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(53, 12);
this.label18.TabIndex = 0;
this.label18.Text = "预留空间";
// //
// panel3 // panel3
// //
...@@ -674,333 +710,316 @@ ...@@ -674,333 +710,316 @@
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "账号："; this.label1.Text = "账号：";
// //
// panel4 // panel1
//
this.panel4.Controls.Add(this.splitContainer1);
this.panel4.Location = new System.Drawing.Point(12, 12);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(756, 372);
this.panel4.TabIndex = 3;
//
// button1
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button1.Location = new System.Drawing.Point(570, 397);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 4;
this.button1.Text = "确认";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.Button1_Click);
//
// button2
//
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button2.Location = new System.Drawing.Point(685, 397);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 4;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.Button2_Click);
//
// checkBox8
//
this.checkBox8.AutoSize = true;
this.checkBox8.Location = new System.Drawing.Point(200, 20);
this.checkBox8.Name = "checkBox8";
this.checkBox8.Size = new System.Drawing.Size(72, 16);
this.checkBox8.TabIndex = 2;
this.checkBox8.Text = "强制就绪";
this.checkBox8.UseVisualStyleBackColor = true;
//
// panel5
// //
this.panel5.Controls.Add(this.groupBox8); this.panel1.Controls.Add(this.groupBox12);
this.panel5.Controls.Add(this.groupBox9); this.panel1.Controls.Add(this.groupBox6);
this.panel5.Controls.Add(this.groupBox10); this.panel1.Controls.Add(this.groupBox5);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Controls.Add(this.groupBox7);
this.panel5.Location = new System.Drawing.Point(0, 0); this.panel1.Controls.Add(this.groupBox3);
this.panel5.Name = "panel5"; this.panel1.Controls.Add(this.groupBox4);
this.panel5.Size = new System.Drawing.Size(498, 370); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.TabIndex = 3; this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(498, 370);
this.panel1.TabIndex = 3;
// //
// groupBox8 // groupBox6
// //
this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox8.Controls.Add(this.label10); this.groupBox6.Controls.Add(this.label9);
this.groupBox8.Controls.Add(this.label11); this.groupBox6.Controls.Add(this.label8);
this.groupBox8.Controls.Add(this.progressBar2); this.groupBox6.Controls.Add(this.label7);
this.groupBox8.Controls.Add(this.label12); this.groupBox6.Controls.Add(this.textBox6);
this.groupBox8.Controls.Add(this.firmwareupdate); this.groupBox6.Controls.Add(this.textBox5);
this.groupBox8.Location = new System.Drawing.Point(9, 259); this.groupBox6.Controls.Add(this.textBox4);
this.groupBox8.Name = "groupBox8"; this.groupBox6.Controls.Add(this.checkBox7);
this.groupBox8.Size = new System.Drawing.Size(476, 84); this.groupBox6.Controls.Add(this.checkBox6);
this.groupBox8.TabIndex = 6; this.groupBox6.Controls.Add(this.checkBox5);
this.groupBox8.TabStop = false; this.groupBox6.Controls.Add(this.checkBox4);
this.groupBox8.Text = "固件更新"; this.groupBox6.Location = new System.Drawing.Point(25, 246);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(448, 98);
this.groupBox6.TabIndex = 8;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "检测器";
// //
// label10 // label9
// //
this.label10.AutoSize = true; this.label9.AutoSize = true;
this.label10.Location = new System.Drawing.Point(80, 25); this.label9.Location = new System.Drawing.Point(186, 46);
this.label10.Name = "label10"; this.label9.Name = "label9";
this.label10.Size = new System.Drawing.Size(0, 12); this.label9.Size = new System.Drawing.Size(17, 12);
this.label10.TabIndex = 4; this.label9.TabIndex = 6;
this.label9.Text = "mA";
// //
// label11 // label8
// //
this.label11.AutoSize = true; this.label8.AutoSize = true;
this.label11.Location = new System.Drawing.Point(427, 16); this.label8.Location = new System.Drawing.Point(186, 70);
this.label11.Name = "label11"; this.label8.Name = "label8";
this.label11.Size = new System.Drawing.Size(0, 12); this.label8.Size = new System.Drawing.Size(11, 12);
this.label11.TabIndex = 3; this.label8.TabIndex = 6;
this.label8.Text = "V";
// //
// progressBar2 // label7
// //
this.progressBar2.Location = new System.Drawing.Point(73, 23); this.label7.AutoSize = true;
this.progressBar2.Name = "progressBar2"; this.label7.Location = new System.Drawing.Point(415, 21);
this.progressBar2.Size = new System.Drawing.Size(342, 16); this.label7.Name = "label7";
this.progressBar2.TabIndex = 2; this.label7.Size = new System.Drawing.Size(17, 12);
this.label7.TabIndex = 5;
this.label7.Text = "uA";
this.label7.Visible = false;
// //
// label12 // textBox6
// //
this.label12.AutoSize = true; this.textBox6.Location = new System.Drawing.Point(117, 40);
this.label12.Location = new System.Drawing.Point(6, 23); this.textBox6.Name = "textBox6";
this.label12.Name = "label12"; this.textBox6.Size = new System.Drawing.Size(63, 21);
this.label12.Size = new System.Drawing.Size(65, 12); this.textBox6.TabIndex = 4;
this.label12.TabIndex = 1;
this.label12.Text = "更新进度：";
// //
// firmwareupdate // textBox5
// //
this.firmwareupdate.Location = new System.Drawing.Point(212, 55); this.textBox5.Location = new System.Drawing.Point(117, 64);
this.firmwareupdate.Name = "firmwareupdate"; this.textBox5.Name = "textBox5";
this.firmwareupdate.Size = new System.Drawing.Size(75, 23); this.textBox5.Size = new System.Drawing.Size(63, 21);
this.firmwareupdate.TabIndex = 0; this.textBox5.TabIndex = 4;
this.firmwareupdate.Text = "一键更新";
this.firmwareupdate.UseVisualStyleBackColor = true;
this.firmwareupdate.Click += new System.EventHandler(this.firmwareupdate_Click);
// //
// groupBox9 // textBox4
// //
this.groupBox9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.textBox4.Location = new System.Drawing.Point(346, 18);
this.groupBox9.Controls.Add(this.label13); this.textBox4.Name = "textBox4";
this.groupBox9.Controls.Add(this.progressBar1); this.textBox4.Size = new System.Drawing.Size(63, 21);
this.groupBox9.Controls.Add(this.updateinfo); this.textBox4.TabIndex = 4;
this.groupBox9.Controls.Add(this.updatebtn);
this.groupBox9.Controls.Add(this.chosenbtn);
this.groupBox9.Controls.Add(this.ProName);
this.groupBox9.Controls.Add(this.label14);
this.groupBox9.Location = new System.Drawing.Point(9, 141);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(476, 112);
this.groupBox9.TabIndex = 5;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "HMI更新";
// //
// label13 // checkBox7
// //
this.label13.AutoSize = true; this.checkBox7.AutoSize = true;
this.label13.Location = new System.Drawing.Point(409, 66); this.checkBox7.Location = new System.Drawing.Point(238, 23);
this.label13.Name = "label13"; this.checkBox7.Name = "checkBox7";
this.label13.Size = new System.Drawing.Size(0, 12); this.checkBox7.Size = new System.Drawing.Size(102, 16);
this.label13.TabIndex = 6; this.checkBox7.TabIndex = 3;
this.checkBox7.Text = "ECD自动开基流";
this.checkBox7.UseVisualStyleBackColor = true;
// //
// progressBar1 // checkBox6
// //
this.progressBar1.Location = new System.Drawing.Point(73, 87); this.checkBox6.AutoSize = true;
this.progressBar1.Name = "progressBar1"; this.checkBox6.Location = new System.Drawing.Point(8, 69);
this.progressBar1.Size = new System.Drawing.Size(342, 16); this.checkBox6.Name = "checkBox6";
this.progressBar1.TabIndex = 5; this.checkBox6.Size = new System.Drawing.Size(90, 16);
this.checkBox6.TabIndex = 3;
this.checkBox6.Text = "自动开启PMT";
this.checkBox6.UseVisualStyleBackColor = true;
// //
// updateinfo // checkBox5
// //
this.updateinfo.AutoSize = true; this.checkBox5.AutoSize = true;
this.updateinfo.Location = new System.Drawing.Point(8, 87); this.checkBox5.Location = new System.Drawing.Point(8, 45);
this.updateinfo.Name = "updateinfo"; this.checkBox5.Name = "checkBox5";
this.updateinfo.Size = new System.Drawing.Size(59, 12); this.checkBox5.Size = new System.Drawing.Size(102, 16);
this.updateinfo.TabIndex = 4; this.checkBox5.TabIndex = 3;
this.updateinfo.Text = "更新进度:"; this.checkBox5.Text = "TCD自动开桥流";
this.checkBox5.UseVisualStyleBackColor = true;
// //
// updatebtn // checkBox4
// //
this.updatebtn.Location = new System.Drawing.Point(278, 51); this.checkBox4.AutoSize = true;
this.updatebtn.Name = "updatebtn"; this.checkBox4.Location = new System.Drawing.Point(8, 23);
this.updatebtn.Size = new System.Drawing.Size(75, 23); this.checkBox4.Name = "checkBox4";
this.updatebtn.TabIndex = 3; this.checkBox4.Size = new System.Drawing.Size(72, 16);
this.updatebtn.Text = "更新"; this.checkBox4.TabIndex = 3;
this.updatebtn.UseVisualStyleBackColor = true; this.checkBox4.Text = "自动点火";
this.updatebtn.Click += new System.EventHandler(this.updatebtn_Click); this.checkBox4.UseVisualStyleBackColor = true;
// //
// chosenbtn // groupBox5
// //
this.chosenbtn.Location = new System.Drawing.Point(139, 51); this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.chosenbtn.Name = "chosenbtn"; this.groupBox5.Controls.Add(this.checkBox8);
this.chosenbtn.Size = new System.Drawing.Size(75, 23); this.groupBox5.Controls.Add(this.checkBox2);
this.chosenbtn.TabIndex = 2; this.groupBox5.Controls.Add(this.checkBox3);
this.chosenbtn.Text = "选择"; this.groupBox5.Location = new System.Drawing.Point(22, 195);
this.chosenbtn.UseVisualStyleBackColor = true; this.groupBox5.Name = "groupBox5";
this.chosenbtn.Click += new System.EventHandler(this.chosenbtn_Click); this.groupBox5.Size = new System.Drawing.Size(449, 45);
this.groupBox5.TabIndex = 7;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "杂项";
// //
// ProName // checkBox8
// //
this.ProName.Location = new System.Drawing.Point(73, 24); this.checkBox8.AutoSize = true;
this.ProName.Name = "ProName"; this.checkBox8.Location = new System.Drawing.Point(120, 20);
this.ProName.Size = new System.Drawing.Size(342, 21); this.checkBox8.Name = "checkBox8";
this.ProName.TabIndex = 1; this.checkBox8.Size = new System.Drawing.Size(72, 16);
this.checkBox8.TabIndex = 2;
this.checkBox8.Text = "强制就绪";
this.checkBox8.UseVisualStyleBackColor = true;
// //
// label14 // groupBox7
// //
this.label14.AutoSize = true; this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.label14.Location = new System.Drawing.Point(14, 27); this.groupBox7.Controls.Add(this.permin);
this.label14.Name = "label14"; this.groupBox7.Location = new System.Drawing.Point(22, 142);
this.label14.Size = new System.Drawing.Size(53, 12); this.groupBox7.Name = "groupBox7";
this.label14.TabIndex = 0; this.groupBox7.Size = new System.Drawing.Size(449, 47);
this.label14.Text = "请选择："; this.groupBox7.TabIndex = 7;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "状态记录";
// //
// groupBox10 // permin
// //
this.groupBox10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.permin.AutoSize = true;
this.groupBox10.Controls.Add(this.hmilist); this.permin.Location = new System.Drawing.Point(11, 18);
this.groupBox10.Controls.Add(this.searchHMI); this.permin.Name = "permin";
this.groupBox10.Controls.Add(this.runbtn); this.permin.Size = new System.Drawing.Size(84, 16);
this.groupBox10.Controls.Add(this.CHmibtn); this.permin.TabIndex = 0;
this.groupBox10.Location = new System.Drawing.Point(9, 30); this.permin.Text = "每分钟记录";
this.groupBox10.Name = "groupBox10"; this.permin.UseVisualStyleBackColor = true;
this.groupBox10.Size = new System.Drawing.Size(476, 105);
this.groupBox10.TabIndex = 4;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "程序启停";
// //
// hmilist // groupBox3
// //
this.hmilist.FormattingEnabled = true; this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.hmilist.Location = new System.Drawing.Point(71, 26); this.groupBox3.Controls.Add(this.runbat);
this.hmilist.Name = "hmilist"; this.groupBox3.Controls.Add(this.runsingle);
this.hmilist.Size = new System.Drawing.Size(125, 20); this.groupBox3.Location = new System.Drawing.Point(22, 87);
this.hmilist.TabIndex = 3; this.groupBox3.Name = "groupBox3";
this.hmilist.Text = "请选择..."; this.groupBox3.Size = new System.Drawing.Size(449, 49);
this.hmilist.SelectedIndexChanged += new System.EventHandler(this.hmilist_SelectedIndexChanged); this.groupBox3.TabIndex = 6;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "开机自动运行";
// //
// searchHMI // runbat
// //
this.searchHMI.Location = new System.Drawing.Point(19, 24); this.runbat.AutoSize = true;
this.searchHMI.Name = "searchHMI"; this.runbat.Location = new System.Drawing.Point(11, 20);
this.searchHMI.Size = new System.Drawing.Size(46, 23); this.runbat.Name = "runbat";
this.searchHMI.TabIndex = 2; this.runbat.Size = new System.Drawing.Size(60, 16);
this.searchHMI.Text = "搜索"; this.runbat.TabIndex = 1;
this.searchHMI.UseVisualStyleBackColor = true; this.runbat.Tag = "2";
this.searchHMI.Click += new System.EventHandler(this.searchHMI_Click); this.runbat.Text = "批处理";
this.runbat.UseVisualStyleBackColor = true;
this.runbat.CheckedChanged += new System.EventHandler(this.Runbat_CheckedChanged);
// //
// runbtn // runsingle
// //
this.runbtn.Location = new System.Drawing.Point(202, 63); this.runsingle.AutoSize = true;
this.runbtn.Name = "runbtn"; this.runsingle.Location = new System.Drawing.Point(182, 20);
this.runbtn.Size = new System.Drawing.Size(161, 23); this.runsingle.Name = "runsingle";
this.runbtn.TabIndex = 1; this.runsingle.Size = new System.Drawing.Size(72, 16);
this.runbtn.Text = "打开HMI程序"; this.runsingle.TabIndex = 0;
this.runbtn.UseVisualStyleBackColor = true; this.runsingle.Tag = "0";
this.runbtn.Click += new System.EventHandler(this.runbtn_Click); this.runsingle.Text = "开启系统";
this.runsingle.UseVisualStyleBackColor = true;
this.runsingle.CheckedChanged += new System.EventHandler(this.Runsingle_CheckedChanged);
// //
// CHmibtn // groupBox4
// //
this.CHmibtn.Location = new System.Drawing.Point(19, 63); this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.CHmibtn.Name = "CHmibtn"; this.groupBox4.Controls.Add(this.appstartup);
this.CHmibtn.Size = new System.Drawing.Size(161, 23); this.groupBox4.Location = new System.Drawing.Point(22, 34);
this.CHmibtn.TabIndex = 0; this.groupBox4.Name = "groupBox4";
this.CHmibtn.Text = "关闭HMI程序"; this.groupBox4.Size = new System.Drawing.Size(113, 47);
this.CHmibtn.UseVisualStyleBackColor = true; this.groupBox4.TabIndex = 5;
this.CHmibtn.Click += new System.EventHandler(this.CHmibtn_Click); this.groupBox4.TabStop = false;
this.groupBox4.Text = "开机配置";
// //
// panel6 // radioButton9
// //
this.panel6.Controls.Add(this.groupBox11); this.radioButton9.AutoSize = true;
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.radioButton9.Location = new System.Drawing.Point(71, 19);
this.panel6.Location = new System.Drawing.Point(0, 0); this.radioButton9.Name = "radioButton9";
this.panel6.Name = "panel6"; this.radioButton9.Size = new System.Drawing.Size(59, 16);
this.panel6.Size = new System.Drawing.Size(498, 370); this.radioButton9.TabIndex = 1;
this.panel6.TabIndex = 4; this.radioButton9.TabStop = true;
this.radioButton9.Text = "实验版";
this.radioButton9.UseVisualStyleBackColor = true;
// //
// groupBox11 // radioButton8
// //
this.groupBox11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.radioButton8.AutoSize = true;
this.groupBox11.Controls.Add(this.textBox7); this.radioButton8.Location = new System.Drawing.Point(6, 20);
this.groupBox11.Controls.Add(this.textBox8); this.radioButton8.Name = "radioButton8";
this.groupBox11.Controls.Add(this.label15); this.radioButton8.Size = new System.Drawing.Size(59, 16);
this.groupBox11.Controls.Add(this.label16); this.radioButton8.TabIndex = 1;
this.groupBox11.Controls.Add(this.label17); this.radioButton8.TabStop = true;
this.groupBox11.Controls.Add(this.label18); this.radioButton8.Text = "在线版";
this.groupBox11.Location = new System.Drawing.Point(34, 139); this.radioButton8.UseVisualStyleBackColor = true;
this.groupBox11.Margin = new System.Windows.Forms.Padding(2);
this.groupBox11.Name = "groupBox11";
this.groupBox11.Padding = new System.Windows.Forms.Padding(2);
this.groupBox11.Size = new System.Drawing.Size(435, 67);
this.groupBox11.TabIndex = 13;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "历史数据";
// //
// textBox7 // appstartup
// //
this.textBox7.Location = new System.Drawing.Point(243, 33); this.appstartup.AutoSize = true;
this.textBox7.Margin = new System.Windows.Forms.Padding(2); this.appstartup.Location = new System.Drawing.Point(11, 20);
this.textBox7.Name = "textBox7"; this.appstartup.Name = "appstartup";
this.textBox7.Size = new System.Drawing.Size(76, 21); this.appstartup.Size = new System.Drawing.Size(84, 16);
this.textBox7.TabIndex = 5; this.appstartup.TabIndex = 0;
this.appstartup.Text = "开机自启动";
this.appstartup.UseVisualStyleBackColor = true;
// //
// textBox8 // panel4
// //
this.textBox8.Location = new System.Drawing.Point(64, 33); this.panel4.Controls.Add(this.splitContainer1);
this.textBox8.Margin = new System.Windows.Forms.Padding(2); this.panel4.Location = new System.Drawing.Point(12, 12);
this.textBox8.Name = "textBox8"; this.panel4.Name = "panel4";
this.textBox8.Size = new System.Drawing.Size(76, 21); this.panel4.Size = new System.Drawing.Size(756, 372);
this.textBox8.TabIndex = 4; this.panel4.TabIndex = 3;
// //
// label15 // button1
// //
this.label15.AutoSize = true; this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label15.Location = new System.Drawing.Point(324, 37); this.button1.Location = new System.Drawing.Point(573, 400);
this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.button1.Name = "button1";
this.label15.Name = "label15"; this.button1.Size = new System.Drawing.Size(75, 23);
this.label15.Size = new System.Drawing.Size(17, 12); this.button1.TabIndex = 4;
this.label15.TabIndex = 3; this.button1.Text = "确认";
this.label15.Text = "月"; this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.Button1_Click);
// //
// label16 // button2
// //
this.label16.AutoSize = true; this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label16.Location = new System.Drawing.Point(194, 38); this.button2.Location = new System.Drawing.Point(688, 400);
this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.button2.Name = "button2";
this.label16.Name = "label16"; this.button2.Size = new System.Drawing.Size(75, 23);
this.label16.Size = new System.Drawing.Size(53, 12); this.button2.TabIndex = 4;
this.label16.TabIndex = 2; this.button2.Text = "取消";
this.label16.Text = "保存期限"; this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.Button2_Click);
// //
// label17 // groupBox12
// //
this.label17.AutoSize = true; this.groupBox12.Controls.Add(this.textBox9);
this.label17.Location = new System.Drawing.Point(146, 37); this.groupBox12.Controls.Add(this.label19);
this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.groupBox12.Controls.Add(this.radioButton8);
this.label17.Name = "label17"; this.groupBox12.Controls.Add(this.radioButton9);
this.label17.Size = new System.Drawing.Size(17, 12); this.groupBox12.Location = new System.Drawing.Point(142, 34);
this.label17.TabIndex = 1; this.groupBox12.Name = "groupBox12";
this.label17.Text = "MB"; this.groupBox12.Size = new System.Drawing.Size(329, 47);
this.groupBox12.TabIndex = 9;
this.groupBox12.TabStop = false;
this.groupBox12.Text = "名称配置";
// //
// label18 // label19
// //
this.label18.AutoSize = true; this.label19.AutoSize = true;
this.label18.Location = new System.Drawing.Point(9, 38); this.label19.Location = new System.Drawing.Point(148, 22);
this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label19.Name = "label19";
this.label18.Name = "label18"; this.label19.Size = new System.Drawing.Size(77, 12);
this.label18.Size = new System.Drawing.Size(53, 12); this.label19.TabIndex = 2;
this.label18.TabIndex = 0; this.label19.Text = "自定义名称：";
this.label18.Text = "预留空间"; //
// textBox9
//
this.textBox9.Location = new System.Drawing.Point(223, 15);
this.textBox9.Name = "textBox9";
this.textBox9.Size = new System.Drawing.Size(100, 21);
this.textBox9.TabIndex = 3;
// //
// SysConfig // SysConfig
// //
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(777, 432); this.ClientSize = new System.Drawing.Size(780, 435);
this.Controls.Add(this.button2); this.Controls.Add(this.button2);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.panel4); this.Controls.Add(this.panel4);
...@@ -1015,6 +1034,18 @@ ...@@ -1015,6 +1034,18 @@
this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false); this.splitContainer1.ResumeLayout(false);
this.panel5.ResumeLayout(false);
this.groupBox8.ResumeLayout(false);
this.groupBox8.PerformLayout();
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
this.groupBox10.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.groupBox11.ResumeLayout(false);
this.groupBox11.PerformLayout();
this.panel3.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.groupBox6.ResumeLayout(false); this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout(); this.groupBox6.PerformLayout();
...@@ -1026,19 +1057,9 @@ ...@@ -1026,19 +1057,9 @@
this.groupBox3.PerformLayout(); this.groupBox3.PerformLayout();
this.groupBox4.ResumeLayout(false); this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout(); this.groupBox4.PerformLayout();
this.panel3.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel4.ResumeLayout(false); this.panel4.ResumeLayout(false);
this.panel5.ResumeLayout(false); this.groupBox12.ResumeLayout(false);
this.groupBox8.ResumeLayout(false); this.groupBox12.PerformLayout();
this.groupBox8.PerformLayout();
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
this.groupBox10.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.groupBox11.ResumeLayout(false);
this.groupBox11.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -1049,7 +1070,6 @@ ...@@ -1049,7 +1070,6 @@
private System.Windows.Forms.CheckBox checkBox2; private System.Windows.Forms.CheckBox checkBox2;
private System.Windows.Forms.CheckBox checkBox3; private System.Windows.Forms.CheckBox checkBox3;
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.RadioButton radioButton3; private System.Windows.Forms.RadioButton radioButton3;
private System.Windows.Forms.RadioButton radioButton2; private System.Windows.Forms.RadioButton radioButton2;
...@@ -1124,5 +1144,8 @@ ...@@ -1124,5 +1144,8 @@
private System.Windows.Forms.Label label16; private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label17; private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label18;
private System.Windows.Forms.GroupBox groupBox12;
private System.Windows.Forms.TextBox textBox9;
private System.Windows.Forms.Label label19;
} }
} }
\ No newline at end of file
GcDevicePc/SysConfig.cs
View file @ 8aecd92c
...@@ -130,31 +130,33 @@ namespace GcDevicePc ...@@ -130,31 +130,33 @@ namespace GcDevicePc
string hmi_log = ini.ReadString("Logs", "HmiLog"); string hmi_log = ini.ReadString("Logs", "HmiLog");
int Version = ini.ReadInteger("Version", "VersionType"); int Version = ini.ReadInteger("Version", "VersionType");
string appname = ini.ReadString("Version", "AppName");
string uname = ini.ReadString("User", "Name"); string uname = ini.ReadString("User", "Name");
string upwd = ini.ReadString("User", "Password"); string upwd = ini.ReadString("User", "Password");
int dsf = ini.ReadInteger("SendData", "Thirdparty"); int dsf = ini.ReadInteger("SendData", "Thirdparty");
int dw = ini.ReadInteger("SendData", "Foreign"); int dw = ini.ReadInteger("SendData", "Foreign");
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData"); int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
int appname = ini.ReadInteger("AppName", "AName");
int fi = ini.ReadInteger("StartUp", "Forceintegral"); int fi = ini.ReadInteger("StartUp", "Forceintegral");
string sp = ini.ReadString("StartUp", "space"); string sp = ini.ReadString("StartUp", "space");
string dt = ini.ReadString("StartUp", "Datetime"); string dt = ini.ReadString("StartUp", "Datetime");
switch (appname) switch (Version)
{ {
case 0: case 0:
radioButton8.Checked = true; radioButton9.Checked = true;
break; break;
case 1: case 1:
radioButton9.Checked = true; radioButton8.Checked = true;
break; break;
default: default:
radioButton8.Checked = true; radioButton8.Checked = true;
break; break;
} }
this.textBox9.Text = appname;
if (Convert.ToInt32(value) == 1) if (Convert.ToInt32(value) == 1)
{ {
this.appstartup.Checked = true; this.appstartup.Checked = true;
...@@ -194,14 +196,14 @@ namespace GcDevicePc ...@@ -194,14 +196,14 @@ namespace GcDevicePc
this.permin.Checked = true; this.permin.Checked = true;
} }
if (Version == 1) //if (Version == 1)
{ //{
this.checkBox1.Checked = true; // this.checkBox1.Checked = true;
} //}
else //else
{ //{
this.checkBox1.Checked = false; // this.checkBox1.Checked = false;
} //}
textBox1.Text = uname; textBox1.Text = uname;
textBox2.Text = upwd; textBox2.Text = upwd;
...@@ -315,6 +317,17 @@ namespace GcDevicePc ...@@ -315,6 +317,17 @@ namespace GcDevicePc
ini.WriteString("StartUp", "Forceintegral", "0"); ini.WriteString("StartUp", "Forceintegral", "0");
} }
if (radioButton8.Checked)
{
ini.WriteString("Version", "VersionType", "1");
}
else if (radioButton9.Checked)
{
ini.WriteString("Version", "VersionType", "0");
}
ini.WriteString("Version", "AppName", this.textBox9.Text);
if (this.permin.Checked) if (this.permin.Checked)
{ {
ini.WriteString("Logs", "HmiLog", "1"); ini.WriteString("Logs", "HmiLog", "1");
...@@ -334,24 +347,6 @@ namespace GcDevicePc ...@@ -334,24 +347,6 @@ namespace GcDevicePc
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.error_log = false; globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.error_log = false;
} }
if (checkBox1.Checked)
{
ini.WriteString("Version", "VersionType", "1");
}
else
{
ini.WriteString("Version", "VersionType", "0");
}
if (radioButton8.Checked)
{
ini.WriteString("AppName", "AName", "0");
}
else if (radioButton9.Checked)
{
ini.WriteString("AppName", "AName", "1");
}
if (radioButton1.Checked) if (radioButton1.Checked)
{ {
ini.WriteString("SendData", "Thirdparty", "1");//zb ini.WriteString("SendData", "Thirdparty", "1");//zb
...@@ -727,12 +722,12 @@ namespace GcDevicePc ...@@ -727,12 +722,12 @@ namespace GcDevicePc
} }
else else
{ {
this.label4.Text = ipos.ToString() + "/100"; this.label13.Text = ipos.ToString() + "/100";
this.progressBar1.Value = Convert.ToInt32(ipos); this.progressBar1.Value = Convert.ToInt32(ipos);
if (ipos == 100 || send_ok) if (ipos == 100 || send_ok)
{ {
this.label4.Text = "传输完成"; this.label13.Text = "传输完成";
this.runbtn.Enabled = true; this.runbtn.Enabled = true;
this.chosenbtn.Enabled = true; this.chosenbtn.Enabled = true;
this.updatebtn.Enabled = true; this.updatebtn.Enabled = true;
...@@ -853,12 +848,12 @@ namespace GcDevicePc ...@@ -853,12 +848,12 @@ namespace GcDevicePc
} }
else else
{ {
this.label6.Text = ipos.ToString() + "/100"; this.label11.Text = ipos.ToString() + "/100";
this.progressBar2.Value = Convert.ToInt32(ipos); this.progressBar2.Value = Convert.ToInt32(ipos);
if (ipos == 100) if (ipos == 100)
{ {
this.label7.Text = "更新完成..."; this.label10.Text = "更新完成...";
} }
} }
} }
......
GcDevicePc/auxtool.cs
View file @ 8aecd92c
...@@ -25,8 +25,8 @@ namespace GcDevicePc ...@@ -25,8 +25,8 @@ namespace GcDevicePc
public delegate void Adjust_SW(int val); public delegate void Adjust_SW(int val);
public partial class auxtool : Form public partial class auxtool : Form
{ {
private string HmiIP = null; //private string HmiIP = null;
private ushort HmiPort = 911; //private ushort HmiPort = 911;
private ArrayList SearchRet = new ArrayList(); private ArrayList SearchRet = new ArrayList();
public auxtool() public auxtool()
......
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