Merge branch 'master' into pre/penta18

[modules/smesh.git] / src / StdMeshers / StdMeshers_Import_1D2D.cxx

diff --git a/src/StdMeshers/StdMeshers_Import_1D2D.cxx b/src/StdMeshers/StdMeshers_Import_1D2D.cxx
index 60b776254489ad854f7f7dd9452386aa3491ceb2..8cc97b6e017243dd4296e504c46d93fdd823b610 100644 (file)
--- a/src/StdMeshers/StdMeshers_Import_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_Import_1D2D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -34,6 +34,7 @@
 #include "SMESHDS_Group.hxx"
 #include "SMESHDS_Mesh.hxx"
 #include "SMESH_Comment.hxx"
+#include "SMESH_ControlsDef.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_Group.hxx"
 #include "SMESH_Mesh.hxx"
@@ -98,7 +99,6 @@ namespace
 StdMeshers_Import_1D2D::StdMeshers_Import_1D2D(int hypId, int studyId, SMESH_Gen * gen)
   :SMESH_2D_Algo(hypId, studyId, gen), _sourceHyp(0)
 {
-  MESSAGE("StdMeshers_Import_1D2D::StdMeshers_Import_1D2D");
   _name = "Import_1D2D";
   _shapeType = (1 << TopAbs_FACE);
 
@@ -188,8 +188,8 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
   SMESHDS_Mesh* tgtMesh = theMesh.GetMeshDS();
 
   const TopoDS_Face& geomFace = TopoDS::Face( theShape );
-  const double faceTol = helper.MaxTolerance( geomFace );
-  const int shapeID = tgtMesh->ShapeToIndex( geomFace );
+  const double  faceTol = helper.MaxTolerance( geomFace );
+  const int     shapeID = tgtMesh->ShapeToIndex( geomFace );
   const bool toCheckOri = (helper.NbAncestors( geomFace, theMesh, TopAbs_SOLID ) == 1 );
 
 
@@ -219,7 +219,7 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
     bndBox2d.Enlarge( 1e-2 * Sqrt( bndBox2d.SquareExtent() ));
 
     BRepBndLib::Add( geomFace, bndBox3d );
-    bndBox3d.Enlarge( 1e-5 * sqrt( bndBox3d.SquareExtent() ));
+    bndBox3d.Enlarge( 1e-2 * sqrt( bndBox3d.SquareExtent() ));
   }
 
   set<int> subShapeIDs;
@@ -270,12 +270,25 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
   map<TLink, int>::iterator link2Nb;
   double minGroupTol = Precision::Infinite();
 
+  SMESH::Controls::ElementsOnShape onEdgeClassifier;
+  if ( helper.HasSeam() )
+  {
+    TopoDS_Compound edgesCompound;
+    BRep_Builder    builder;
+    builder.MakeCompound( edgesCompound );
+    for ( size_t iE = 0; iE < edges.size(); ++iE )
+      builder.Add( edgesCompound, edges[ iE ]);
+    onEdgeClassifier.SetShape( edgesCompound, SMDSAbs_Node );
+  }
+
   // =========================
   // Import faces from groups
   // =========================
 
   StdMeshers_Import_1D::TNodeNodeMap* n2n;
   StdMeshers_Import_1D::TElemElemMap* e2e;
+  StdMeshers_Import_1D::TNodeNodeMap::iterator n2nIt;
+  pair< StdMeshers_Import_1D::TNodeNodeMap::iterator, bool > it_isnew;
   vector<TopAbs_State>         nodeState;
   vector<const SMDS_MeshNode*> newNodes; // of a face
   set   <const SMDS_MeshNode*> bndNodes; // nodes classified ON
@@ -298,8 +311,8 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
     //                             S.VResolution( 0.1 * groupTol ));
     const double clsfTol = BRep_Tool::Tolerance( geomFace );
 
-    StdMeshers_Import_1D::TNodeNodeMap::iterator n2nIt;
-    pair< StdMeshers_Import_1D::TNodeNodeMap::iterator, bool > it_isnew;
+    if ( helper.HasSeam() )
+      onEdgeClassifier.SetMesh( srcMesh->GetMeshDS() );
 
     SMDS_ElemIteratorPtr srcElems = srcGroup->GetElements();
     while ( srcElems->more() ) // loop on group contents
