From 6087507f5c9445055a38f7b861e40a22e82d3316 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 25 七月 2025 16:09:29 +0800
Subject: [PATCH] 1. ProfileInspect单独使用坐标转换参数，与全局的区分开。如果ProfileInspect没有设置，那么默认使用全局的
---
ENRIT/Recipe/GlassRecipe.cpp | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/ENRIT/Recipe/GlassRecipe.cpp b/ENRIT/Recipe/GlassRecipe.cpp
index 0faf916..957704d 100644
--- a/ENRIT/Recipe/GlassRecipe.cpp
+++ b/ENRIT/Recipe/GlassRecipe.cpp
@@ -3612,6 +3612,8 @@
CopyMemory(m_stProfile,rh.m_stProfile,sizeof(ST_PROFILE_SETTING)*MAX_PROFILE_SETTING_COUNT);
CopyMemory(m_stCamferUp,rh.m_stCamferUp,sizeof(ST_CHAMFER_SETTING)*MAX_PROFILE_SETTING_COUNT);
CopyMemory(m_stCamferDn,rh.m_stCamferDn,sizeof(ST_CHAMFER_SETTING)*MAX_PROFILE_SETTING_COUNT);
+ CopyMemory(m_dConvResolution, rh.m_dConvResolution, sizeof(double) * MAX_DIMENSION_COUNT * MAX_STAGE_HAND_COUNT);
+ CopyMemory(m_dScanResolution, rh.m_dScanResolution, sizeof(double) * MAX_DIMENSION_COUNT * MAX_STAGE_HAND_COUNT);
return *this;
}
@@ -3640,7 +3642,17 @@
str.Format(_T("CAD_PROFILE_OFFSET_X"));
pFile->GetItemValue(i,(TCHAR*)(LPCTSTR)str, m_nCADOffsetX[i]);
str.Format(_T("CAD_PROFILE_OFFSET_Y"));
- pFile->GetItemValue(i,(TCHAR*)(LPCTSTR)str, m_nCADOffsetY[i]);
+ pFile->GetItemValue(i,(TCHAR*)(LPCTSTR)str, m_nCADOffsetY[i]);
+
+ for (int j = 0; j < MAX_STAGE_HAND_COUNT; j++) {
+ // Conv Resolution
+ str.Format(_T("CONV_RESOLUTION_%d_%d"), i, j);
+ pFile->GetItemValue(i, (TCHAR*)(LPCTSTR)str, m_dConvResolution[i][j]);
+
+ // Scan Resolution
+ str.Format(_T("SCAN_RESOLUTION_%d_%d"), i, j);
+ pFile->GetItemValue(i, (TCHAR*)(LPCTSTR)str, m_dScanResolution[i][j]);
+ }
}
for(i=0;i<MAX_PROFILE_SETTING_COUNT;i++)
@@ -3702,7 +3714,15 @@
str.Format(_T("CAD_PROFILE_OFFSET_X"));
pFile->SetItemValue(i,(TCHAR*)(LPCTSTR)str, m_nCADOffsetX[i]);
str.Format(_T("CAD_PROFILE_OFFSET_Y"));
- pFile->SetItemValue(i,(TCHAR*)(LPCTSTR)str, m_nCADOffsetY[i]);
+ pFile->SetItemValue(i,(TCHAR*)(LPCTSTR)str, m_nCADOffsetY[i]);
+
+ for (int j = 0; j < MAX_STAGE_HAND_COUNT; j++) {
+ str.Format(_T("CONV_RESOLUTION_%d_%d"), i, j);
+ pFile->SetItemValue(i, (TCHAR*)(LPCTSTR)str, m_dConvResolution[i][j]);
+
+ str.Format(_T("SCAN_RESOLUTION_%d_%d"), i, j);
+ pFile->SetItemValue(i, (TCHAR*)(LPCTSTR)str, m_dScanResolution[i][j]);
+ }
}
for(i=0;i<MAX_PROFILE_SETTING_COUNT;i++)
@@ -3751,7 +3771,9 @@
ZeroMemory(m_nCADOffsetX,sizeof(int)*MAX_DIMENSION_COUNT);
ZeroMemory(m_stProfile,sizeof(ST_PROFILE_SETTING)*MAX_PROFILE_SETTING_COUNT);
ZeroMemory(m_stCamferUp,sizeof(ST_CHAMFER_SETTING)*MAX_PROFILE_SETTING_COUNT);
- ZeroMemory(m_stCamferDn,sizeof(ST_CHAMFER_SETTING)*MAX_PROFILE_SETTING_COUNT);
+ ZeroMemory(m_stCamferDn,sizeof(ST_CHAMFER_SETTING)*MAX_PROFILE_SETTING_COUNT);
+ ZeroMemory(m_dConvResolution, sizeof(double) * MAX_DIMENSION_COUNT * MAX_STAGE_HAND_COUNT);
+ ZeroMemory(m_dScanResolution, sizeof(double) * MAX_DIMENSION_COUNT * MAX_STAGE_HAND_COUNT);
}
//////////////////////////////////////////////////////////////////////////
--
Gitblit v1.9.3