suzanne.soy/cadquery-freecad-module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #96 from dcowden/cleanup

Browse Source 
Cleanup
This commit is contained in:
Jeremy Wright 2015-06-16 17:04:50 -04:00
commit dc40f2e406
4 changed files with 117 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.coverage
View File

Binary file not shown.

28
cadquery/CQ.py
View File

@ -20,6 +20,7 @@
import time, math
from cadquery import *
from cadquery import selectors
from cadquery import exporters
class CQContext(object):
@ -389,7 +390,6 @@ class CQ(object):
will return the same as::
CQ(obj).faces("+Z")
"""
if self.parent:
return self.parent
@ -643,7 +643,7 @@ class CQ(object):
:type opts: dictionary, width and height
:return: a string that contains SVG that represents this item.
"""
return SVGexporter.getSVG(self.val().wrapped, opts)
return exporters.getSVG(self.val().wrapped, opts)
def exportSvg(self, fileName):
"""
@ -1093,6 +1093,15 @@ class Workplane(CQ):
"""
return self.line(0, distance, forConstruction)
def hLine(self, distance, forConstruction=False):
"""
Make a horizontal line from the current point the provided distance
:param float distance: (x) distance from current point
:return: the Workplane object with the current point at the end of the new line
"""
return self.line(distance, 0, forConstruction)
def vLineTo(self, yCoord, forConstruction=False):
"""
Make a vertical line from the current point to the provided y coordinate.
@ -1119,15 +1128,6 @@ class Workplane(CQ):
p = self._findFromPoint(True)
return self.lineTo(xCoord, p.y, forConstruction)
def hLine(self, distance, forConstruction=False):
"""
Make a horizontal line from the current point the provided distance
:param float distance: (x) distance from current point
:return: the Workplane object with the current point at the end of the new line
"""
return self.line(distance, 0, forConstruction)
#absolute move in current plane, not drawing
def moveTo(self, x=0, y=0):
"""
@ -1652,11 +1652,11 @@ class Workplane(CQ):
if s:
return s.BoundingBox().DiagonalLength * 5.0
else:
return 1000000
return -1
def cutEach(self, fcn, useLocalCoords=False):
"""
Evaluates the provided function at each point on the stack ( ie, eachpoint )
Evaluates the provided function at each point on the stack (ie, eachpoint)
and then cuts the result from the context solid.
:param fcn: a function suitable for use in the eachpoint method: ie, that accepts
a vector
@ -1968,7 +1968,7 @@ class Workplane(CQ):
def combine(self):
"""
Attempts to combine all of the items on the items on the stack into a single item.
Attempts to combine all of the items on the stack into a single item.
WARNING: all of the items must be of the same type!
:raises: ValueError if there are no items on the stack, or if they cannot be combined

1
cadquery/freecad_impl/exporters.py
View File

