Skip to content

G
GC_Branch
Commit 521df5d2 authored by liu's avatar liu
Browse files
Options

添加三通道三检测相关，实验室在线合一。

parent 06c79fd5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6790 additions and 6250 deletions
GcDevicePc/AboutForm.cs
View file @ 521df5d2
...@@ -42,7 +42,7 @@ namespace GcDevicePc ...@@ -42,7 +42,7 @@ namespace GcDevicePc
this.fid1ver.Text = this.FID1version; this.fid1ver.Text = this.FID1version;
this.fid2ver.Text = this.FID2version; this.fid2ver.Text = this.FID2version;
this.tcdver.Text = this.TCD1version; this.tcdver.Text = this.TCD1version;
this.PCver.Text = this.Hmiversion + "/1.4.9"; this.PCver.Text = this.Hmiversion + "/1.5.1";
} }
} }
} }
GcDevicePc/AppInit.cs
View file @ 521df5d2
...@@ -773,6 +773,18 @@ namespace GcDevicePc ...@@ -773,6 +773,18 @@ namespace GcDevicePc
} }
globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_StatusName = tmpfile; globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_StatusName = tmpfile;
tmpfile = null; tmpfile = null;
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
IniFile ini = new IniFile(file);
string Version = ini.ReadString("Version", "VersionType");
if (string.IsNullOrEmpty(Version))
{
Version = "0";
}
globaldata.CurrentVersion = Version;
} }
public void LocalNetworkCheck() public void LocalNetworkCheck()
......
GcDevicePc/CK_UI/CurveDisPlay.cs
View file @ 521df5d2
...@@ -23,6 +23,8 @@ namespace GcDevicePc ...@@ -23,6 +23,8 @@ namespace GcDevicePc
InitializeComponent(); InitializeComponent();
curdisp.Location = new Point(5, 5); curdisp.Location = new Point(5, 5);
curdisp.Fidname = "A";
Size size = curdisp.Size; Size size = curdisp.Size;
size.Width = size.Width - 20; size.Width = size.Width - 20;
size.Height = size.Height - 25; size.Height = size.Height - 25;
......
GcDevicePc/CK_UI/CurveDisPlay2.cs
View file @ 521df5d2
...@@ -18,6 +18,8 @@ namespace GcDevicePc.CK_UI ...@@ -18,6 +18,8 @@ namespace GcDevicePc.CK_UI
InitializeComponent(); InitializeComponent();
curdisp2.Location = new Point(5, 5); curdisp2.Location = new Point(5, 5);
curdisp2.Fidname = "B";
Size size = curdisp2.Size; Size size = curdisp2.Size;
size.Width = size.Width - 20; size.Width = size.Width - 20;
size.Height = size.Height - 25; size.Height = size.Height - 25;
......
GcDevicePc/CK_UI/CurveDisPlay3.cs
View file @ 521df5d2
...@@ -18,6 +18,8 @@ namespace GcDevicePc.CK_UI ...@@ -18,6 +18,8 @@ namespace GcDevicePc.CK_UI
InitializeComponent(); InitializeComponent();
curdisp3.Location = new Point(5, 5); curdisp3.Location = new Point(5, 5);
curdisp3.Fidname = "C";
Size size = curdisp3.Size; Size size = curdisp3.Size;
size.Width = size.Width - 20; size.Width = size.Width - 20;
size.Height = size.Height - 25; size.Height = size.Height - 25;
......
GcDevicePc/CK_UI/HistChartForm.cs
View file @ 521df5d2
using System; using GcDevicePc.GCBuffer;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
...@@ -13,10 +14,12 @@ namespace GcDevicePc ...@@ -13,10 +14,12 @@ namespace GcDevicePc
public partial class HistChartForm : Form public partial class HistChartForm : Form
{ {
CKVocAnalyzer.CtrlWaveHistory adjust; CKVocAnalyzer.CtrlWaveHistory adjust;
public HistChartForm() public HistChartForm(string file)
{ {
InitializeComponent(); InitializeComponent();
adjust = new CKVocAnalyzer.CtrlWaveHistory(); adjust = new CKVocAnalyzer.CtrlWaveHistory();
adjust.ZbRecord = file;
adjust.Location = new Point(1, 1); adjust.Location = new Point(1, 1);
Size size = this.Size; Size size = this.Size;
size.Width = size.Width - 15; size.Width = size.Width - 15;
......
GcDevicePc/CK_UI/LandIn.cs
View file @ 521df5d2
...@@ -13,19 +13,21 @@ namespace GcDevicePc.CK_UI ...@@ -13,19 +13,21 @@ namespace GcDevicePc.CK_UI
{ {
private string user = "admin"; private string user = "admin";
public static bool Island = false; public static bool Island = false;
private string dt;
CKVocAnalyzer.NumForm form; CKVocAnalyzer.NumForm form;
public LandIn(string userstr) public LandIn(string userstr,string pwd)
{ {
InitializeComponent(); InitializeComponent();
this.ControlBox = false; this.ControlBox = false;
this.user = userstr; this.user = userstr;
this.dt = pwd;
} }
private void button1_Click(object sender, EventArgs e) //登录系统 private void button1_Click(object sender, EventArgs e) //登录系统
{ {
string strpw = DateTime.Now.ToString("HHmm"); string strpw = this.dt;
if (textBox1.Text == user && textBox2.Text == strpw) if (textBox1.Text == user && textBox2.Text == strpw)
{ {
Island = true; Island = true;
......
GcDevicePc/Common/TWFile.cs
View file @ 521df5d2
...@@ -34,7 +34,7 @@ namespace GcDevicePc.Common ...@@ -34,7 +34,7 @@ namespace GcDevicePc.Common
0xC0,0xC3,0xCE,0xC5,0xD1,0xC3,0xC3,0x80,0xC3,0xDB,0x83,0xD8,0xCA,0xD3,0xD7,0xD7, 0xC0,0xC3,0xCE,0xC5,0xD1,0xC3,0xC3,0x80,0xC3,0xDB,0x83,0xD8,0xCA,0xD3,0xD7,0xD7,
0xDB,0xCB,0xDD,0xE5,0x95,0x97,0x9B,0x90,0xE4,0xEB,0xE6,0xE8,0xDA,0xE3,0x97,0xD9, 0xDB,0xCB,0xDD,0xE5,0x95,0x97,0x9B,0x90,0xE4,0xEB,0xE6,0xE8,0xDA,0xE3,0x97,0xD9,
0xDD,0xE7,0xE4,0xEA,0xE6,0xF1,0xF3,0xF2,0xE2,0xF6,0xF2,0xF6,0x8F,0x00,0x00,0x00, 0xDD,0xE7,0xE4,0xEA,0xE6,0xF1,0xF3,0xF2,0xE2,0xF6,0xF2,0xF6,0x8F,0x00,0x00,0x00,
0x00 0x00
}; };
public TWFile(string file) public TWFile(string file)
...@@ -60,7 +60,7 @@ namespace GcDevicePc.Common ...@@ -60,7 +60,7 @@ namespace GcDevicePc.Common
public void TW_Close(int datanum) public void TW_Close(int datanum)
{ {
int i; int i;
for (i = 0; i < enddata.Length; i++ ) for (i = 0; i < enddata.Length; i++)
{ {
bw.Write(enddata[i]); bw.Write(enddata[i]);
} }
......
GcDevicePc/ConfigMethod/MethodMain.cs
View file @ 521df5d2
...@@ -10,6 +10,7 @@ using System.Threading; ...@@ -10,6 +10,7 @@ using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.ConfigMethod.injectionport; using GcDevicePc.ConfigMethod.injectionport;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
using GcDevicePc.ProThread;
namespace GcDevicePc.ConfigMethod namespace GcDevicePc.ConfigMethod
{ {
...@@ -103,7 +104,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -103,7 +104,7 @@ namespace GcDevicePc.ConfigMethod
this.auxTabs = new AuxTabs(this.gchwconfig, ref this.gcmethodconfig); this.auxTabs = new AuxTabs(this.gchwconfig, ref this.gcmethodconfig);
} }
#region #region
...@@ -201,9 +202,8 @@ namespace GcDevicePc.ConfigMethod ...@@ -201,9 +202,8 @@ namespace GcDevicePc.ConfigMethod
m_ReadColTab.reflashContent(); m_ReadColTab.reflashContent();
m_DetTab.reflashContent(); m_DetTab.reflashContent();
m_SignalTab.reflashContent(); m_SignalTab.reflashContent();
//m_AuxTab.reflashContent();
auxTabs.reflashContent(); auxTabs.reflashContent();
//m_AuxTab.reflashContent();
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
//fID.reflashContent(0); //fID.reflashContent(0);
//m_ePCFID.reflashContent(0); //m_ePCFID.reflashContent(0);
...@@ -252,7 +252,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -252,7 +252,7 @@ namespace GcDevicePc.ConfigMethod
auxTabs.TopLevel = false; auxTabs.TopLevel = false;
auxTabs.Show(); auxTabs.Show();
tabmain.TabPages[7].Controls.Add(auxTabs); tabmain.TabPages[7].Controls.Add(auxTabs);
InitAllTab(); InitAllTab();
} }
...@@ -300,10 +300,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -300,10 +300,7 @@ namespace GcDevicePc.ConfigMethod
//{ //{
// this.gcmethodconfig.SetValInjPortAllPara(); // this.gcmethodconfig.SetValInjPortAllPara();
//} //}
m_chromTabs.recordCurData(); m_chromTabs.recordCurData();
this.gcmethodconfig.SetChromAllPara(); this.gcmethodconfig.SetChromAllPara();
...@@ -321,7 +318,6 @@ namespace GcDevicePc.ConfigMethod ...@@ -321,7 +318,6 @@ namespace GcDevicePc.ConfigMethod
{ {
this.gcmethodconfig.SetFidByID(0); this.gcmethodconfig.SetFidByID(0);
} }
} }
if (this.gchwconfig.hwconfiginfo.u16DetInter == 1) if (this.gchwconfig.hwconfiginfo.u16DetInter == 1)
...@@ -438,6 +434,8 @@ namespace GcDevicePc.ConfigMethod ...@@ -438,6 +434,8 @@ namespace GcDevicePc.ConfigMethod
globaldata.m_configDlg.m_SignalDlg.reflashContent(); globaldata.m_configDlg.m_SignalDlg.reflashContent();
} }
SignalDataToHw.methodconfig = this.gcmethodconfig;
//string message = "提交成功！"; //string message = "提交成功！";
//MessageBox.Show(message, "提示信息", MessageBoxButtons.OK, MessageBoxIcon.Information); //MessageBox.Show(message, "提示信息", MessageBoxButtons.OK, MessageBoxIcon.Information);
} }
...@@ -446,6 +444,8 @@ namespace GcDevicePc.ConfigMethod ...@@ -446,6 +444,8 @@ namespace GcDevicePc.ConfigMethod
{ {
} }
} }
} }
else else
......
GcDevicePc/ConfigMethod/MethodMain.resx
View file @ 521df5d2
This diff is collapsed.
GcDevicePc/ConfigMethod/PortTab.cs
View file @ 521df5d2
...@@ -133,7 +133,6 @@ namespace GcDevicePc.ConfigMethod ...@@ -133,7 +133,6 @@ namespace GcDevicePc.ConfigMethod
private void InjPortBox_SelectedIndexChanged(object sender, EventArgs e) private void InjPortBox_SelectedIndexChanged(object sender, EventArgs e)
{ {
recordCurData(); recordCurData();
int index; int index;
......
GcDevicePc/ConfigMethod/SignalTab.cs
View file @ 521df5d2
...@@ -7,6 +7,7 @@ using System.Linq; ...@@ -7,6 +7,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
using GcDevicePc.IniParam;
namespace GcDevicePc.ConfigMethod namespace GcDevicePc.ConfigMethod
{ {
...@@ -89,7 +90,6 @@ namespace GcDevicePc.ConfigMethod ...@@ -89,7 +90,6 @@ namespace GcDevicePc.ConfigMethod
tmptextbox = (TextBox)(this.Controls.Find("signalAT" + channel.ToString(), true)[0]); tmptextbox = (TextBox)(this.Controls.Find("signalAT" + channel.ToString(), true)[0]);
tmpcombox.SelectedIndex = (int)this.methodconfig.signal.uDetA[i]; tmpcombox.SelectedIndex = (int)this.methodconfig.signal.uDetA[i];
if (this.methodconfig.signal.u16DetTimeLengthA[i] > 0) if (this.methodconfig.signal.u16DetTimeLengthA[i] > 0)
{ {
tmptextbox.Text = ((float)this.methodconfig.signal.u16DetTimeLengthA[i] / 60).ToString("#0.0"); tmptextbox.Text = ((float)this.methodconfig.signal.u16DetTimeLengthA[i] / 60).ToString("#0.0");
...@@ -103,7 +103,6 @@ namespace GcDevicePc.ConfigMethod ...@@ -103,7 +103,6 @@ namespace GcDevicePc.ConfigMethod
tmptextbox = (TextBox)(this.Controls.Find("signalBT" + channel.ToString(), true)[0]); tmptextbox = (TextBox)(this.Controls.Find("signalBT" + channel.ToString(), true)[0]);
tmpcombox.SelectedIndex = (int)this.methodconfig.signal.uDetB[i]; tmpcombox.SelectedIndex = (int)this.methodconfig.signal.uDetB[i];
if (this.methodconfig.signal.u16DetTimeLengthB[i] > 0) if (this.methodconfig.signal.u16DetTimeLengthB[i] > 0)
{ {
tmptextbox.Text = ((float)this.methodconfig.signal.u16DetTimeLengthB[i] / 60).ToString("#0.0"); tmptextbox.Text = ((float)this.methodconfig.signal.u16DetTimeLengthB[i] / 60).ToString("#0.0");
...@@ -239,6 +238,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -239,6 +238,10 @@ namespace GcDevicePc.ConfigMethod
this.methodconfig.signal.u16ChannelA = (signalA_sw.CheckState == CheckState.Checked) ? (ushort)1 : (ushort)0; this.methodconfig.signal.u16ChannelA = (signalA_sw.CheckState == CheckState.Checked) ? (ushort)1 : (ushort)0;
this.methodconfig.signal.u16ChannelB = (signalB_sw.CheckState == CheckState.Checked) ? (ushort)1 : (ushort)0; this.methodconfig.signal.u16ChannelB = (signalB_sw.CheckState == CheckState.Checked) ? (ushort)1 : (ushort)0;
CProfileDevice.m_DevParam.signal.u16ChannelA = (signalA_sw.CheckState == CheckState.Checked) ? (ushort)1 : (ushort)0;
CProfileDevice.m_DevParam.signal.u16ChannelB = (signalB_sw.CheckState == CheckState.Checked) ? (ushort)1 : (ushort)0;
for (i = 0; i < MAX_NUM; i++) for (i = 0; i < MAX_NUM; i++)
{ {
channel = i + 1; channel = i + 1;
...@@ -261,6 +264,24 @@ namespace GcDevicePc.ConfigMethod ...@@ -261,6 +264,24 @@ namespace GcDevicePc.ConfigMethod
this.methodconfig.signal.u16DetTimeLengthA[i] = newtime; this.methodconfig.signal.u16DetTimeLengthA[i] = newtime;
} }
if (tmpcombox.SelectedIndex < 0)
CProfileDevice.m_DevParam.signal.uDetA[i] = 0;
else
CProfileDevice.m_DevParam.signal.uDetA[i] = (ushort)tmpcombox.SelectedIndex;
if (string.IsNullOrEmpty(tmptextbox.Text))
{
CProfileDevice.m_DevParam.signal.u16DetTimeLengthA[i] = 0;
}
else
{
time = (float)Convert.ToDecimal(tmptextbox.Text);
newtime = (ushort)Convert.ToDecimal((time * 60).ToString());
CProfileDevice.m_DevParam.signal.u16DetTimeLengthA[i] = newtime;
}
} }
for (i = 0; i < MAX_NUM; i++) for (i = 0; i < MAX_NUM; i++)
...@@ -284,7 +305,24 @@ namespace GcDevicePc.ConfigMethod ...@@ -284,7 +305,24 @@ namespace GcDevicePc.ConfigMethod
newtime = (ushort)Convert.ToDecimal((time * 60).ToString()); newtime = (ushort)Convert.ToDecimal((time * 60).ToString());
this.methodconfig.signal.u16DetTimeLengthB[i] = newtime; this.methodconfig.signal.u16DetTimeLengthB[i] = newtime;
} }
if (tmpcombox.SelectedIndex < 0)
CProfileDevice.m_DevParam.signal.uDetB[i] = 0;
else
CProfileDevice.m_DevParam.signal.uDetB[i] = (ushort)tmpcombox.SelectedIndex;
if (string.IsNullOrEmpty(tmptextbox.Text))
{
CProfileDevice.m_DevParam.signal.u16DetTimeLengthB[i] = 0;
}
else
{
time = (float)Convert.ToDecimal(tmptextbox.Text);
newtime = (ushort)Convert.ToDecimal((time * 60).ToString());
CProfileDevice.m_DevParam.signal.u16DetTimeLengthB[i] = newtime;
}
} }
} }
......
GcDevicePc/DataState.cs
View file @ 521df5d2
...@@ -1048,9 +1048,21 @@ namespace GcDevicePc ...@@ -1048,9 +1048,21 @@ namespace GcDevicePc
tempshow = new ListViewItem(); tempshow = new ListViewItem();
tempshow.Text = "运行时间/总时间"; tempshow.Text = "运行时间/总时间";
if (globaldata.MethodRun_Statue == 4 || globaldata.MethodRun_Statue == 5) if (globaldata.MethodRun_Statue == 4 || globaldata.MethodRun_Statue == 5)
tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.runtimenow / 60.0f).ToString("0.00") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0")); {
if (globaldata.m_dpbuffer.ShowList.showtime.runtimenow <= globaldata.m_dpbuffer.ShowList.showtime.alltime)
{
tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.runtimenow / 60.0f).ToString("0.00") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0"));
}
else
{
tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.00") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0"));
}
}
else else
{
tempshow.SubItems.Add("0.00 /" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0")); tempshow.SubItems.Add("0.00 /" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0"));
}
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
......
GcDevicePc/FormUser.cs
View file @ 521df5d2
...@@ -63,9 +63,7 @@ namespace GcDevicePc ...@@ -63,9 +63,7 @@ namespace GcDevicePc
//自动校准 //自动校准
private void buttonauto_Click(object sender, EventArgs e) private void buttonauto_Click(object sender, EventArgs e)
{ {
DialogResult dr = new CK_UI.LandIn("calibration", DateTime.Now.ToString("HHmm")).ShowDialog();
DialogResult dr = new CK_UI.LandIn("calibration").ShowDialog();
if (dr == DialogResult.OK) if (dr == DialogResult.OK)
{ {
......
GcDevicePc/Formdebug.cs
View file @ 521df5d2
...@@ -17,8 +17,8 @@ namespace GcDevicePc ...@@ -17,8 +17,8 @@ namespace GcDevicePc
{ {
//CurveDisPlay cuidisp = new CurveDisPlay();//显示波形 //CurveDisPlay cuidisp = new CurveDisPlay();//显示波形
CurveDisPlay curdisplay = new CurveDisPlay(); CurveDisPlay curdisplay = new CurveDisPlay();
//CurveDisPlay2 curdisplay2 = new CurveDisPlay2(); CurveDisPlay2 curdisplay2 = new CurveDisPlay2();
//CurveDisPlay3 curdisplay3 = new CurveDisPlay3(); CurveDisPlay3 curdisplay3 = new CurveDisPlay3();
DataState dataleft = new DataState();//状态显示 DataState dataleft = new DataState();//状态显示
...@@ -33,11 +33,11 @@ namespace GcDevicePc ...@@ -33,11 +33,11 @@ namespace GcDevicePc
} }
private void loadPanel() //加载界面 private void loadPanel() //加载界面
{ {
this.dockPanel1.Contains(curdisplay); //this.dockPanel1.Contains(curdisplay);
curdisplay.Show(this.dockPanel1); //curdisplay.Show(this.dockPanel1);
curdisplay.CloseButtonVisible = false; //curdisplay.CloseButtonVisible = false;
//Load_Win(); Load_Win();
dataleft.Show(this.dockPanel1,DockState.DockRight); dataleft.Show(this.dockPanel1,DockState.DockRight);
dataleft.CloseButtonVisible = false; dataleft.CloseButtonVisible = false;
...@@ -45,88 +45,88 @@ namespace GcDevicePc ...@@ -45,88 +45,88 @@ namespace GcDevicePc
//dataleft.Close(); //dataleft.Close();
} }
//private void Load_Win() private void Load_Win()
//{ {
// if (!String.IsNullOrEmpty(globaldata.connection_ip)) if (!String.IsNullOrEmpty(globaldata.connection_ip))
// { {
// if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1) if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1)
// { {
// curdisplay.Text = "前检测器"; curdisplay.Text = "前检测器";
// } }
// if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1) if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
// { {
// curdisplay2.Text = "中检测器"; curdisplay2.Text = "中检测器";
// } }
// if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1) if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
// { {
// curdisplay3.Text = "后检测器"; curdisplay3.Text = "后检测器";
// } }
// } }
// else else
// { {
// if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1) if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1)
// { {
// curdisplay.Text = "前检测器"; curdisplay.Text = "前检测器";
// } }
// if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1) if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
// { {
// curdisplay2.Text = "中检测器"; curdisplay2.Text = "中检测器";
// } }
// if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1) if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
// { {
// curdisplay3.Text = "后检测器"; curdisplay3.Text = "后检测器";
// } }
// } }
// if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1) if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1)
// { {
// this.dockPanel1.Contains(curdisplay); this.dockPanel1.Contains(curdisplay);
// curdisplay.Show(this.dockPanel1); curdisplay.Show(this.dockPanel1);
// curdisplay.CloseButtonVisible = false; curdisplay.CloseButtonVisible = false;
// } }
// else else
// { {
// curdisplay.Dispose(); curdisplay.Dispose();
// } }
// if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1) if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
// { {
// this.dockPanel1.Contains(curdisplay2); this.dockPanel1.Contains(curdisplay2);
// curdisplay2.Show(this.dockPanel1); curdisplay2.Show(this.dockPanel1);
// curdisplay2.CloseButtonVisible = false; curdisplay2.CloseButtonVisible = false;
// } }
// else else
// { {
// curdisplay2.Dispose(); curdisplay2.Dispose();
// } }
// if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1) if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
// { {
// this.dockPanel1.Contains(curdisplay3); this.dockPanel1.Contains(curdisplay3);
// curdisplay3.Show(this.dockPanel1); curdisplay3.Show(this.dockPanel1);
// curdisplay3.CloseButtonVisible = false; curdisplay3.CloseButtonVisible = false;
// } }
// else else
// { {
// curdisplay3.Dispose(); curdisplay3.Dispose();
// } }
// //Start_Thread(); //Start_Thread();
// //dockPanelSideLeft.Show(this.dockPanel1, WeifenLuo.WinFormsUI.Docking.DockState.DockRight); //dockPanelSideLeft.Show(this.dockPanel1, WeifenLuo.WinFormsUI.Docking.DockState.DockRight);
// //dockPanelSideLeft.CloseButtonVisible = false; //dockPanelSideLeft.CloseButtonVisible = false;
//} }
public void CloseThread() public void CloseThread()
{ {
......
GcDevicePc/GCBuffer/GCMethodConfig.cs
View file @ 521df5d2
...@@ -2148,10 +2148,6 @@ namespace GcDevicePc.GCBuffer ...@@ -2148,10 +2148,6 @@ namespace GcDevicePc.GCBuffer
sw.WriteLine("[方法名称]"); sw.WriteLine("[方法名称]");
sw.Close(); sw.Close();
} }
} }
} }
......
GcDevicePc/GCMain.cs
View file @ 521df5d2
...@@ -11,10 +11,10 @@ namespace GcDevicePc ...@@ -11,10 +11,10 @@ namespace GcDevicePc
{ {
public partial class GCMain : Form public partial class GCMain : Form
{ {
CurveDisPlay curdisplay = new CurveDisPlay(); //CurveDisPlay curdisplay = new CurveDisPlay();
DataState dockPanelSideLeft = new DataState(); //DataState dockPanelSideLeft = new DataState();
GCTitle title = new GCTitle(); //GCTitle title = new GCTitle();
public GCMain() public GCMain()
...@@ -24,16 +24,16 @@ namespace GcDevicePc ...@@ -24,16 +24,16 @@ namespace GcDevicePc
private void GCMain_Load(object sender, EventArgs e) private void GCMain_Load(object sender, EventArgs e)
{ {
this.showdockPanel.Contains(curdisplay); // this.showdockPanel.Contains(curdisplay);
curdisplay.Show(this.showdockPanel); // curdisplay.Show(this.showdockPanel);
curdisplay.CloseButtonVisible = false; // curdisplay.CloseButtonVisible = false;
dockPanelSideLeft.Show(this.showdockPanel, WeifenLuo.WinFormsUI.Docking.DockState.DockRight); // dockPanelSideLeft.Show(this.showdockPanel, WeifenLuo.WinFormsUI.Docking.DockState.DockRight);
dockPanelSideLeft.CloseButtonVisible = false; // dockPanelSideLeft.CloseButtonVisible = false;
// title.Height = 62; //// title.Height = 62;
title.Show(this.showdockPanel, WeifenLuo.WinFormsUI.Docking.DockState.DockTop); // title.Show(this.showdockPanel, WeifenLuo.WinFormsUI.Docking.DockState.DockTop);
title.CloseButtonVisible = false; // title.CloseButtonVisible = false;
} }
} }
} }
GcDevicePc/MDIBase.Designer.cs
View file @ 521df5d2
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
this.SingleCancel = new System.Windows.Forms.ToolStripMenuItem(); this.SingleCancel = new System.Windows.Forms.ToolStripMenuItem();
this.HelpMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.HelpMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AboutMenu = new System.Windows.Forms.ToolStripMenuItem(); this.AboutMenu = new System.Windows.Forms.ToolStripMenuItem();
this.changeVsi = new System.Windows.Forms.ToolStripMenuItem();
this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
...@@ -105,14 +106,14 @@ ...@@ -105,14 +106,14 @@
// UserLoginMenu // UserLoginMenu
// //
this.UserLoginMenu.Name = "UserLoginMenu"; this.UserLoginMenu.Name = "UserLoginMenu";
this.UserLoginMenu.Size = new System.Drawing.Size(144, 26); this.UserLoginMenu.Size = new System.Drawing.Size(180, 26);
this.UserLoginMenu.Text = "用户登录"; this.UserLoginMenu.Text = "用户登录";
this.UserLoginMenu.Click += new System.EventHandler(this.UserLoginMenu_Click); this.UserLoginMenu.Click += new System.EventHandler(this.UserLoginMenu_Click);
// //
// UserLogoutMenu // UserLogoutMenu
// //
this.UserLogoutMenu.Name = "UserLogoutMenu"; this.UserLogoutMenu.Name = "UserLogoutMenu";
this.UserLogoutMenu.Size = new System.Drawing.Size(144, 26); this.UserLogoutMenu.Size = new System.Drawing.Size(180, 26);
this.UserLogoutMenu.Text = "用户注销"; this.UserLogoutMenu.Text = "用户注销";
this.UserLogoutMenu.Click += new System.EventHandler(this.UserLogoutMenu_Click); this.UserLogoutMenu.Click += new System.EventHandler(this.UserLogoutMenu_Click);
// //
...@@ -317,7 +318,8 @@ ...@@ -317,7 +318,8 @@
// HelpMainMenu // HelpMainMenu
// //
this.HelpMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.HelpMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AboutMenu}); this.AboutMenu,
this.changeVsi});
this.HelpMainMenu.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); this.HelpMainMenu.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.HelpMainMenu.Name = "HelpMainMenu"; this.HelpMainMenu.Name = "HelpMainMenu";
this.HelpMainMenu.Size = new System.Drawing.Size(54, 25); this.HelpMainMenu.Size = new System.Drawing.Size(54, 25);
...@@ -326,10 +328,17 @@ ...@@ -326,10 +328,17 @@
// AboutMenu // AboutMenu
// //
this.AboutMenu.Name = "AboutMenu"; this.AboutMenu.Name = "AboutMenu";
this.AboutMenu.Size = new System.Drawing.Size(112, 26); this.AboutMenu.Size = new System.Drawing.Size(144, 26);
this.AboutMenu.Text = "关于"; this.AboutMenu.Text = "关于";
this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click); this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click);
// //
// changeVsi
//
this.changeVsi.Name = "changeVsi";
this.changeVsi.Size = new System.Drawing.Size(144, 26);
this.changeVsi.Text = "切换版本";
this.changeVsi.Click += new System.EventHandler(this.changeVsi_Click);
//
// timer1 // timer1
// //
this.timer1.Enabled = true; this.timer1.Enabled = true;
...@@ -481,6 +490,7 @@ ...@@ -481,6 +490,7 @@
private System.Windows.Forms.StatusStrip statusStrip; private System.Windows.Forms.StatusStrip statusStrip;
private System.Windows.Forms.ToolStripProgressBar workProgress; private System.Windows.Forms.ToolStripProgressBar workProgress;
private System.Windows.Forms.Timer timer2; private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.ToolStripMenuItem changeVsi;
} }
} }
......
GcDevicePc/MDIBase.cs
View file @ 521df5d2
This diff is collapsed.
GcDevicePc/MainForm.Designer.cs
View file @ 521df5d2
...@@ -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 = "VOCs在线监测-1.4.9 用户窗口"; this.Text = "VOCs在线监测-1.5.1 用户窗口";
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
......
GcDevicePc/ProThread/CKvocUpdata.cs
View file @ 521df5d2
This diff is collapsed.
GcDevicePc/ProThread/CKvocUpdata2.cs
View file @ 521df5d2
This diff is collapsed.
GcDevicePc/ProThread/CKvocUpdata3.cs
View file @ 521df5d2
This diff is collapsed.
GcDevicePc/ProThread/GcDataTh.cs
View file @ 521df5d2
...@@ -236,17 +236,17 @@ namespace GcDevicePc.ProThread ...@@ -236,17 +236,17 @@ namespace GcDevicePc.ProThread
globaldata.m_signalbuffer.Draw_Port.Add(globaldata.m_signalbuffer.Channel1_Port); globaldata.m_signalbuffer.Draw_Port.Add(globaldata.m_signalbuffer.Channel1_Port);
globaldata.m_signalbuffer.Save_Port.Add(globaldata.m_signalbuffer.Channel1_Port); globaldata.m_signalbuffer.Save_Port.Add(globaldata.m_signalbuffer.Channel1_Port);
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw) if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw)
//{ {
// lock (globaldata.channelA_A) lock (globaldata.channelA_A)
// { {
// globaldata.channelA_A.Add((long)(fidv[i] * 1000000)); globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
// } }
// lock (globaldata.channelB_A) lock (globaldata.channelB_A)
// { {
// globaldata.channelB_A.Add((long)(fidv[i] * 1000000)); globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
// } }
//} }
} }
} }
} }
...@@ -299,18 +299,18 @@ namespace GcDevicePc.ProThread ...@@ -299,18 +299,18 @@ namespace GcDevicePc.ProThread
globaldata.m_signalbuffer.Draw_Port2.Add(globaldata.m_signalbuffer.Channel2_Port); globaldata.m_signalbuffer.Draw_Port2.Add(globaldata.m_signalbuffer.Channel2_Port);
globaldata.m_signalbuffer.Save_Port2.Add(globaldata.m_signalbuffer.Channel2_Port); globaldata.m_signalbuffer.Save_Port2.Add(globaldata.m_signalbuffer.Channel2_Port);
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw) if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw)
//{ {
// lock (globaldata.channelA_B) lock (globaldata.channelA_B)
// { {
// globaldata.channelA_B.Add((long)(fidv[i] * 1000000)); globaldata.channelA_B.Add((long)(fidv[i] * 1000000));
// } }
// lock (globaldata.channelB_B) lock (globaldata.channelB_B)
// { {
// globaldata.channelB_B.Add((long)(fidv[i] * 1000000)); globaldata.channelB_B.Add((long)(fidv[i] * 1000000));
// } }
//} }
} }
} }
} }
...@@ -363,17 +363,17 @@ namespace GcDevicePc.ProThread ...@@ -363,17 +363,17 @@ namespace GcDevicePc.ProThread
globaldata.m_signalbuffer.Draw_Port3.Add(globaldata.m_signalbuffer.Channel3_Port); globaldata.m_signalbuffer.Draw_Port3.Add(globaldata.m_signalbuffer.Channel3_Port);
globaldata.m_signalbuffer.Save_Port3.Add(globaldata.m_signalbuffer.Channel3_Port); globaldata.m_signalbuffer.Save_Port3.Add(globaldata.m_signalbuffer.Channel3_Port);
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw) if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw)
//{ {
// lock (globaldata.channelA_C) lock (globaldata.channelA_C)
// { {
// globaldata.channelA_C.Add((long)(fidv[i] * 1000000)); globaldata.channelA_C.Add((long)(fidv[i] * 1000000));
// } }
// lock (globaldata.channelB_C) lock (globaldata.channelB_C)
// { {
// globaldata.channelB_C.Add((long)(fidv[i] * 1000000)); globaldata.channelB_C.Add((long)(fidv[i] * 1000000));
// } }
//} }
} }
} }
} }
......
GcDevicePc/ProThread/SignalDataToHw.cs
View file @ 521df5d2
This diff is collapsed.
GcDevicePc/TestForm.cs
View file @ 521df5d2
...@@ -39,7 +39,7 @@ namespace GcDevicePc ...@@ -39,7 +39,7 @@ namespace GcDevicePc
loadingCtl.Hide(); loadingCtl.Hide();
} }
Form1 form1; Form1 form1;
private void btnShow_Click(object sender, EventArgs e) private void btnShow_Click(object sender, EventArgs e)
{ {
......
GcDevicePc/UserConfig.cs
View file @ 521df5d2
...@@ -61,7 +61,7 @@ namespace GcDevicePc ...@@ -61,7 +61,7 @@ namespace GcDevicePc
test.INIWriteValue(file, "StartUp", "运行类型", "0"); test.INIWriteValue(file, "StartUp", "运行类型", "0");
} }
} }
foreach (CheckBox chk in this.groupBox3.Controls) foreach (CheckBox chk in this.groupBox3.Controls)
{ {
if (chk.Checked == false) if (chk.Checked == false)
...@@ -168,8 +168,6 @@ namespace GcDevicePc ...@@ -168,8 +168,6 @@ namespace GcDevicePc
string err_log = test.INIGetStringValue("Logs", "ErrLog", null); string err_log = test.INIGetStringValue("Logs", "ErrLog", null);
string hmi_log = test.INIGetStringValue("Logs", "HmiLog", null); string hmi_log = test.INIGetStringValue("Logs", "HmiLog", null);
try try
{ {
NetworkInterface[] port = NetworkInterface.GetAllNetworkInterfaces(); NetworkInterface[] port = NetworkInterface.GetAllNetworkInterfaces();
...@@ -277,8 +275,6 @@ namespace GcDevicePc ...@@ -277,8 +275,6 @@ namespace GcDevicePc
} }
//string AddressIP = string.Empty; //string AddressIP = string.Empty;
//string IPGateWay = string.Empty; //string IPGateWay = string.Empty;
//string IPSubNet = string.Empty; //string IPSubNet = string.Empty;
...@@ -298,7 +294,6 @@ namespace GcDevicePc ...@@ -298,7 +294,6 @@ namespace GcDevicePc
// { // {
// IPGateWay = _IPAddress.ToString(); // IPGateWay = _IPAddress.ToString();
// } // }
//} //}
} }
...@@ -324,9 +319,8 @@ namespace GcDevicePc ...@@ -324,9 +319,8 @@ namespace GcDevicePc
else e.Handled = true; else e.Handled = true;
} }
} }
} }
private void CaseNo_TextBoxChange(object sender, EventArgs e) private void CaseNo_TextBoxChange(object sender, EventArgs e)
{ {
TextBox text = sender as TextBox; TextBox text = sender as TextBox;
...@@ -341,6 +335,7 @@ namespace GcDevicePc ...@@ -341,6 +335,7 @@ namespace GcDevicePc
TextBox text = sender as TextBox; TextBox text = sender as TextBox;
text.SelectAll(); text.SelectAll();
} }
private void changemac_Click(object sender, EventArgs e) private void changemac_Click(object sender, EventArgs e)
{ {
//bool ret = false; //bool ret = false;
...@@ -467,8 +462,7 @@ namespace GcDevicePc ...@@ -467,8 +462,7 @@ namespace GcDevicePc
} }
} }
} }
public static bool IsIPAddress(string ip) public static bool IsIPAddress(string ip)
{ {
return Regex.IsMatch(ip, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$"); return Regex.IsMatch(ip, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$");
...@@ -519,9 +513,7 @@ namespace GcDevicePc ...@@ -519,9 +513,7 @@ namespace GcDevicePc
} }
Thread th_changeip; Thread th_changeip;
private void changelocal_Click(object sender, EventArgs e) private void changelocal_Click(object sender, EventArgs e)
{ {
try try
......
GcDevicePc/auxtool.cs
View file @ 521df5d2
...@@ -34,7 +34,7 @@ namespace GcDevicePc ...@@ -34,7 +34,7 @@ namespace GcDevicePc
InitializeComponent(); InitializeComponent();
} }
public auxtool(ushort time1, ushort time2,ushort time3) public auxtool(ushort time1, ushort time2, ushort time3)
{ {
InitializeComponent(); InitializeComponent();
...@@ -62,21 +62,21 @@ namespace GcDevicePc ...@@ -62,21 +62,21 @@ namespace GcDevicePc
else else
{ {
this.label4.Text = ipos.ToString() + "/100"; this.label4.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.label4.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;
} }
} }
} }
private void hvalvetime_KeyPress(object sender, KeyPressEventArgs e) private void hvalvetime_KeyPress(object sender, KeyPressEventArgs e)
{ {
if(!(Char.IsNumber(e.KeyChar)) && e.KeyChar != (char)8) if (!(Char.IsNumber(e.KeyChar)) && e.KeyChar != (char)8)
{ {
e.Handled = true; e.Handled = true;
} }
...@@ -150,30 +150,31 @@ namespace GcDevicePc ...@@ -150,30 +150,31 @@ namespace GcDevicePc
{ {
if (HmiIP != null) if (HmiIP != null)
{ {
if(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == false) if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == false)
{ {
this.CHmibtn.Enabled = false; this.CHmibtn.Enabled = false;
int ret = 0; int ret = 0;
FileServerClient singlesend = new FileServerClient(); FileServerClient singlesend = new FileServerClient();
singlesend.WtClientInit(HmiIP, HmiPort); singlesend.WtClientInit(HmiIP, HmiPort);
ret = singlesend.WtHMICloseRro("WtMainProc"); ret = singlesend.WtHMICloseRro("WtMainProc");
if(ret == 1) if (ret == 1)
{ {
MessageBox.Show("停止系统成功！"); MessageBox.Show("停止系统成功！");
} }
singlesend.WtClientClose(); singlesend.WtClientClose();
// this.runbtn.Enabled = true; // this.runbtn.Enabled = true;
this.chosenbtn.Enabled = true; this.chosenbtn.Enabled = true;
this.updatebtn.Enabled = true; this.updatebtn.Enabled = true;
}else }
else
{ {
MessageBox.Show("请停止系统，再关闭！"); MessageBox.Show("请停止系统，再关闭！");
} }
} }
} }
private void runbtn_Click(object sender, EventArgs e) private void runbtn_Click(object sender, EventArgs e)
...@@ -246,21 +247,21 @@ namespace GcDevicePc ...@@ -246,21 +247,21 @@ namespace GcDevicePc
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
{ {
if(send_ok) if (send_ok)
{ {
SetTextMesssage(100, i.ToString() + "\r\n"); SetTextMesssage(100, i.ToString() + "\r\n");
}else }
else
{ {
Thread.Sleep(200); Thread.Sleep(200);
SetTextMesssage(i, i.ToString() + "\r\n"); SetTextMesssage(i, i.ToString() + "\r\n");
if(i == 95) if (i == 95)
{ {
i--; i--;
} }
}
} }
}
} }
private void sendnewhmi() private void sendnewhmi()
...@@ -285,23 +286,23 @@ namespace GcDevicePc ...@@ -285,23 +286,23 @@ namespace GcDevicePc
private void searchHMI_Click(object sender, EventArgs e) private void searchHMI_Click(object sender, EventArgs e)
{ {
ArrayList DeviceList = new ArrayList(); ArrayList DeviceList = new ArrayList();
if(!hmisearch) if (!hmisearch)
{ {
if(mre != null) if (mre != null)
mre.Reset(); mre.Reset();
addhmi = new Thread(searchhmi); addhmi = new Thread(searchhmi);
addhmi.IsBackground = true; addhmi.IsBackground = true;
addhmi.Start(); addhmi.Start();
this.searchHMI.Text = "停止"; this.searchHMI.Text = "停止";
hmisearch = !hmisearch; hmisearch = !hmisearch;
} }
else else
{ {
this.searchHMI.Text = "搜索"; this.searchHMI.Text = "搜索";
this.hmilist.Text = "请选择..."; this.hmilist.Text = "请选择...";
mre.Set(); mre.Set();
hmisearch = !hmisearch; hmisearch = !hmisearch;
} }
} }
private void searchhmi() private void searchhmi()
...@@ -409,55 +410,55 @@ namespace GcDevicePc ...@@ -409,55 +410,55 @@ namespace GcDevicePc
//try //try
//{ //{
FileServerClient singlesend = new FileServerClient(); FileServerClient singlesend = new FileServerClient();
DirectoryInfo theFolder = new DirectoryInfo(firmDire); DirectoryInfo theFolder = new DirectoryInfo(firmDire);
DirectoryInfo[] dirInfo = theFolder.GetDirectories(); DirectoryInfo[] dirInfo = theFolder.GetDirectories();
singlesend.WtClientInit(HmiIP, HmiPort); singlesend.WtClientInit(HmiIP, HmiPort);
foreach (FileInfo NextFile in theFolder.GetFiles()) foreach (FileInfo NextFile in theFolder.GetFiles())
{ {
fullfilename = NextFile.FullName; fullfilename = NextFile.FullName;
singlesend.WtClientCopytoServerNoDelay(NextFile.Name, fullfilename, globaldata.updateremoteFolder); singlesend.WtClientCopytoServerNoDelay(NextFile.Name, fullfilename, globaldata.updateremoteFolder);
Thread.Sleep(500); Thread.Sleep(500);
} }
sendfirm_ok = true;
singlesend.WtClientClose();
if (sendfirm_ok) sendfirm_ok = true;
{ singlesend.WtClientClose();
updatefirm();
while(true) if (sendfirm_ok)
{
updatefirm();
while (true)
{
if (globaldata.m_hmibuffer.gcinfo.hmistatus == 5)
{ {
if (globaldata.m_hmibuffer.gcinfo.hmistatus == 5)
this.Invoke(new Action(() =>
{ {
this.label7.Text = "更新中...";
}));
updatestart = true;
}
if (updatestart)
{
if (globaldata.m_hmibuffer.gcinfo.hmistatus == 0)
{
this.Invoke(new Action(() => this.Invoke(new Action(() =>
{ {
this.label7.Text = "更新中..."; this.label7.Text = "更新完成...";
})); }));
updatestart = true;
}
if( updatestart) updatefirm_ok = true;
{ sendfirm_ok = false;
if (globaldata.m_hmibuffer.gcinfo.hmistatus == 0) break;
{
this.Invoke(new Action(() =>
{
this.label7.Text = "更新完成...";
}));
updatefirm_ok = true;
sendfirm_ok = false;
break;
}
} }
Thread.Sleep(500);
} }
}
Thread.Sleep(500);
}
}
} }
private void SetTextMesssage2(int ipos, string vinfo) private void SetTextMesssage2(int ipos, string vinfo)
......
GcDevicePc/globaldata.cs
View file @ 521df5d2
...@@ -70,6 +70,7 @@ namespace GcDevicePc ...@@ -70,6 +70,7 @@ namespace GcDevicePc
//public static string cur_RunTab; //当前运行表名 //public static string cur_RunTab; //当前运行表名
//public static string cur_DataName; //保存数据文件名 //public static string cur_DataName; //保存数据文件名
public static string show_MethodName; //显示方法名 public static string show_MethodName; //显示方法名
public static string CurrentVersion; //当前版本
//public static bool system_Statue; //系统开启状态 //public static bool system_Statue; //系统开启状态
//public static ushort work_Statue; //系统工作状态 //public static ushort work_Statue; //系统工作状态
...@@ -126,10 +127,14 @@ namespace GcDevicePc ...@@ -126,10 +127,14 @@ namespace GcDevicePc
// public static Modbus m_modbus = new Modbus(); // public static Modbus m_modbus = new Modbus();
//public static UInt32 starttimer = 0x7FFFFFFF; //开始时间
//public static bool startimerIsSet = false;
// public static int savetimer; //开始时间
public static UInt32 starttimer = 0x7FFFFFFF; //开始时间 public static UInt32 starttimer = 0x7FFFFFFF; //开始时间
public static bool startimerIsSet = false; public static bool startimerIsSet = false;
// public static int savetimer; //开始时间 public static bool startimerIsSet1 = false;
public static bool startimerIsSet2 = false;
public static bool startimerIsSet3 = false;
//public static int[] channel1_timer = new int[30]; //public static int[] channel1_timer = new int[30];
//public static float[] channel1_data = new float[30]; //public static float[] channel1_data = new float[30];
...@@ -141,7 +146,7 @@ namespace GcDevicePc ...@@ -141,7 +146,7 @@ namespace GcDevicePc
//public static Channel_XY Channel1_Port; //public static Channel_XY Channel1_Port;
//public static ArrayList Draw_Port = new ArrayList(); //public static ArrayList Draw_Port = new ArrayList();
//Flag //Flag
//public static bool startflag = false; //public static bool startflag = false;
//public static bool startclear = false; //public static bool startclear = false;
......
dll/CKVocAnalyzer.dll
View file @ 521df5d2
No preview for this file type
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