@@ -357,11 +370,21 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
           gp_XY uv( Precision::Infinite(), 0 );
           isOut = ( !helper.CheckNodeUV( geomFace, *node, uv, groupTol, /*force=*/true ) ||
                     bndBox2d.IsOut( uv ));
+          //int iCoo;
           if ( !isOut && !isIn ) // classify
           {
             classifier.Perform( geomFace, uv, clsfTol );
             nodeState[i] = classifier.State();
             isOut = ( nodeState[i] == TopAbs_OUT );
+            if ( isOut && helper.IsOnSeam( uv ) && onEdgeClassifier.IsSatisfy( (*node)->GetID() ))
+            {
+              // uv.SetCoord( iCoo, helper.GetOtherParam( uv.Coord( iCoo )));
+              // classifier.Perform( geomFace, uv, clsfTol );
+              // nodeState[i] = classifier.State();
+              // isOut = ( nodeState[i] == TopAbs_OUT );
+              nodeState[i] = TopAbs_ON;
+              isOut = false;
+            }
           }
           if ( !isOut ) // create a new node
           {
@@ -375,13 +398,14 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
             }
             if ( nodeState[i] == TopAbs_ON )
               bndNodes.insert( *node );
-            else
+            else if ( nodeState[i] != TopAbs_UNKNOWN )
               isNodeIn[ newNode->GetID() ] = isIn = true;
           }
         }
         if ( !(newNodes[i] = newNode ) || isOut )
           break;
-      }
+
+      } // loop on face nodes
 
       if ( !newNodes.back() )
         continue; // not all nodes of the face lie on theShape
@@ -412,7 +436,7 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
           proj.Perform( gc );
           if ( !proj.IsDone() || proj.NbPoints() < 1 )
             continue;
-          Quantity_Parameter U,V;
+          Standard_Real U,V;
           proj.LowerDistanceParameters(U,V);
           gp_XY uv( U,V );
           classifier.Perform( geomFace, uv, clsfTol );
@@ -492,23 +516,32 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
           medium = newNodes[i+nbCorners];
         link2Nb = linkCount.insert( make_pair( TLink( n1, n2, medium ), 0)).first;
         ++link2Nb->second;
-        // if ( link2Nb->second == 1 )
-        // {
-        //   // measure link length
-        //   double len2 = SMESH_TNodeXYZ( n1 ).SquareDistance( n2 );
-        //   if ( len2 < minGroupTol )
-        //     minGroupTol = len2;
-        // }
       }
-    }
+    } // loop on group contents
+
     // Remove OUT nodes from n2n map
     for ( n2nIt = n2n->begin(); n2nIt != n2n->end(); )
       if ( !n2nIt->second )
         n2n->erase( n2nIt++ );
       else
         ++n2nIt;
-  }
 
+  } // loop on src groups
+
+  // remove free nodes created on EDGEs
+  {
+    set<const SMDS_MeshNode*>::iterator node = bndNodes.begin();
+    for ( ; node != bndNodes.end(); ++node )
+    {
+      n2nIt = n2n->find( *node );
+      const SMDS_MeshNode* newNode = n2nIt->second;
+      if ( newNode && newNode->NbInverseElements() == 0 )
+      {
+        tgtMesh->RemoveFreeNode( newNode, 0, false );
+        n2n->erase( n2nIt );
+      }
+    }
+  }
 
   // ==========================================================
   // Put nodes on geom edges and create edges on them;
@@ -824,7 +857,7 @@ bool StdMeshers_Import_1D2D::Evaluate(SMESH_Mesh &         theMesh,
     set<const SMDS_MeshNode* > allNodes;
     gp_XY uv;
     double minGroupTol = 1e100;
-    for ( int iG = 0; iG < srcGroups.size(); ++iG )
+    for ( size_t iG = 0; iG < srcGroups.size(); ++iG )
     {
       const SMESHDS_GroupBase* srcGroup = srcGroups[iG]->GetGroupDS();
       const double groupTol = 0.5 * sqrt( getMinElemSize2( srcGroup ));