From b1a6187d3eb41a1730e730447b69ac35d0755dd2 Mon Sep 17 00:00:00 2001 From: Jeremy Mack Wright Date: Mon, 23 Nov 2015 21:44:36 -0500 Subject: [PATCH] Made the normalize to normalized change to make CadQuery match the PythonOCC/OCC symantics. --- cadquery/CQ.py | 2 +- cadquery/freecad_impl/geom.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cadquery/CQ.py b/cadquery/CQ.py index 8d21173..2ba78a5 100644 --- a/cadquery/CQ.py +++ b/cadquery/CQ.py @@ -375,7 +375,7 @@ class CQ(object): normal = normal.multiply(-1.0) #offset origin if desired - offsetVector = normal.normalize().multiply(offset) + offsetVector = normal.normalized().multiply(offset) offsetCenter = center.add(offsetVector) #make the new workplane diff --git a/cadquery/freecad_impl/geom.py b/cadquery/freecad_impl/geom.py index 37ea922..2ae7525 100644 --- a/cadquery/freecad_impl/geom.py +++ b/cadquery/freecad_impl/geom.py @@ -125,7 +125,7 @@ class Vector(object): tmp_fc_vector = FreeCAD.Base.Vector(self.wrapped) return Vector(tmp_fc_vector.multiply(scale)) - def normalize(self): + def normalized(self): """Return a normalized version of this vector""" tmp_fc_vector = FreeCAD.Base.Vector(self.wrapped) tmp_fc_vector.normalize() @@ -343,7 +343,7 @@ class Plane(object): normal = Vector(normal) if (normal.Length == 0.0): raise ValueError('normal should be non null') - self.zDir = normal.normalize() + self.zDir = normal.normalized() xDir = Vector(xDir) if (xDir.Length == 0.0): raise ValueError('xDir should be non null') @@ -539,8 +539,8 @@ class Plane(object): if (self.zDir.dot(xDir) > 1e-5): raise ValueError('xDir must be parralel to the plane') xDir = Vector(xDir) - self.xDir = xDir.normalize() - self.yDir = self.zDir.cross(self.xDir).normalize() + self.xDir = xDir.normalized() + self.yDir = self.zDir.cross(self.xDir).normalized() def _calcTransforms(self): """Computes transformation matrices to convert between coordinates