improve workplane() method to create workplanes from multiple co-planar face selection

cadquery/CQ.py

@@ -298,11 +298,11 @@ class CQ(object):
             For now you can work around by creating a workplane and then offsetting the center
             afterwards.
         """
-        if len(self.objects) > 1:
+        def _isCoPlanar(f0, f1):
-            raise ValueError("Workplane cannot be created if more than"
+            p0 = f0.Center()
-                             " 1 object is selected.")
+            p1 = f1.Center()
-
+            n = f0.normalAt()
-        obj = self.objects[0]
+            return abs(n.dot(p0.sub(p1)) < self.ctx.tolerance)
 
         def _computeXdir(normal):
             """
@@ -317,28 +317,33 @@ class CQ(object):
                 xd = Vector(1, 0, 0)
             return xd
 
-        faceToBuildOn = None
+        if len(self.objects) > 1:
-        center = None
+            # are all objects 'PLANE'?
-        #if isinstance(obj,Vertex):
+            if not all(o.geomType() == 'PLANE' for o in self.objects):
-        #    f = self.parent.objects[0]
+                raise ValueError("If multiple objects selected, they all must be planar faces.")
-        #    if f != None and isinstance(f,Face):
+
-        #        center = obj.Center()
+            # are all faces co-planar with each other?
-        #        normal = f.normalAt(center)
+            if not all(_isCoPlanar(self.objects[0], f) for f in self.objects[1:]):
-        #        xDir = _computeXdir(normal)
+                raise ValueError("Selected faces must be co-planar.")
-        #    else:
+
-        #        raise ValueError("If a vertex is selected, a face must be the immediate parent")
+            center = Shape.CombinedCenter(self.objects)
-        if isinstance(obj, Face):
+            normal = self.objects[0].normalAt()
-            faceToBuildOn = obj
-            center = obj.Center()
-            normal = obj.normalAt(center)
             xDir = _computeXdir(normal)
+
         else:
-            if hasattr(obj, 'Center'):
+            obj = self.objects[0]
+
+            if isinstance(obj, Face):
                 center = obj.Center()
-                normal = self.plane.zDir
+                normal = obj.normalAt(center)
-                xDir = self.plane.xDir
+                xDir = _computeXdir(normal)
             else:
-                raise ValueError("Needs a face or a vertex or point on a work plane")
+                if hasattr(obj, 'Center'):
+                    center = obj.Center()
+                    normal = self.plane.zDir
+                    xDir = self.plane.xDir
+                else:
+                    raise ValueError("Needs a face or a vertex or point on a work plane")
 
         #invert if requested
         if invert:

cadquery/freecad_impl/shapes.py

@@ -198,6 +198,22 @@ class Shape(object):
         else:
             raise ValueError("Cannot find the center of %s object type" % str(type(self.Solids()[0].wrapped)))
 
+    @staticmethod
+    def CombinedCenter(objects):
+        """
+        Calculates the center of mass of multiple objects.
+
+        :param objects: a list of objects with mass
+        """
+        total_mass = sum(o.wrapped.Mass for o in objects)
+        weighted_centers = [o.wrapped.CenterOfMass.multiply(o.wrapped.Mass) for o in objects]
+
+        sum_wc = weighted_centers[0]
+        for wc in weighted_centers[1:] :
+            sum_wc = sum_wc.add(wc)
+
+        return Vector(sum_wc.multiply(1./total_mass))
+
     def Closed(self):
         return self.wrapped.Closed