ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-15 03:30:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to DEV version of OCCT.

Browse Source
This commit is contained in:
mnt 2017-07-07 12:09:54 +03:00
parent 6466454bba
commit 4fa5fdbd44
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controls/SMESH_Controls.cxx
View File

@ -4493,7 +4493,7 @@ bool ElementsOnShape::Classifier::isOutOfFace (const gp_Pnt& p)
if ( myProjFace.IsDone() && myProjFace.LowerDistance() <= myTol ) if ( myProjFace.IsDone() && myProjFace.LowerDistance() <= myTol )
{ {
// check relatively to the face // check relatively to the face
Quantity_Parameter u, v; Standard_Real u, v;
myProjFace.LowerDistanceParameters(u, v); myProjFace.LowerDistanceParameters(u, v);
gp_Pnt2d aProjPnt (u, v); gp_Pnt2d aProjPnt (u, v);
BRepClass_FaceClassifier aClsf ( TopoDS::Face( myShape ), aProjPnt, myTol ); BRepClass_FaceClassifier aClsf ( TopoDS::Face( myShape ), aProjPnt, myTol );

4
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -824,7 +824,7 @@ bool SMESH_MesherHelper::CheckNodeUV(const TopoDS_Face& F,
MESSAGE( "SMESH_MesherHelper::CheckNodeUV() failed to project" ); MESSAGE( "SMESH_MesherHelper::CheckNodeUV() failed to project" );
return false; return false;
} }
Quantity_Parameter U,V; Standard_Real U,V;
projector.LowerDistanceParameters(U,V); projector.LowerDistanceParameters(U,V);
uv.SetCoord( U,V ); uv.SetCoord( U,V );
surfPnt = surface->Value( U, V ); surfPnt = surface->Value( U, V );
@ -1130,7 +1130,7 @@ bool SMESH_MesherHelper::CheckNodeU(const TopoDS_Edge& E,
MESSAGE( "SMESH_MesherHelper::CheckNodeU() failed to project" ); MESSAGE( "SMESH_MesherHelper::CheckNodeU() failed to project" );
return false; return false;
} }
Quantity_Parameter U = projector->LowerDistanceParameter(); Standard_Real U = projector->LowerDistanceParameter();
u = double( U ); u = double( U );
curvPnt = curve->Value( u ); curvPnt = curve->Value( u );
dist = nodePnt.Distance( curvPnt ); dist = nodePnt.Distance( curvPnt );

2
src/SMESHUtils/SMESH_MeshAlgos.cxx
View File

@ -667,7 +667,7 @@ bool SMESH_ElementSearcherImpl::getIntersParamOnLine(const gp_Lin& lin
anExtCC.Init( lineCurve, edge.Value() ); anExtCC.Init( lineCurve, edge.Value() );
if ( anExtCC.NbExtrema() > 0 && anExtCC.LowerDistance() <= tol) if ( anExtCC.NbExtrema() > 0 && anExtCC.LowerDistance() <= tol)
{ {
Quantity_Parameter pl, pe; Standard_Real pl, pe;
anExtCC.LowerDistanceParameters( pl, pe ); anExtCC.LowerDistanceParameters( pl, pe );
param += pl; param += pl;
if ( ++nbInts == 2 ) if ( ++nbInts == 2 )

2
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
View File

@ -2924,7 +2924,7 @@ namespace
proj.Perform( testPnt ); proj.Perform( testPnt );
if ( proj.IsDone() && proj.NbPoints() > 0 ) if ( proj.IsDone() && proj.NbPoints() > 0 )
{ {
Quantity_Parameter u,v; Standard_Real u,v;
proj.LowerDistanceParameters( u,v ); proj.LowerDistanceParameters( u,v );
if ( proj.LowerDistance() <= 0.1 * _grid->_tol ) if ( proj.LowerDistance() <= 0.1 * _grid->_tol )

2
src/StdMeshers/StdMeshers_Import_1D2D.cxx
View File

@ -411,7 +411,7 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
proj.Perform( gc ); proj.Perform( gc );
if ( !proj.IsDone() || proj.NbPoints() < 1 ) if ( !proj.IsDone() || proj.NbPoints() < 1 )
continue; continue;
Quantity_Parameter U,V; Standard_Real U,V;
proj.LowerDistanceParameters(U,V); proj.LowerDistanceParameters(U,V);
gp_XY uv( U,V ); gp_XY uv( U,V );
classifier.Perform( geomFace, uv, clsfTol ); classifier.Perform( geomFace, uv, clsfTol );

1
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -51,7 +51,6 @@
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <NCollection_DefineArray2.hxx> #include <NCollection_DefineArray2.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <Quantity_Parameter.hxx>
#include <TColStd_SequenceOfInteger.hxx> #include <TColStd_SequenceOfInteger.hxx>
#include <TColStd_SequenceOfReal.hxx> #include <TColStd_SequenceOfReal.hxx>
#include <TColgp_SequenceOfXY.hxx> #include <TColgp_SequenceOfXY.hxx>

2
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -3691,7 +3691,7 @@ gp_XYZ _ViscousBuilder::getFaceNormal(const SMDS_MeshNode* node,
isOK = false; isOK = false;
return p.XYZ(); return p.XYZ();
} }
Quantity_Parameter U,V; Standard_Real U,V;
projector.LowerDistanceParameters(U,V); projector.LowerDistanceParameters(U,V);
uv.SetCoord( U,V ); uv.SetCoord( U,V );
} }

2
src/StdMeshers/StdMeshers_ViscousLayers2D.cxx
View File

@ -1318,7 +1318,7 @@ void _ViscousBuilder2D::setLayerEdgeData( _LayerEdge& lEdge,
faceProj->Perform( p ); faceProj->Perform( p );
if ( !faceProj->IsDone() || faceProj->NbPoints() < 1 ) if ( !faceProj->IsDone() || faceProj->NbPoints() < 1 )
return setLayerEdgeData( lEdge, u, pcurve, curve, p, reverse, NULL ); return setLayerEdgeData( lEdge, u, pcurve, curve, p, reverse, NULL );
Quantity_Parameter U,V; Standard_Real U,V;
faceProj->LowerDistanceParameters(U,V); faceProj->LowerDistanceParameters(U,V);
lEdge._normal2D.SetCoord( U - uv.X(), V - uv.Y() ); lEdge._normal2D.SetCoord( U - uv.X(), V - uv.Y() );
lEdge._normal2D.Normalize(); lEdge._normal2D.Normalize();