OCC: removeFaces in OCAF

Author: benoit128

Cassiopee/OCC/OCC/Atomic/addFillet.cpp

@@ -42,11 +42,9 @@ PyObject* K_OCC::addFillet(PyObject* self, PyObject* args)
   if (!PYPARSETUPLE_(args, OO_ R_ OO_, &hook, &listEdges, &radius, &edgeMap, &faceMap)) return NULL;
 
   GETPACKET;
-
-  // get top shape
-  TopoDS_Shape* shape = (TopoDS_Shape*)packet[0];
-  TopTools_IndexedMapOfShape& edges = *(TopTools_IndexedMapOfShape*)packet[2];
-  TopTools_IndexedMapOfShape& surfaces = *(TopTools_IndexedMapOfShape*)packet[1];
+  GETSHAPE;
+  GETMAPEDGES;
+  GETMAPSURFACES;
 
   // get edges 
   BRepFilletAPI_MakeFillet mkFillet(*shape);

Cassiopee/OCC/OCC/Atomic/getLabelName.cpp

@@ -29,7 +29,7 @@
 //=====================================================================
 E_Int K_OCC::getLabelName(TDF_Label& label, TCollection_ExtendedString& labelName)
 {
-  labelName = "unknown";
+  labelName = "Unnamed";
   Handle(TDataStd_Name) name = new TDataStd_Name();
   if (label.FindAttribute(TDataStd_Name::GetID(), name))
   { 

Cassiopee/OCC/OCC/Atomic/projectOnFace.cpp

@@ -74,12 +74,8 @@ PyObject* K_OCC::projectOnFaces(PyObject* self, PyObject* args)
   PyObject* hook; PyObject* array; PyObject* faceList;
   if (!PYPARSETUPLE_(args, OOO_, &hook, &array, &faceList)) return NULL;  
 
-  void** packet = NULL;
-#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 1)
-  packet = (void**) PyCObject_AsVoidPtr(hook);
-#else
-  packet = (void**) PyCapsule_GetPointer(hook, NULL);
-#endif
+  GETPACKET;
+  GETMAPSURFACES;
 
   // array a projeter
   FldArrayF* fi; E_Int ni, nj, nk;
@@ -92,9 +88,6 @@ PyObject* K_OCC::projectOnFaces(PyObject* self, PyObject* args)
     return NULL;
   }
 
-  TopTools_IndexedMapOfShape& surfaces = *(TopTools_IndexedMapOfShape*)packet[1];
-  //TopTools_IndexedMapOfShape& edges = *(TopTools_IndexedMapOfShape*)packet[2];
-
   // liste des no des faces sur lesquelles on projete
   FldArrayI faces;
   if (faceList == Py_None)

Cassiopee/OCC/OCC/Atomic/readCAD.cpp

@@ -190,14 +190,8 @@ PyObject* K_OCC::getNbFaces(PyObject* self, PyObject* args)
   PyObject* hook;
   if (!PYPARSETUPLE_(args, O_, &hook)) return NULL;  
 
-  void** packet = NULL;
-#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 1)
-  packet = (void**) PyCObject_AsVoidPtr(hook);
-#else
-  packet = (void**) PyCapsule_GetPointer(hook, NULL);
-#endif
-
-  TopTools_IndexedMapOfShape& surfaces = *(TopTools_IndexedMapOfShape*)packet[1];
+  GETPACKET;
+  GETMAPSURFACES;
   return Py_BuildValue("l", surfaces.Extent());
 }
 
@@ -209,14 +203,8 @@ PyObject* K_OCC::getNbEdges(PyObject* self, PyObject* args)
   PyObject* hook;
   if (!PYPARSETUPLE_(args, O_, &hook)) return NULL;  
 
-  void** packet = NULL;
-#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 1)
-  packet = (void**) PyCObject_AsVoidPtr(hook);
-#else
-  packet = (void**) PyCapsule_GetPointer(hook, NULL);
-#endif
-
-  TopTools_IndexedMapOfShape& edges = *(TopTools_IndexedMapOfShape*)packet[2];
+  GETPACKET;
+  GETMAPEDGES;
   return Py_BuildValue("l", edges.Extent());
 }
 
@@ -228,12 +216,6 @@ PyObject* K_OCC::getFileAndFormat(PyObject* self, PyObject* args)
   PyObject* hook;
   if (!PYPARSETUPLE_(args, O_, &hook)) return NULL;  
 
-  void** packet = NULL;
-#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 1)
-  packet = (void**) PyCObject_AsVoidPtr(hook);
-#else
-  packet = (void**) PyCapsule_GetPointer(hook, NULL);
-#endif
-
+  GETPACKET;
   return Py_BuildValue("ss", packet[3], packet[4]);
 }

Cassiopee/OCC/OCC/Atomic/removeFaces.cpp

