X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FControls%2FSMESH_Controls.cxx;fp=src%2FControls%2FSMESH_Controls.cxx;h=b1279a6594d78ec63fecc1d34b2f792ea758e6c3;hb=7f69bf0122b3be1c986dace03f53a78f50d021ad;hp=1ccd96f9905611d39a69424bcebb65a90f437dc6;hpb=17af9c65254903ebd2c5c92bb3ef58dc707bd70c;p=modules%2Fsmesh.git

diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx
index 1ccd96f99..b1279a659 100644
--- a/src/Controls/SMESH_Controls.cxx
+++ b/src/Controls/SMESH_Controls.cxx
@@ -28,6 +28,8 @@
 #include "SMDS_Mesh.hxx"
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
+#include "SMDS_QuadraticEdge.hxx"
+#include "SMDS_QuadraticFaceOfNodes.hxx"
 #include "SMDS_VolumeTool.hxx"
 #include "SMESHDS_GroupBase.hxx"
 #include "SMESHDS_GroupOnFilter.hxx"
@@ -251,7 +253,26 @@ bool NumericalFunctor::GetPoints(const SMDS_MeshElement* anElem,
   theRes.setElement( anElem );
 
   // Get nodes of the element
-  SMDS_NodeIteratorPtr anIter= anElem->interlacedNodesIterator();
+  SMDS_ElemIteratorPtr anIter;
+
+  if ( anElem->IsQuadratic() ) {
+    switch ( anElem->GetType() ) {
+    case SMDSAbs_Edge:
+      anIter = dynamic_cast<const SMDS_VtkEdge*>
+        (anElem)->interlacedNodesElemIterator();
+      break;
+    case SMDSAbs_Face:
+      anIter = dynamic_cast<const SMDS_VtkFace*>
+        (anElem)->interlacedNodesElemIterator();
+      break;
+    default:
+      anIter = anElem->nodesIterator();
+    }
+  }
+  else {
+    anIter = anElem->nodesIterator();
+  }
+
   if ( anIter ) {
     SMESH_NodeXYZ p;
     while( anIter->more() ) {
@@ -750,8 +771,8 @@ double AspectRatio::GetValue( long theId )
   if ( myCurrElement && myCurrElement->GetVtkType() == VTK_QUAD )
   {
     // issue 21723
-    vtkUnstructuredGrid* grid = const_cast<SMDS_Mesh*>( myMesh )->GetGrid();
-    if ( vtkCell* avtkCell = grid->GetCell( myCurrElement->GetVtkID() ))
+    vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myCurrElement->getMeshId()]->getGrid();
+    if ( vtkCell* avtkCell = grid->GetCell( myCurrElement->getVtkId() ))
       aVal = Round( vtkMeshQuality::QuadAspectRatio( avtkCell ));
   }
   else
@@ -994,8 +1015,8 @@ double AspectRatio3D::GetValue( long theId )
     // Action from CoTech | ACTION 31.3:
     // EURIWARE BO: Homogenize the formulas used to calculate the Controls in SMESH to fit with
     // those of ParaView. The library used by ParaView for those calculations can be reused in SMESH.
-    vtkUnstructuredGrid* grid = const_cast<SMDS_Mesh*>( myMesh )->GetGrid();
-    if ( vtkCell* avtkCell = grid->GetCell( myCurrElement->GetVtkID() ))
+    vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myCurrElement->getMeshId()]->getGrid();
+    if ( vtkCell* avtkCell = grid->GetCell( myCurrElement->getVtkId() ))
       aVal = Round( vtkMeshQuality::TetAspectRatio( avtkCell ));
   }
   else
@@ -1014,7 +1035,7 @@ double AspectRatio3D::GetValue( const TSequenceOfXYZ& P )
 
   int nbNodes = P.size();
 
