Skip to content

G
GC_Branch
Commit b0741b9c authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

parents da42b463 495044b8
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 22 deletions
GcDevicePc/MDIBase.cs
View file @ b0741b9c
......@@ -1825,14 +1825,19 @@ namespace GcDevicePc
{
SharedSpace.MControl.errstr = null;
SharedSpace.MControl.zhouqi = globaldata.m_dpbuffer.ShowList.showtime.alltime;
Trace.WriteLine(string.Format("开始校准{0},{1}", SharedSpace.MControl.zhouqi, SharedSpace.MControl.runcount), "sys");
if(SharedSpace.MControl.zhouqi*SharedSpace.MControl.runcount<=SharedSpace.MControl.dateend)
{
// RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name);
RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name,100);
Thread.Sleep(60 * 1000);
SharedSpace.MControl.SetRun = true;//仪器进入校准环境
AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend);
// RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name,100);
if (RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name)==1)
{
Trace.WriteLine(string.Format("开始校准{0},{1}", SharedSpace.MControl.zhouqi, SharedSpace.MControl.runcount), "sys");
SharedSpace.MControl.SetRun = true;//仪器进入校准环境
AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend);
}
// Thread.Sleep(60 * 1000);
}else
{
......@@ -1844,25 +1849,34 @@ namespace GcDevicePc
if (DateTime.Now >= AutoAdjust && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
{
SharedSpace.MControl.IsEnd = true;
// RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
RunTableOptWithCount(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName, 10000);
Thread.Sleep(30 * 1000);
// RunTableOptWithCount(65534);
SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false;
Trace.WriteLine("校准结束", "sys");
if(RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName)==1)
{
SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false;
Trace.WriteLine("校准结束", "sys");
}
}
if (SharedSpace.MControl.forceEnd && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
{
SharedSpace.MControl.IsEnd = false;
//RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 10000);
Thread.Sleep(30 * 1000);
SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false;
Trace.WriteLine("强制校准结束", "sys");
//RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 1000);
// Thread.Sleep(30 * 1000);
//SharedSpace.MControl.SetOut = false;
//SharedSpace.MControl.SetRun = false;
//Trace.WriteLine("强制校准结束", "sys");
if (RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName) == 1)
{
SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false;
Trace.WriteLine("强制校准结束", "sys");
}
}
......
GcDevicePc/ProThread/CKvocUpdata.cs
View file @ b0741b9c
......@@ -114,7 +114,7 @@ namespace GcDevicePc.ProThread
NowTimeOld = globaldata.m_hmibuffer.gcinfo.NowStartTime;
CurveDisPlay.curdisp.cleardata();
Trace.WriteLine("周期开始"+globaldata.m_hmibuffer.gcinfo.NowStartTime.ToString(), "sys");
// Trace.WriteLine("周期开始"+globaldata.m_hmibuffer.gcinfo.NowStartTime.ToString(), "sys");
}
CKVocAnalyzer.GlobalCKV.dataFtime.FTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
......@@ -143,7 +143,7 @@ namespace GcDevicePc.ProThread
{
if(globaldata.m_signalbuffer.TCP_Port.Count>0)
{
Trace.WriteLine("TCP数据回传","sys");
// Trace.WriteLine("TCP数据回传","sys");
List<double[]> tcpraw = new List<double[]>();
for (int tcpi = 0; tcpi < globaldata.m_signalbuffer.TCP_Port.Count;tcpi++ )
{
......@@ -209,7 +209,7 @@ namespace GcDevicePc.ProThread
drbool = true;
isstart = 0;
Trace.WriteLine("周期结束" + globaldata.m_hmibuffer.gcinfo.NowEndTime.ToString(), "sys");
// Trace.WriteLine("周期结束" + globaldata.m_hmibuffer.gcinfo.NowEndTime.ToString(), "sys");
break;
}
......
GcDevicePc/ProThread/DataOutput.cs
View file @ b0741b9c
......@@ -139,7 +139,7 @@ namespace GcDevicePc.ProThread
break;
}
Trace.WriteLine("周期结束" + count.ToString() + ":" + data[count].ToString(), "sys");
// Trace.WriteLine("周期结束" + count.ToString() + ":" + data[count].ToString(), "sys");
}
if (wtd624x.GetWorkFlag())
......
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