ByoungSooPark/cadquery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refectored Vector and added more tests

Browse Source
This commit is contained in:
adam-urbanczyk
2018-12-26 00:19:34 +01:00
parent 56ad889f57
commit 9583160ad1
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cadquery/occ_impl/geom.py
View File

@ -38,11 +38,7 @@ class Vector(object):
fV = gp_Vec(*arg)
elif len(arg)==2:
fV = gp_Vec(*arg,0)
elif isinstance(args[0], gp_Vec):
fV = gp_Vec(args[0].XYZ())
elif isinstance(args[0], gp_Pnt):
fV = gp_Vec(args[0].XYZ())
elif isinstance(args[0], gp_Dir):
elif isinstance(args[0], (gp_Vec, gp_Pnt, gp_Dir)):
fV = gp_Vec(args[0].XYZ())
elif isinstance(args[0], gp_XYZ):
fV = gp_Vec(args[0])

21
tests/TestCadObjects.py
View File

@ -2,7 +2,7 @@
import sys
import unittest
from tests import BaseTest
from OCC.gp import gp_Vec, gp_Pnt, gp_Ax2, gp_Circ, gp_DZ
from OCC.gp import gp_Vec, gp_Pnt, gp_Ax2, gp_Circ, gp_DZ, gp_XYZ
from OCC.BRepBuilderAPI import (BRepBuilderAPI_MakeVertex,
BRepBuilderAPI_MakeEdge,
BRepBuilderAPI_MakeFace)
@ -24,9 +24,26 @@ class TestCadObjects(BaseTest):
v1 = Vector(1, 2, 3)
v2 = Vector((1, 2, 3))
v3 = Vector(gp_Vec(1, 2, 3))
v4 = Vector([1,2,3])
v5 = Vector(gp_XYZ(1,2,3))
for v in [v1, v2, v3]:
for v in [v1, v2, v3, v4, v5]:
self.assertTupleAlmostEquals((1, 2, 3), v.toTuple(), 4)
v6 = Vector((1,2))
v7 = Vector([1,2])
v8 = Vector(1,2)
for v in [v6, v7, v8]:
self.assertTupleAlmostEquals((1, 2, 0), v.toTuple(), 4)
v9 = Vector()
self.assertTupleAlmostEquals((0, 0, 0), v9.toTuple(), 4)
v9.x = 1.
v9.y = 2.
v9.z = 3.
self.assertTupleAlmostEquals((1, 2, 3), (v9.x, v9.y, v9.z), 4)
def testVertex(self):
"""