dev #1

Merged
gebo merged 24 commits from dev into master 2025-12-19 14:56:09 +08:00
Showing only changes of commit 7c7e69bee5 - Show all commits

View File

@@ -224,7 +224,7 @@ namespace TetraPackOCR
CloseCC24(); CloseCC24();
if (myJobManagerDET == null) if (myJobManagerDET == null)
Environment.Exit(0); System.Environment.Exit(0);
} }
catch catch
{ {
@@ -1146,7 +1146,14 @@ namespace TetraPackOCR
//画定位的十字点 //画定位的十字点
CPMARunStatus.DrawPointMarker(xx, yy, CogMisc.DegToRad(rr), CogColorConstants.Orange, Location_Display, "."); CPMARunStatus.DrawPointMarker(xx, yy, CogMisc.DegToRad(rr), CogColorConstants.Orange, Location_Display, ".");
log.Info("定位计算已完成。"); log.Info("定位计算已完成。");
SendToPLC(xx, yy, rr);
if (xx > 350)
{
log.Error("定位横向轴偏左,疑似倒数第二张图,请重新摆放后识别");
NoticePLCCompleteDet(DataConverter.FloatToByte(0.0f, true));
}
else
SendToPLC(xx, yy, rr);
} }
else else
{ {