X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Import_1D2D.cxx;h=d0906bfb08aafc90882d7f111634dea28fff15a3;hp=60b776254489ad854f7f7dd9452386aa3491ceb2;hb=4fa5fdbd44a9567a62142d6abd80f663165f3ba2;hpb=23d90107acec5e54ded86d9f309fe5cb42720b78 diff --git a/src/StdMeshers/StdMeshers_Import_1D2D.cxx b/src/StdMeshers/StdMeshers_Import_1D2D.cxx index 60b776254..d0906bfb0 100644 --- 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 @@ -98,7 +98,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); @@ -219,7 +218,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 subShapeIDs; @@ -412,7 +411,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 ); @@ -824,7 +823,7 @@ bool StdMeshers_Import_1D2D::Evaluate(SMESH_Mesh & theMesh, set 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 ));