From 0896fd408c982b35776582f1bd4f8b52ed395724 Mon Sep 17 00:00:00 2001 From: LWQ <1806950222@qq.com> Date: 星期四, 24 七月 2025 09:03:55 +0800 Subject: [PATCH] 修复新增COM控件被Tab覆盖的问题 --- ENRIT/Define/Global_Define.h | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ENRIT/Define/Global_Define.h b/ENRIT/Define/Global_Define.h index c7a483b..d4ac76c 100644 --- a/ENRIT/Define/Global_Define.h +++ b/ENRIT/Define/Global_Define.h @@ -6,12 +6,13 @@ #include <functional> using namespace std; -#define WM_USER_SYSTEM_CLOSE WM_USER + 1 -#define UM_LIST_SELECTDEFECT WM_USER + 2 -#define WM_POCESS_STATUS WM_USER + 3 -#define WM_LIVE_IMG_UPDATE WM_USER + 4 -#define UM_UPDATE_RECIPE WM_USER + 5 -#define UM_SEND_MESSAGE_MAIN_DLG WM_USER + 6 +#define WM_USER_SYSTEM_CLOSE (WM_USER + 1) +#define UM_LIST_SELECTDEFECT (WM_USER + 2) +#define WM_POCESS_STATUS (WM_USER + 3) +#define WM_LIVE_IMG_UPDATE (WM_USER + 4) +#define UM_UPDATE_RECIPE (WM_USER + 5) +#define UM_SEND_MESSAGE_MAIN_DLG (WM_USER + 6) +#define WM_BATCH_PROCESS_NEXT (WM_USER + 7) #define MAX_CAMERA_COUNT 4 #define MAX_SCAN_COUNT 2 @@ -257,6 +258,7 @@ virtual void IV2M_InitView(Init_View_Command eVew) = 0; virtual void IV2M_LoadImageFullFile(int iSide, CGlass_Data *pGlassData = NULL, std::function<void(BYTE)> _Func = nullptr) = 0; + virtual void IV2M_LoadImageFromFolder(int iSide, const CString& strFolderPath, CGlass_Data* pGlassData = NULL, std::function<void(BYTE)> _Func = nullptr) = 0; virtual BOOL IV2M_SaveFullImage(CString strPath,int iSide,CPoint ptStart,int nLength) = 0; virtual BOOL IV2M_RecipeChange(CString strRecipe) = 0; -- Gitblit v1.9.3