implemented CAD TopoDS_Shape modification in FFD CAD. Added corresponding tests to test_ffd.py. Fixed igeshandler.py and stephandler.py and corresponding tests

Author: Andrea Mola

pygem/cad/ffd.py

@@ -47,9 +47,23 @@
 import os
 import numpy as np
 from scipy import special
-from OCC.Core.TopoDS import TopoDS_Shape, TopoDS_Compound
-
+from OCC.TopoDS import TopoDS_Shape, topods_Compound, TopoDS_Compound, topods_Face, TopoDS_Face, topods_Wire, TopoDS_Wire, topods_Edge, TopoDS_Edge
+from OCC.BRep import (BRep_Builder)
+from OCC.TopExp import TopExp_Explorer
+from OCC.TopAbs import TopAbs_VERTEX, TopAbs_EDGE, TopAbs_FACE, TopAbs_WIRE
+from OCC.TopTools import TopTools_ListOfShape
+from OCC.BRepBuilderAPI import BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakeWire, BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeVertex, BRepBuilderAPI_NurbsConvert
+from OCC.BRep import BRep_Tool, BRep_Tool_Curve
+from OCC.GeomConvert import geomconvert_SurfaceToBSplineSurface, geomconvert_CurveToBSplineCurve, GeomConvert_CompCurveToBSplineCurve
+from OCC.gp import gp_Pnt
+from OCC.BRepTools import breptools_OuterWire
+ 
+ 
+from OCC.IGESControl import IGESControl_Reader, IGESControl_Writer
+ 
+ 
 from pygem import FFD as OriginalFFD
+from pygem.cad.igeshandler import IgesHandler
 
 class FFD(OriginalFFD):
     """
@@ -89,14 +103,15 @@ class FFD(OriginalFFD):
         >>> new = free_form.modified_mesh_points
     """
 
-    def __call__(self, obj):
+    def __call__(self, obj,dst=None):
         """
         This method performs the deformation on the CAD file.
         """
 
         # Manage input
         if isinstance(obj, str): # if a input filename is passed
-            shape = # extract topo_shape from filename
+            iges_handler = IgesHandler()
+            shape = iges_handler.load_shape_from_file(obj)
         elif isinstance(obj, TopoDS_Shape):
             shape = obj
         # Maybe do we need to handle also Compound?
@@ -105,31 +120,35 @@ def __call__(self, obj):
 
         print("Modifying faces")
 
+
+        tol = 1e-5
+        
+        #create compound to store modified faces
         compound_builder = BRep_Builder()
-        compound = OCC.TopoDS.TopoDS_Compound()
+        compound = TopoDS_Compound()
         compound_builder.MakeCompound(compound)
 
+
         # cycle on the faces to get the control points
         # init some quantities
         faceCount = 0
         face_list = []
         control_point_position = [0]
-        faces_explorer = TopExp_Explorer(color, TopAbs_FACE)
+        faces_explorer = TopExp_Explorer(shape, TopAbs_FACE)
         mesh_points = np.zeros(shape=(0, 3))
 
         while faces_explorer.More():
             points_orig = []
             points_def = []
             # performing some conversions to get the right format (BSplineSurface)
             print("Processing face ",faceCount) 
-            face = OCC.TopoDS.topods_Face(faces_explorer.Current())
+            face = topods_Face(faces_explorer.Current())
             nurbs_converter = BRepBuilderAPI_NurbsConvert(face)
             nurbs_converter.Perform(face)
             nurbs_face = nurbs_converter.Shape()
-            face_aux = OCC.TopoDS.topods_Face(nurbs_face)
-            int_tools = IntTools_FClass2d(face_aux, 1e-3)
-            brep_face = BRep_Tool.Surface(OCC.TopoDS.topods_Face(nurbs_face))
-            old_brep_face = BRep_Tool.Surface(OCC.TopoDS.topods_Face(nurbs_face))
+            face_aux = topods_Face(nurbs_face)
+            brep_face = BRep_Tool.Surface(topods_Face(nurbs_face))
+            old_brep_face = BRep_Tool.Surface(topods_Face(nurbs_face))
 
             bounds = 0.0
             bounds = brep_face.GetObject().Bounds()
