Skip to content

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

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

parent d6ea31fd
Expand all Hide 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 @@
// cBox加热器
//
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加热器.Name = "cBox加热器";
this.cBox加热器.Size = new System.Drawing.Size(60, 16);
this.cBox加热器.TabIndex = 1;
this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
//
// label16
//
......
GcDevicePc/ConfigMethod/PortTab.Designer.cs
View file @ 8aecd92c
......@@ -106,15 +106,12 @@
// cBox加热器
//
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加热器.Name = "cBox加热器";
this.cBox加热器.Size = new System.Drawing.Size(60, 16);
this.cBox加热器.TabIndex = 2;
this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
//
// label2
//
......
GcDevicePc/ConfigMethod/TCD.Designer.cs
View file @ 8aecd92c
......@@ -171,15 +171,12 @@
// cBox加热器
//
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加热器.Name = "cBox加热器";
this.cBox加热器.Size = new System.Drawing.Size(60, 16);
this.cBox加热器.TabIndex = 1;
this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
//
// label描述
//
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.Designer.cs
View file @ 8aecd92c
......@@ -74,8 +74,6 @@
// cbHeater
//
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.Location = new System.Drawing.Point(99, 155);
this.cbHeater.Name = "cbHeater";
......@@ -83,7 +81,6 @@
this.cbHeater.TabIndex = 3;
this.cbHeater.Text = "加热器";
this.cbHeater.UseVisualStyleBackColor = true;
this.cbHeater.Visible = false;
//
// txtHeater
//
......
GcDevicePc/DataState.cs
View file @ 8aecd92c
......@@ -1338,7 +1338,7 @@ namespace GcDevicePc
{
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();
if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD
......
GcDevicePc/GCBuffer/PCBuffer.cs
View file @ 8aecd92c
......@@ -157,14 +157,14 @@ namespace GcDevicePc.GCBuffer
int dsf = ini.ReadInteger("SendData", "Thirdparty");
int dw = ini.ReadInteger("SendData", "Foreign");
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
int apname = ini.ReadInteger("AppName", "AName");
string apname = ini.ReadString("Version", "AppName");
int fi = ini.ReadInteger("StartUp", "Forceintegral");
globaldata.UserName = uname;
globaldata.UserPwd = upwd;
globaldata.CurrentVersion = Version;
globaldata.Foreign = dw;
globaldata.ZbDataSave = sdzb == 0 ? false : true;
globaldata.AppName = apname == 0 ? "Vocs在线色谱软件" : "TetChrom色谱软件";
globaldata.AppName = apname;
gcpcinfo.pcworkinfo.hmimac = ini.ReadString("NetWorkConfig", "MAC地址");
CKVocAnalyzer.GlobalCKV.vocAlgorithm.Forceintegral = fi == 1 ? true : false;
......
GcDevicePc/IniParam/IniOp.cs
View file @ 8aecd92c
......@@ -1084,6 +1084,5 @@ namespace GcDevicePc.IniParam
return true;
}
}//class
}//namespace
GcDevicePc/MDIBase.cs
View file @ 8aecd92c
......@@ -1088,7 +1088,6 @@ namespace GcDevicePc
}
catch
{
Log.Error("System Init Failed");
}
......@@ -1726,7 +1725,7 @@ namespace GcDevicePc
try
{
this.Dispose();
System.Diagnostics.Process.GetCurrentProcess().Kill();
Process.GetCurrentProcess().Kill();
}
catch
{
......@@ -1782,7 +1781,7 @@ namespace GcDevicePc
try
{
this.Dispose();
System.Diagnostics.Process.GetCurrentProcess().Kill();
Process.GetCurrentProcess().Kill();
}
catch
{
......
GcDevicePc/MainForm.Designer.cs
View file @ 8aecd92c
......@@ -39,7 +39,7 @@
this.ClientSize = new System.Drawing.Size(1008, 730);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "MainForm";
this.Text = "Tetchrom色谱工作站-1.5.5 用户界面";
this.Text = "用户界面";
this.ResumeLayout(false);
this.PerformLayout();
......
GcDevicePc/Program.cs
View file @ 8aecd92c
......@@ -12,7 +12,7 @@ namespace GcDevicePc
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
bool createNew;
//Application.Run(new Compound());
//Application.Run(new SysConfig());
{
using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
{
......
GcDevicePc/SysConfig.Designer.cs
View file @ 8aecd92c
This diff is collapsed.
GcDevicePc/SysConfig.cs
View file @ 8aecd92c
......@@ -130,31 +130,33 @@ namespace GcDevicePc
string hmi_log = ini.ReadString("Logs", "HmiLog");
int Version = ini.ReadInteger("Version", "VersionType");
string appname = ini.ReadString("Version", "AppName");
string uname = ini.ReadString("User", "Name");
string upwd = ini.ReadString("User", "Password");
int dsf = ini.ReadInteger("SendData", "Thirdparty");
int dw = ini.ReadInteger("SendData", "Foreign");
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
int appname = ini.ReadInteger("AppName", "AName");
int fi = ini.ReadInteger("StartUp", "Forceintegral");
string sp = ini.ReadString("StartUp", "space");
string dt = ini.ReadString("StartUp", "Datetime");
switch (appname)
switch (Version)
{
case 0:
radioButton8.Checked = true;
radioButton9.Checked = true;
break;
case 1:
radioButton9.Checked = true;
radioButton8.Checked = true;
break;
default:
radioButton8.Checked = true;
break;
}
this.textBox9.Text = appname;
if (Convert.ToInt32(value) == 1)
{
this.appstartup.Checked = true;
......@@ -194,14 +196,14 @@ namespace GcDevicePc
this.permin.Checked = true;
}
if (Version == 1)
{
this.checkBox1.Checked = true;
}
else
{
this.checkBox1.Checked = false;
}
//if (Version == 1)
//{
// this.checkBox1.Checked = true;
//}
//else
//{
// this.checkBox1.Checked = false;
//}
textBox1.Text = uname;
textBox2.Text = upwd;
......@@ -315,6 +317,17 @@ namespace GcDevicePc
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)
{
ini.WriteString("Logs", "HmiLog", "1");
......@@ -334,24 +347,6 @@ namespace GcDevicePc
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)
{
ini.WriteString("SendData", "Thirdparty", "1");//zb
......@@ -727,12 +722,12 @@ namespace GcDevicePc
}
else
{
this.label4.Text = ipos.ToString() + "/100";
this.label13.Text = ipos.ToString() + "/100";
this.progressBar1.Value = Convert.ToInt32(ipos);
if (ipos == 100 || send_ok)
{
this.label4.Text = "传输完成";
this.label13.Text = "传输完成";
this.runbtn.Enabled = true;
this.chosenbtn.Enabled = true;
this.updatebtn.Enabled = true;
......@@ -853,12 +848,12 @@ namespace GcDevicePc
}
else
{
this.label6.Text = ipos.ToString() + "/100";
this.label11.Text = ipos.ToString() + "/100";
this.progressBar2.Value = Convert.ToInt32(ipos);
if (ipos == 100)
{
this.label7.Text = "更新完成...";
this.label10.Text = "更新完成...";
}
}
}
......
GcDevicePc/auxtool.cs
View file @ 8aecd92c
......@@ -25,8 +25,8 @@ namespace GcDevicePc
public delegate void Adjust_SW(int val);
public partial class auxtool : Form
{
private string HmiIP = null;
private ushort HmiPort = 911;
//private string HmiIP = null;
//private ushort HmiPort = 911;
private ArrayList SearchRet = new ArrayList();
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