@ -249,6 +249,7 @@ def getPaths(freeCadSVG):
else:
return ([],[])
def getSVG(shape,opts=None):
"""
Export a shape to SVG

111
tests/TestCadQuery.py
View File

@ -88,6 +88,18 @@ class TestCadQuery(BaseTest):
self.assertEqual(12, len(r.Edges))
def testToSVG(self):
"""
Tests to make sure that a CadQuery object is converted correctly to SVG
"""
r = Workplane('XY').rect(5, 5).extrude(5)
r_str = r.toSvg()
# Make sure that a couple of sections from the SVG output make sense
self.assertTrue(r_str.index('path d=" M 2.35965 -2.27987 L 4.0114 -3.23936 "') > 0)
self.assertTrue(r_str.index('line x1="30" y1="-30" x2="58" y2="-15" stroke-width="3"') > 0)
def testCubePlugin(self):
"""
Tests a plugin that combines cubes together with a base
@ -173,17 +185,27 @@ class TestCadQuery(BaseTest):
def testPointList(self):
"Tests adding points and using them"
"""
Tests adding points and using them
"""
c = CQ(makeUnitCube())
s = c.faces(">Z").workplane().pushPoints([(-0.3,0.3),(0.3,0.3),(0,0)])
self.assertEqual(3,s.size())
s = c.faces(">Z").workplane().pushPoints([(-0.3, 0.3), (0.3, 0.3), (0, 0)])
self.assertEqual(3, s.size())
#TODO: is the ability to iterate over points with circle really worth it?
#maybe we should just require using all() and a loop for this. the semantics and
#possible combinations got too hard ( ie, .circle().circle() ) was really odd
body = s.circle(0.05).cutThruAll()
self.saveModel(body)
self.assertEqual(9,body.faces().size())
self.assertEqual(9, body.faces().size())
# Test the case when using eachpoint with only a blank workplane
def callback_fn(pnt):
self.assertEqual((0.0, 0.0), (pnt.x, pnt.y))
r = Workplane('XY')
r.objects = []
r.eachpoint(callback_fn)
def testWorkplaneFromFace(self):
@ -248,7 +270,8 @@ class TestCadQuery(BaseTest):
Test creating a solid using the revolve operation.
:return:
"""
#The dimensions of the model. These can be modified rather than changing the shape's code directly.
# The dimensions of the model. These can be modified rather than changing the
# shape's code directly.
rectangle_width = 10.0
rectangle_length = 10.0
angle_degrees = 360.0
@ -304,12 +327,14 @@ class TestCadQuery(BaseTest):
Test creating a solid donut shape with square walls
:return:
"""
#The dimensions of the model. These can be modified rather than changing the shape's code directly.
# The dimensions of the model. These can be modified rather than changing the
# shape's code directly.
rectangle_width = 10.0
rectangle_length = 10.0
angle_degrees = 360.0
result = Workplane("XY").rect(rectangle_width, rectangle_length, True).revolve(angle_degrees, (20, 0), (20, 10))
result = Workplane("XY").rect(rectangle_width, rectangle_length, True)\
.revolve(angle_degrees, (20, 0), (20, 10))
self.assertEqual(4, result.faces().size())
self.assertEqual(4, result.vertices().size())
self.assertEqual(6, result.edges().size())
@ -324,6 +349,24 @@ class TestCadQuery(BaseTest):
self.assertEqual(2, result.vertices().size())
self.assertEqual(3, result.edges().size())
def testTwistExtrude(self):
"""
Tests extrusion while twisting through an angle.
"""
profile = Workplane('XY').rect(10, 10)
r = profile.twistExtrude(10, 45, False)
self.assertEqual(6, r.faces().size())
def testTwistExtrudeCombine(self):
"""
Tests extrusion while twisting through an angle, combining with other solids.
"""
profile = Workplane('XY').rect(10, 10)
r = profile.twistExtrude(10, 45)
self.assertEqual(6, r.faces().size())
def testRectArray(self):
NUMX=3
NUMY=3
@ -556,7 +599,9 @@ class TestCadQuery(BaseTest):
self.saveModel(r)
def test2DDrawing(self):
"""Draw things like 2D lines and arcs, should be expanded later to include all 2D constructs"""
"""
Draw things like 2D lines and arcs, should be expanded later to include all 2D constructs
"""
s = Workplane(Plane.XY())
r = s.lineTo(1.0, 0.0) \
.lineTo(1.0, 1.0) \
@ -572,6 +617,46 @@ class TestCadQuery(BaseTest):
self.assertEqual(1, r.wires().size())
# Test the *LineTo functions
s = Workplane(Plane.XY())
r = s.hLineTo(1.0).vLineTo(1.0).hLineTo(0.0).close()
self.assertEqual(1, r.wire().size())
self.assertEqual(4, r.edges().size())
# Test the *Line functions
s = Workplane(Plane.XY())
r = s.hLine(1.0).vLine(1.0).hLine(-1.0).close()
self.assertEqual(1, r.wire().size())
self.assertEqual(4, r.edges().size())
# Test the move function
s = Workplane(Plane.XY())
r = s.move(1.0, 1.0).hLine(1.0).vLine(1.0).hLine(-1.0).close()
self.assertEqual(1, r.wire().size())
self.assertEqual(4, r.edges().size())
self.assertEqual((1.0, 1.0),
(r.vertices(selectors.NearestToPointSelector((0.0, 0.0, 0.0)))\
.first().val().X,
r.vertices(selectors.NearestToPointSelector((0.0, 0.0, 0.0)))\
.first().val().Y))
def testLargestDimension(self):
"""
Tests the largestDimension function when no solids are on the stack and when there are
"""
r = Workplane('XY').box(1, 1, 1)
dim = r.largestDimension()
self.assertAlmostEqual(8.66025403784, dim)
r = Workplane('XY')
dim = r.largestDimension()
self.assertEqual(-1, dim)
def testOccBottle(self):
"""
Make the OCC bottle example.
@ -728,9 +813,17 @@ class TestCadQuery(BaseTest):
(-1.0, -1.0), (0.0, 0.0), (1.0, 1.0)
]
c.faces(">Z").workplane().pushPoints(pnts).cboreHole(0.1, 0.25, 0.25, 0.75)
self.assertEquals(18, c.faces().size() )
self.assertEquals(18, c.faces().size())
self.saveModel(c)
# Tests the case where the depth of the cboreHole is not specified
c2 = CQ(makeCube(3.0))
pnts = [
(-1.0, -1.0), (0.0, 0.0), (1.0, 1.0)
]
c2.faces(">Z").workplane().pushPoints(pnts).cboreHole(0.1, 0.25, 0.25)
self.assertEquals(15, c2.faces().size())
def testCounterSinks(self):
"""
Tests countersinks