|
|
@@ -357,7 +357,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
// ch:注册事件回调 | en:Register event callback
|
|
|
//nReVal = mvCameraAcq.RegisterPayloadCallBack(new SciCam.fnOnPayloadDelegate(ImageCallBack), IntPtr.Zero, true);
|
|
|
// ch:设置采集策略 | en:Set Grab Strategy
|
|
|
- nReVal = mvCameraAcq.SetGrabStrategy(CurrentGrabStrategy);
|
|
|
+ nReVal = mvCameraAcq.SetGrabStrategy(SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_Upcoming);
|
|
|
if (nReVal != SciCam.SCI_CAMERA_OK)
|
|
|
{
|
|
|
Console.WriteLine("Register Event CallBack fail! nRet {0}", nReVal);
|
|
|
@@ -433,24 +433,24 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
}
|
|
|
|
|
|
//如果仅仅采集最后一帧,则清空缓存
|
|
|
- if (lastImageOnly)
|
|
|
- {
|
|
|
- //判断当前的模式是否为最新模式,如果不是则设置为最新模式
|
|
|
- if (CurrentGrabStrategy != SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_OneByOne)
|
|
|
- {
|
|
|
- CurrentGrabStrategy = SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_OneByOne;
|
|
|
- nReVal = mvCameraAcq.SetGrabStrategy(CurrentGrabStrategy);
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- //判断当前的模式是否为顺序模式,如果不是则设置为顺序模式
|
|
|
- if (CurrentGrabStrategy != SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_Latest)
|
|
|
- {
|
|
|
- CurrentGrabStrategy = SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_Latest;
|
|
|
- nReVal = mvCameraAcq.SetGrabStrategy(CurrentGrabStrategy);
|
|
|
- }
|
|
|
- }
|
|
|
+ //if (lastImageOnly)
|
|
|
+ //{
|
|
|
+ // //判断当前的模式是否为最新模式,如果不是则设置为最新模式
|
|
|
+ // if (CurrentGrabStrategy != SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_Upcoming)
|
|
|
+ // {
|
|
|
+ // CurrentGrabStrategy = SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_Upcoming;
|
|
|
+ // nReVal = mvCameraAcq.SetGrabStrategy(CurrentGrabStrategy);
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // //判断当前的模式是否为顺序模式,如果不是则设置为顺序模式
|
|
|
+ // if (CurrentGrabStrategy != SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_Latest)
|
|
|
+ // {
|
|
|
+ // CurrentGrabStrategy = SciCam.SciCamGrabStrategy.SciCam_GrabStrategy_Latest;
|
|
|
+ // nReVal = mvCameraAcq.SetGrabStrategy(CurrentGrabStrategy);
|
|
|
+ // }
|
|
|
+ //}
|
|
|
//if (!mvCameraAcq.IsGrabbing())
|
|
|
//{
|
|
|
// mvCameraAcq.StartGrabbing();
|