| Common_Class/AutoFileCleanupTool/AutoFileCleanupTool.vcxproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Common_Class/SISAssem/SISAssem.vcxproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| EdgeInspector_App/BICommon.h | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| EdgeInspector_App/Process/InspectCamera.cpp | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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> 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"> 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 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;
