From 1e751a5eb3c23d932b5de94456b5a8741f28c7cc Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 16 八月 2025 17:37:49 +0800
Subject: [PATCH] 1. 修复离线测试设置错误的扫描个数,应该设置的是需要扫描的个数(非相机个数)

---
 EdgeInspector_App/Process/InspectCamera.h |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/EdgeInspector_App/Process/InspectCamera.h b/EdgeInspector_App/Process/InspectCamera.h
index a16b3c1..a809c17 100644
--- a/EdgeInspector_App/Process/InspectCamera.h
+++ b/EdgeInspector_App/Process/InspectCamera.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 
 #include "ThreadControl.h"
 #include "DefectStorage.h"
@@ -59,7 +59,7 @@
 	// 0. Start Line
 	BOOL				CheckStartLineFrame(DimensionDir eDim,int iFrame);
 	BOOL				FindGlassStartLine(DimensionDir emDim, stFrameIndex stFrame);
-	BOOL				MakeNotchArea(DimensionDir emDim);	// 矫累急阑 茫栏搁 Notch 康开阑 固府 父甸绢 初绰促.
+	BOOL				MakeNotchArea(DimensionDir emDim);	// 鐭疮鎬ラ槕 鑼爮鎼� Notch 搴峰紑闃� 鍥哄簻 鐖剁敻缁� 鍒濈话淇�.
 
 	// 1. Process Frame
 	BOOL				ProcessFrame(int iThread,DimensionDir emDim, stFrameIndex stFrame);
@@ -137,8 +137,28 @@
 	// 12. Exception Area Process
 	BOOL				ExceptionArea_Process(int iThread,DimensionDir emDim, stFrameIndex stFrame);
 
-	//13. 视觉功能
+	//13. 瑙嗚鍔熻兘
 	void FinallyVisionProc(DimensionDir eDim);
+	
+	//14. 鎴浘鍥惧儚
+	int CutImageROI(uchar* img, DimensionDir eDim, int x1, int y1, int x2, int y2);
+	BOOL MeasureSideEdge_EI(DimensionDir eDim);
+
+	void MeasureSideEdge_POS_1(DimensionDir eDim,
+		int x1, int y1, int x2, int y2,
+		int leftThres, int rightThres, int gassThres,
+		double& minEdgeX, double& minEdgeY, double& maxEdgeX, double& maxEdgeY,
+		double& minGasX, double& minGasY, double& maxGasX, double& maxGasY,
+		double& szDist, double& leftGassDist, double& rightGassDist);
+
+	void MeasureSideEdge_POS(DimensionDir eDim, 
+		int x1, int y1, int x2, int y2,
+		int leftThres, int rightThres, int gassThres,
+		double& minEdgeX, double& minEdgeY, double& maxEdgeX, double& maxEdgeY,
+		double& minGasX, double& minGasY, double& maxGasX, double& maxGasY,
+		double& szDist, double& leftGassDist, double& rightGassDist);
+	bool MeasureResultProc(MeasurePoint* ptResult, int dotNum, int leftThres, int rightRes, int gasThres, double fzDist,
+		double& minX, double& minY, double& maxX, double& maxY, double& minGasX, double& minGasY, double& maxGasX, double& maxGasY);
 
 protected:	
 	void				SaveFullImageCopy(int iScan);

--
Gitblit v1.9.3