From 47873f48d17bb8f7602fda73d29b19adcf43fdd0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 14 八月 2025 15:50:27 +0800
Subject: [PATCH] 1. 修复执行界面没有显示侧面检数据的问题
---
EdgeInspector_App/Define/StatusMonitor.cpp | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/EdgeInspector_App/Define/StatusMonitor.cpp b/EdgeInspector_App/Define/StatusMonitor.cpp
index ea165b6..92f9435 100644
--- a/EdgeInspector_App/Define/StatusMonitor.cpp
+++ b/EdgeInspector_App/Define/StatusMonitor.cpp
@@ -1,17 +1,19 @@
-#include "StdAfx.h"
+锘�#include "StdAfx.h"
#include "StatusMonitor.h"
+#define VALID_IDX(i, max) ((unsigned)(i) < (unsigned)(max))
+#define VALID_CAM(c) VALID_IDX((c), MAX_CAMERA_COUNT)
+#define VALID_SCAN(s) VALID_IDX((s), MAX_SCAN_COUNT)
+#define VALID_CAM_SCAN(c, s) (VALID_CAM(c) && VALID_SCAN(s))
//////////////////////////////////////////////////////////////////////////
CStatusMonitor::CStatusMonitor(void)
{
m_iScanIdx = -1;
-
- for(int iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
+ for (int iCam = 0; iCam < MAX_CAMERA_COUNT; iCam++) {
m_pFrameBuffer[iCam] = NULL;
-
- InitGlassLoading();
+ }
m_pControlInterface = NULL;
m_pLightManager = NULL;
@@ -21,6 +23,8 @@
m_pHWSettings = NULL;
m_pLanguageControl = NULL;
m_pLicenseChecker = NULL;
+
+ InitGlassLoading();
}
CStatusMonitor::~CStatusMonitor(void)
@@ -29,35 +33,31 @@
void CStatusMonitor::InitGlassLoading()
{
- for(int i=0;i<MAX_SCAN_COUNT;i++)
- {
- m_nGrabFrame[i] = 0;
- m_bGrabEnd[i] = FALSE;
+ ZeroMemory(m_nGrabFrame, sizeof(m_nGrabFrame));
+ ZeroMemory(m_bGrabEnd, sizeof(m_bGrabEnd));
+}
+
+int CStatusMonitor::GetGrabFrameCount(int nCamera, int iScan)
+{
+ if (VALID_CAM_SCAN(nCamera, iScan)) {
+ return m_nGrabFrame[nCamera][iScan];
+ }
+
+ return 0;
+}
+
+void CStatusMonitor::SetGrabEnd(int nCamera, int iScan)
+{
+ if (VALID_CAM_SCAN(nCamera, iScan)) {
+ m_bGrabEnd[nCamera][iScan] = TRUE;
}
}
-int CStatusMonitor::GetGrabFrameCount(int iScan)
+void CStatusMonitor::SetGrabFrametoScan(int nCamera, int iScan,int nFrame)
{
- if(iScan < 0 || iScan >= MAX_SCAN_COUNT)
- return 0;
-
- return m_nGrabFrame[iScan];
-}
-
-void CStatusMonitor::SetGrabEnd(int iScan)
-{
- if(iScan < 0 || iScan >= MAX_SCAN_COUNT)
- return;
-
- m_bGrabEnd[iScan] = TRUE;
-}
-
-void CStatusMonitor::SetGrabFrametoScan(int iScan,int nFrame)
-{
- if(iScan < 0 || iScan >= MAX_SCAN_COUNT)
- return;
-
- m_nGrabFrame[iScan] = nFrame;
+ if (VALID_CAM_SCAN(nCamera, iScan)) {
+ m_nGrabFrame[nCamera][iScan] = nFrame;
+ }
}
BOOL CStatusMonitor::DeleteFolder(const CString &strFolder)
@@ -66,13 +66,13 @@
TCHAR szTemp[MAX_PATH];
wcscpy_s(szTemp, MAX_PATH, strFolder);
- szTemp[strFolder.GetLength() + 1] = NULL; // NULL巩磊啊 滴俺 甸绢啊具 茄促.
+ szTemp[strFolder.GetLength() + 1] = NULL; // NULL宸╃鍟� 婊翠亢 鐢哥虎鍟婂叿 鑼勪績.
FileOp.hwnd = NULL;
FileOp.wFunc = FO_DELETE;
FileOp.pFrom = NULL;
FileOp.pTo = NULL;
- FileOp.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI; // 犬牢皋矫瘤啊 救哆档废 汲沥
+ FileOp.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI; // 鐘墷鐨嬬煫鐦ゅ晩 鏁戝搯妗ｅ簾 姹叉播
FileOp.fAnyOperationsAborted = false;
FileOp.hNameMappings = NULL;
FileOp.lpszProgressTitle = NULL;
--
Gitblit v1.9.3