From 1e751a5eb3c23d932b5de94456b5a8741f28c7cc Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期六, 16 八月 2025 17:37:49 +0800 Subject: [PATCH] 1. 修复离线测试设置错误的扫描个数，应该设置的是需要扫描的个数（非相机个数） --- EdgeInspector_App/Side_Data.h | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/EdgeInspector_App/Side_Data.h b/EdgeInspector_App/Side_Data.h index e2039ce..48aa99f 100644 --- a/EdgeInspector_App/Side_Data.h +++ b/EdgeInspector_App/Side_Data.h @@ -1,7 +1,7 @@ -#pragma once +锘�#pragma once #include "Global_Define.h" -// 弥措 橇饭烙 160, 1橇饭烙 1024, 256栏肺 唱床辑 八荤窍搁 1橇饭烙俊 4 = 640俺 沥档 +// 寮ユ帾 姗囬キ鐑� 160, 1姗囬キ鐑� 1024, 256鏍忚偤 鍞卞簥杈� 鍏崵绐嶆悂 1姗囬キ鐑欎繆 4 = 640淇� 娌ユ。 #define MAX_INSPECT_AREA_LIST 1024 class CSide_Data @@ -20,7 +20,7 @@ double m_dPixelSizeX; double m_dPixelSizeY; - BOOL m_bInspection_Complete; // 八荤 肯丰 犬牢 + BOOL m_bInspection_Complete; // 鍏崵 鑲赴 鐘墷 // Start Line BOOL m_bFindGlassStartLine; @@ -28,7 +28,7 @@ int m_nGlassStartFrame; // Pre End Line - int m_nPreGlassEndLine; // 抗惑登绰 End Line + int m_nPreGlassEndLine; // 鎶楁儜鐧荤话 End Line int m_nPreGlassEndFrame; // End Line @@ -74,11 +74,11 @@ int m_nBotMarkToEdge_X_pxl; int m_nBotMarkToEdge_Y_pxl; - // Scan Start锭 固府 拌魂秦辑 静磊.. + // Scan Start閿� 鍥哄簻 鎷岄瓊绉﹁緫 闈欑.. double m_dCamResolutionX; double m_dCamResolutionY; - // Frame 喊 茫篮 Side Line... + // Frame 鍠� 鑼 Side Line... double m_nSideLineFrame[MAX_IMAGE_FRAME]; // Frame Side Line double m_nSide_Chamfer_LineFrame[MAX_IMAGE_FRAME]; // Frame Side Line @@ -90,7 +90,7 @@ int m_nSideInspectAreaCount[MAX_IMAGE_FRAME]; CRect m_rtSideInspectArea[MAX_IMAGE_FRAME][MAX_SIDE_INSPECT_AREA_COUNT]; - CRect m_rtInspectArea_InsType[MAX_SIDE_INSPECT_TYPE][MAX_IMAGE_FRAME]; // 八荤 康开 + CRect m_rtInspectArea_InsType[MAX_SIDE_INSPECT_TYPE][MAX_IMAGE_FRAME]; // 鍏崵 搴峰紑 int m_nSideFilterLine_InsType[MAX_SIDE_INSPECT_TYPE][MAX_IMAGE_FRAME]; // Side Filter Line // Measure Dimension @@ -181,14 +181,24 @@ int m_nUserDefectAreaCount; CRect m_rtUserDefectArea_pxl[MAX_SIDE_USER_DEFECT_AREA_COUNT]; - // Defect int m_nTotalDefectCount; int m_nNgDefectCount; // Thread Processing.. - BOOL m_nFrameThreadProc[MAX_IMAGE_FRAME]; // Thread啊 瘤唱埃 Frame阑 眉农窍磊.. + BOOL m_nFrameThreadProc[MAX_IMAGE_FRAME]; // Thread鍟� 鐦ゅ敱鍩� Frame闃� 鐪夊啘绐嶇.. CCriticalSection m_csFrameThread; -}; + // RIP Thickness + int m_nSideRip_Glass_Status[MAX_RIP_SAMPLE_COUNT]; + int m_nSideRip_Left_Status[MAX_RIP_SAMPLE_COUNT]; + int m_nSideRip_Right_Status[MAX_RIP_SAMPLE_COUNT]; + double m_dSideRip_Glass_um[MAX_RIP_SAMPLE_COUNT]; + double m_dSideRip_Left_um[MAX_RIP_SAMPLE_COUNT]; + double m_dSideRip_Right_um[MAX_RIP_SAMPLE_COUNT]; + + CPoint m_ptSideRip_Glass_pxl[MAX_RIP_SAMPLE_COUNT][RIP_POINT_COUNT]; + CPoint m_ptSideRip_Left_pxl[MAX_RIP_SAMPLE_COUNT][RIP_POINT_COUNT]; + CPoint m_ptSideRip_Right_pxl[MAX_RIP_SAMPLE_COUNT][RIP_POINT_COUNT]; +}; \ No newline at end of file -- Gitblit v1.9.3