From 06548959f857ca6a9eabaa695ab84dfa0ff73849 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期日, 10 八月 2025 14:03:11 +0800
Subject: [PATCH] 1. 添加侧面检的执行和报警参数 2. 修复配方界面分组按钮的显示异常问题
---
EdgeInspector_App/Recipe/HardwareSettings.cpp | 183 +++++++++++++++++++++------------------------
1 files changed, 87 insertions(+), 96 deletions(-)
diff --git a/EdgeInspector_App/Recipe/HardwareSettings.cpp b/EdgeInspector_App/Recipe/HardwareSettings.cpp
index 2a5f35c..4cfde21 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.cpp
+++ b/EdgeInspector_App/Recipe/HardwareSettings.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+锘�#include "StdAfx.h"
#include "HardwareSettings.h"
//////////////////////////////////////////////////////////////////////////
@@ -1138,84 +1138,97 @@
BOOL CHardwareSettings::SetCameraCount(int nCameraCount,int nScanCount)
{
- CCameraSettings *ptmpSet = NULL;
- int nBackCamCnt = 0,nBackScanCnt = 0;
- int iLoop;
-
- if(m_pCameraSettings != NULL)
- {
- if((m_nCameraCount*m_nScanCount) > 0)
- {
- ptmpSet = new CCameraSettings[m_nCameraCount*m_nScanCount];
-
- for(iLoop=0;iLoop<m_nCameraCount*m_nScanCount;iLoop++)
- {
- ptmpSet[iLoop] = m_pCameraSettings[iLoop];
- }
- nBackCamCnt = m_nCameraCount;
- nBackScanCnt = m_nScanCount;
- }
- delete[] m_pCameraSettings, m_pCameraSettings=NULL;
- }
-
- m_nCameraCount = nCameraCount;
- m_nScanCount = nScanCount;
-
- if(m_nCameraCount <= 0 || m_nScanCount <= 0)
+ if (nCameraCount <= 0 || nScanCount <= 0) {
return FALSE;
+ }
- m_pCameraSettings = new CCameraSettings[m_nCameraCount*m_nScanCount];
+ // 鍏堜繚瀛樻棫鐨勭浉鏈哄拰鎵弿鏁�
+ static int nOldCameraCount = m_nCameraCount;
+ static int nOldScanCount = m_nScanCount;
- int iCam,iScan;
-
- iLoop=0;
- for(iCam=0;iCam<m_nCameraCount;iCam++)
- {
- for(iScan=0;iScan<m_nScanCount;iScan++)
- {
- m_pCameraSettings[iLoop].m_iCamera = iCam;
- m_pCameraSettings[iLoop].m_iScan = iScan;
- iLoop++;
+ // 淇濆瓨鏃ц缃暟鎹�
+ CCameraSettings* pOldSettings = nullptr;
+ if (m_pCameraSettings != nullptr && nOldCameraCount > 0 && nOldScanCount > 0)
+ {
+ pOldSettings = new CCameraSettings[nOldCameraCount * nOldScanCount];
+ for (int i = 0; i < nOldCameraCount * nOldScanCount; ++i) {
+ pOldSettings[i] = m_pCameraSettings[i];
}
}
- if(ptmpSet != NULL)
- {
- for(iLoop=0;iLoop<nBackCamCnt*nBackScanCnt;iLoop++)
- {
- SetCameraSettings(&ptmpSet[iLoop]);
- }
- delete[] ptmpSet, ptmpSet=NULL;
+ // 鏇存柊鎴愬憳鍙橀噺
+ m_nCameraCount = nCameraCount;
+ m_nScanCount = nScanCount;
+
+ // 閲嶆柊鍒嗛厤鏂扮粨鏋�
+ int nNewCount = m_nCameraCount * m_nScanCount;
+ int nOldCount = nOldCameraCount * nOldScanCount;
+ if (m_pCameraSettings != nullptr) {
+ delete[] m_pCameraSettings;
+ m_pCameraSettings = nullptr;
}
+ m_pCameraSettings = new CCameraSettings[m_nCameraCount * m_nScanCount];
+
+ // 鍒濆鍖栨柊缁撴瀯
+ int iIndex = 0;
+ for (int iCam = 0; iCam < m_nCameraCount; ++iCam) {
+ for (int iScan = 0; iScan < m_nScanCount; ++iScan, ++iIndex) {
+ m_pCameraSettings[iIndex].m_iCamera = iCam;
+ m_pCameraSettings[iIndex].m_iScan = iScan;
+ }
+ }
+
+ // 鎷疯礉鍥炴棫璁剧疆
+ if (pOldSettings != nullptr) {
+ for (int iCam = 0; iCam < nOldCameraCount; ++iCam) {
+ for (int iScan = 0; iScan < nOldScanCount; ++iScan) {
+ if (iCam < m_nCameraCount && iScan < m_nScanCount) {
+ int nNewIndex = iCam * m_nScanCount + iScan;
+ int nOldIndex = iCam * nOldScanCount + iScan;
+
+ if (nNewIndex < nNewCount && nOldIndex < nOldCount)
+ {
+ SetCameraSettings(&pOldSettings[nOldIndex]);
+ }
+ }
+ }
+ }
+ delete[] pOldSettings;
+ }
+
+ // 鏇存柊鏃х殑鐩告満鍜屾壂鎻忔暟
+ nOldCameraCount = m_nCameraCount;
+ nOldScanCount = m_nScanCount;
return TRUE;
}
-CCameraSettings *CHardwareSettings::GetCameraSettings(int iCamera,int iScan)
+CCameraSettings* CHardwareSettings::GetCameraSettings(int iCamera,int iScan)
{
- if(iCamera >= m_nCameraCount || iScan >= m_nScanCount
- || m_nCameraCount <= 0 || m_nScanCount <= 0)
- return NULL;
-
- for(int iLoop=0;iLoop<m_nCameraCount*m_nScanCount;iLoop++)
- {
- if(m_pCameraSettings[iLoop].m_iCamera == iCamera && m_pCameraSettings[iLoop].m_iScan == iScan)
- return &m_pCameraSettings[iLoop];
+ if (nullptr == m_pCameraSettings || iCamera < 0 || iScan < 0) {
+ return nullptr;
}
- return NULL;
+ if (iCamera >= m_nCameraCount || iScan >= m_nScanCount) {
+ return nullptr;
+ }
+
+ int nIndex = iCamera * m_nScanCount + iScan;
+ return &m_pCameraSettings[nIndex];
}
BOOL CHardwareSettings::SetCameraSettings(CCameraSettings *pCamera)
{
- if(pCamera == NULL || m_nCameraCount <= 0 || m_nScanCount <= 0)
+ if (pCamera == nullptr || m_pCameraSettings == nullptr) {
return FALSE;
+ }
- CCameraSettings *pOrgCam = GetCameraSettings(pCamera->m_iCamera,pCamera->m_iScan);
- if(pOrgCam == NULL)
+ CCameraSettings* pTarget = GetCameraSettings(pCamera->m_iCamera, pCamera->m_iScan);
+ if (pTarget == nullptr) {
return FALSE;
+ }
- *pOrgCam = *pCamera;
+ *pTarget = *pCamera;
return TRUE;
}
@@ -1985,61 +1998,39 @@
return TRUE;
}
-
int CHardwareSettings::GetScanToDimension(DimensionDir eDir)
{
- int iScan,iFindScan;
- int iCam;
- CCameraSettings *pCamera;
-
- iFindScan = -1;
- for(iCam=0;iCam<GetCameraCount();iCam++)
- {
- for(iScan=0;iScan<GetScanCount();iScan++)
- {
- pCamera = GetCameraSettings(iCam,iScan);
- if(pCamera == NULL)
- continue;
-
- if(pCamera->m_eDimension == eDir)
- {
- iFindScan = iScan;
- break;
+ for (int iCam = 0; iCam < GetCameraCount(); ++iCam) {
+ for (int iScan = 0; iScan < GetScanCount(); ++iScan) {
+ CCameraSettings* pCamera = GetCameraSettings(iCam, iScan);
+ if (pCamera != nullptr && pCamera->m_eDimension == eDir) {
+ return iScan;
}
}
-
- if(iFindScan != -1)
- break;
}
- return iFindScan;
+ return -1;
}
-CAMERA_SCANDIR CHardwareSettings::GetScanToScanDir(int iCam,int iScan)
+CAMERA_SCANDIR CHardwareSettings::GetScanToScanDir(int iCam, int iScan)
{
- CCameraSettings *pCamera;
-
- pCamera = GetCameraSettings(iCam,iScan);
- if(pCamera == NULL)
+ CCameraSettings *pCamera = GetCameraSettings(iCam, iScan);
+ if (pCamera == nullptr) {
return SCANGLASS_NONE;
+ }
return pCamera->m_eScanDir;
}
int CHardwareSettings::GetCameraIndexToDimension(DimensionDir eDir)
{
- CCameraSettings *pCamera;
- int iCam,iScan;
+ if (m_pCameraSettings == nullptr) {
+ return -1;
+ }
- for(iCam=0;iCam<GetCameraCount();iCam++)
- {
- for(iScan=0;iScan<GetScanCount();iScan++)
- {
- pCamera = GetCameraSettings(iCam,iScan);
- if(pCamera == NULL)
- continue;
-
- if(pCamera->m_eDimension == eDir)
- {
+ for (int iCam = 0; iCam < GetCameraCount(); ++iCam) {
+ for (int iScan = 0; iScan < GetScanCount(); ++iScan) {
+ CCameraSettings* pCamera = GetCameraSettings(iCam, iScan);
+ if (pCamera && pCamera->m_eDimension == eDir) {
return iCam;
}
}
--
Gitblit v1.9.3