Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6

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

diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx
index ce52a9c051c342ac2a049cb0fa19b1c929982b36..bf1d3b7b1ce9c5be34388018f8b6b94e1efe8836 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.hxx
+++ b/src/SMESH/SMESH_MeshEditor.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -117,7 +117,6 @@ public:
   const SMESH_SequenceOfElemPtr& GetLastCreatedNodes() const { return myLastCreatedNodes; }
   const SMESH_SequenceOfElemPtr& GetLastCreatedElems() const { return myLastCreatedElems; }
   void                           CrearLastCreated();
-
   SMESH_ComputeErrorPtr &        GetError() { return myError; }
 
   /*!
@@ -492,15 +491,15 @@ public:
   // insert theNodesToInsert into all volumes, containing link
   // theBetweenNode1 - theBetweenNode2, between theBetweenNode1 and theBetweenNode2.
 
-  void ConvertToQuadratic(const bool theForce3d);
-  void ConvertToQuadratic(const bool theForce3d, TIDSortedElemSet& theElements);
-  // Converts all mesh to quadratic one, deletes old elements, replacing 
-  // them with quadratic ones with the same id.
+  void ConvertToQuadratic(const bool theForce3d, const bool theToBiQuad);
+  void ConvertToQuadratic(const bool theForce3d,
+                          TIDSortedElemSet& theElements, const bool theToBiQuad);
+  // Converts all mesh to quadratic or bi-quadratic one, deletes old elements, 
+  // replacing them with quadratic or bi-quadratic ones with the same id.
   // If theForce3d = 1; this results in the medium node lying at the 
-  // middle of the line segments connecting start and end node of a mesh 
-  // element
+  // middle of the line segments connecting start and end node of a mesh element.
   // If theForce3d = 0; this results in the medium node lying at the 
-  // geometrical edge from which the mesh element is built
+  // geometrical edge from which the mesh element is built.
 
   bool ConvertFromQuadratic();
   void ConvertFromQuadratic(TIDSortedElemSet& theElements);
@@ -625,7 +624,6 @@ public:
                        bool                    toAddExistingBondary = false,
                        bool                    aroundElements = false);
 
-
  private:
 
   /*!
@@ -658,7 +656,7 @@ public:
   typedef std::map<const SMDS_MeshNode*, std::list<const SMDS_MeshNode*> > TNodeOfNodeListMap;
   typedef TNodeOfNodeListMap::iterator                                     TNodeOfNodeListMapItr;
   typedef std::vector<TNodeOfNodeListMapItr>                               TVecOfNnlmiMap;
-  typedef std::map<const SMDS_MeshElement*, TVecOfNnlmiMap >               TElemOfVecOfNnlmiMap;
+  typedef std::map<const SMDS_MeshElement*, TVecOfNnlmiMap, TIDCompare >   TElemOfVecOfNnlmiMap;
 
   /*!
    * \brief Create elements by sweeping an element