From 4fb0f6c9b7b0fdfc6cc52c9bf1153d87f92651ca Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 14 八月 2025 11:52:50 +0800
Subject: [PATCH] 1. 修复RIP新增配方闪退的问题 2. 完善RIP结果绘画在视图窗口
---
EdgeInspector_App/InterfaceManager.h | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/EdgeInspector_App/InterfaceManager.h b/EdgeInspector_App/InterfaceManager.h
index 175d77f..685bad3 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"
@@ -67,9 +67,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 +102,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);
@@ -123,6 +125,11 @@
long long GetCurrentTimestamp();
+private:
+ CRITICAL_SECTION m_criticalSection;
+ inline void Lock() { ::InitializeCriticalSection(&m_criticalSection); }
+ inline void Unlock() { ::DeleteCriticalSection(&m_criticalSection); }
+
#if USE_WEBSOCKET
protected:
void CreateWebSocketClients(WebSocketClientPool** wsClients, CString cstrURI, int nThreadCount);
--
Gitblit v1.9.3