From 1c0ac1c7924efb8a2cb6962d3eda4126533a5ac8 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 14 七月 2025 16:55:55 +0800
Subject: [PATCH] 合并代码（代提交）

---
 ENRIT/View/ViewScanImage.h |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ENRIT/View/ViewScanImage.h b/ENRIT/View/ViewScanImage.h
index ed35659..865d1a1 100644
--- a/ENRIT/View/ViewScanImage.h
+++ b/ENRIT/View/ViewScanImage.h
@@ -59,6 +59,7 @@
 	afx_msg void OnBnClickedCheckAutoView();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	LRESULT OnProcessStatus(WPARAM wParam, LPARAM lParam);
+	LRESULT OnBatchProcessNext(WPARAM wParam, LPARAM lParam);
 	DECLARE_MESSAGE_MAP()
 	DECLARE_EVENTSINK_MAP()
 
@@ -77,6 +78,8 @@
 	void			OnBnClickedBtnProc();
 	void			OnBnClickedLoadAll();
 	void			OnBnClickedSaveAll();
+	void			OnBtnStartBatch();
+	void			OnBtnStopBatch();
 
 protected:
 	int				GetSideIdx(int nViewIndex);
@@ -91,6 +94,8 @@
 	void			SaveFullImage(int nViewIndex);
 	void			SaveFullImageAll();	
 	void			LoadAndProcessImages(const CString& strFolderPath);
+	void			StartBatchProcess(const CString& strRootFolder);
+	void			ProcessNextFolder();
 
 protected:
 	CMFCButton		m_btnLoad[MAX_PANEL_SIDE * UPDN_TYPE];
@@ -111,5 +116,10 @@
 	BOOL			m_bInitDlg;
 	CHardwareSettings		*m_pHardware;
 	IViewInterface2Parent	*m_IV2M;
-	CGlass_Data				*m_pGlassData;	
+	CGlass_Data				*m_pGlassData;
+
+	// ly,2025.07.11
+	int				m_nCurrentFolderIndex;
+	BOOL			m_bIsBatchProcessing;
+	CStringArray	m_arrFolderList;
 };

--
Gitblit v1.9.3