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/Recipe/HardwareSettings.cpp | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/EdgeInspector_App/Recipe/HardwareSettings.cpp b/EdgeInspector_App/Recipe/HardwareSettings.cpp
index f5f9d15..a4f1357 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.cpp
+++ b/EdgeInspector_App/Recipe/HardwareSettings.cpp
@@ -991,7 +991,7 @@
{
if(this != &rhs)
{
- int iLoop;
+ int iLoop;
Reset();
m_nLightCount_Trans = rhs.m_nLightCount_Trans;
@@ -1009,10 +1009,12 @@
m_strMachineName = rhs.m_strMachineName;
m_strLineID = rhs.m_strLineID;
- m_nPLCSignalRetry = rhs.m_nPLCSignalRetry;
- m_nSaveImageQuality = rhs.m_nSaveImageQuality;
+ m_nPLCSignalRetry = rhs.m_nPLCSignalRetry;
- // m_dOneScanTime = rhs.m_dOneScanTime;
+ m_nSaveImageQuality = rhs.m_nSaveImageQuality;
+ m_bAsyncFullSave = rhs.m_bAsyncFullSave;
+
+ // m_dOneScanTime = rhs.m_dOneScanTime;
m_nFolderRemoveDay = rhs.m_nFolderRemoveDay;
m_PLCSettings = rhs.m_PLCSettings;
@@ -1050,7 +1052,7 @@
void CHardwareSettings::Reset()
{
- // m_dOneScanTime = 0.;
+ // m_dOneScanTime = 0.;
m_nLightCount_Trans = 0;
m_nLightCount_Reflect = 0;
m_nCameraCount = 0;
@@ -1058,6 +1060,7 @@
m_nFolderRemoveDay = 0;
m_nPLCSignalRetry = 0;
m_nSaveImageQuality = 30;
+ m_bAsyncFullSave = FALSE;
m_strMachineName = _T("");
m_strLineID = _T("");
m_nBoardType = GRAB_LINK_BOARD;
@@ -1280,6 +1283,8 @@
str = _T("SAVE_DEBUG_IMAGE");
else if((void *)&m_nSaveImageQuality == pValue)
str = _T("SAVEIMAGE_QUALITY");
+ else if ((void*)&m_bAsyncFullSave == pValue)
+ str = _T("ASYNC_FULL_SAVE");
// ly,2025.07.10
else if ((void*)&m_bSaveResultByHour == pValue)
@@ -1381,6 +1386,10 @@
return FALSE;
BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str,m_nSaveImageQuality,30);
+ str = GetFileString((void*)&m_bAsyncFullSave);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str, m_bAsyncFullSave, FALSE);
SetCameraCount(m_nCameraCount,m_nScanCount);
iLoop = 0;
@@ -1567,7 +1576,12 @@
str = GetFileString((void *)&m_nSaveImageQuality);
if(str.IsEmpty() == TRUE)
return FALSE;
- Register.GetItemValue((TCHAR*)(LPCTSTR)str,m_nSaveImageQuality,30);
+ Register.GetItemValue((TCHAR*)(LPCTSTR)str,m_nSaveImageQuality,30);
+
+ str = GetFileString((void*)&m_bAsyncFullSave);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.GetItemValue((TCHAR*)(LPCTSTR)str, m_bAsyncFullSave, FALSE);
SetCameraCount(m_nCameraCount,m_nScanCount);
iLoop = 0;
@@ -1737,6 +1751,11 @@
if(str.IsEmpty() == TRUE)
return FALSE;
Register.SetItemValue((TCHAR*)(LPCTSTR)str,m_nSaveImageQuality);
+
+ str = GetFileString((void*)&m_bAsyncFullSave);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.SetItemValue((TCHAR*)(LPCTSTR)str, m_bAsyncFullSave);
if(m_pCameraSettings != NULL)
{
@@ -1926,7 +1945,13 @@
if (str.IsEmpty() == TRUE) {
return FALSE;
}
- BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str,m_nSaveImageQuality);
+ BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str,m_nSaveImageQuality);
+
+ str = GetFileString((void*)&m_bAsyncFullSave);
+ if (str.IsEmpty() == TRUE) {
+ return FALSE;
+ }
+ BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str, m_bAsyncFullSave);
if (m_pCameraSettings != NULL) {
iLoop = 0;
--
Gitblit v1.9.3