Skip to content

G
GC_Branch
Commit 0213af2e authored by liu's avatar liu
Browse files
Options

解决cpu占用率问题，检测器温度信号分开，和仪器方法中的信号配置出错问题

parent c3f8262d
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 196 deletions
GcDevicePc/ConfigMethod/SignalTab.cs
View file @ 0213af2e
......@@ -28,7 +28,7 @@ namespace GcDevicePc.ConfigMethod
{
cleanALLItem();
addALLItem("无");
if (this.hwconfig.hwconfiginfo.u16DetFront == 1)
//if (this.hwconfig.hwconfiginfo.u16DetFront == 1)
{
if (this.hwconfig.hwconfiginfo.u16DetFrontType == 0) //TCD
{
......@@ -41,7 +41,7 @@ namespace GcDevicePc.ConfigMethod
}
if (this.hwconfig.hwconfiginfo.u16DetInter == 1)
//if (this.hwconfig.hwconfiginfo.u16DetInter == 1)
{
if (this.hwconfig.hwconfiginfo.u16DetInterType == 0) //TCD
{
......@@ -54,7 +54,7 @@ namespace GcDevicePc.ConfigMethod
}
if (this.hwconfig.hwconfiginfo.u16DetBehind == 1)
//if (this.hwconfig.hwconfiginfo.u16DetBehind == 1)
{
if (this.hwconfig.hwconfiginfo.u16DetBehindType == 0) //TCD
{
......
GcDevicePc/DataState.cs
View file @ 0213af2e
......@@ -1395,11 +1395,12 @@ namespace GcDevicePc
}
if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
//if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp != 0.0f)
//if (globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp != 0.0f)
{
tempshow = new ListViewItem();
if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0) //TCD
......@@ -1452,11 +1453,12 @@ namespace GcDevicePc
}
if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
//if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp != 0.0f)
//if (globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp != 0.0f)
{
//tempshow.SubItems.Add(IsException(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp) + " / " + "未定义");
tempshow = new ListViewItem();
......@@ -1896,7 +1898,7 @@ namespace GcDevicePc
//tempshow = new ListViewItem();
//this.datalist.Items.Add(tempshow);
if (CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
//if (CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
{
if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
{
......@@ -2017,13 +2019,13 @@ namespace GcDevicePc
//tempshow = new ListViewItem();
//this.datalist.Items.Add(tempshow);
if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
//if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
{
if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
{
//if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 0 &&
// CProfileDevice.m_DevParam.tcd[2].u16HeaterSel > 0) //TCD
if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 00) //TCD
if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 0) //TCD
{
tempshow = new ListViewItem();
tempshow.Text = "TCD3";
......
GcDevicePc/MDIBase.Designer.cs
View file @ 0213af2e
......@@ -40,6 +40,7 @@
this.AuxToolMenu = new System.Windows.Forms.ToolStripMenuItem();
this.ParameterSettingMenu = new System.Windows.Forms.ToolStripMenuItem();
this.自动校准ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sysconfigp = new System.Windows.Forms.ToolStripMenuItem();
this.SettingMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.NetWorkMenu = new System.Windows.Forms.ToolStripMenuItem();
this.MethodBatMenu = new System.Windows.Forms.ToolStripMenuItem();
......@@ -75,7 +76,6 @@
this.AdjustStat = new System.Windows.Forms.ToolStripStatusLabel();
this.workProgress = new System.Windows.Forms.ToolStripProgressBar();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.sysconfigp = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip.SuspendLayout();
this.statusStrip.SuspendLayout();
this.SuspendLayout();
......@@ -137,38 +137,45 @@
// SystemStartMenu
//
this.SystemStartMenu.Name = "SystemStartMenu";
this.SystemStartMenu.Size = new System.Drawing.Size(180, 26);
this.SystemStartMenu.Size = new System.Drawing.Size(144, 26);
this.SystemStartMenu.Text = "系统开启";
this.SystemStartMenu.Click += new System.EventHandler(this.SystemStartMenu_Click);
//
// SystemStopMenu
//
this.SystemStopMenu.Name = "SystemStopMenu";
this.SystemStopMenu.Size = new System.Drawing.Size(180, 26);
this.SystemStopMenu.Size = new System.Drawing.Size(144, 26);
this.SystemStopMenu.Text = "系统关闭";
this.SystemStopMenu.Click += new System.EventHandler(this.SystemStopMenu_Click);
//
// AuxToolMenu
//
this.AuxToolMenu.Name = "AuxToolMenu";
this.AuxToolMenu.Size = new System.Drawing.Size(180, 26);
this.AuxToolMenu.Size = new System.Drawing.Size(144, 26);
this.AuxToolMenu.Text = "辅助工具";
this.AuxToolMenu.Click += new System.EventHandler(this.AuxToolMenu_Click);
//
// ParameterSettingMenu
//
this.ParameterSettingMenu.Name = "ParameterSettingMenu";
this.ParameterSettingMenu.Size = new System.Drawing.Size(180, 26);
this.ParameterSettingMenu.Size = new System.Drawing.Size(144, 26);
this.ParameterSettingMenu.Text = "参数设置";
this.ParameterSettingMenu.Click += new System.EventHandler(this.ParameterSettingMenu_Click);
//
// 自动校准ToolStripMenuItem
//
this.自动校准ToolStripMenuItem.Name = "自动校准ToolStripMenuItem";
this.自动校准ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.自动校准ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.自动校准ToolStripMenuItem.Text = "系统校准";
this.自动校准ToolStripMenuItem.Click += new System.EventHandler(this.自动校准ToolStripMenuItem_Click);
//
// sysconfigp
//
this.sysconfigp.Name = "sysconfigp";
this.sysconfigp.Size = new System.Drawing.Size(144, 26);
this.sysconfigp.Text = "选项";
this.sysconfigp.Click += new System.EventHandler(this.系统配置ToolStripMenuItem_Click);
//
// SettingMainMenu
//
this.SettingMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
......@@ -187,47 +194,47 @@
// NetWorkMenu
//
this.NetWorkMenu.Name = "NetWorkMenu";
this.NetWorkMenu.Size = new System.Drawing.Size(180, 26);
this.NetWorkMenu.Size = new System.Drawing.Size(176, 26);
this.NetWorkMenu.Text = "通讯设置";
this.NetWorkMenu.Click += new System.EventHandler(this.NetWorkMenu_Click);
//
// MethodBatMenu
//
this.MethodBatMenu.Name = "MethodBatMenu";
this.MethodBatMenu.Size = new System.Drawing.Size(180, 26);
this.MethodBatMenu.Size = new System.Drawing.Size(176, 26);
this.MethodBatMenu.Text = "方法批处理";
this.MethodBatMenu.Click += new System.EventHandler(this.MethodBatMenu_Click);
//
// NewMethodMenu
//
this.NewMethodMenu.Name = "NewMethodMenu";
this.NewMethodMenu.Size = new System.Drawing.Size(180, 26);
this.NewMethodMenu.Size = new System.Drawing.Size(176, 26);
this.NewMethodMenu.Text = "新建方法";
this.NewMethodMenu.Click += new System.EventHandler(this.NewMethodMenu_Click);
//
// OpenMethodMenu
//
this.OpenMethodMenu.Name = "OpenMethodMenu";
this.OpenMethodMenu.Size = new System.Drawing.Size(180, 26);
this.OpenMethodMenu.Size = new System.Drawing.Size(176, 26);
this.OpenMethodMenu.Text = "打开方法文件";
this.OpenMethodMenu.Click += new System.EventHandler(this.OpenMethodMenu_Click);
//
// MethodBrowseMenuItem
//
this.MethodBrowseMenuItem.Name = "MethodBrowseMenuItem";
this.MethodBrowseMenuItem.Size = new System.Drawing.Size(180, 26);
this.MethodBrowseMenuItem.Size = new System.Drawing.Size(176, 26);
this.MethodBrowseMenuItem.Text = "方法查阅";
this.MethodBrowseMenuItem.Click += new System.EventHandler(this.MethodBrowseMenuItem_Click);
//
// SettingSeparator
//
this.SettingSeparator.Name = "SettingSeparator";
this.SettingSeparator.Size = new System.Drawing.Size(177, 6);
this.SettingSeparator.Size = new System.Drawing.Size(173, 6);
//
// GCConfigMenuItem
//
this.GCConfigMenuItem.Name = "GCConfigMenuItem";
this.GCConfigMenuItem.Size = new System.Drawing.Size(180, 26);
this.GCConfigMenuItem.Size = new System.Drawing.Size(176, 26);
this.GCConfigMenuItem.Text = "仪器配置";
this.GCConfigMenuItem.Click += new System.EventHandler(this.ConfigCreateSubMenuItem_Click);
//
......@@ -246,28 +253,28 @@
// HistoryDataMenu
//
this.HistoryDataMenu.Name = "HistoryDataMenu";
this.HistoryDataMenu.Size = new System.Drawing.Size(180, 26);
this.HistoryDataMenu.Size = new System.Drawing.Size(144, 26);
this.HistoryDataMenu.Text = "数据查询";
this.HistoryDataMenu.Click += new System.EventHandler(this.HistoryDataMenu_Click);
//
// CalibrationMenu
//
this.CalibrationMenu.Name = "CalibrationMenu";
this.CalibrationMenu.Size = new System.Drawing.Size(180, 26);
this.CalibrationMenu.Size = new System.Drawing.Size(144, 26);
this.CalibrationMenu.Text = "数据校准";
this.CalibrationMenu.Click += new System.EventHandler(this.CalibrationMenu_Click);
//
// HistoryPicMenu
//
this.HistoryPicMenu.Name = "HistoryPicMenu";
this.HistoryPicMenu.Size = new System.Drawing.Size(180, 26);
this.HistoryPicMenu.Size = new System.Drawing.Size(144, 26);
this.HistoryPicMenu.Text = "历史谱图";
this.HistoryPicMenu.Click += new System.EventHandler(this.HistoryPicMenu_Click);
//
// 数据路径ToolStripMenuItem
//
this.数据路径ToolStripMenuItem.Name = "数据路径ToolStripMenuItem";
this.数据路径ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.数据路径ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.数据路径ToolStripMenuItem.Text = "数据路径";
this.数据路径ToolStripMenuItem.Click += new System.EventHandler(this.数据路径ToolStripMenuItem_Click);
//
......@@ -288,7 +295,7 @@
this.SingleStop,
this.SingleCancel});
this.SingleControlMenu.Name = "SingleControlMenu";
this.SingleControlMenu.Size = new System.Drawing.Size(180, 26);
this.SingleControlMenu.Size = new System.Drawing.Size(176, 26);
this.SingleControlMenu.Text = "单次流程控制";
//
// SingleStart
......@@ -315,7 +322,7 @@
// testToolStripMenuItem
//
this.testToolStripMenuItem.Name = "testToolStripMenuItem";
this.testToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.testToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.testToolStripMenuItem.Text = "test";
this.testToolStripMenuItem.Visible = false;
this.testToolStripMenuItem.Click += new System.EventHandler(this.TestToolStripMenuItem_Click);
......@@ -334,14 +341,14 @@
// AboutMenu
//
this.AboutMenu.Name = "AboutMenu";
this.AboutMenu.Size = new System.Drawing.Size(180, 26);
this.AboutMenu.Size = new System.Drawing.Size(144, 26);
this.AboutMenu.Text = "关于";
this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click);
//
// changeVsi
//
this.changeVsi.Name = "changeVsi";
this.changeVsi.Size = new System.Drawing.Size(180, 26);
this.changeVsi.Size = new System.Drawing.Size(144, 26);
this.changeVsi.Text = "切换版本";
this.changeVsi.Visible = false;
this.changeVsi.Click += new System.EventHandler(this.changeVsi_Click);
......@@ -349,7 +356,7 @@
// 单位换算ToolStripMenuItem
//
this.单位换算ToolStripMenuItem.Name = "单位换算ToolStripMenuItem";
this.单位换算ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.单位换算ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.单位换算ToolStripMenuItem.Text = "单位换算";
this.单位换算ToolStripMenuItem.Click += new System.EventHandler(this.单位换算ToolStripMenuItem_Click);
//
......@@ -448,13 +455,6 @@
this.timer2.Interval = 1000;
this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
//
// sysconfigp
//
this.sysconfigp.Name = "sysconfigp";
this.sysconfigp.Size = new System.Drawing.Size(180, 26);
this.sysconfigp.Text = "选项";
this.sysconfigp.Click += new System.EventHandler(this.系统配置ToolStripMenuItem_Click);
//
// MDIBase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
GcDevicePc/ProThread/SendDataToZB.cs
View file @ 0213af2e
......@@ -365,7 +365,7 @@ namespace GcDevicePc.ProThread
//int i = 0;
bool runflag = false;
while (true)
while (!datamre.WaitOne(500))
{
if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && methodconfig != null && run_stop != true)
//if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && globaldata.m_hmibuffer.gcinfo.hmistatus == 4 && run_stop != true)
......
GcDevicePc/ProThread/SignalDataToHw.cs
View file @ 0213af2e
......@@ -291,7 +291,7 @@ namespace GcDevicePc.ProThread
ushort SendNumB = 0;
//int i = 0;
bool runflag = false;
while (true)
while (!datamre.WaitOne(500))
{
if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && methodconfig != null && run_stop != true)
//if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && globaldata.m_hmibuffer.gcinfo.hmistatus == 4 && run_stop != true)
......
GcDevicePc/SysConfig.Designer.cs
View file @ 0213af2e
......@@ -39,14 +39,7 @@
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.listBox1 = new System.Windows.Forms.ListBox();
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
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.panel3 = new System.Windows.Forms.Panel();
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();
......@@ -54,13 +47,20 @@
this.runsingle = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.appstartup = new System.Windows.Forms.CheckBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
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.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
......@@ -68,12 +68,12 @@
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.panel3.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
this.panel4.SuspendLayout();
this.SuspendLayout();
//
......@@ -224,94 +224,22 @@
this.panel1.Size = new System.Drawing.Size(495, 362);
this.panel1.TabIndex = 3;
//
// panel2
//
this.panel2.Controls.Add(this.label6);
this.panel2.Controls.Add(this.label5);
this.panel2.Controls.Add(this.label4);
this.panel2.Controls.Add(this.textBox3);
this.panel2.Controls.Add(this.textBox2);
this.panel2.Controls.Add(this.textBox1);
this.panel2.Controls.Add(this.label3);
this.panel2.Controls.Add(this.label2);
this.panel2.Controls.Add(this.label1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(495, 362);
this.panel2.TabIndex = 3;
//
// textBox3
//
this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.textBox3.Location = new System.Drawing.Point(256, 109);
this.textBox3.Name = "textBox3";
this.textBox3.PasswordChar = '*';
this.textBox3.Size = new System.Drawing.Size(164, 21);
this.textBox3.TabIndex = 1;
this.textBox3.TextChanged += new System.EventHandler(this.TextBox3_TextChanged);
//
// textBox2
//
this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.textBox2.Location = new System.Drawing.Point(256, 70);
this.textBox2.Name = "textBox2";
this.textBox2.PasswordChar = '*';
this.textBox2.Size = new System.Drawing.Size(164, 21);
this.textBox2.TabIndex = 1;
this.textBox2.TextChanged += new System.EventHandler(this.TextBox2_TextChanged);
//
// textBox1
//
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.textBox1.Location = new System.Drawing.Point(256, 33);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(164, 21);
this.textBox1.TabIndex = 1;
this.textBox1.TextChanged += new System.EventHandler(this.TextBox1_TextChanged);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(26, 118);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 12);
this.label3.TabIndex = 0;
this.label3.Text = "确认密码：";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(26, 78);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.TabIndex = 0;
this.label2.Text = "密码：";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(26, 42);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 0;
this.label1.Text = "账号：";
//
// panel3
// groupBox5
//
this.panel3.Controls.Add(this.groupBox1);
this.panel3.Controls.Add(this.groupBox2);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 0);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(495, 362);
this.panel3.TabIndex = 3;
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.checkBox1);
this.groupBox5.Location = new System.Drawing.Point(22, 191);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(445, 47);
this.groupBox5.TabIndex = 7;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "杂项";
//
// groupBox7
//
this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox7.Controls.Add(this.permin);
this.groupBox7.Location = new System.Drawing.Point(22, 192);
this.groupBox7.Location = new System.Drawing.Point(22, 138);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(445, 47);
this.groupBox7.TabIndex = 7;
......@@ -333,7 +261,7 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.runbat);
this.groupBox3.Controls.Add(this.runsingle);
this.groupBox3.Location = new System.Drawing.Point(22, 137);
this.groupBox3.Location = new System.Drawing.Point(22, 83);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(445, 49);
this.groupBox3.TabIndex = 6;
......@@ -366,7 +294,7 @@
//
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox4.Controls.Add(this.appstartup);
this.groupBox4.Location = new System.Drawing.Point(22, 84);
this.groupBox4.Location = new System.Drawing.Point(22, 30);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(445, 47);
this.groupBox4.TabIndex = 5;
......@@ -383,16 +311,127 @@
this.appstartup.Text = "开机自启动";
this.appstartup.UseVisualStyleBackColor = true;
//
// groupBox5
// panel3
//
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.checkBox1);
this.groupBox5.Location = new System.Drawing.Point(22, 245);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(445, 47);
this.groupBox5.TabIndex = 7;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "杂项";
this.panel3.Controls.Add(this.groupBox1);
this.panel3.Controls.Add(this.groupBox2);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 0);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(495, 362);
this.panel3.TabIndex = 3;
//
// panel2
//
this.panel2.Controls.Add(this.label6);
this.panel2.Controls.Add(this.label5);
this.panel2.Controls.Add(this.label4);
this.panel2.Controls.Add(this.textBox3);
this.panel2.Controls.Add(this.textBox2);
this.panel2.Controls.Add(this.textBox1);
this.panel2.Controls.Add(this.label3);
this.panel2.Controls.Add(this.label2);
this.panel2.Controls.Add(this.label1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(495, 362);
this.panel2.TabIndex = 3;
//
// label6
//
this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Red;
this.label6.Location = new System.Drawing.Point(426, 118);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(41, 12);
this.label6.TabIndex = 2;
this.label6.Text = "label4";
this.label6.Visible = false;
//
// label5
//
this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Red;
this.label5.Location = new System.Drawing.Point(427, 78);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(41, 12);
this.label5.TabIndex = 2;
this.label5.Text = "label4";
this.label5.Visible = false;
//
// label4
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Red;
this.label4.Location = new System.Drawing.Point(428, 41);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(41, 12);
this.label4.TabIndex = 2;
this.label4.Text = "label4";
this.label4.Visible = false;
//
// textBox3
//
this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.textBox3.Location = new System.Drawing.Point(256, 109);
this.textBox3.Name = "textBox3";
this.textBox3.PasswordChar = '*';
this.textBox3.Size = new System.Drawing.Size(164, 21);
this.textBox3.TabIndex = 1;
this.textBox3.TextChanged += new System.EventHandler(this.TextBox3_TextChanged);
//
// textBox2
//
this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.textBox2.Location = new System.Drawing.Point(256, 70);
this.textBox2.Name = "textBox2";
this.textBox2.PasswordChar = '*';
this.textBox2.Size = new System.Drawing.Size(164, 21);
this.textBox2.TabIndex = 1;
this.textBox2.TextChanged += new System.EventHandler(this.TextBox2_TextChanged);
//
// textBox1
//
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.textBox1.Location = new System.Drawing.Point(256, 33);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(164, 21);
this.textBox1.TabIndex = 1;
this.textBox1.TextChanged += new System.EventHandler(this.TextBox1_TextChanged);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(26, 118);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 12);
this.label3.TabIndex = 0;
this.label3.Text = "确认密码：";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(26, 78);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.TabIndex = 0;
this.label2.Text = "密码：";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(26, 42);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 0;
this.label1.Text = "账号：";
//
// panel4
//
......@@ -427,45 +466,6 @@
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.Button2_Click);
//
// label4
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Red;
this.label4.Location = new System.Drawing.Point(428, 41);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(41, 12);
this.label4.TabIndex = 2;
this.label4.Text = "label4";
this.label4.Visible = false;
//
// label5
//
this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Red;
this.label5.Location = new System.Drawing.Point(427, 78);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(41, 12);
this.label5.TabIndex = 2;
this.label5.Text = "label4";
this.label5.Visible = false;
//
// label6
//
this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Red;
this.label6.Location = new System.Drawing.Point(426, 118);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(41, 12);
this.label6.TabIndex = 2;
this.label6.Text = "label4";
this.label6.Visible = false;
//
// SysConfig
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -486,17 +486,17 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel3.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.panel3.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel4.ResumeLayout(false);
this.ResumeLayout(false);
......
GcDevicePc/SysConfig.cs
View file @ 0213af2e
......@@ -49,7 +49,7 @@ namespace GcDevicePc
private void ListBox1_MeasureItem(object sender, MeasureItemEventArgs e)
{
e.ItemHeight = e.ItemHeight + 12;
e.ItemHeight += 12;
}
private void ListBox1_SelectedIndexChanged(object sender, EventArgs e)
......
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