@@ -156,14 +175,13 @@ def __call__(self, obj):
             v_min = bounds[2]
             v_max = bounds[3]
             center = occ_face.Value((u_min+u_max)/2.0,(v_min+v_max)/2.0)
-            print("*Center: ",center.X(),center.Y(),center.Z())
+            print("Face Center: ",center.X(),center.Y(),center.Z())
 
             # extract the Control Points of each face
             n_poles_u = occ_face.NbUPoles()
             n_poles_v = occ_face.NbVPoles()
             control_polygon_coordinates = np.zeros(\
             shape=(n_poles_u * n_poles_v, 3))
-            #print("Number of poles: ", n_poles_u * n_poles_v)
             # cycle over the poles to get their coordinates
             i = 0
             for pole_u_direction in range(n_poles_u):
@@ -173,76 +191,67 @@ def __call__(self, obj):
                     control_polygon_coordinates[i, :] = [control_point_coordinates.X(),\
                     control_point_coordinates.Y(),\
                     control_point_coordinates.Z()]
-                    
-                    #control_point = gp_Pnt(control_point_coordinates.X(),\
-                    #control_point_coordinates.Y(),control_point_coordinates.Z())
-                    #display.DisplayShape(BRepBuilderAPI_MakeVertex(control_point).Vertex(),update=True)
-                    #print("Original: ",control_point.X()," ",control_point.Y()," ",control_point.Z())
                     i+=1
-            
 
-            #orig_control_polygon_coordinates = deepcopy(control_polygon_coordinates)
             ## SURFACES PHASE #####################################################
             src_pts = control_polygon_coordinates
             new_pts = super().__call__(src_pts) # dont touch this line
+            
             i = 0
             for pole_u_direction in range(n_poles_u):
                 for pole_v_direction in range(n_poles_v):
-                    control_point = gp_Pnt(control_polygon_coordinates[i,0],
-                                           control_polygon_coordinates[i,1],
-                                           control_polygon_coordinates[i,2])
+                    control_point = gp_Pnt(new_pts[i,0],
+                                           new_pts[i,1],
+                                           new_pts[i,2])
                     occ_face.SetPole(pole_u_direction + 1, pole_v_direction + 1, control_point)
                     i += 1
             # through moving the control points, we now changed the SURFACE of the FACE we are processing
             # we now need to obtain the curves (actually, the WIRES) that define the bounds of the surface and TRIM the surface
             # with them, to obtain the new face
 
-            faceFilling = BRepFill_Filling()
             # we start creating a face with the modified surface. we will cut this new face with all the wires
             # that the original face had
             brep = BRepBuilderAPI_MakeFace(occ_face.GetHandle(), tol).Face()
-            #IGESControl_Controller_Init()
-            #writer = IGESControl_Writer()
-            #writer.AddShape(brep)
-            #nomefile = "untrimmed_face"+str(faceCount)+".iges"
-            #writer.Write(nomefile)
+
 
             # we here start looping on the wires of the original face
-            # in this forst loop we do nothing but count the wires in this face
+            # in this first loop we do nothing but count the wires in this face
             # few faces have more than one wire: if they have, it is because they have holes, and
             # if this is the case one wire is the outer, and the others are the inner ones.
             # the loop will also tell us which wire is the outer one
             wire_count = 0
             wire_explorer = TopExp_Explorer(face_aux, TopAbs_WIRE)
             while wire_explorer.More():
-                wire = OCC.TopoDS.topods_Wire(wire_explorer.Current())
+                wire = topods_Wire(wire_explorer.Current())
                 if (wire == breptools_OuterWire(face_aux)):
                     print("Wire", wire_count+1, "is outer wire")
                 wire_count += 1
                 wire_explorer.Next()
             print("This face has ",wire_count," wires")
 
             #we now start really looping on the wires
+            #we will create a single curve joining all the edges in the wire
+            # the curve must be a bspline curve so we need to make conversions  through all the way 
             wire_count = 0
             outer_wires = []
             inner_wires = []
             brep_face = BRep_Tool.Surface(brep)
             wire_explorer = TopExp_Explorer(face_aux, TopAbs_WIRE)
             while wire_explorer.More():
