Merge branch 'master' into docs-install

Author: lorenzncode

.gitignore

@@ -32,3 +32,4 @@ nested.stl
 out1.3mf
 out2.3mf
 out3.3mf
+orig.dxf

appveyor.yml

@@ -38,3 +38,8 @@ test_script:
 
 on_success:
     - codecov
+
+#on_finish:
+#    - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#   - sh: export APPVEYOR_SSH_BLOCK=true
+#   - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -

azure-pipelines.yml

@@ -18,29 +18,10 @@ parameters:
   - name: minor
     type: object
     default:
-      - 8
-      - 9
-      - 10
       - 11
 
 jobs:
 - ${{ each minor in parameters.minor }}:
-  - template: conda-build.yml@templates
-    parameters:
-      name: Linux
-      vmImage: 'ubuntu-18.04'
-      py_maj: 3
-      py_min: ${{minor}}
-      conda_bld: 3.21.6
-
-  - template: conda-build.yml@templates
-    parameters:
-      name: macOS
-      vmImage: 'macOS-10.15'
-      py_maj: 3
-      py_min: ${{minor}}
-      conda_bld: 3.21.6
-
   - template: conda-build.yml@templates
     parameters:
       name: Windows

cadquery/assembly.py

@@ -1,5 +1,16 @@
 from functools import reduce
-from typing import Union, Optional, List, Dict, Any, overload, Tuple, Iterator, cast
+from typing import (
+    Union,
+    Optional,
+    List,
+    Dict,
+    Any,
+    overload,
+    Tuple,
+    Iterator,
+    cast,
+    get_args,
+)
 from typing_extensions import Literal
 from typish import instance_of
 from uuid import uuid1 as uuid
@@ -21,6 +32,8 @@
     exportVTKJS,
     exportVRML,
     exportGLTF,
+    STEPExportModeLiterals,
+    ExportModes,
 )
 
 from .selectors import _expression_grammar as _selector_grammar
