PAL9022. Improve methods binding nodes to shape, allow binding nodes to solid

[modules/smesh.git] / src / SMESHDS / SMESHDS_Mesh.cxx

diff --git a/src/SMESHDS/SMESHDS_Mesh.cxx b/src/SMESHDS/SMESHDS_Mesh.cxx
index ded954d0ce39c9e9cdf7921c4159bb8d01e3cef7..5f92232ddb19bf33bd15f05f00cab9cf3a660993 100644 (file)
--- a/src/SMESHDS/SMESHDS_Mesh.cxx
+++ b/src/SMESHDS/SMESHDS_Mesh.cxx
@@ -171,12 +171,10 @@ bool SMESHDS_Mesh::ChangeElementNodes(const SMDS_MeshElement * elem,
   if ( ! SMDS_Mesh::ChangeElementNodes( elem, nodes, nbnodes ))
     return false;
 
-  //ASSERT( nbnodes < 9 );
-  //int i, IDs[ 8 ];
-  int i, IDs[ nbnodes ];
-  for ( i = 0; i < nbnodes; i++ )
+  vector<int> IDs( nbnodes );
+  for ( int i = 0; i < nbnodes; i++ )
     IDs [ i ] = nodes[ i ]->GetID();
-  myScript->ChangeElementNodes( elem->GetID(), IDs, nbnodes);
+  myScript->ChangeElementNodes( elem->GetID(), &IDs[0], nbnodes);
 
   return true;
 }