-                wire = OCC.TopoDS.topods_Wire(wire_explorer.Current())
+                wire = topods_Wire(wire_explorer.Current())
                 wire_count += 1
                 h_bspline_edge = GeomConvert_CompCurveToBSplineCurve()
                 edge_explorer = TopExp_Explorer(wire, TopAbs_EDGE)
                 edgesCount=0
                 while edge_explorer.More():
                     # performing some conversions to get the right format (BSplineSurface)
                     #print("Edge in curve: ", edgesCount)
-                    edge = OCC.TopoDS.topods_Edge(edge_explorer.Current())
+                    edge = topods_Edge(edge_explorer.Current())
                     if (BRep_Tool.Degenerated(edge) == False):
                         bspline_converter = BRepBuilderAPI_NurbsConvert(edge)
                         bspline_converter.Perform(edge)
                         bspline_tshape_edge = bspline_converter.Shape()
-                        h_geom_edge, a, b = BRep_Tool_Curve(OCC.TopoDS.topods_Edge(bspline_tshape_edge))
+                        h_geom_edge, a, b = BRep_Tool_Curve(topods_Edge(bspline_tshape_edge))
                         this_bspline_edge = geomconvert_CurveToBSplineCurve(h_geom_edge)
                         bspline_geom_edge = this_bspline_edge.GetObject()
                         h_bspline_edge.Add(this_bspline_edge,1e-4)
@@ -253,29 +262,11 @@ def __call__(self, obj):
                 bspline_geom_hedge = h_bspline_edge.BSplineCurve()
                 bspline_geom_edge = bspline_geom_hedge.GetObject()
                 unified_edge = BRepBuilderAPI_MakeEdge(bspline_geom_hedge).Edge()
-                #aa = bspline_geom_edge.FirstParameter()
-                #bb = bspline_geom_edge.LastParameter()
-                #print("Unif. Edge First Point:", bspline_geom_edge.Value(aa).X(),
-                #bspline_geom_edge.Value(aa).Y(),
-                #bspline_geom_edge.Value(aa).Z())
-                #print("Unif. Edge Last Point:", bspline_geom_edge.Value(bb).X(),
-                #bspline_geom_edge.Value(bb).Y(),
-                #bspline_geom_edge.Value(bb).Z())
-                #unified_edge = BRepBuilderAPI_MakeEdge(bspline_geom_hedge).Edge()
-                #print("SAVING UNIFIED CURVE: ", curve_count)
-                #IGESControl_Controller_Init()
-                #writer = IGESControl_Writer()
-                #writer.AddShape(unified_edge)
-                #filename = nomedir+"unfied_curve_"+str(curve_count)+".iges"
-                ##print(filename)
-                #writer.Write(filename)
-
 
+                # number of knots is enriched here: this can become a user prescribed parameter for the class
+                knotsToAdd = 200
                 firstParam = bspline_geom_edge.FirstParameter()
                 lastParam = bspline_geom_edge.LastParameter()
-                #print("First Parameter: ", firstParam)
-                #print("Last Parameter: ", lastParam)
-                knotsToAdd = 200
                 for i in range(knotsToAdd):
                     bspline_geom_edge.InsertKnot(firstParam+i*(lastParam-firstParam)/knotsToAdd,1,1e-7)
                 shapesList = TopTools_ListOfShape()
@@ -286,7 +277,6 @@ def __call__(self, obj):
                 n_poles = occ_edge.NbPoles()
                 control_polygon_coordinates = np.zeros(\
                 shape=(n_poles , 3))
-                #print("Number of poles: ", n_poles)
                 # cycle over the poles to get their coordinates. The idea here is to move poles
                 # coordinates to deform the curves
                 i = 0
@@ -295,44 +285,29 @@ def __call__(self, obj):
                     control_polygon_coordinates[i, :] = [control_point_coordinates.X(),\
                     control_point_coordinates.Y(),\
                     control_point_coordinates.Z()]
-                    #control_point = gp_Pnt(control_point_coordinates.X(),\
-                    #control_point_coordinates.Y(),control_point_coordinates.Z())
-                    #orig_control_point = control_point
-                    #display.DisplayShape(BRepBuilderAPI_MakeVertex(control_point).Vertex(),update=True)
-                    #print("Original: ",control_point.X()," ",control_point.Y()," ",control_point.Z())
+                    i+=1
 
                 ## CURVES PHASE #######################################################
