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

fixed tests to pass with FreeCAD 0.15

Browse Source
This commit is contained in:
Dave Cowden 2016-04-03 20:24:13 -04:00
parent 3ea7829471
commit e0e14a133d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cadquery/freecad_impl/shapes.py
View File

@ -237,8 +237,8 @@ class Shape(object):
:param objects: a list of objects with mass :param objects: a list of objects with mass
""" """
total_mass = sum(o.wrapped.Mass for o in objects) total_mass = sum(Shape.computeMass(o) for o in objects)
weighted_centers = [o.wrapped.CenterOfMass.multiply(o.wrapped.Mass) for o in objects] weighted_centers = [o.wrapped.CenterOfMass.multiply(Shape.computeMass(o)) for o in objects]
sum_wc = weighted_centers[0] sum_wc = weighted_centers[0]
for wc in weighted_centers[1:] : for wc in weighted_centers[1:] :
@ -246,6 +246,17 @@ class Shape(object):
return Vector(sum_wc.multiply(1./total_mass)) return Vector(sum_wc.multiply(1./total_mass))
@staticmethod
def computeMass(object):
"""
Calculates the 'mass' of an object. in FreeCAD < 15, all objects had a mass.
in FreeCAD >=15, faces no longer have mass, but instead have area.
"""
if object.wrapped.ShapeType == 'Face':
return object.wrapped.Area
else:
return object.wrapped.Mass
@staticmethod @staticmethod
def CombinedCenterOfBoundBox(objects): def CombinedCenterOfBoundBox(objects):
""" """