From 47873f48d17bb8f7602fda73d29b19adcf43fdd0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 14 八月 2025 15:50:27 +0800
Subject: [PATCH] 1. 修复执行界面没有显示侧面检数据的问题
---
EdgeInspector_App/Process/InspectCamera.cpp | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/EdgeInspector_App/Process/InspectCamera.cpp b/EdgeInspector_App/Process/InspectCamera.cpp
index 0ccd88e..51633bc 100644
--- a/EdgeInspector_App/Process/InspectCamera.cpp
+++ b/EdgeInspector_App/Process/InspectCamera.cpp
@@ -556,6 +556,40 @@
double dDiff = SpecDiff(right_dist_Gass_array[i], rip.m_nRightRipSizeMin_um, rip.m_nRightRipSizeMax_um);
m_pDefectControl->ExtractDefect_RipThickness(eDim, m_iCamera, stFrame.nScanIdx, defect, right_dist_Gass_array[i], dDiff);
}
+
+ if (i < MAX_RIP_SAMPLE_COUNT) {
+ pSideData->m_ptSideRip_Glass_pxl[i][0] = CPoint((int)xMinEdge_array_px[i], (int)yMinEdge_array_px[i]); // start
+ pSideData->m_ptSideRip_Glass_pxl[i][1] = CPoint((int)xMaxEdge_array_px[i], (int)yMaxEdge_array_px[i]); // end
+ pSideData->m_ptSideRip_Left_pxl[i][0] = CPoint((int)xMinEdge_array_px[i], (int)yMinEdge_array_px[i]); // start
+ pSideData->m_ptSideRip_Left_pxl[i][1] = CPoint((int)xMinGas_array_px[i], (int)yMinGas_array_px[i]); // end
+ pSideData->m_ptSideRip_Right_pxl[i][0] = CPoint((int)xMaxGas_array_px[i], (int)yMaxGas_array_px[i]); // start
+ pSideData->m_ptSideRip_Right_pxl[i][1] = CPoint((int)xMaxEdge_array_px[i], (int)yMaxEdge_array_px[i]); // end
+
+ pSideData->m_dSideRip_Glass_um[i] = dist_array[i];
+ pSideData->m_dSideRip_Left_um[i] = left_dist_Gass_array[i];
+ pSideData->m_dSideRip_Right_um[i] = right_dist_Gass_array[i];
+
+ if (dist_array[i] > 0) {
+ pSideData->m_nSideRip_Glass_Status[i] = ngGlass ? 2 : 1;
+ }
+ else {
+ pSideData->m_nSideRip_Glass_Status[i] = 0;
+ }
+
+ if (left_dist_Gass_array[i] > 0) {
+ pSideData->m_nSideRip_Left_Status[i] = ngLeft ? 2 : 1;
+ }
+ else {
+ pSideData->m_nSideRip_Left_Status[i] = 0;
+ }
+
+ if (right_dist_Gass_array[i] > 0) {
+ pSideData->m_nSideRip_Right_Status[i] = ngRight ? 2 : 1;
+ }
+ else {
+ pSideData->m_nSideRip_Right_Status[i] = 0;
+ }
+ }
}
return TRUE;
@@ -1789,12 +1823,6 @@
return TRUE;
}
- BOOL bTopCornerUse = (BOOL)(m_pRecipe->m_SideParam[emDim].m_nTopCornerShape == 0) ? FALSE : TRUE;
- if (bTopCornerUse == FALSE) {
- localLock.Unlock();
- return FALSE;
- }
-
double dCornerSizeY_Um = (double)m_pRecipe->m_SideParam[emDim].m_nTopCornerSizeY_um;
int nCornerSizeY_Pixel = (int)GetUmToPixel_Y(dCornerSizeY_Um);
int nFrameHeight = m_nFrameHeight;
@@ -2404,12 +2432,6 @@
if (pSideData->m_bBotCorner_Find == TRUE) {
localLock.Unlock();
return TRUE;
- }
-
- BOOL bBotCornerUse = (BOOL)(m_pRecipe->m_SideParam[emDim].m_nBottomCornerShape == 0) ? FALSE : TRUE;
- if (bBotCornerUse == FALSE) {
- localLock.Unlock();
- return FALSE;
}
double dCornerSizeY_Um = (double)m_pRecipe->m_SideParam[emDim].m_nBottomCornerSizeY_um;
--
Gitblit v1.9.3