-  if( myCurrElement->IsQuadratic() ) {
+  if(myCurrElement->IsQuadratic()) {
     if(nbNodes==10) nbNodes=4; // quadratic tetrahedron
     else if(nbNodes==13) nbNodes=5; // quadratic pyramid
     else if(nbNodes==15) nbNodes=6; // quadratic pentahedron
@@ -1806,33 +1827,35 @@ bool Length2D::Value::operator<(const Length2D::Value& x) const
 void Length2D::GetValues(TValues& theValues)
 {
   TValues aValues;
-  for ( SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); anIter->more(); )
-  {
+  SMDS_FaceIteratorPtr anIter = myMesh->facesIterator();
+  for(; anIter->more(); ){
     const SMDS_MeshFace* anElem = anIter->next();
-    if ( anElem->IsQuadratic() )
-    {
+
+    if(anElem->IsQuadratic()) {
+      const SMDS_VtkFace* F =
+        dynamic_cast<const SMDS_VtkFace*>(anElem);
       // use special nodes iterator
-      SMDS_NodeIteratorPtr anIter = anElem->interlacedNodesIterator();
+      SMDS_ElemIteratorPtr anIter = F->interlacedNodesElemIterator();
       long aNodeId[4] = { 0,0,0,0 };
       gp_Pnt P[4];
 
       double aLength = 0;
-      if ( anIter->more() )
-      {
-        const SMDS_MeshNode* aNode = anIter->next();
-        P[0] = P[1] = SMESH_NodeXYZ( aNode );
+      const SMDS_MeshElement* aNode;
+      if(anIter->more()){
+        aNode = anIter->next();
+        const SMDS_MeshNode* aNodes = (SMDS_MeshNode*) aNode;
+        P[0] = P[1] = gp_Pnt(aNodes->X(),aNodes->Y(),aNodes->Z());
         aNodeId[0] = aNodeId[1] = aNode->GetID();
         aLength = 0;
       }
-      for ( ; anIter->more(); )
-      {
-        const SMDS_MeshNode* N1 = anIter->next();
-        P[2] = SMESH_NodeXYZ( N1 );
+      for(; anIter->more(); ){
+        const SMDS_MeshNode* N1 = static_cast<const SMDS_MeshNode*> (anIter->next());
+        P[2] = gp_Pnt(N1->X(),N1->Y(),N1->Z());
         aNodeId[2] = N1->GetID();
         aLength = P[1].Distance(P[2]);
         if(!anIter->more()) break;
-        const SMDS_MeshNode* N2 = anIter->next();
-        P[3] = SMESH_NodeXYZ( N2 );
+        const SMDS_MeshNode* N2 = static_cast<const SMDS_MeshNode*> (anIter->next());
+        P[3] = gp_Pnt(N2->X(),N2->Y(),N2->Z());
         aNodeId[3] = N2->GetID();
         aLength += P[2].Distance(P[3]);
         Value aValue1(aLength,aNodeId[1],aNodeId[2]);
@@ -1849,28 +1872,28 @@ void Length2D::GetValues(TValues& theValues)
       theValues.insert(aValue2);
     }
     else {
-      SMDS_NodeIteratorPtr aNodesIter = anElem->nodeIterator();
+      SMDS_ElemIteratorPtr aNodesIter = anElem->nodesIterator();
       long aNodeId[2] = {0,0};
       gp_Pnt P[3];
 
       double aLength;
       const SMDS_MeshElement* aNode;
-      if ( aNodesIter->more())
-      {
+      if(aNodesIter->more()){
         aNode = aNodesIter->next();
-        P[0] = P[1] = SMESH_NodeXYZ( aNode );
+        const SMDS_MeshNode* aNodes = (SMDS_MeshNode*) aNode;
+        P[0] = P[1] = gp_Pnt(aNodes->X(),aNodes->Y(),aNodes->Z());
         aNodeId[0] = aNodeId[1] = aNode->GetID();
         aLength = 0;
       }
-      for( ; aNodesIter->more(); )
-      {
+      for(; aNodesIter->more(); ){
         aNode = aNodesIter->next();
+        const SMDS_MeshNode* aNodes = (SMDS_MeshNode*) aNode;
         long anId = aNode->GetID();
-
-        P[2] = SMESH_NodeXYZ( aNode );
-
+        
+        P[2] = gp_Pnt(aNodes->X(),aNodes->Y(),aNodes->Z());
+        
         aLength = P[1].Distance(P[2]);
-
+        
         Value aValue(aLength,aNodeId[1],anId);
         aNodeId[1] = anId;
         P[1] = P[2];
@@ -1924,7 +1947,8 @@ double Deflection2D::GetValue( const TSequenceOfXYZ& P )
       {
         gc += P(i+1);
 
-        if ( SMDS_FacePositionPtr fPos = P.getElement()->GetNode( i )->GetPosition() )
+        if ( const SMDS_FacePosition* fPos = dynamic_cast<const SMDS_FacePosition*>
+             ( P.getElement()->GetNode( i )->GetPosition() ))
         {
           uv.ChangeCoord(1) += fPos->GetUParameter();
           uv.ChangeCoord(2) += fPos->GetVParameter();
@@ -2100,24 +2124,59 @@ bool MultiConnection2D::Value::operator<(const MultiConnection2D::Value& x) cons
 void MultiConnection2D::GetValues(MValues& theValues)
 {
   if ( !myMesh ) return;
-  for ( SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); anIter->more(); )
-  {
-    const SMDS_MeshFace*     anElem = anIter->next();
-    SMDS_NodeIteratorPtr aNodesIter = anElem->interlacedNodesIterator();
+  SMDS_FaceIteratorPtr anIter = myMesh->facesIterator();
+  for(; anIter->more(); ){
+    const SMDS_MeshFace* anElem = anIter->next();
+    SMDS_ElemIteratorPtr aNodesIter;
+    if ( anElem->IsQuadratic() )
+      aNodesIter = dynamic_cast<const SMDS_VtkFace*>
+        (anElem)->interlacedNodesElemIterator();
+    else
+      aNodesIter = anElem->nodesIterator();
+    long aNodeId[3] = {0,0,0};
 
-    const SMDS_MeshNode* aNode1 = anElem->GetNode( anElem->NbNodes() - 1 );
+    //int aNbConnects=0;
+    const SMDS_MeshNode* aNode0;
+    const SMDS_MeshNode* aNode1;
     const SMDS_MeshNode* aNode2;
-    for ( ; aNodesIter->more(); )
-    {
-      aNode2 = aNodesIter->next();
-
-      Value aValue ( aNode1->GetID(), aNode2->GetID() );
-      MValues::iterator aItr = theValues.insert( std::make_pair( aValue, 0 )).first;
-      aItr->second++;
+    if(aNodesIter->more()){
+      aNode0 = (SMDS_MeshNode*) aNodesIter->next();
+      aNode1 = aNode0;
+      const SMDS_MeshNode* aNodes = (SMDS_MeshNode*) aNode1;
+      aNodeId[0] = aNodeId[1] = aNodes->GetID();
+    }
+    for(; aNodesIter->more(); ) {
+      aNode2 = (SMDS_MeshNode*) aNodesIter->next();
+      long anId = aNode2->GetID();
+      aNodeId[2] = anId;
+
+      Value aValue(aNodeId[1],aNodeId[2]);
+      MValues::iterator aItr = theValues.find(aValue);
+      if (aItr != theValues.end()){
+        aItr->second += 1;
+        //aNbConnects = nb;
+      }
+      else {
+        theValues[aValue] = 1;
+        //aNbConnects = 1;
+      }
+      //cout << "NodeIds: "<<aNodeId[1]<<","<<aNodeId[2]<<" nbconn="<<aNbConnects<<endl;
+      aNodeId[1] = aNodeId[2];
       aNode1 = aNode2;
     }
+    Value aValue(aNodeId[0],aNodeId[2]);
+    MValues::iterator aItr = theValues.find(aValue);
+    if (aItr != theValues.end()) {
+      aItr->second += 1;
+      //aNbConnects = nb;
+    }
+    else {
+      theValues[aValue] = 1;
+      //aNbConnects = 1;
+    }
+    //cout << "NodeIds: "<<aNodeId[0]<<","<<aNodeId[2]<<" nbconn="<<aNbConnects<<endl;
   }
-  return;
+
 }
 
 //================================================================================
@@ -2132,7 +2191,7 @@ double BallDiameter::GetValue( long theId )
   double diameter = 0;
 
   if ( const SMDS_BallElement* ball =
-       myMesh->DownCast< SMDS_BallElement >( myMesh->FindElement( theId )))
+       dynamic_cast<const SMDS_BallElement*>( myMesh->FindElement( theId )))
   {
     diameter = ball->GetDiameter();
   }
@@ -2370,7 +2429,7 @@ void CoincidentNodes::SetMesh( const SMDS_Mesh* theMesh )
   if ( myMeshModifTracer.IsMeshModified() )
   {
     TIDSortedNodeSet nodesToCheck;
-    SMDS_NodeIteratorPtr nIt = theMesh->nodesIterator();
+    SMDS_NodeIteratorPtr nIt = theMesh->nodesIterator(/*idInceasingOrder=*/true);
     while ( nIt->more() )
       nodesToCheck.insert( nodesToCheck.end(), nIt->next() );
 
@@ -2573,21 +2632,31 @@ inline void UpdateBorders(const FreeEdges::Border& theBorder,
 void FreeEdges::GetBoreders(TBorders& theBorders)
 {
   TBorders aRegistry;
-  for ( SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); anIter->more(); )
-  {
+  SMDS_FaceIteratorPtr anIter = myMesh->facesIterator();
+  for(; anIter->more(); ){
     const SMDS_MeshFace* anElem = anIter->next();
     long anElemId = anElem->GetID();
-    SMDS_NodeIteratorPtr aNodesIter = anElem->interlacedNodesIterator();
-    if ( !aNodesIter->more() ) continue;
+    SMDS_ElemIteratorPtr aNodesIter;
+    if ( anElem->IsQuadratic() )
+      aNodesIter = static_cast<const SMDS_VtkFace*>(anElem)->
+        interlacedNodesElemIterator();
+    else
+      aNodesIter = anElem->nodesIterator();
     long aNodeId[2] = {0,0};
-    aNodeId[0] = anElem->GetNode( anElem->NbNodes()-1 )->GetID();
-    for ( ; aNodesIter->more(); )
-    {
-      aNodeId[1] = aNodesIter->next()->GetID();
-      Border aBorder( anElemId, aNodeId[0], aNodeId[1] );
-      UpdateBorders( aBorder, aRegistry, theBorders );
-      aNodeId[0] = aNodeId[1];
+    const SMDS_MeshElement* aNode;
+    if(aNodesIter->more()){
+      aNode = aNodesIter->next();
+      aNodeId[0] = aNodeId[1] = aNode->GetID();
     }
+    for(; aNodesIter->more(); ){
+      aNode = aNodesIter->next();
+      long anId = aNode->GetID();
+      Border aBorder(anElemId,aNodeId[1],anId);
+      aNodeId[1] = anId;
+      UpdateBorders(aBorder,aRegistry,theBorders);
+    }
+    Border aBorder(anElemId,aNodeId[0],aNodeId[1]);
+    UpdateBorders(aBorder,aRegistry,theBorders);
   }
 }
 
@@ -3939,20 +4008,24 @@ void ManifoldPart::expandBoundary
 void ManifoldPart::getFacesByLink( const ManifoldPart::Link& theLink,
                                    ManifoldPart::TVectorOfFacePtr& theFaces ) const
 {
-
+  std::set<SMDS_MeshCell *> aSetOfFaces;
   // take all faces that shared first node
-  SMDS_ElemIteratorPtr anItr = theLink.myNode1->GetInverseElementIterator( SMDSAbs_Face );
-  SMDS_StdIterator< const SMDS_MeshElement*, SMDS_ElemIteratorPtr > faces( anItr ), facesEnd;
-  std::set<const SMDS_MeshElement *> aSetOfFaces( faces, facesEnd );
-
+  SMDS_ElemIteratorPtr anItr = theLink.myNode1->facesIterator();
+  for ( ; anItr->more(); )
+  {
+    SMDS_MeshFace* aFace = (SMDS_MeshFace*)anItr->next();
+    if ( !aFace )
+      continue;
+    aSetOfFaces.insert( aFace );
+  }
   // take all faces that shared second node
-  anItr = theLink.myNode2->GetInverseElementIterator( SMDSAbs_Face );
+  anItr = theLink.myNode2->facesIterator();
   // find the common part of two sets
   for ( ; anItr->more(); )
   {
-    const SMDS_MeshElement* aFace = anItr->next();
-    if ( aSetOfFaces.count( aFace ))
-      theFaces.push_back( (SMDS_MeshFace*) aFace );
+    SMDS_MeshFace* aFace = (SMDS_MeshFace*)anItr->next();
+    if ( aSetOfFaces.count( aFace ) )
+      theFaces.push_back( aFace );
   }
 }