|
|
|
@ -6,6 +6,7 @@ using Rs.Framework;
|
|
|
|
|
using Rs.MotionPlat.Commom;
|
|
|
|
|
using Rs.MotionPlat.Flow;
|
|
|
|
|
using Rs.MotionPlat.Flow.NormalFlow;
|
|
|
|
|
using Rs.MotionPlat.SysConfig;
|
|
|
|
|
using Rs.MotionPlat.Vision;
|
|
|
|
|
using System;
|
|
|
|
|
using System.Collections.Concurrent;
|
|
|
|
@ -452,7 +453,10 @@ namespace Rs.MotionPlat.Entitys
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//先把侧相机数据清空
|
|
|
|
|
if(!GlobalVar.IsSimTest)
|
|
|
|
|
{
|
|
|
|
|
VisionHelper.sideCameraVision.ClearQueue(this.Index);
|
|
|
|
|
}
|
|
|
|
|
int noise = GlobalVar.Noise ? 1 : 0;
|
|
|
|
|
int mtcp=GlobalVar.Mtcp ? 1 : 0;
|
|
|
|
|
int isFirstFixture = IsFirstFixture ? 1 : 0;
|
|
|
|
@ -763,7 +767,7 @@ namespace Rs.MotionPlat.Entitys
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
logs.Enqueue(log);
|
|
|
|
|
logs.Enqueue($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff")} {log}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public string GetLog()
|
|
|
|
@ -774,7 +778,7 @@ namespace Rs.MotionPlat.Entitys
|
|
|
|
|
bool b = logs.TryDequeue(out string content);
|
|
|
|
|
if(b)
|
|
|
|
|
{
|
|
|
|
|
msg.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} {content}\r\n");
|
|
|
|
|
msg.Append($"{content}\r\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return msg.ToString();
|
|
|
|
|