Skip to content

G
GC_Branch
Commit b331ea60 authored by leon.huang's avatar leon.huang
Browse files
Options

version1.6.9 第一次 release。修改画图界面停止的问题

parent 5659e826
Expand all Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 32 deletions
GcDevicePc/AboutForm.cs
View file @ b331ea60
...@@ -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.6.8"; this.PCver.Text = this.Hmiversion + "/1.6.9";
} }
} }
} }
GcDevicePc/Common/MoudbusOperation.cs
View file @ b331ea60
...@@ -314,6 +314,8 @@ namespace GcDevicePc.Common ...@@ -314,6 +314,8 @@ namespace GcDevicePc.Common
#region 功能函数 #region 功能函数
private UInt32[] Beforetime = new UInt32[30];
private UInt32[] OverTimes = new UInt32[30];
public void Get_Channel_Data() public void Get_Channel_Data()
{ {
UInt16[] dest = new UInt16[channel_num]; UInt16[] dest = new UInt16[channel_num];
...@@ -345,11 +347,23 @@ namespace GcDevicePc.Common ...@@ -345,11 +347,23 @@ namespace GcDevicePc.Common
for (int i = 0; i < channel_num / 4; i++) for (int i = 0; i < channel_num / 4; i++)
{ {
tmp = timev[i]; tmp = timev[i];
if (Beforetime[i] > tmp && (Beforetime[i]- tmp) > 0xfffff000)
{
OverTimes[i] ++;
}
Beforetime[i] = tmp;
if(tmp < 0x000F0000 && fDetMax_Time > 0xFFFFF000)
{
fDetMax_Time = 0;
}
if (tmp > fDetMax_Time) if (tmp > fDetMax_Time)
{ {
fDetMax_Time = tmp; fDetMax_Time = tmp;
globaldata.m_signalbuffer.Channel1_Port.ctimer = tmp;
//globaldata.m_signalbuffer.Channel1_Port.ctimer = tmp;
globaldata.m_signalbuffer.Channel1_Port.ctimer = tmp + (ulong)(0x100000000 * OverTimes[i]);
globaldata.m_signalbuffer.Channel1_Port.cdata = fidv[i]; globaldata.m_signalbuffer.Channel1_Port.cdata = fidv[i];
globaldata.m_dpbuffer.ShowList.showDet.fDetValue = fidv[i] * 1000.0f; globaldata.m_dpbuffer.ShowList.showDet.fDetValue = fidv[i] * 1000.0f;
......
GcDevicePc/ConfigDlg/FIDDlg.Designer.cs
View file @ b331ea60
...@@ -264,13 +264,13 @@ ...@@ -264,13 +264,13 @@
this.label15.Location = new System.Drawing.Point(261, 208); this.label15.Location = new System.Drawing.Point(261, 208);
this.label15.Name = "label15"; this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(41, 12); this.label15.Size = new System.Drawing.Size(41, 12);
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(261, 180);
this.label15.TabIndex = 0; this.label15.TabIndex = 0;
this.label15.Text = "ml/min"; this.label15.Text = "ml/min";
// //
// label13 // label13
// //
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(261, 180);
this.label13.Name = "label13"; this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(41, 12); this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 0; this.label13.TabIndex = 0;
......
GcDevicePc/DataState.cs
View file @ b331ea60
...@@ -1878,6 +1878,11 @@ namespace GcDevicePc ...@@ -1878,6 +1878,11 @@ namespace GcDevicePc
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
tempshow = new ListViewItem();
tempshow.Text = GettempName("尾吹流量(mL/min)");
tempshow.SubItems.Add(GetValue(globaldata.m_dpbuffer.ShowList.showepc.EPC1_1_Cur) + "/" +
GetSetValue(globaldata.m_dpbuffer.ShowList.showepc.EPC1_1_Set));
this.datalist.Items.Add(tempshow);
tempshow = new ListViewItem(); tempshow = new ListViewItem();
tempshow.Text = "点火状态"; tempshow.Text = "点火状态";
......
GcDevicePc/GCBuffer/SignalBuffer.cs
View file @ b331ea60
...@@ -10,7 +10,7 @@ namespace GcDevicePc.GCBuffer ...@@ -10,7 +10,7 @@ namespace GcDevicePc.GCBuffer
{ {
public struct Channel_XY public struct Channel_XY
{ {
public UInt32 ctimer; public UInt64 ctimer;
public float cdata; public float cdata;
}; };
......
GcDevicePc/MDIBase.cs
View file @ b331ea60
...@@ -688,7 +688,7 @@ namespace GcDevicePc ...@@ -688,7 +688,7 @@ namespace GcDevicePc
/// 1.0.2.3 添加了周期完成后，重新绘图功能 /// 1.0.2.3 添加了周期完成后，重新绘图功能
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
this.Text = String.Format("{0}-1.6.8 {1}", globaldata.AppName,Formstr); this.Text = String.Format("{0}-1.6.9 {1}", globaldata.AppName,Formstr);
HmiStatus.Text = String.Format("状态：{0}", statestr); HmiStatus.Text = String.Format("状态：{0}", statestr);
......
GcDevicePc/ProThread/CKvocUpdata2.cs
View file @ b331ea60
...@@ -32,7 +32,7 @@ namespace GcDevicePc.ProThread ...@@ -32,7 +32,7 @@ namespace GcDevicePc.ProThread
List<double[]> listRawTem = new List<double[]>();//原始数据缓存 List<double[]> listRawTem = new List<double[]>();//原始数据缓存
bool drbool = false; bool drbool = false;
uint NowTimeOld = 0;//上一周期开始 uint NowTimeOld = 0;//上一周期开始
UInt32 starttimer = 0x7FFFFFFF; UInt64 starttimer = 0x7FFFFFFF;
while (!datamre.WaitOne(500)) while (!datamre.WaitOne(500))
{ {
......
GcDevicePc/ProThread/CKvocUpdata3.cs
View file @ b331ea60
...@@ -33,7 +33,7 @@ namespace GcDevicePc.ProThread ...@@ -33,7 +33,7 @@ namespace GcDevicePc.ProThread
List<double[]> listRawTem = new List<double[]>();//原始数据缓存 List<double[]> listRawTem = new List<double[]>();//原始数据缓存
bool drbool = false; bool drbool = false;
uint NowTimeOld = 0;//上一周期开始 uint NowTimeOld = 0;//上一周期开始
UInt32 starttimer = 0x7FFFFFFF; UInt64 starttimer = 0x7FFFFFFF;
while (!datamre.WaitOne(500)) while (!datamre.WaitOne(500))
{ {
......
GcDevicePc/ProThread/ChannelDataSave.cs
View file @ b331ea60
...@@ -103,12 +103,12 @@ namespace GcDevicePc.ProThread ...@@ -103,12 +103,12 @@ namespace GcDevicePc.ProThread
{ {
double value = 0; double value = 0;
float dvalue = 0.0f; float dvalue = 0.0f;
UInt32 starttimer = 0x7FFFFFFF; UInt64 starttimer = 0x7FFFFFFF;
UInt32 endtimer = 0x7FFFFFFF; UInt32 endtimer = 0x7FFFFFFF;
Boolean saveflag = false; Boolean saveflag = false;
List<float> listPoint = new List<float>();//临时数据区 List<float> listPoint = new List<float>();//临时数据区
List<float> savePoint = new List<float>(); List<float> savePoint = new List<float>();
List<uint> timePoint = new List<uint>();//临时数据区 List<UInt64> timePoint = new List<UInt64>();//临时数据区
try try
{ {
......
GcDevicePc/ProThread/ChannelDataSave2.cs
View file @ b331ea60
...@@ -31,12 +31,12 @@ namespace GcDevicePc.ProThread ...@@ -31,12 +31,12 @@ namespace GcDevicePc.ProThread
{ {
double value = 0; double value = 0;
float dvalue = 0.0f; float dvalue = 0.0f;
UInt32 starttimer = 0x7FFFFFFF; UInt64 starttimer = 0x7FFFFFFF;
UInt32 endtimer = 0x7FFFFFFF; UInt32 endtimer = 0x7FFFFFFF;
Boolean saveflag = false; Boolean saveflag = false;
List<float> listPoint = new List<float>();//临时数据区 List<float> listPoint = new List<float>();//临时数据区
List<float> savePoint = new List<float>(); List<float> savePoint = new List<float>();
List<uint> timePoint = new List<uint>();//临时数据区 List<UInt64> timePoint = new List<UInt64>();//临时数据区
try try
{ {
......
GcDevicePc/ProThread/ChannelDataSave3.cs
View file @ b331ea60
...@@ -29,12 +29,12 @@ namespace GcDevicePc.ProThread ...@@ -29,12 +29,12 @@ namespace GcDevicePc.ProThread
{ {
double value = 0; double value = 0;
float dvalue = 0.0f; float dvalue = 0.0f;
UInt32 starttimer = 0x7FFFFFFF; UInt64 starttimer = 0x7FFFFFFF;
UInt32 endtimer = 0x7FFFFFFF; UInt32 endtimer = 0x7FFFFFFF;
Boolean saveflag = false; Boolean saveflag = false;
List<float> listPoint = new List<float>();//临时数据区 List<float> listPoint = new List<float>();//临时数据区
List<float> savePoint = new List<float>(); List<float> savePoint = new List<float>();
List<uint> timePoint = new List<uint>();//临时数据区 List<UInt64> timePoint = new List<UInt64>();//临时数据区
try try
{ {
......
GcDevicePc/ProThread/GcDataTh.cs
View file @ b331ea60
...@@ -176,11 +176,14 @@ namespace GcDevicePc.ProThread ...@@ -176,11 +176,14 @@ namespace GcDevicePc.ProThread
} }
#region 三通道数据获取 #region 三通道数据获取
private UInt32[] Beforetime1 = new UInt32[30];
private UInt32[] OverTimes1 = new UInt32[30];
/// <summary> /// <summary>
/// 获取通道数据 /// 获取通道数据
/// </summary> /// </summary>
/// <param name="address"></param> /// <param name="address"></param>
/// <param name="num"></param> /// <param name="num"></param>
///
private void Get_Channel_Data(ushort address, ushort num) private void Get_Channel_Data(ushort address, ushort num)
{ {
int ret; int ret;
...@@ -217,14 +220,22 @@ namespace GcDevicePc.ProThread ...@@ -217,14 +220,22 @@ namespace GcDevicePc.ProThread
for (int i = 0; i < num / 4; i++) for (int i = 0; i < num / 4; i++)
{ {
tmp = timev[i]; tmp = timev[i];
if (Beforetime1[i] > tmp && (Beforetime1[i]- tmp) > 0xfffff000)
{
OverTimes1[i] ++;
}
Beforetime1[i] = tmp;
if(tmp < 0x000F0000 && fDetMax_Time > 0xFFFFF000)
{
fDetMax_Time = 0;
}
if (tmp > fDetMax_Time) if (tmp > fDetMax_Time)
{ {
fDetMax_Time = tmp; fDetMax_Time = tmp;
globaldata.m_signalbuffer.Channel1_Port.ctimer = tmp; //globaldata.m_signalbuffer.Channel1_Port.ctimer = tmp;
globaldata.m_signalbuffer.Channel1_Port.ctimer = tmp + (ulong)(0x100000000 * OverTimes1[i]);
globaldata.m_signalbuffer.Channel1_Port.cdata = fidv[i]; globaldata.m_signalbuffer.Channel1_Port.cdata = fidv[i];
globaldata.m_dpbuffer.ShowList.showDet.fDetValue = fidv[i] * 1000.0f; globaldata.m_dpbuffer.ShowList.showDet.fDetValue = fidv[i] * 1000.0f;
#if (data) #if (data)
...@@ -264,7 +275,8 @@ namespace GcDevicePc.ProThread ...@@ -264,7 +275,8 @@ namespace GcDevicePc.ProThread
} }
} }
} }
private UInt32[] Beforetime2 = new UInt32[30];
private UInt32[] OverTimes2 = new UInt32[30];
private void Get_Channel2_Data(ushort address, ushort num) private void Get_Channel2_Data(ushort address, ushort num)
{ {
UInt32 tmp; UInt32 tmp;
...@@ -299,11 +311,21 @@ namespace GcDevicePc.ProThread ...@@ -299,11 +311,21 @@ namespace GcDevicePc.ProThread
for (int i = 0; i < num / 4; i++) for (int i = 0; i < num / 4; i++)
{ {
tmp = timev[i]; tmp = timev[i];
if (Beforetime2[i] > tmp && (Beforetime2[i]- tmp) > 0xfffff000)
{
OverTimes2[i] ++;
}
Beforetime2[i] = tmp;
if(tmp < 0x000F0000 && iDetMax_Time > 0xFFFFF000)
{
iDetMax_Time = 0;
}
if (tmp > iDetMax_Time) if (tmp > iDetMax_Time)
{ {
iDetMax_Time = tmp; iDetMax_Time = tmp;
globaldata.m_signalbuffer.Channel2_Port.ctimer = tmp; //globaldata.m_signalbuffer.Channel2_Port.ctimer = tmp;
globaldata.m_signalbuffer.Channel2_Port.ctimer = tmp + (ulong)(0x100000000 * OverTimes2[i]);
globaldata.m_signalbuffer.Channel2_Port.cdata = fidv[i]; globaldata.m_signalbuffer.Channel2_Port.cdata = fidv[i];
globaldata.m_dpbuffer.ShowList.showDet.iDetValue = fidv[i] * 1000.0f; globaldata.m_dpbuffer.ShowList.showDet.iDetValue = fidv[i] * 1000.0f;
...@@ -341,7 +363,8 @@ namespace GcDevicePc.ProThread ...@@ -341,7 +363,8 @@ namespace GcDevicePc.ProThread
} }
} }
private UInt32[] Beforetime3 = new UInt32[30];
private UInt32[] OverTimes3 = new UInt32[30];
private void Get_Channel3_Data(ushort address, ushort num) private void Get_Channel3_Data(ushort address, ushort num)
{ {
UInt32 tmp; UInt32 tmp;
...@@ -376,11 +399,21 @@ namespace GcDevicePc.ProThread ...@@ -376,11 +399,21 @@ namespace GcDevicePc.ProThread
for (int i = 0; i < num / 4; i++) for (int i = 0; i < num / 4; i++)
{ {
tmp = timev[i]; tmp = timev[i];
if (Beforetime3[i] > tmp && (Beforetime3[i]- tmp) > 0xfffff000)
{
OverTimes3[i] ++;
}
Beforetime3[i] = tmp;
if(tmp < 0x000F0000 && bDetMax_Time > 0xFFFFF000)
{
bDetMax_Time = 0;
}
if (tmp > bDetMax_Time) if (tmp > bDetMax_Time)
{ {
bDetMax_Time = tmp; bDetMax_Time = tmp;
globaldata.m_signalbuffer.Channel3_Port.ctimer = tmp; // globaldata.m_signalbuffer.Channel3_Port.ctimer = tmp;
globaldata.m_signalbuffer.Channel3_Port.ctimer = tmp + (ulong)(0x100000000 * OverTimes3[i]);
globaldata.m_signalbuffer.Channel3_Port.cdata = fidv[i]; globaldata.m_signalbuffer.Channel3_Port.cdata = fidv[i];
globaldata.m_dpbuffer.ShowList.showDet.bDetValue = fidv[i] * 1000.0f; globaldata.m_dpbuffer.ShowList.showDet.bDetValue = fidv[i] * 1000.0f;
globaldata.m_signalbuffer.Draw_Port3.Add(globaldata.m_signalbuffer.Channel3_Port); globaldata.m_signalbuffer.Draw_Port3.Add(globaldata.m_signalbuffer.Channel3_Port);
......
GcDevicePc/StartForm.cs
View file @ b331ea60
...@@ -263,7 +263,6 @@ namespace GcDevicePc ...@@ -263,7 +263,6 @@ namespace GcDevicePc
e.Cancel = true; e.Cancel = true;
break; break;
} }
_initSec++; _initSec++;
string tail = ""; string tail = "";
for (int i = 0; i < (_initSec % 4); i++) for (int i = 0; i < (_initSec % 4); i++)
......
GcDevicePc/UserConfig.cs
View file @ b331ea60
...@@ -51,7 +51,7 @@ namespace GcDevicePc ...@@ -51,7 +51,7 @@ namespace GcDevicePc
{ {
if(adapter.Name == this.label5.Text)//if (adapter.Name == Meshport || string.IsNullOrEmpty(Meshport)) if(adapter.Name == this.label5.Text)//if (adapter.Name == Meshport || string.IsNullOrEmpty(Meshport))
{ {
bool Pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet); //判断是否是以太网连接 bool Pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet || adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211); //判断是否是以太网连接
if (Pd1) if (Pd1)
{ {
{ {
......
GcDevicePc/globaldata.cs
View file @ b331ea60
...@@ -141,7 +141,7 @@ namespace GcDevicePc ...@@ -141,7 +141,7 @@ namespace GcDevicePc
//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 int savetimer; //开始时间
public static UInt32 starttimer = 0x7FFFFFFF; //开始时间 public static UInt64 starttimer = 0x7FFFFFFF; //开始时间
public static bool startimerIsSet = false; public static bool startimerIsSet = false;
public static bool startimerIsSet1 = false; public static bool startimerIsSet1 = false;
public static bool startimerIsSet2 = false; public static bool startimerIsSet2 = false;
......
VocsSetup/GC_Config/GC_Set/tmpfile/230/DevStatus.ini 0 → 100644
View file @ b331ea60
B[仪器编号] B[仪器编号]
VocsSetup/GC_Config/GC_Set/仪器方法/VOC/SingleAnal.ini deleted 100644 → 0
View file @ 5659e826
Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/VOC/SingleAnal.ini" and /dev/null differ Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/VOC/SingleAnal.ini" and /dev/null differ
VocsSetup/GC_Config/GC_Set/仪器方法/cs/测试.ini 0 → 100644
View file @ b331ea60
B[方法名称] B[方法名称]
VocsSetup/GC_Config/GC_Set/仪器方法/tvoc/1.ini deleted 100644 → 0
View file @ 5659e826
Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/tvoc/1.ini" and /dev/null differ Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/tvoc/1.ini" and /dev/null differ
VocsSetup/GC_Config/GC_Set/仪器方法/tvoc/3.ini deleted 100644 → 0
View file @ 5659e826
Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/tvoc/3.ini" and /dev/null differ Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/tvoc/3.ini" and /dev/null differ
VocsSetup/GC_Config/GC_Set/仪器方法/voc/20200420.ini deleted 100644 → 0
View file @ 5659e826
Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/voc/20200420.ini" and /dev/null differ Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/voc/20200420.ini" and /dev/null differ
VocsSetup/GC_Config/GC_Set/仪器方法/voc/20200424.ini deleted 100644 → 0
View file @ 5659e826
Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/voc/20200424.ini" and /dev/null differ Binary files "a/VocsSetup/GC_Config/GC_Set/\344\273\252\345\231\250\346\226\271\346\263\225/voc/20200424.ini" and /dev/null differ
VocsSetup/GC_Config/GC_Set/启动参数/startup.ini
View file @ b331ea60
[NetWorkConfig] [NetWorkConfig]
MAC地址=F8:02:78:60:70:A0 MAC地址=F8:02:78:60:70:9E
网口=本地连接 网口=本地连接
搜索时间=10 搜索时间=20
[StartUp] [StartUp]
自启动=0 自启动=0
打开系统=0 打开系统=0
...@@ -17,13 +17,13 @@ InfoLog=0 ...@@ -17,13 +17,13 @@ InfoLog=0
ErrLog=0 ErrLog=0
HmiLog=0 HmiLog=0
[Version] [Version]
VersionType=1 VersionType=0
AppName= AppName=
[User] [User]
Name=admin Name=admin
Password=0 Password=0
[SendData] [SendData]
Thirdparty=1 Thirdparty=0
Foreign=2 Foreign=2
[SaveData] [SaveData]
ZBSaveData=1 ZBSaveData=1
VocsSetup/GC_Control/GcDevicePc.xml
View file @ b331ea60
...@@ -2500,6 +2500,7 @@ ...@@ -2500,6 +2500,7 @@
</summary> </summary>
<param name="address"></param> <param name="address"></param>
<param name="num"></param> <param name="num"></param>
</member> </member>
<member name="M:GcDevicePc.ProThread.GcDataTh.GetCState(System.UInt16,System.UInt16,System.Byte[]@)"> <member name="M:GcDevicePc.ProThread.GcDataTh.GetCState(System.UInt16,System.UInt16,System.Byte[]@)">
<summary> <summary>
......
VocsSetup/GC_User/ResultData/Record2.db
View file @ b331ea60
This diff is collapsed.
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