@@ -436,6 +449,7 @@ def save(
         self,
         path: str,
         exportType: Optional[ExportLiterals] = None,
+        mode: STEPExportModeLiterals = "default",
         tolerance: float = 0.1,
         angularTolerance: float = 0.1,
         **kwargs,
@@ -451,6 +465,10 @@ def save(
             See :meth:`~cadquery.occ_impl.exporters.assembly.exportAssembly`.
         """
 
+        # Make sure the export mode setting is correct
+        if mode not in get_args(STEPExportModeLiterals):
+            raise ValueError(f"Unknown assembly export mode {mode} for STEP")
+
         if exportType is None:
             t = path.split(".")[-1].upper()
             if t in ("STEP", "XML", "VRML", "VTKJS", "GLTF", "STL"):
@@ -459,7 +477,7 @@ def save(
                 raise ValueError("Unknown extension, specify export type explicitly")
 
         if exportType == "STEP":
-            exportAssembly(self, path, **kwargs)
+            exportAssembly(self, path, mode, **kwargs)
         elif exportType == "XML":
             exportCAF(self, path)
         elif exportType == "VRML":

cadquery/occ_impl/assembly.py

@@ -1,15 +1,19 @@
-from typing import Union, Iterable, Tuple, Dict, overload, Optional, Any, List
+from typing import Union, Iterable, Tuple, Dict, overload, Optional, Any, List, cast
 from typing_extensions import Protocol
 from math import degrees
 
 from OCP.TDocStd import TDocStd_Document
 from OCP.TCollection import TCollection_ExtendedString
-from OCP.XCAFDoc import XCAFDoc_DocumentTool, XCAFDoc_ColorType
+from OCP.XCAFDoc import XCAFDoc_DocumentTool, XCAFDoc_ColorType, XCAFDoc_ColorGen
 from OCP.XCAFApp import XCAFApp_Application
 from OCP.TDataStd import TDataStd_Name
 from OCP.TDF import TDF_Label
 from OCP.TopLoc import TopLoc_Location
 from OCP.Quantity import Quantity_ColorRGBA
+from OCP.BRepAlgoAPI import BRepAlgoAPI_Fuse
+from OCP.TopTools import TopTools_ListOfShape
+from OCP.BOPAlgo import BOPAlgo_GlueEnum
+from OCP.TopoDS import TopoDS_Shape
 
 from vtkmodules.vtkRenderingCore import (
     vtkActor,
@@ -112,6 +116,10 @@ def parent(self) -> Optional["AssemblyProtocol"]:
     def color(self) -> Optional[Color]:
         ...
 
+    @property
+    def obj(self) -> AssemblyObjects:
+        ...
+
     @property
     def shapes(self) -> Iterable[Shape]:
         ...
@@ -289,3 +297,117 @@ def toJSON(
         rv.extend(toJSON(child, loc, color, tolerance))
 
     return rv
+
+
+def toFusedCAF(
+    assy: AssemblyProtocol, glue: bool = False, tol: Optional[float] = None,
+) -> Tuple[TDF_Label, TDocStd_Document]:
+    """
+    Converts the assembly to a fused compound and saves that within the document
+    to be exported in a way that preserves the face colors. Because of the use of
+    boolean operations in this method, performance may be slow in some cases.
+
+    :param assy: Assembly that is being converted to a fused compound for the document.
+    """
+
+    # Prepare the document
+    app = XCAFApp_Application.GetApplication_s()
+    doc = TDocStd_Document(TCollection_ExtendedString("XmlOcaf"))
+    app.InitDocument(doc)
+
+    # Shape and color tools
+    shape_tool = XCAFDoc_DocumentTool.ShapeTool_s(doc.Main())
+    color_tool = XCAFDoc_DocumentTool.ColorTool_s(doc.Main())
+
+    # To fuse the parts of the assembly together
+    fuse_op = BRepAlgoAPI_Fuse()
+    args = TopTools_ListOfShape()
+    tools = TopTools_ListOfShape()
+
+    # If there is only one solid, there is no reason to fuse, and it will likely cause problems anyway
+    top_level_shape = None
+
+    # Walk the entire assembly, collecting the located shapes and colors
+    shapes: List[Shape] = []
+    colors = []
+
+    def extract_shapes(assy, parent_loc=None, parent_color=None):
+
+        loc = parent_loc * assy.loc if parent_loc else assy.loc
+        color = assy.color if assy.color else parent_color
+
+        for shape in assy.shapes:
+            shapes.append(shape.moved(loc).copy())
+            colors.append(color)
+
+        for ch in assy.children:
+            extract_shapes(ch, loc, color)
+
+    extract_shapes(assy)
+
+    # Initialize with a dummy value for mypy
+    top_level_shape = cast(TopoDS_Shape, None)
+
+    # If the tools are empty, it means we only had a single shape and do not need to fuse
+    if not shapes:
+        raise Exception(f"Error: Assembly {assy.name} has no shapes.")
+    elif len(shapes) == 1:
+        # There is only one shape and we only need to make sure it is a Compound
+        # This seems to be needed to be able to add subshapes (i.e. faces) correctly
+        sh = shapes[0]
+        if sh.ShapeType() != "Compound":
+            top_level_shape = Compound.makeCompound((sh,)).wrapped
+        elif sh.ShapeType() == "Compound":
+            sh = sh.fuse(glue=glue, tol=tol)
+            top_level_shape = Compound.makeCompound((sh,)).wrapped
+            shapes = [sh]
+    else:
+        # Set the shape lists up so that the fuse operation can be performed
+        args.Append(shapes[0].wrapped)
+
+        for shape in shapes[1:]:
+            tools.Append(shape.wrapped)
+
+        # Allow the caller to configure the fuzzy and glue settings
+        if tol:
+            fuse_op.SetFuzzyValue(tol)
+        if glue:
+            fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift)
+
+        fuse_op.SetArguments(args)
+        fuse_op.SetTools(tools)
+        fuse_op.Build()
+
+        top_level_shape = fuse_op.Shape()
+
+    # Add the fused shape as the top level object in the document
+    top_level_lbl = shape_tool.AddShape(top_level_shape, False)
+    TDataStd_Name.Set_s(top_level_lbl, TCollection_ExtendedString(assy.name))
+
+    # Walk the assembly->part->shape->face hierarchy and add subshapes for all the faces
+    for color, shape in zip(colors, shapes):
+        for face in shape.Faces():
+            # See if the face can be treated as-is
+            cur_lbl = shape_tool.AddSubShape(top_level_lbl, face.wrapped)
+            if color and not cur_lbl.IsNull() and not fuse_op.IsDeleted(face.wrapped):
+                color_tool.SetColor(cur_lbl, color.wrapped, XCAFDoc_ColorGen)
+
+            # Handle any modified faces
+            modded_list = fuse_op.Modified(face.wrapped)
+
+            for mod in modded_list:
+                # Add the face as a subshape and set its color to match the parent assembly component
+                cur_lbl = shape_tool.AddSubShape(top_level_lbl, mod)
+                if color and not cur_lbl.IsNull() and not fuse_op.IsDeleted(mod):
+                    color_tool.SetColor(cur_lbl, color.wrapped, XCAFDoc_ColorGen)
+
+            # Handle any generated faces
+            gen_list = fuse_op.Generated(face.wrapped)
+
+            for gen in gen_list:
+                # Add the face as a subshape and set its color to match the parent assembly component
+                cur_lbl = shape_tool.AddSubShape(top_level_lbl, gen)
+                if color and not cur_lbl.IsNull():
+                    color_tool.SetColor(cur_lbl, color.wrapped, XCAFDoc_ColorGen)
+
+    return top_level_lbl, doc

cadquery/occ_impl/exporters/assembly.py

@@ -1,8 +1,10 @@
 import os.path
+import uuid
 
 from tempfile import TemporaryDirectory
 from shutil import make_archive
 from itertools import chain
+from typing_extensions import Literal
 
 from vtkmodules.vtkIOExport import vtkJSONSceneExporter, vtkVRMLExporter
 from vtkmodules.vtkRenderingCore import vtkRenderer, vtkRenderWindow
@@ -23,20 +25,41 @@
 from OCP.Message import Message_ProgressRange
 from OCP.Interface import Interface_Static
 
-from ..assembly import AssemblyProtocol, toCAF, toVTK
+from ..assembly import AssemblyProtocol, toCAF, toVTK, toFusedCAF
 from ..geom import Location
 
 
-def exportAssembly(assy: AssemblyProtocol, path: str, **kwargs) -> bool:
+class ExportModes:
+    DEFAULT = "default"
+    FUSED = "fused"
+
+
+STEPExportModeLiterals = Literal["default", "fused"]
+
+
+def exportAssembly(
+    assy: AssemblyProtocol,
+    path: str,
+    mode: STEPExportModeLiterals = "default",
+    **kwargs
+) -> bool:
     """
     Export an assembly to a STEP file.
 
     kwargs is used to provide optional keyword arguments to configure the exporter.
 
     :param assy: assembly
     :param path: Path and filename for writing
+    :param mode: STEP export mode. The options are "default", and "fused" (a single fused compound).
+        It is possible that fused mode may exhibit low performance.
+    :param fuzzy_tol: OCCT fuse operation tolerance setting used only for fused assembly export.
+    :type fuzzy_tol: float
+    :param glue: Enable gluing mode for improved performance during fused assembly export.
+        This option should only be used for non-intersecting shapes or those that are only touching or partially overlapping.
+        Note that when glue is enabled, the resulting fused shape may be invalid if shapes are intersecting in an incompatible way.
+        Defaults to False.
+    :type glue: bool
     :param write_pcurves: Enable or disable writing parametric curves to the STEP file. Default True.
-
         If False, writes STEP file without pcurves. This decreases the size of the resulting STEP file.
     :type write_pcurves: bool
     :param precision_mode: Controls the uncertainty value for STEP entities. Specify -1, 0, or 1. Default 0.
@@ -49,8 +72,17 @@ def exportAssembly(assy: AssemblyProtocol, path: str, **kwargs) -> bool:
     if "write_pcurves" in kwargs and not kwargs["write_pcurves"]:
         pcurves = 0
     precision_mode = kwargs["precision_mode"] if "precision_mode" in kwargs else 0
+    fuzzy_tol = kwargs["fuzzy_tol"] if "fuzzy_tol" in kwargs else None
+    glue = kwargs["glue"] if "glue" in kwargs else False
+
+    # Use the assembly name if the user set it
+    assembly_name = assy.name if assy.name else str(uuid.uuid1())
 
-    _, doc = toCAF(assy, True)
+    # Handle the doc differently based on which mode we are using
+    if mode == "fused":
+        _, doc = toFusedCAF(assy, glue, fuzzy_tol)
+    else:  # Includes "default"
+        _, doc = toCAF(assy, True)
 
     session = XSControl_WorkSession()
     writer = STEPCAFControl_Writer(session, False)

cadquery/occ_impl/shapes.py

@@ -545,8 +545,10 @@ def geomType(self) -> Geoms:
         The return values depend on the type of the shape:
 
         | Vertex:  always 'Vertex'
-        | Edge:   LINE, ARC, CIRCLE, SPLINE
-        | Face:   PLANE, SPHERE, CONE
+        | Edge:   LINE, CIRCLE, ELLIPSE, HYPERBOLA, PARABOLA, BEZIER, 
+        |         BSPLINE, OFFSET, OTHER
+        | Face:   PLANE, CYLINDER, CONE, SPHERE, TORUS, BEZIER, BSPLINE, 
+        |         REVOLUTION, EXTRUSION, OFFSET, OTHER
         | Solid:  'Solid'
         | Shell:  'Shell'
         | Compound: 'Compound'
@@ -2188,7 +2190,7 @@ def makeHelix(
         return cls(w)
 
     def stitch(self, other: "Wire") -> "Wire":
-        """Attempt to stich wires"""
+        """Attempt to stitch wires"""
 
         wire_builder = BRepBuilderAPI_MakeWire()
         wire_builder.Add(TopoDS.Wire_s(self.wrapped))

conda/meta.yaml

@@ -6,16 +6,18 @@ source:
   path: ..
 
 build:
-  string: {{ 'py'+environ.get('PYTHON_VERSION')}}
+  string: {{ GIT_DESCRIBE_TAG }}_{{ GIT_BUILD_STR }}
+  noarch: python
   script: python setup.py install --single-version-externally-managed --record=record.txt
 
 requirements:
   build:
-    - python {{ environ.get('PYTHON_VERSION') }}
+    - python >=3.8
     - setuptools
   run:
-    - python {{ environ.get('PYTHON_VERSION') }}
-    - ocp 7.7.*
+    - python >=3.8
+    - ocp 7.7.0
+    - occt 7.7.0
     - pyparsing >=2.1.9
     - ezdxf
     - ipython