delete no need camera response

This commit is contained in:
2025-11-05 15:08:47 +08:00
parent 1a54dcdf2c
commit b4d33c9c0e

View File

@@ -962,7 +962,7 @@ namespace TetraPackOCR
/// <param name="e"></param> /// <param name="e"></param>
private void btn_manualOcr_Click(object sender, EventArgs e) private void btn_manualOcr_Click(object sender, EventArgs e)
{ {
m_dev_cam_ocr.ExecuteSoftwareTrigger();//相机1触发 = OCR拍照 m_dev_cam_ocr?.ExecuteSoftwareTrigger();//相机1触发 = OCR拍照
log.Info("手动触发OCR"); log.Info("手动触发OCR");
} }
/// <summary> /// <summary>
@@ -972,7 +972,7 @@ namespace TetraPackOCR
/// <param name="e"></param> /// <param name="e"></param>
private void btn_manualDet_Click(object sender, EventArgs e) private void btn_manualDet_Click(object sender, EventArgs e)
{ {
m_dev_cam_det.ExecuteSoftwareTrigger(); m_dev_cam_det?.ExecuteSoftwareTrigger();
log.Info("手动触发定位"); log.Info("手动触发定位");
} }
private bool autorunFlag = false; private bool autorunFlag = false;
@@ -1056,29 +1056,6 @@ namespace TetraPackOCR
} }
#endregion #endregion
#region PLC触发相机
#region
/// <summary>
/// 定位相机拍照信号过来程序需要进行的操作
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void DetCamTriger()
{
try
{
log.Info("PLC触发定位相机正在拍照计算...");
m_dev_cam_det?.ExecuteSoftwareTrigger();
}
catch (Exception ex)
{
log.Error(ex.Message);
}
}
#endregion
#region OCR相机拍照触发处理函数 #region OCR相机拍照触发处理函数
/// <summary> /// <summary>
/// OCR相机拍照信号过来需要进行的操作 /// OCR相机拍照信号过来需要进行的操作
@@ -1090,7 +1067,7 @@ namespace TetraPackOCR
try try
{ {
log.Info("PLC触发OCR相机正在拍照计算..."); log.Info("PLC触发OCR相机正在拍照计算...");
m_dev_cam_ocr.ExecuteSoftwareTrigger(); m_dev_cam_ocr?.ExecuteSoftwareTrigger();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -1099,8 +1076,6 @@ namespace TetraPackOCR
} }
#endregion #endregion
#endregion
#region #region
#region #region
@@ -1798,7 +1773,6 @@ namespace TetraPackOCR
} }
byte[] data = cc24.ReadBytesFromPLC(0, 4); byte[] data = cc24.ReadBytesFromPLC(0, 4);
float mMatchingStrf = DataConverter.ByteToFloat(data, true); float mMatchingStrf = DataConverter.ByteToFloat(data, true);
mMatchingStr = Convert.ToInt32(mMatchingStrf); mMatchingStr = Convert.ToInt32(mMatchingStrf);
@@ -1830,20 +1804,11 @@ namespace TetraPackOCR
} }
try try
{ {
#region
if (e.CameraIndex == 0)
{
DetCamTriger();
}
#endregion
#region OCR拍照信号
if (e.CameraIndex == 1) if (e.CameraIndex == 1)
{ {
Thread.Sleep(1000); Thread.Sleep(1000);
OcrCamTriger(); OcrCamTriger();
} }
#endregion
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -1856,20 +1821,6 @@ namespace TetraPackOCR
private void CC24_PlcTriggerCamAcqStop(object sender, CogNdmTriggerAcquisitionStopEventArgs e) private void CC24_PlcTriggerCamAcqStop(object sender, CogNdmTriggerAcquisitionStopEventArgs e)
{ {
if (InvokeRequired)
{
Invoke(new CogNdmTriggerAcquisitionStopEventHandler(CC24_PlcTriggerCamAcqStop), new object[] { sender, e });
return;
}
if (e.CameraIndex == 0)
{
log.Info("PLC中断定位相机拍照。");
}
if (e.CameraIndex == 1)
{
log.Info("PLC中断OCR相机拍照。");
}
} }
#endregion #endregion
@@ -2109,10 +2060,7 @@ namespace TetraPackOCR
cc24.PlcTriggerCamAcqStop -= CC24_PlcTriggerCamAcqStop; cc24.PlcTriggerCamAcqStop -= CC24_PlcTriggerCamAcqStop;
cc24.NotifyCamAcqEnabled -= CC24_NotifyCamAcqEnabled; cc24.NotifyCamAcqEnabled -= CC24_NotifyCamAcqEnabled;
cc24.NotifyCamAcqDisabled -= CC24_NotifyCamAcqDisabled; cc24.NotifyCamAcqDisabled -= CC24_NotifyCamAcqDisabled;
cc24.Shutdown(); cc24.Shutdown();
} }
catch (Exception ex) catch (Exception ex)
{ {