X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Projection_1D2D.cxx;h=e0c036dfb2422b1d8d14cbd602080b13908ae857;hp=d0966d7b8f6bf962b8d43082b5d94f6b1b843976;hb=6d32f944a0a115b6419184c50b57bf7c4eef5786;hpb=e74c29b7867ca230102fc580d831dda6b81b3b4c

diff --git a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
index d0966d7b8..e0c036dfb 100644
--- a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -93,8 +93,8 @@ namespace
 //purpose  : 
 //=======================================================================
 
-StdMeshers_Projection_1D2D::StdMeshers_Projection_1D2D(int hypId, int studyId, SMESH_Gen* gen)
-  :StdMeshers_Projection_2D(hypId, studyId, gen)
+StdMeshers_Projection_1D2D::StdMeshers_Projection_1D2D(int hypId, SMESH_Gen* gen)
+  :StdMeshers_Projection_2D(hypId, gen)
 {
   _name = "Projection_1D2D";
   _requireDiscreteBoundary = false;
@@ -140,7 +140,7 @@ bool StdMeshers_Projection_1D2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape
     {
       const SMDS_MeshElement* f = fIt->next();
       //if ( !f->IsQuadratic() ) continue;
-      nodes.assign( SMDS_MeshElement::iterator( f->interlacedNodesElemIterator() ),
+      nodes.assign( SMDS_MeshElement::iterator( f->interlacedNodesIterator() ),
                     SMDS_MeshElement::iterator() );
       nodes.push_back( nodes[0] );
       for ( size_t i = 2; i < nodes.size(); i += 2 )
@@ -149,8 +149,8 @@ bool StdMeshers_Projection_1D2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape
         if ( idType.second == TopAbs_EDGE &&
              idType.first  != nodes[i-1]->getshapeId() )
         {
-          faceSubMesh->RemoveNode( nodes[i-1], /*isDeleted=*/false );
-          meshDS->SetNodeOnEdge( (SMDS_MeshNode*) nodes[i-1], idType.first );
+          faceSubMesh->RemoveNode( nodes[i-1] );
+          meshDS->SetNodeOnEdge( nodes[i-1], idType.first );
           posFixer.SetSubShape( idType.first );
           posFixer.CheckNodeU( TopoDS::Edge( posFixer.GetSubShape() ),
                                nodes[i-1], dummyU=0., tol, /*force=*/true );
@@ -160,8 +160,8 @@ bool StdMeshers_Projection_1D2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape
   }
   TopoDS_Face F = TopoDS::Face( theShape );
   TError err;
-  TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, theMesh,
-                                                         /*ignoreMediumNodes=*/false, err);
+  TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, theMesh, /*ignoreMediumNodes=*/false,
+                                                         err, &helper);
   if ( err && !err->IsOK() )
     return error( err );