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