@@ -97,17 +97,37 @@ PyObject* K_OCC::removeFaces(PyObject* self, PyObject* args)
   if (!PYPARSETUPLE_(args, OO_ OO_, &hook, &listFaces, &edgeMap, &faceMap)) return NULL;
 
   GETPACKET;
-  
-  // get top shape
-  TopoDS_Shape* shp = (TopoDS_Shape*)packet[0];
-  TopTools_IndexedMapOfShape& edges = *(TopTools_IndexedMapOfShape*)packet[2];
-  TopTools_IndexedMapOfShape& surfaces = *(TopTools_IndexedMapOfShape*)packet[1];
-  E_Int nbFaces = surfaces.Extent();
+  GETSHAPE;
+
+#ifdef USEXCAF
+  GETDOC;
+  std::map< E_Int, std::vector<E_Int> > label2Faces;
+  std::map< E_Int, std::vector<E_Int> > label2Edges;
+  getLabel2Edges(*doc, label2Edges);
+  getLabel2Faces(*doc, label2Faces);
+  for (E_Int no = 0; no < PyList_Size(listFaces); no++)
+  {
+    PyObject* noFaceO = PyList_GetItem(listFaces, no);
+    E_Int noFace = PyInt_AsLong(noFaceO);
+    for (size_t i = 0; i < label2Faces.size(); i++)
+    {
+      std::vector< E_Int >& f = label2Faces[i];
+      f.erase(std::remove(f.begin(), f.end(), noFace), f.end());
+    }
+  }
+  copyTopShape2OCAF(*shape, label2Edges, label2Faces, *doc);
+  TopoDS_Shape* newshp = copyOCAF2TopShape(*doc);
+  delete shape;
+  SETSHAPE(newshp);
+  Py_INCREF(Py_None);
+  return Py_None;
 
-  //Handle(TDF_Data) data = new TDF_Data();
-  //TDF_Label label = data->Root();
-  //TDataStd_Name::Set(label, "MyFaceTag");
-  //TDF_Tool::AddShape(label, F);
+#else
+  GETMAPEDGES;
+  GETMAPSURFACES;
+
+// get top shape
+  E_Int nbFaces = surfaces.Extent();
 
   ShapeBuild_ReShape reshaper;
   for (E_Int no = 0; no < PyList_Size(listFaces); no++)
@@ -122,17 +142,18 @@ PyObject* K_OCC::removeFaces(PyObject* self, PyObject* args)
     }
     else printf("Warning: removeFaces: invalid face number.\n");
   }
-  TopoDS_Shape shc = reshaper.Apply(*shp);
+  TopoDS_Shape shc = reshaper.Apply(*shape);
 
   // export
   TopoDS_Shape* newshp = new TopoDS_Shape(shc);
+
   TopTools_IndexedMapOfShape* sf = new TopTools_IndexedMapOfShape();
   TopExp::MapShapes(*newshp, TopAbs_FACE, *sf);
   TopTools_IndexedMapOfShape* se = new TopTools_IndexedMapOfShape();
   TopExp::MapShapes(*newshp, TopAbs_EDGE, *se);
   getFaceMap(surfaces, *sf, faceMap);
   getEdgeMap(edges, *se, edgeMap);
-  delete shp;
+  delete shape;
   TopTools_IndexedMapOfShape* ptr = (TopTools_IndexedMapOfShape*)packet[1];
   delete ptr;
   TopTools_IndexedMapOfShape* ptr2 = (TopTools_IndexedMapOfShape*)packet[2];
@@ -146,4 +167,5 @@ PyObject* K_OCC::removeFaces(PyObject* self, PyObject* args)
 
   Py_INCREF(Py_None);
   return Py_None;
+#endif
 }

Cassiopee/OCC/OCC/Atomic/trim.cpp Cassiopee/OCC/OCC/Atomic/trimFaces.cppCassiopee/OCC/OCC/Atomic/trim.cpp renamed to Cassiopee/OCC/OCC/Atomic/trimFaces.cpp

@@ -103,7 +103,7 @@ def getFiles(module):
         'OCC/Atomic/rotate.cpp',
 
         'OCC/Atomic/intersectEdgeFace.cpp',
-        'OCC/Atomic/trim.cpp',
+        'OCC/Atomic/trimFaces.cpp',
         'OCC/Atomic/boolean.cpp',
 
         'OCC/Atomic/getOppData.cpp',

Cassiopee/OCC/srcs.py

@@ -1,10 +1,9 @@
 # - removeFaces (array) -
 import OCC
 
-hook = OCC.readCAD("cubeNoTrim.step", "fmt_step")
+hook = OCC.readCAD("cube.step")
 
-ret = OCC.getFaceNameInOCAF(hook)
-cube1 = ret[3]
-OCC._removeFaces(hook, cube1)
+#faceList = OCC.getFaceNos(hook, 'Cube')
+OCC._removeFaces(hook, [1,2])
 
-OCC.writeCAD(hook, 'out.step', 'fmt_step')
+OCC.writeCAD(hook, 'out.step')