From 52d230fd0eb38adc5c6f4c6d6ed3786a3c19354d Mon Sep 17 00:00:00 2001
From: LWQ <1806950222@qq.com>
Date: 星期一, 14 七月 2025 11:35:51 +0800
Subject: [PATCH] mini车间与模组车间区分功能
---
EdgeInspector_App/Process/InspectCamera.cpp | 9 +++++----
Common_Class/AutoFileCleanupTool/AutoFileCleanupTool.vcxproj | 2 +-
EdgeInspector_App/BICommon.h | 2 +-
Common_Class/SISAssem/SISAssem.vcxproj | 1 +
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Common_Class/AutoFileCleanupTool/AutoFileCleanupTool.vcxproj b/Common_Class/AutoFileCleanupTool/AutoFileCleanupTool.vcxproj
index 930afda..cf48e8d 100644
--- a/Common_Class/AutoFileCleanupTool/AutoFileCleanupTool.vcxproj
+++ b/Common_Class/AutoFileCleanupTool/AutoFileCleanupTool.vcxproj
@@ -44,7 +44,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v143</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
diff --git a/Common_Class/SISAssem/SISAssem.vcxproj b/Common_Class/SISAssem/SISAssem.vcxproj
index cab5378..19206e2 100644
--- a/Common_Class/SISAssem/SISAssem.vcxproj
+++ b/Common_Class/SISAssem/SISAssem.vcxproj
@@ -22,6 +22,7 @@
<ProjectGuid>{147FB2E2-F781-431F-92A5-15F9E72E2FF2}</ProjectGuid>
<RootNamespace>SISAssem</RootNamespace>
<Keyword>MFCDLLProj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/EdgeInspector_App/BICommon.h b/EdgeInspector_App/BICommon.h
index 239fca6..f4ef8f0 100644
--- a/EdgeInspector_App/BICommon.h
+++ b/EdgeInspector_App/BICommon.h
@@ -8,7 +8,7 @@
#include <string>
#include <time.h>
-#define OFFLINE_KEY 1 //OFFLINE_KEY:1鏄绾挎ā寮�;0鏄湪绾挎ā寮�
+#define OFFLINE_KEY 0 //OFFLINE_KEY:1鏄绾挎ā寮�;0鏄湪绾挎ā寮�
#define MINI_LED 0 //Mini杞﹂棿
#define MINI_NOTCH 0 //Mini杞﹂棿, 鏄惁浣跨敤鍒绘Ы鍔熻兘
#define HALCON_VISION_KEY 0 //鏄惁鍚敤HALCON
diff --git a/EdgeInspector_App/Process/InspectCamera.cpp b/EdgeInspector_App/Process/InspectCamera.cpp
index 67c6767..a0d6d06 100644
--- a/EdgeInspector_App/Process/InspectCamera.cpp
+++ b/EdgeInspector_App/Process/InspectCamera.cpp
@@ -4214,11 +4214,14 @@
double dChamfer_Diff_um = dChamfer_std_um - dChamfer_um;
pSideData->m_nNotch_Chamfer_Edge_Judge[nNotchIdx][nMeasureIdx] = 1;
+
+#if MINI_LED
//选取测量研磨尺寸最大值
- if (m_nChamferOffset_um < dChamfer_um)
- {
+ if (m_nChamferOffset_um < dChamfer_um) {
m_nChamferOffset_um = dChamfer_um;
}
+#endif
+
pSideData->m_dNotch_Chamfer_Edge_Result_Diff_um[nNotchIdx][nMeasureIdx] = dChamfer_std_um - dChamfer_um;
pSideData->m_dNotch_Chamfer_Edge_Judge_Std_um[nNotchIdx][nMeasureIdx] = dChamfer_std_um;
pSideData->m_dNotch_Chamfer_Edge_Judge_Min_um[nNotchIdx][nMeasureIdx] = dChamfer_min_um;
@@ -4331,8 +4334,6 @@
nOffset = m_nChamferOffset_um / m_pGlassData->GetSideData(emDim)->m_dPixelSizeX;
nOffset += pNotchParam->m_nNotch_Inspect_Defect_Offset;
m_nChamferOffset_um = 0;
-#else
- nOffset = pNotchParam->m_nNotch_Inspect_Defect_Offset;
#endif // MINI_LED
CRect rcIns = rtROI;
--
Gitblit v1.9.3