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/Define/Global_Define.h | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/EdgeInspector_App/Define/Global_Define.h b/EdgeInspector_App/Define/Global_Define.h
index ff34171..2080542 100644
--- a/EdgeInspector_App/Define/Global_Define.h
+++ b/EdgeInspector_App/Define/Global_Define.h
@@ -43,7 +43,7 @@
#define CHKMIN(a,b) (((a) < (b)) ? (a) : (b))
#define MAX_PANEL_SIDE 4 // 鎼� 鑽�
-#define UPDN_TYPE 2 // 鎯戠獚 闉嶆崬 涔愮话鐗堝揩 2 绐嶅敱鐖� 涔愮话鐗堝揩 1
+#define UPDN_TYPE 3 // 鎯戠獚 闉嶆崬 涔愮话鐗堝揩 2 绐嶅敱鐖� 涔愮话鐗堝揩 1
#define MAX_SIDE_COUNT 12
#define MAX_CORNER_DIMENSION_MEASURE_COUNT 5
#define MAX_SIDE_DIMENSION_MEASURE_COUNT 16 // 寮ユ帾 Frame 鑽� 鐖舵��
@@ -54,16 +54,19 @@
#define MAX_SIDE_NOTCH_MEASURE_COUNT 10
#define MAX_SIDE_NOTCH_CIRCLE_COUNT 4
+#define MAX_RIP_SAMPLE_COUNT 36
+#define RIP_POINT_COUNT 2
+
/*
#define MAX_PROFILE_SETTING_COUNT 79
-#define PROFILE_INSPECT_SIZE_A_C 13
-#define PROFILE_INSPECT_SIZE_B_D 10
-#define PROFILE_RCUT_SIZE 5
-#define PROFILE_INSPECT_INDEX_A 33
-#define PROFILE_INSPECT_INDEX_B 0
-#define PROFILE_INSPECT_INDEX_C 10
-#define PROFILE_INSPECT_INDEX_D 23
-#define PROFILE_INSPECT_INDEX_CF 46
+#define PROFILE_INSPECT_SIZE_A_C 13
+#define PROFILE_INSPECT_SIZE_B_D 10
+#define PROFILE_RCUT_SIZE 5
+#define PROFILE_INSPECT_INDEX_A 33
+#define PROFILE_INSPECT_INDEX_B 0
+#define PROFILE_INSPECT_INDEX_C 10
+#define PROFILE_INSPECT_INDEX_D 23
+#define PROFILE_INSPECT_INDEX_CF 46
#define PROFILE_RCUT_INSPECT_INDEX_A 59
#define PROFILE_RCUT_INSPECT_INDEX_B 64
#define PROFILE_RCUT_INSPECT_INDEX_C 69
@@ -80,7 +83,7 @@
enum LIGHT_TYPE {LIGHT_TYPE_TRANS=0,LIGHT_TYPE_REF,LIGHT_TYPE_NONE};
enum LIGHT_MAKER {MAKER_LCP=0,MAKER_AKP,MAKER_NONE};
- enum CAMERA_DIR {CAMDIR_TOP=0,CAMDIR_BOTTOM,CAMDIR_NONE};
+ enum CAMERA_DIR {CAMDIR_TOP=0,CAMDIR_BOTTOM,CAMDIR_SIDE,CAMDIR_NONE};
enum CAMERA_INSPECTION_DIR {INSPECTDIR_FORWARD=0,INSPECTDIR_BACKWARD,INSPECTDIR_NONE};
enum CAMERA_SCANDIR {SCANGLASS_X=0,SCANGLASS_Y,SCANGLASS_NONE};
enum BOARD_TYPE {GRAB_LINK_BOARD=0,RADIENT_BOARD,SOLIOS_BOARD,SAP_BOARD,BOARDTYPE_NONE};
@@ -90,7 +93,7 @@
enum ScanDirectionIns { SD_Forward = 0, SD_Backward, SD_Unknown }; // Glass 鎵侀湒 Scan 瑙勬阿.
enum DimensionDir {
- DIMENSION_A=0,
+ DIMENSION_A = 0,
DIMENSION_B,
DIMENSION_C,
DIMENSION_D,
@@ -112,7 +115,14 @@
enum GlassDirection { GD_LeftTop = 0, GD_RightTop = 1, GD_LeftBottom = 10, GD_RightBottom = 11 };
enum ExpRegionType { ER_ALL=0, ER_AREA, ER_NONE};//130115
- enum Procee_Mode {PROC_MODE_AUTO=0,PROC_MODE_SIMULATION_ONESIDE,PROC_MODE_SIMULATION_SIDESHORT,PROC_MODE_SIMULATION_SIDELONG,PROC_MODE_SIMULATION_ALL};
+ enum Procee_Mode {
+ PROC_MODE_AUTO = 0,
+ PROC_MODE_SIMULATION_SIDERIP,
+ PROC_MODE_SIMULATION_ONESIDE,
+ PROC_MODE_SIMULATION_SIDESHORT,
+ PROC_MODE_SIMULATION_SIDELONG,
+ PROC_MODE_SIMULATION_ALL,
+ };
enum Init_View_Command {VIEW_RECIPE=0,VIEW_SCANIMAGE};
};
@@ -291,7 +301,21 @@
#define ZOOM_RANGE 20
#define ZOOM_RATIO (1.0/(((double)ZOOM_RANGE+2.0)/2.0))
-enum eViewCmdSide {eRcp_SideRD_A=0, eRcp_SideRD_B, eRcp_SideRD_C, eRcp_SideRD_D,eRcp_SideRD_A_DN,eRcp_SideRD_B_DN,eRcp_SideRD_C_DN,eRcp_SideRD_D_DN,eRcp_SideRD_End};
+enum eViewCmdSide {
+ eRcp_SideRD_A = 0,
+ eRcp_SideRD_B,
+ eRcp_SideRD_C,
+ eRcp_SideRD_D,
+ eRcp_SideRD_A_DN,
+ eRcp_SideRD_B_DN,
+ eRcp_SideRD_C_DN,
+ eRcp_SideRD_D_DN,
+ eRcp_SideRD_A_RIP,
+ eRcp_SideRD_B_RIP,
+ eRcp_SideRD_C_RIP,
+ eRcp_SideRD_D_RIP,
+ eRcp_SideRD_End
+};
enum eViewCmdInsType
{
@@ -304,10 +328,11 @@
eRcp_InsType_In_Burr,
eRcp_InsType_In_Chamfer,
eRcp_InsType_TopCorner,
- eRcp_InsType_BotCorner
+ eRcp_InsType_BotCorner,
+ eRcp_InsType_RipThickness
};
-static CString g_strInsType[10] =
+static CString g_strInsType[] =
{
_T("Chip"),
_T("Crack"),
@@ -319,6 +344,7 @@
_T("In_Chamfer"),
_T("Top_Corner"),
_T("Bot_Corner"),
+ _T("Thickness")
};
enum eSideInsType
--
Gitblit v1.9.3