徐孝锋 8 ماه پیش
والد
کامیت
0813fac741
1فایلهای تغییر یافته به همراه11 افزوده شده و 6 حذف شده
  1. 11 6
      TeamAAS-VM/Core/Cameras/OptCamera.cs

+ 11 - 6
TeamAAS-VM/Core/Cameras/OptCamera.cs

@@ -352,6 +352,7 @@ namespace TeamAAS_VP.Core.Cameras
                 {
                     CameraConnectChangedEvent?.Invoke(ID, true);
                 }
+                mvCameraAcq.SetGrabTimeout(300);
                 IsConnected = mvCameraAcq.IsDeviceOpen();
                 if (IsConnected) 
                 {
@@ -415,25 +416,29 @@ namespace TeamAAS_VP.Core.Cameras
                         {
                             OpenDevice();
                         }
-                        //nReVal = mvCameraAcq.StartGrabbing();
+                        //if (!mvCameraAcq.IsGrabbing())
+                        //{
+                        //    mvCameraAcq.StartGrabbing();
+                        //}
+                        nReVal = mvCameraAcq.StartGrabbing();
                         mvCameraAcq.ClearPayloadBuffer();
                         nReVal = mvCameraAcq.Grab(ref payload);
                         if (nReVal == SciCam.SCI_CAMERA_OK)
                         {
                             Image = GetConvertedInfo(payload);
                             mvCameraAcq.FreePayload(payload);
-                            //nReVal = mvCameraAcq.StopGrabbing();
+                            nReVal = mvCameraAcq.StopGrabbing();
                             TotalTime = sw.Elapsed;
-                            ErrorMessage= "";
+                            ErrorMessage= $"{i+1}";
                             return Image;
                         }
                         else
                         {
                             nReVal = mvCameraAcq.FreePayload(payload);
-                            //nReVal = mvCameraAcq.StopGrabbing();
+                            nReVal = mvCameraAcq.StopGrabbing();
                             //_operationSemaphore.Release();
-                            CloseDevice();
-                            OpenDevice();
+                            //CloseDevice();
+                            //OpenDevice();
                             ErrorMessage = "图像采集失败!";
                         }
                     }