无

eyemLib/eyemLib.h

@@ -102,10 +102,6 @@
 typedef intptr_t        IntPtr;
 #endif
 
-//#ifndef LPSTR
-//typedef char*			LPSTR;
-//#endif
-
 
 // 图像边界处理
 #ifndef __EYEM_BORDER
@@ -423,6 +419,15 @@ enum
 	EYEM_DIST_ATLWORTH = 10			/**< w = 1 * (abs(r)<1) c=2.975*/
 };
 
+typedef struct {
+	double					a00;							// a00
+	double					a01;							// a01
+	double					b00;							// b00
+	double					a10;							// a10
+	double					a11;							// a11
+	double					b10;							// b10
+}	EyemRigidMatrix;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -430,15 +435,12 @@ extern "C" {
 	// 函数接口
 	EXPORTS int				eyemFitLine(int iPtnNum, EyemOcsDXY *taPoint, int numToIgnore, EyemOcsDABC &tpLine);
 	EXPORTS int				eyemRobustFitLine(int iPtnNum, EyemOcsDXY *taPoint, int iCalcMode, double dRobustCoef, EyemOcsDABC &tpLine);
+	EXPORTS int				eyemFitLineRANSAC(int iPtnNum, EyemOcsDXY *taPoint, double dClippingFactor, EyemOcsDABC &tpLine);
 	EXPORTS int				eyemFitCircle(int iPtnNum, EyemOcsDXY *taPoint, int numToIgnore, double &dRMS, EyemOcsDXYR &tpCircle);
 	EXPORTS int				eyemRobustFitCircle(int iPtnNum, EyemOcsDXY *taPoint, int iCalcMode, double dRobustCoef, EyemOcsDXYR &tpCircle);
-	EXPORTS int				eyemFitPlane(int iPtnNum, EyemOcsDXYZ *taPoint, int iCalcMode, double &dRMS, EyemOcsDABCD &tpPlane);
-	EXPORTS int				eyemFitEllipse(int, EyemOcsDXY[], int, double, EyemOcsDXYLSQ *);
-	EXPORTS int				eyemFitEllipseC(int, EyemOcsDXY[], int, double, double[]);
-	EXPORTS int				eyemFitConics(int, EyemOcsDXY[], int, double, double[]);
-	EXPORTS int				eyemFitParabola(int, EyemOcsDXY[], int, double, EyemOcsDABC *);
-	EXPORTS int				eyemFitEllipsoid(int, EyemOcsDXYZ[], int, double, EyemOcsDCRUVW *);
-	EXPORTS int				eyemFitCone(int, EyemOcsDXYZ[], int, double, double[]);
+	EXPORTS int				eyemFitRTMatrix(int iPtnNum, EyemOcsDXY *taPointA, EyemOcsDXY *taPointB, EyemRigidMatrix &dpResult);
+	EXPORTS int				eyemRobustFitPlane(int iPtnNum, EyemOcsDXYZ *taPoint, int iCalcMode, double dRobustCoef, EyemOcsDABCD &tpPlane);
+	EXPORTS int				eyemRobustFitEllipse(int iPtnNum, EyemOcsDXY *taPoint, int iCalcMode, double dRobustCoef, EyemOcsDXYLSQ &tpEllipse);
 
 #ifdef __cplusplus
 }
@@ -833,7 +835,6 @@ typedef struct {
 	char*					lpszName;						// 名称
 }	EyemModelID;
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -859,6 +860,9 @@ extern "C" {
 	EXPORTS int				eyemMarkerTracing(EyemImage tpImage, double dThreshold, EyemOcsFXYR *tpCircle, bool bHighAccuracy = false);
 	EXPORTS int				eyemMulFuncTool(EyemImage tpImage, EyemRect tpRoi, const char *funcName, double dThreshold, int iNumToIgnore, EyemOcsFXYR *tpCircle, EyemImage *tpDstImg);
 	EXPORTS int				eyemLibImpl(EyemImage tpImage, EyemImage *tpDstImg);
+	EXPORTS int				eyemDrawLine(EyemImage tpImage, EyemOcsDABC tpLine);
+	EXPORTS int				eyemDrawCircle(EyemImage tpImage, EyemOcsDXYR tpCircle);
+	EXPORTS int				eyemDrawRectangle(EyemImage tpImag, EyemRect tpRect);
 
 #ifdef __cplusplus
 }