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/Define/StatusMonitor.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EdgeInspector_App/Define/StatusMonitor.h b/EdgeInspector_App/Define/StatusMonitor.h index 624fbf6..e9fb842 100644 --- a/EdgeInspector_App/Define/StatusMonitor.h +++ b/EdgeInspector_App/Define/StatusMonitor.h @@ -1,4 +1,4 @@ -#pragma once +锘�#pragma once #include "Singleton.h" #include "Config.h" @@ -16,13 +16,13 @@ #include "LicenseChecker.h" /* -Main Interface 狼 Instance Pointer 甫 爱绊 乐绰促. +Main Interface 鐙� Instance Pointer 鐢� 鐖辩粖 涔愮话淇�. -UI俊辑绰 Main Interface 立辟阑 窍霸登搁 惑龋 曼炼捞骨肺, +UI淇婅緫缁� Main Interface 绔嬭緹闃� 绐嶉湼鐧绘悂 鎯戦緥 鏇肩偧鎹為鑲�, -CStatusMonitor 肺 阿 Instance 俊 立辟窍档废 窍磊 +CStatusMonitor 鑲� 闃� Instance 淇� 绔嬭緹绐嶆。搴� 绐嶇 -UI 付促 Interface 父靛绰芭 蓖满栏聪瘪 +UI 浠樹績 Interface 鐖堕潧缁拌姯 钃栨弧鏍忚仾鐦� */ class CStatusMonitor : public Singleton<CStatusMonitor> @@ -36,9 +36,9 @@ void InitGlassLoading(); - void SetGrabFrametoScan(int iScan,int nFrame); - int GetGrabFrameCount(int iScan); - void SetGrabEnd(int iScan); + void SetGrabFrametoScan(int nCamera, int iScan, int nFrame); + int GetGrabFrameCount(int nCamera, int iScan); + void SetGrabEnd(int nCamera, int iScan); BOOL DeleteFolder(const CString &strFolder); BOOL CheckDirectory(const TCHAR szPathName[], BOOL bDelete = FALSE); @@ -47,8 +47,8 @@ int m_iScanIdx; CFrameBufferController *m_pFrameBuffer[MAX_CAMERA_COUNT]; - int m_nGrabFrame[MAX_SCAN_COUNT]; - BOOL m_bGrabEnd[MAX_SCAN_COUNT]; + int m_nGrabFrame[MAX_CAMERA_COUNT][MAX_SCAN_COUNT]; + BOOL m_bGrabEnd[MAX_CAMERA_COUNT][MAX_SCAN_COUNT]; CControl_Interface* m_pControlInterface; CLightManager* m_pLightManager; -- Gitblit v1.9.3