Skip to content

G
GC_Branch
Commit 495044b8 authored by wangwanxh@sina.com's avatar wangwanxh@sina.com
Browse files
Options

修改校准

parent 9ff1bfa2
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 16 deletions
GcDevicePc/MDIBase.cs
View file @ 495044b8
...@@ -1819,14 +1819,19 @@ namespace GcDevicePc ...@@ -1819,14 +1819,19 @@ namespace GcDevicePc
{ {
SharedSpace.MControl.errstr = null; SharedSpace.MControl.errstr = null;
SharedSpace.MControl.zhouqi = globaldata.m_dpbuffer.ShowList.showtime.alltime; 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) if(SharedSpace.MControl.zhouqi*SharedSpace.MControl.runcount<=SharedSpace.MControl.dateend)
{ {
// RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name); // RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name);
RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name,100); // RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name,100);
// Thread.Sleep(60 * 1000); 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;//仪器进入校准环境 SharedSpace.MControl.SetRun = true;//仪器进入校准环境
AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend); AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend);
}
// Thread.Sleep(60 * 1000);
}else }else
{ {
...@@ -1839,24 +1844,33 @@ namespace GcDevicePc ...@@ -1839,24 +1844,33 @@ namespace GcDevicePc
{ {
SharedSpace.MControl.IsEnd = true; SharedSpace.MControl.IsEnd = true;
// RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
RunTableOptWithCount(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName, 1000); if(RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName)==1)
// Thread.Sleep(30 * 1000); {
// RunTableOptWithCount(65534);
SharedSpace.MControl.SetOut = false; SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false; SharedSpace.MControl.SetRun = false;
Trace.WriteLine("校准结束", "sys"); Trace.WriteLine("校准结束", "sys");
} }
}
if (SharedSpace.MControl.forceEnd && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun) if (SharedSpace.MControl.forceEnd && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
{ {
SharedSpace.MControl.IsEnd = false; SharedSpace.MControl.IsEnd = false;
//RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName); //RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 1000); //RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 1000);
// Thread.Sleep(30 * 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.SetOut = false;
SharedSpace.MControl.SetRun = false; SharedSpace.MControl.SetRun = false;
Trace.WriteLine("强制校准结束", "sys"); Trace.WriteLine("强制校准结束", "sys");
}
} }
......
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