X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_MeshEditor.hxx;h=ea02a7a7c105e3229b86d7d7e560ae850f3c450a;hp=6c4dc76c8ef55a38daac5e66238e305382225385;hb=868e306e098d4ca6bfd1d183f0a57fb9cb805086;hpb=9efbaa6f5e4947bdcfdd04e5412ae1ece49b02fd

diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx
index 6c4dc76c8..ea02a7a7c 100644
--- a/src/SMESH/SMESH_MeshEditor.hxx
+++ b/src/SMESH/SMESH_MeshEditor.hxx
@@ -35,8 +35,9 @@
 
 #include <list>
 #include <map>
-//#include <TColStd_DataMapOfIntegerListOfInteger.hxx>
-#include <SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx>
+
+typedef map<const SMDS_MeshElement*,
+            list<const SMDS_MeshElement*> > TElemOfElemListMap;
 
 class SMDS_MeshElement;
 class SMDS_MeshFace;
@@ -142,9 +143,46 @@ class SMESH_MeshEditor {
   // Generate new elements by rotation of theElements around theAxis
   // by theAngle by theNbSteps
 
-  void ExtrusionSweep (std::set<const SMDS_MeshElement*> & theElements,
-                       const gp_Vec&                       theStep,
-                       const int                           theNbSteps);
+  /*!
+   * Auxilary flag for advanced extrusion.
+   * BOUNDARY: create or not boundary for result of extrusion
+   * SEW:      try to use existing nodes or create new nodes in any case
+   */
+  enum ExtrusionFlags {
+    EXTRUSION_FLAG_BOUNDARY = 0x01,
+    EXTRUSION_FLAG_SEW = 0x02
+  };
+  
+  /*!
+   * Create new node in the mesh with given coordinates
+   * (auxilary for advanced extrusion)
+   */
+  const SMDS_MeshNode* CreateNode(const double x,
+                                  const double y,
+                                  const double z,
+                                  const double tolnode);
+
+  /*!
+   * Generate new elements by extrusion of theElements 
+   * by theStep by theNbSteps
+   * param theHistory returns history of extrusion
+   * param theFlags set flags for performing extrusion (see description
+   *   of enum ExtrusionFlags for additional information)
+   * param theTolerance - uses for comparing locations of nodes if flag
+   *   EXTRUSION_FLAG_SEW is set
+   */
+  //void ExtrusionSweep (std::set<const SMDS_MeshElement*> & theElements,
+  //                     const gp_Vec&                       theStep,
+  //                     const int                           theNbSteps);
+  void ExtrusionSweep
+           (set<const SMDS_MeshElement*> & theElems,
+            const gp_Vec&                  theStep,
+            const int                      theNbSteps,
+            TElemOfElemListMap&            newElemsMap,
+            //SMESH_DataMapOfElemPtrSequenceOfElemPtr& theHistory,
+            const int                      theFlags = EXTRUSION_FLAG_BOUNDARY,
+            const double                   theTolerance = 1.e-6);
+  
   // Generate new elements by extrusion of theElements 
   // by theStep by theNbSteps
 
@@ -306,15 +344,10 @@ class SMESH_MeshEditor {
 
   SMESHDS_Mesh * GetMeshDS() { return myMesh->GetMeshDS(); }
 
-  const SMESH_DataMapOfElemPtrSequenceOfElemPtr& GetExtrusionHistory() const
-    { return myExtrusionHistory; }
-
  private:
 
   SMESH_Mesh * myMesh;
 
-  SMESH_DataMapOfElemPtrSequenceOfElemPtr myExtrusionHistory;
-
 };
 
 #endif