From dc5497d482727accd3fbcfa77db52b99f2e9eb0e Mon Sep 17 00:00:00 2001 From: LWQ <1806950222@qq.com> Date: 星期四, 24 七月 2025 09:05:39 +0800 Subject: [PATCH] Merge branch 'master' into LWQ --- ENRIT/MainFrm.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ENRIT/MainFrm.h b/ENRIT/MainFrm.h index 0b59b86..caaba75 100644 --- a/ENRIT/MainFrm.h +++ b/ENRIT/MainFrm.h @@ -42,6 +42,7 @@ virtual LPBYTE IV2M_GetGrabBufferByDimension(DimensionDir eDim,int iVline); virtual BOOL IV2M_SetLiveGrabCommand(DimensionDir eDim,BOOL bStop); virtual void IV2M_LoadImageFullFile(int iSide, CGlass_Data *pGlassData = NULL, std::function<void(BYTE)> _Func = nullptr); + virtual void IV2M_LoadImageFromFolder(int iSide, const CString& strFolderPath, CGlass_Data* pGlassData = NULL, std::function<void(BYTE)> _Func = nullptr); virtual BOOL IV2M_SaveFullImage(CString strPath,int iSide,CPoint ptStart,int nLength); virtual BOOL IV2M_RecipeChange(CString strRecipe); virtual void IV2M_InitView(Init_View_Command eVew); @@ -66,6 +67,8 @@ BOOL GetRegistryRcpName(CString& strRecipe); void SetRegistryRcpName(CString strRecipe); void ApplyViewRecipeSettingss(); + CString GetGlassIDFromFolder(const CString& strFolderPath); + void LoadImageSetFromFolder(const CString& strFolderPath, const CString& strGlsID, int iSide, CGlass_Data* pGlassData, std::function<void(BYTE)> _Func); // 积己等 皋矫瘤 甘 窃荐 protected: -- Gitblit v1.9.3