@@ -186,18 +184,12 @@ bool SMESHDS_Mesh::ChangeElementNodes(const SMDS_MeshElement * elem,
 //purpose  : 
 //=======================================================================
 bool SMESHDS_Mesh::ChangePolygonNodes
-                   (const SMDS_MeshElement * elem,
-                    std::vector<const SMDS_MeshNode*> nodes)
+                   (const SMDS_MeshElement *     elem,
+                    vector<const SMDS_MeshNode*> nodes)
 {
   ASSERT(nodes.size() > 3);
 
-  int nb = nodes.size();
-  const SMDS_MeshNode* nodes_array [nb];
-  for (int inode = 0; inode < nb; inode++) {
-    nodes_array[inode] = nodes[inode];
-  }
-
-  return ChangeElementNodes(elem, nodes_array, nb);
+  return ChangeElementNodes(elem, &nodes[0], nodes.size());
 }
 
 //=======================================================================
@@ -716,89 +708,52 @@ void SMESHDS_Mesh::RemoveElement(const SMDS_MeshElement * elt)
 //function : SetNodeOnVolume
 //purpose  : 
 //=======================================================================
-void SMESHDS_Mesh::SetNodeInVolume(SMDS_MeshNode * aNode,
-       const TopoDS_Shell & S)
+void SMESHDS_Mesh::SetNodeInVolume(SMDS_MeshNode *      aNode,
+                                   const TopoDS_Shell & S)
 {
-       if (myShape.IsNull()) MESSAGE("myShape is NULL");
-
-       int Index = myIndexToShape.FindIndex(S);
-
-       //Set Position on Node
-       //Handle (SMDS_FacePosition) aPos = new SMDS_FacePosition (myFaceToId(S),0.,0.);;
-       //aNode->SetPosition(aPos);
-
-       //Update or build submesh
-       map<int,SMESHDS_SubMesh*>::iterator it=myShapeIndexToSubMesh.find(Index);
-       if (it==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]= new SMESHDS_SubMesh();
-
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  SetNodeInVolume( aNode, myIndexToShape.FindIndex(S) );
+}
+//=======================================================================
+//function : SetNodeOnVolume
+//purpose  : 
+//=======================================================================
+void SMESHDS_Mesh::SetNodeInVolume(SMDS_MeshNode *      aNode,
+                                   const TopoDS_Solid & S)
+{
+  SetNodeInVolume( aNode, myIndexToShape.FindIndex(S) );
 }
 
 //=======================================================================
 //function : SetNodeOnFace
 //purpose  : 
 //=======================================================================
-void SMESHDS_Mesh::SetNodeOnFace(SMDS_MeshNode * aNode,
-       const TopoDS_Face & S)
+void SMESHDS_Mesh::SetNodeOnFace(SMDS_MeshNode *     aNode,
+                                 const TopoDS_Face & S,
+                                 double              u,
+                                 double              v)
 {
-       if (myShape.IsNull()) MESSAGE("myShape is NULL");
-
-       int Index = myIndexToShape.FindIndex(S);
-
-       //Set Position on Node
-       aNode->SetPosition(SMDS_PositionPtr(new SMDS_FacePosition(Index, 0., 0.)));
-
-       //Update or build submesh
-       map<int,SMESHDS_SubMesh*>::iterator it=myShapeIndexToSubMesh.find(Index);
-       if (it==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]= new SMESHDS_SubMesh();
-
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  SetNodeOnFace( aNode, myIndexToShape.FindIndex(S), u, v );
 }
 
 //=======================================================================
 //function : SetNodeOnEdge
 //purpose  : 
 //=======================================================================
-void SMESHDS_Mesh::SetNodeOnEdge(SMDS_MeshNode * aNode,
-       const TopoDS_Edge & S)
+void SMESHDS_Mesh::SetNodeOnEdge(SMDS_MeshNode *     aNode,
+                                 const TopoDS_Edge & S,
+                                 double              u)
 {
-       if (myShape.IsNull()) MESSAGE("myShape is NULL");
-
-       int Index = myIndexToShape.FindIndex(S);
-
-       //Set Position on Node
-       aNode->SetPosition(SMDS_PositionPtr(new SMDS_EdgePosition(Index, 0.)));
-
-       //Update or build submesh
-       map<int,SMESHDS_SubMesh*>::iterator it=myShapeIndexToSubMesh.find(Index);
-       if (it==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]= new SMESHDS_SubMesh();
-
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  SetNodeOnEdge( aNode, myIndexToShape.FindIndex(S), u );
 }
 
 //=======================================================================
 //function : SetNodeOnVertex
 //purpose  : 
 //=======================================================================
-void SMESHDS_Mesh::SetNodeOnVertex(SMDS_MeshNode * aNode,
-       const TopoDS_Vertex & S)
+void SMESHDS_Mesh::SetNodeOnVertex(SMDS_MeshNode *       aNode,
+                                   const TopoDS_Vertex & S)
 {
-       if (myShape.IsNull()) MESSAGE("myShape is NULL");
-
-       int Index = myIndexToShape.FindIndex(S);
-
-       //Set Position on Node
-       aNode->SetPosition(SMDS_PositionPtr(new SMDS_VertexPosition(Index)));
-
-       //Update or build submesh
-       map<int,SMESHDS_SubMesh*>::iterator it=myShapeIndexToSubMesh.find(Index);
-       if (it==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]= new SMESHDS_SubMesh();
-
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  SetNodeOnVertex( aNode, myIndexToShape.FindIndex(S));
 }
 
 //=======================================================================
@@ -975,13 +930,14 @@ bool SMESHDS_Mesh::HasHypothesis(const TopoDS_Shape & S)
 SMESHDS_SubMesh * SMESHDS_Mesh::NewSubMesh(int Index)
 {
   SMESHDS_SubMesh* SM = 0;
-  if (myShapeIndexToSubMesh.find(Index)==myShapeIndexToSubMesh.end())
+  TShapeIndexToSubMesh::iterator anIter = myShapeIndexToSubMesh.find(Index);
+  if (anIter == myShapeIndexToSubMesh.end())
   {
     SM = new SMESHDS_SubMesh();
     myShapeIndexToSubMesh[Index]=SM;
   }
   else
-    SM = myShapeIndexToSubMesh[Index];
+    SM = anIter->second;
   return SM;
 }
 
@@ -1050,47 +1006,33 @@ int SMESHDS_Mesh::ShapeToIndex(const TopoDS_Shape & S) const
 //=======================================================================
 void SMESHDS_Mesh::SetNodeInVolume(const SMDS_MeshNode* aNode, int Index)
 {
-       //Set Position on Node
-       //Handle (SMDS_FacePosition) aPos = new SMDS_FacePosition (myFaceToId(S),0.,0.);;
-       //aNode->SetPosition(aPos);
-
-       //Update or build submesh
-       if (myShapeIndexToSubMesh.find(Index)==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]=new SMESHDS_SubMesh();
-
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  addNodeToSubmesh( aNode, Index );
 }
 
 //=======================================================================
 //function : SetNodeOnFace
 //purpose  : 
 //=======================================================================
-void SMESHDS_Mesh::SetNodeOnFace(SMDS_MeshNode* aNode, int Index)
+void SMESHDS_Mesh::SetNodeOnFace(SMDS_MeshNode* aNode, int Index, double u, double v)
 {
-       //Set Position on Node
-       aNode->SetPosition(SMDS_PositionPtr(new SMDS_FacePosition(Index, 0., 0.)));
-
-       //Update or build submesh
-       if (myShapeIndexToSubMesh.find(Index)==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]=new SMESHDS_SubMesh();
+  //Set Position on Node
+  aNode->SetPosition(SMDS_PositionPtr(new SMDS_FacePosition(Index, u, v)));
 
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  addNodeToSubmesh( aNode, Index );
 }
 
 //=======================================================================
 //function : SetNodeOnEdge
 //purpose  : 
 //=======================================================================
-void SMESHDS_Mesh::SetNodeOnEdge(SMDS_MeshNode* aNode, int Index)
+void SMESHDS_Mesh::SetNodeOnEdge(SMDS_MeshNode* aNode,
+                                 int            Index,
+                                 double         u)
 {
-       //Set Position on Node
-       aNode->SetPosition(SMDS_PositionPtr(new SMDS_EdgePosition(Index, 0.)));
+  //Set Position on Node
+  aNode->SetPosition(SMDS_PositionPtr(new SMDS_EdgePosition(Index, u)));
 
-       //Update or build submesh
-       if (myShapeIndexToSubMesh.find(Index)==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]=new SMESHDS_SubMesh();
-
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  addNodeToSubmesh( aNode, Index );
 }
 
 //=======================================================================
@@ -1099,14 +1041,10 @@ void SMESHDS_Mesh::SetNodeOnEdge(SMDS_MeshNode* aNode, int Index)
 //=======================================================================
 void SMESHDS_Mesh::SetNodeOnVertex(SMDS_MeshNode* aNode, int Index)
 {
-       //Set Position on Node
-       aNode->SetPosition(SMDS_PositionPtr(new SMDS_VertexPosition(Index)));
-
-       //Update or build submesh
-       if (myShapeIndexToSubMesh.find(Index)==myShapeIndexToSubMesh.end())
-               myShapeIndexToSubMesh[Index]=new SMESHDS_SubMesh();
+  //Set Position on Node
+  aNode->SetPosition(SMDS_PositionPtr(new SMDS_VertexPosition(Index)));
 
-       myShapeIndexToSubMesh[Index]->AddNode(aNode);
+  addNodeToSubmesh( aNode, Index );
 }
 
 //=======================================================================