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/InterfaceManager.h | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/EdgeInspector_App/InterfaceManager.h b/EdgeInspector_App/InterfaceManager.h
index 175d77f..899d454 100644
--- a/EdgeInspector_App/InterfaceManager.h
+++ b/EdgeInspector_App/InterfaceManager.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
#include "Global_Define.h"
#include "EdgeInspector_AppView.h"
@@ -18,6 +18,7 @@
#include "LanguageControl.h"
#include "LicenseChecker.h"
#include "TriggerControl_Mvsol.h"
+#include "Thread_SaveFullImg.h"
#if USE_WEBSOCKET
#include "WebSocketClientPool.h"
@@ -67,9 +68,11 @@
static UINT ScanStartCam_1(LPVOID pParam);
static UINT ScanStartCam_2(LPVOID pParam);
static UINT ScanStartCam_3(LPVOID pParam);
+ static UINT ScanStartCam_4(LPVOID pParam);
+ static UINT ScanStartCam_5(LPVOID pParam);
static UINT CheckScanStart(LPVOID pParam);
- static UINT PLCSignalThreadFunc(LPVOID pParam);
- static UINT ScanEndProcess(LPVOID pParam);
+ static UINT PLCSignalThreadFunc(LPVOID pParam);
+ static UINT ScanEndProcess(LPVOID pParam);
protected:
BOOL InitInspect();
@@ -100,7 +103,7 @@
BOOL IsScanNow();
int LoadFullImage(CString strPath,int iSide,int nStartY = 0, CGlass_Data *pGlassData = NULL, const bool bIsDebugImg = true);
BOOL SaveFullImage(CString strPath,int iSide,CPoint ptStart,int nLineCnt);
- BOOL SaveFullImage2(CString strPath,LPBYTE lpOrigin,int nImgWidth,int nImgHeight,int iSide,int nStartY,int nQuality = 50);
+ BOOL SaveFullImageModern(CString strPath,LPBYTE lpOrigin,int nImgWidth,int nImgHeight,int iSide,int nStartY,int nQuality = 50);
LPBYTE GetGrabBuffer(DimensionDir eDir,int iVline);
BOOL SetLiveGrabCommand(DimensionDir eDir,BOOL bStop);
void WriteLogManager(TCHAR *str);
@@ -122,6 +125,11 @@
void setLineCameraParamToSDK(void);
long long GetCurrentTimestamp();
+
+private:
+ CRITICAL_SECTION m_criticalSection;
+ inline void Lock() { ::InitializeCriticalSection(&m_criticalSection); }
+ inline void Unlock() { ::DeleteCriticalSection(&m_criticalSection); }
#if USE_WEBSOCKET
protected:
@@ -154,6 +162,7 @@
CThread_SendMSG* m_pThread_SendMSG;
CThread_CheckSequence* m_pThread_CheckSequence;
CThread_ViewRefresh* m_pThread_ViewRefresh;
+ CThread_SaveFullImg* m_pSaveFullImgThread;
CPostProcess m_PostProcess;
CCriticalSection m_csScanStart;
int m_nScanStartCount;
--
Gitblit v1.9.3