-                src_pts = control_point_coordinates
-
+                src_pts = control_polygon_coordinates
                 new_pts = super().__call__(src_pts) # dont touch this line
-
                 # save here the `new_pts` into the shape
                 ## END CURVES #########################################################
 
                 i = 0
                 for pole in range(n_poles):
-                    #print("Function test:", mod_test_control_point.X(),mod_test_control_point.Y(),mod_test_control_point.Z())
-                    #print("**")
-                    control_point = gp_Pnt(control_polygon_coordinates[i,0],
-                                           control_polygon_coordinates[i,1],
-                                           control_polygon_coordinates[i,2])
+                    control_point = gp_Pnt(new_pts[i,0],
+                                           new_pts[i,1],
+                                           new_pts[i,2])
                     occ_edge.SetPole(pole + 1, control_point)
                     i += 1
 
-                #occ_new_hedge = geomprojlib.Project(occ_edge.GetHandle(),occ_face.GetHandle())
-                #new_curve = occ_new_hedge.GetObject()
-                #print("??", new_curve.IsClosed())
                 modified_edge= BRepBuilderAPI_MakeEdge(occ_edge.GetHandle()).Edge()
                 shapesList.Append(modified_edge)
-                #if new_curve.IsClosed()==False:
-               #fixer_edge = BRepBuilderAPI_MakeEdge(new_curve.Value(new_curve.LastParameter()),new_curve.Value(new_curve.FirstParameter())).Edge()
-                    #shapesList.Append(fixer_edge)
-                #display.DisplayShape(modified_edge,update=True,color="BLUE1")
-                
+
                 wire_maker = BRepBuilderAPI_MakeWire()
                 wire_maker.Add(shapesList)
                 result_wire = wire_maker.Wire()
-
+                
 
                 # now, the wire can be oute or inner. we store the outer and (possible) inner ones in different lists
                 # this is because we first need to trim the surface using the outer wire, and then we can trim it
@@ -344,10 +319,6 @@ def __call__(self, obj):
                 wire_count += 1
                 wire_explorer.Next()
 
-            #faceFilling.LoadInitSurface(brep)
-            #faceFilling.Build()
-            # checking if things worked out
-            #print("Is face Filling Done? ",faceFilling.IsDone())
 
             # so once we finished looping on all the wires to modify them, we use the only outer one to trim the surface
             face_maker = BRepBuilderAPI_MakeFace(occ_face.GetHandle(),outer_wires[0])
@@ -358,12 +329,10 @@ def __call__(self, obj):
 
             # finally, we get our trimmed face with all its holes
             brep_surf = face_maker.Face()
-            #brep_surf = faceFilling.Face()
-            #IGESControl_Controller_Init()
-            #writer = IGESControl_Writer()
-            #writer.AddShape(brep_surf)
-            #nomefile = nomedir+"trimmed_face"+str(faceCount)+".iges"
-            #writer.Write(nomefile)
+
+            
+            compound_builder.Add(compound, brep_surf)
+            face_list.append(brep_surf)
 
 
             # and move to the next face
@@ -379,7 +348,9 @@ def __call__(self, obj):
 
 
 
-        if isinstance(obj, str): # if a input filename is passed
-            # save the shape exactly to the filename, aka `obj`
-        elif isinstance(obj, TopoDS_Shape):
-            return shape
+        if isinstance(dst, str): # if a input filename is passed
+            # save the shape exactly to the filename, aka `dst`
+            iges_handler = IgesHandler()
+            iges_handler.write_shape_to_file(compound, dst)
+        else :
+            return compound

pygem/cad/igeshandler.py

@@ -1,9 +1,9 @@
 """
 Derived module from filehandler.py to handle iges and igs files.
 """
-from OCC.Core.IGESControl import (IGESControl_Reader, IGESControl_Writer,
+from OCC.IGESControl import (IGESControl_Reader, IGESControl_Writer,
                              IGESControl_Controller_Init)
-from OCC.Core.IFSelect import IFSelect_RetDone
+from OCC.IFSelect import IFSelect_RetDone
 from pygem.cad import NurbsHandler