Merge from V6_main (04/10/2012)

[modules/smesh.git] / src / SMESH / SMESH_MeshEditor.hxx

diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx
index 4bd4558253c964e18cb991e05e8e98091fc5c443..1874360a79fdda983309e0359d18dea871d32e7e 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.hxx
+++ b/src/SMESH/SMESH_MeshEditor.hxx
@@ -34,6 +34,7 @@
 #include "SMESH_Controls.hxx"
 #include "SMESH_Mesh.hxx"
 #include "SMESH_TypeDefs.hxx"
+#include "SMESH_ComputeError.hxx"
 
 #include <utilities.h>
 
@@ -110,6 +111,14 @@ public:
 
   SMESH_MeshEditor( SMESH_Mesh* theMesh );
 
+  SMESH_Mesh   *                 GetMesh()   { return myMesh; }
+  SMESHDS_Mesh *                 GetMeshDS() { return myMesh->GetMeshDS(); }
+
+  const SMESH_SequenceOfElemPtr& GetLastCreatedNodes() const { return myLastCreatedNodes; }
+  const SMESH_SequenceOfElemPtr& GetLastCreatedElems() const { return myLastCreatedElems; }
+
+  SMESH_ComputeErrorPtr &        GetError() { return myError; }
+
   /*!
    * \brief Add element
    */
@@ -561,14 +570,6 @@ public:
   // Return an index of the shape theElem is on
   // or zero if a shape not found
 
-  SMESH_Mesh * GetMesh() { return myMesh; }
-
-  SMESHDS_Mesh * GetMeshDS() { return myMesh->GetMeshDS(); }
-
-  const SMESH_SequenceOfElemPtr& GetLastCreatedNodes() const { return myLastCreatedNodes; }
-
-  const SMESH_SequenceOfElemPtr& GetLastCreatedElems() const { return myLastCreatedElems; }
-
   bool DoubleNodes( const std::list< int >& theListOfNodes, 
                     const std::list< int >& theListOfModifiedElems );
   
@@ -576,6 +577,11 @@ public:
                     const TIDSortedElemSet& theNodesNot,
                     const TIDSortedElemSet& theAffectedElems );
 
+  bool AffectedElemGroupsInRegion( const TIDSortedElemSet& theElems,
+                                   const TIDSortedElemSet& theNodesNot,
+                                   const TopoDS_Shape&     theShape,
+                                   TIDSortedElemSet& theAffectedElems);
+
   bool DoubleNodesInRegion( const TIDSortedElemSet& theElems, 
                             const TIDSortedElemSet& theNodesNot,
                             const TopoDS_Shape&     theShape );
@@ -587,6 +593,13 @@ public:
 
   bool CreateFlatElementsOnFacesGroups( const std::vector<TIDSortedElemSet>& theElems );
 
+  void CreateHoleSkin(double radius,
+                      const TopoDS_Shape& theShape,
+                      SMESH_NodeSearcher* theNodeSearcher,
+                      const char* groupName,
+                      std::vector<double>&   nodesCoords,
+                      std::vector<std::vector<int> >& listOfListOfNodes);
+
   /*!
    * \brief Generated skin mesh (containing 2D cells) from 3D mesh
    * The created 2D mesh elements based on nodes of free faces of boundary volumes
@@ -709,18 +722,13 @@ public:
 
 private:
 
-  SMESH_Mesh * myMesh;
+  SMESH_Mesh *            myMesh;
 
-  /*!
-   * Sequence for keeping nodes created during last operation
-   */
-  SMESH_SequenceOfElemPtr myLastCreatedNodes;
-
-  /*!
-   * Sequence for keeping elements created during last operation
-   */
-  SMESH_SequenceOfElemPtr myLastCreatedElems;
+  // Nodes and elements created during last operation
+  SMESH_SequenceOfElemPtr myLastCreatedNodes, myLastCreatedElems;
 
+  // Description of error/warning occured during last operation
+  SMESH_ComputeErrorPtr   myError;
 };
 
 #endif