From e39bf56cbe48a588c115d31c7f404f01747d3c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Yavuz=20=C3=96ZDERYA?= Date: Sun, 14 Jun 2015 23:09:58 +0300 Subject: [PATCH] fixed NearestToPointSelector failure with tuple as arguments --- cadquery/selectors.py | 2 +- tests/TestCQSelectors.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cadquery/selectors.py b/cadquery/selectors.py index 42f0a24..07fc31e 100644 --- a/cadquery/selectors.py +++ b/cadquery/selectors.py @@ -62,7 +62,7 @@ class NearestToPointSelector(Selector): def filter(self,objectList): def dist(tShape): - return tShape.Center().sub(self.pnt).Length + return tShape.Center().sub(Vector(*self.pnt)).Length #if tShape.ShapeType == 'Vertex': # return tShape.Point.sub(toVector(self.pnt)).Length #else: diff --git a/tests/TestCQSelectors.py b/tests/TestCQSelectors.py index fc87664..e81a393 100644 --- a/tests/TestCQSelectors.py +++ b/tests/TestCQSelectors.py @@ -163,12 +163,12 @@ class TestCQSelectors(BaseTest): c = CQ(makeUnitCube()) #nearest vertex to origin is (0,0,0) - t = Vector(0.1,0.1,0.1) + t = (0.1,0.1,0.1) v = c.vertices(selectors.NearestToPointSelector(t)).vals()[0] self.assertTupleAlmostEquals((0.0,0.0,0.0),(v.X,v.Y,v.Z),3) - t = Vector(0.1,0.1,0.2) + t = (0.1,0.1,0.2) #nearest edge is the vertical side edge, 0,0,0 -> 0,0,1 e = c.edges(selectors.NearestToPointSelector(t)).vals()[0] v = c.edges(selectors.NearestToPointSelector(t)).vertices().vals()