ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-26 14:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Windows compatibility

Browse Source
This commit is contained in:
ana 2015-05-07 12:16:49 +03:00
parent 26862b255f
commit fc0c585f17
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/StdMeshers/StdMeshers_Projection_2D.cxx
View File

@ -394,16 +394,15 @@ namespace {
{
double f,l;
Handle(Geom2d_Curve) c1 = BRep_Tool::CurveOnSurface( E1, F, f, l );
gp_Pnt2d uvFirst1 = c1->Value( f );
gp_Pnt2d uvLast1 = c1->Value( l );
gp_Pnt2d uvLast1 = c1->Value( E1.Orientation() == TopAbs_REVERSED ? f : l );
Handle(Geom2d_Curve) c2 = BRep_Tool::CurveOnSurface( E2, F, f, l );
gp_Pnt2d uvFirst2 = c2->Value( E2.Orientation() == TopAbs_REVERSED ? l : f );
double tol2 = Max( Precision::PConfusion() * Precision::PConfusion(),
1e-5 * uvLast1.SquareDistance( uvFirst1 ));
gp_Pnt2d uvFirst2 = c2->Value( f );
gp_Pnt2d uvLast2 = c2->Value( l );
double tol2 = 1e-5 * uvLast2.SquareDistance( uvFirst2 );
return (( uvFirst2.SquareDistance( uvFirst1 ) < tol2 ) ||
( uvFirst2.SquareDistance( uvLast1 ) < tol2 ));
return (( uvLast1.SquareDistance( uvFirst2 ) < tol2 ) ||
( uvLast1.SquareDistance( uvLast2 ) < tol2 ));
}
//================================================================================
@ -442,7 +441,7 @@ namespace {
for ( size_t iW = 0; iW < srcWires.size(); ++iW )
{
// check ori
//bool reverse = false;
bool reverse = false;
StdMeshers_FaceSidePtr srcWire = srcWires[iW];
// for ( int iE = 0; iE < srcWire->NbEdges(); ++iE )
// {
@ -487,8 +486,7 @@ namespace {
{
list< TopoDS_Edge >::iterator eIt = tgtEdges.begin();
std::advance( eIt, index-1 );
if ( are2dConnected( tgtEdges.back(), *eIt, tgtFace ))
eIt->Reverse();
eIt->Reverse();
}
else
{
@ -1031,7 +1029,7 @@ namespace {
TAssocTool::TNodeNodeMap::iterator srcN_tgtN;
std::map< const SMDS_MeshNode*, TNodeOrXY >::iterator srcN_tgtNXY;
std::pair< std::map< const SMDS_MeshNode*, TNodeOrXY >::iterator, bool > n2n_isNew;
TNodeOrXY nullNXY( 0, gp_XYZ(0,0,0) );
TNodeOrXY nullNXY( (SMDS_MeshNode*)NULL, gp_XYZ(0,0,0) );
SMESHDS_SubMesh* srcSubDS = srcMeshDS->MeshElements( srcFace );
newFacesVec.resize( srcSubDS->NbElements() );