From e89283dda089022ccc484b2ded9a239d3c4f4ec5 Mon Sep 17 00:00:00 2001
From: "liu.wenjie" <783789228@qq.com>
Date: Wed, 13 Apr 2022 09:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FindLine/FindLine.cs | 82 --------------------------------------------
1 file changed, 82 deletions(-)
diff --git a/FindLine/FindLine.cs b/FindLine/FindLine.cs
index 5d18adb..f3ae92f 100644
--- a/FindLine/FindLine.cs
+++ b/FindLine/FindLine.cs
@@ -20,42 +20,11 @@ namespace FindLineTool
///
public HTuple inputPoseHomMat2D = new HTuple();
///
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 751e985 (1、修复找线工具的selectObject无法实时跟随的问题)
-=======
->>>>>>> 8c64a4f (1、修复找线工具的selectObject无法实时跟随的问题)
-=======
->>>>>>> 751e985 (1、修复找线工具的selectObject无法实时跟随的问题)
/// 位置修正姿态
///
public HTuple changePoseHomMat2D = new HTuple();
///
/// 制作模板时的位姿
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> fa76389 (修正FindLine工具无法位置跟随的问题)
-=======
->>>>>>> b070592 (修正FindLine工具无法位置跟随的问题)
-=======
->>>>>>> fa76389 (修正FindLine工具无法位置跟随的问题)
- /// 制作模板时的输入位姿
->>>>>>> b070592 (修正FindLine工具无法位置跟随的问题)
-=======
->>>>>>> 751e985 (1、修复找线工具的selectObject无法实时跟随的问题)
-=======
->>>>>>> 8c64a4f (1、修复找线工具的selectObject无法实时跟随的问题)
-=======
->>>>>>> 751e985 (1、修复找线工具的selectObject无法实时跟随的问题)
///
public PosXYU templatePose = new PosXYU();
///
@@ -293,60 +262,9 @@ namespace FindLineTool
}
if (inputPoseHomMat2D != null)
{
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
//对预期线的起始点做放射变换
HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelStartRow, modelStartCol, out newExpectLineStartRow, out newExpectLineStartCol);
HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelEndRow, modelEndCol, out newExpectLineEndRow, out newExpectLineEndCol);
-=======
-=======
->>>>>>> fa76389 (修正FindLine工具无法位置跟随的问题)
-=======
->>>>>>> b070592 (修正FindLine工具无法位置跟随的问题)
-=======
->>>>>>> fa76389 (修正FindLine工具无法位置跟随的问题)
- //HTuple Row = inputPose.X - templatePose.X;
- //HTuple Col = inputPose.Y - templatePose.Y;
- //HTuple angle = inputPose.U - templatePose.U;
-
- //HTuple _homMat2D;
- //HOperatorSet.HomMat2dIdentity(out _homMat2D);
- //HOperatorSet.HomMat2dRotate(_homMat2D, (HTuple)(angle), (HTuple)templatePose.X, (HTuple)templatePose.Y, out _homMat2D);
- //HOperatorSet.HomMat2dTranslate(_homMat2D, (HTuple)(Row), (HTuple)(Col), out _homMat2D);
-
- //对预期线的起始点做放射变换
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, (HTuple)expectLineStartRow, (HTuple)expectLineStartCol, out newExpectLineStartRow, out newExpectLineStartCol);
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, (HTuple)expectLineEndRow, (HTuple)expectLineEndCol, out newExpectLineEndRow, out newExpectLineEndCol);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> b070592 (修正FindLine工具无法位置跟随的问题)
-=======
->>>>>>> fa76389 (修正FindLine工具无法位置跟随的问题)
-=======
- //对预期线的起始点做放射变换
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelStartRow, modelStartCol, out newExpectLineStartRow, out newExpectLineStartCol);
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelEndRow, modelEndCol, out newExpectLineEndRow, out newExpectLineEndCol);
->>>>>>> 751e985 (1、修复找线工具的selectObject无法实时跟随的问题)
-=======
- //对预期线的起始点做放射变换
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelStartRow, modelStartCol, out newExpectLineStartRow, out newExpectLineStartCol);
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelEndRow, modelEndCol, out newExpectLineEndRow, out newExpectLineEndCol);
->>>>>>> 8c64a4f (1、修复找线工具的selectObject无法实时跟随的问题)
-=======
->>>>>>> b070592 (修正FindLine工具无法位置跟随的问题)
-=======
->>>>>>> fa76389 (修正FindLine工具无法位置跟随的问题)
-=======
- //对预期线的起始点做放射变换
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelStartRow, modelStartCol, out newExpectLineStartRow, out newExpectLineStartCol);
- HOperatorSet.AffineTransPixel(inputPoseHomMat2D, modelEndRow, modelEndCol, out newExpectLineEndRow, out newExpectLineEndCol);
->>>>>>> 751e985 (1、修复找线工具的selectObject无法实时跟随的问题)
}
else
{