From 1c0ac1c7924efb8a2cb6962d3eda4126533a5ac8 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 14 七月 2025 16:55:55 +0800
Subject: [PATCH] 合并代码（代提交）
---
ENRIT/Recipe/HardwareSettings.cpp | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ENRIT/Recipe/HardwareSettings.cpp b/ENRIT/Recipe/HardwareSettings.cpp
index 5c2d269..5e01225 100644
--- a/ENRIT/Recipe/HardwareSettings.cpp
+++ b/ENRIT/Recipe/HardwareSettings.cpp
@@ -1017,7 +1017,7 @@
m_bInsDirReverse = rhs.m_bInsDirReverse;
m_bUseColorVisual = rhs.m_bUseColorVisual;
-
+ m_bUseCoordProfile = rhs.m_bUseCoordProfile;
m_bUseFreerun = rhs.m_bUseFreerun;
m_nFreerunPeriod = rhs.m_nFreerunPeriod;
m_nFreerunExposureTime = rhs.m_nFreerunExposureTime;
@@ -1049,7 +1049,7 @@
m_SoftWareSettings.Reset();
m_bInsDirReverse = FALSE;
m_bUseColorVisual = TRUE;
-
+ m_bUseCoordProfile = FALSE;
m_bTriggerBoardUse = FALSE;
m_nTriggerBoardComport = 0;
m_nFullImageCompressRatio = 70;
@@ -1233,6 +1233,8 @@
str = _T("FOLERREMOVEDAY");
else if((void *)&m_bUseColorVisual == pValue)
str = _T("USECOLORVISUAL");
+ else if ((void*)&m_bUseCoordProfile == pValue)
+ str = _T("USECOORDPROFILE");
else if((void *)&m_bUseFreerun == pValue)
str = _T("USE_FREERUN");
else if((void *)&m_nFreerunPeriod == pValue)
@@ -1300,7 +1302,10 @@
if(str.IsEmpty() == TRUE)
return FALSE;
BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str,m_bUseColorVisual);
-
+ str = GetFileString((void*)&m_bUseCoordProfile);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str, m_bUseCoordProfile);
SetCameraCount(m_nCameraCount,m_nScanCount);
iLoop = 0;
@@ -1423,7 +1428,10 @@
if(str.IsEmpty() == TRUE)
return FALSE;
Register.GetItemValue((TCHAR*)(LPCTSTR)str,m_bUseColorVisual);
-
+ str = GetFileString((void*)&m_bUseCoordProfile);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.GetItemValue((TCHAR*)(LPCTSTR)str, m_bUseCoordProfile);
SetCameraCount(m_nCameraCount,m_nScanCount);
iLoop = 0;
for(iCam=0;iCam<m_nCameraCount;iCam++)
@@ -1542,7 +1550,10 @@
if(str.IsEmpty() == TRUE)
return FALSE;
Register.SetItemValue((TCHAR*)(LPCTSTR)str,m_bUseColorVisual);
-
+ str = GetFileString((void*)&m_bUseCoordProfile);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.SetItemValue((TCHAR*)(LPCTSTR)str, m_bUseCoordProfile);
if(m_pCameraSettings != NULL)
{
iLoop = 0;
@@ -1672,6 +1683,10 @@
return FALSE;
BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str,m_bUseColorVisual);
+ str = GetFileString((void*)&m_bUseCoordProfile);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str, m_bUseCoordProfile);
if(m_pCameraSettings != NULL)
{
iLoop = 0;
--
Gitblit v1.9.3