Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6466454
)
Porting to DEV version of OCCT.
author
mnt
<mnt@opencascade.com>
Fri, 7 Jul 2017 09:09:54 +0000
(12:09 +0300)
committer
mnt
<mnt@opencascade.com>
Fri, 7 Jul 2017 09:09:54 +0000
(12:09 +0300)
src/Controls/SMESH_Controls.cxx
patch
|
blob
|
history
src/SMESH/SMESH_MesherHelper.cxx
patch
|
blob
|
history
src/SMESHUtils/SMESH_MeshAlgos.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_Import_1D2D.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_ViscousLayers.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_ViscousLayers2D.cxx
patch
|
blob
|
history
diff --git
a/src/Controls/SMESH_Controls.cxx
b/src/Controls/SMESH_Controls.cxx
index 6e80cc77ad1a53324ea380b885c3cc6eb78c1a8b..ee372e22239ca26fdeede963c30de29d18e2beaf 100644
(file)
--- a/
src/Controls/SMESH_Controls.cxx
+++ b/
src/Controls/SMESH_Controls.cxx
@@
-4493,7
+4493,7
@@
bool ElementsOnShape::Classifier::isOutOfFace (const gp_Pnt& p)
if ( myProjFace.IsDone() && myProjFace.LowerDistance() <= myTol )
{
// check relatively to the face
if ( myProjFace.IsDone() && myProjFace.LowerDistance() <= myTol )
{
// check relatively to the face
-
Quantity_Parameter
u, v;
+
Standard_Real
u, v;
myProjFace.LowerDistanceParameters(u, v);
gp_Pnt2d aProjPnt (u, v);
BRepClass_FaceClassifier aClsf ( TopoDS::Face( myShape ), aProjPnt, myTol );
myProjFace.LowerDistanceParameters(u, v);
gp_Pnt2d aProjPnt (u, v);
BRepClass_FaceClassifier aClsf ( TopoDS::Face( myShape ), aProjPnt, myTol );
diff --git
a/src/SMESH/SMESH_MesherHelper.cxx
b/src/SMESH/SMESH_MesherHelper.cxx
index 004c856f1bae102ebbdc2e7a4bd6b56966ccaef4..4d8f9952a0749638ba138ce458ae7f1c2825630c 100644
(file)
--- a/
src/SMESH/SMESH_MesherHelper.cxx
+++ b/
src/SMESH/SMESH_MesherHelper.cxx
@@
-824,7
+824,7
@@
bool SMESH_MesherHelper::CheckNodeUV(const TopoDS_Face& F,
MESSAGE( "SMESH_MesherHelper::CheckNodeUV() failed to project" );
return false;
}
MESSAGE( "SMESH_MesherHelper::CheckNodeUV() failed to project" );
return false;
}
-
Quantity_Parameter
U,V;
+
Standard_Real
U,V;
projector.LowerDistanceParameters(U,V);
uv.SetCoord( U,V );
surfPnt = surface->Value( U, V );
projector.LowerDistanceParameters(U,V);
uv.SetCoord( 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" );
return false;
}
MESSAGE( "SMESH_MesherHelper::CheckNodeU() failed to project" );
return false;
}
-
Quantity_Parameter
U = projector->LowerDistanceParameter();
+
Standard_Real
U = projector->LowerDistanceParameter();
u = double( U );
curvPnt = curve->Value( u );
dist = nodePnt.Distance( curvPnt );
u = double( U );
curvPnt = curve->Value( u );
dist = nodePnt.Distance( curvPnt );
diff --git
a/src/SMESHUtils/SMESH_MeshAlgos.cxx
b/src/SMESHUtils/SMESH_MeshAlgos.cxx
index 03e6f7cf582595481e694ef675ce244e2015d7ff..8464e245fe197e6765f100a08498d730211522bb 100644
(file)
--- a/
src/SMESHUtils/SMESH_MeshAlgos.cxx
+++ b/
src/SMESHUtils/SMESH_MeshAlgos.cxx
@@
-667,7
+667,7
@@
bool SMESH_ElementSearcherImpl::getIntersParamOnLine(const gp_Lin& lin
anExtCC.Init( lineCurve, edge.Value() );
if ( anExtCC.NbExtrema() > 0 && anExtCC.LowerDistance() <= tol)
{
anExtCC.Init( lineCurve, edge.Value() );
if ( anExtCC.NbExtrema() > 0 && anExtCC.LowerDistance() <= tol)
{
-
Quantity_Parameter
pl, pe;
+
Standard_Real
pl, pe;
anExtCC.LowerDistanceParameters( pl, pe );
param += pl;
if ( ++nbInts == 2 )
anExtCC.LowerDistanceParameters( pl, pe );
param += pl;
if ( ++nbInts == 2 )
diff --git
a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
index aebd779eea189c77019b1ac01a7b7bc6ea636687..0b92acc5f2692f6221f48fad0fbe7c1a10e13c62 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
+++ b/
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
@@
-2924,7
+2924,7
@@
namespace
proj.Perform( testPnt );
if ( proj.IsDone() && proj.NbPoints() > 0 )
{
proj.Perform( testPnt );
if ( proj.IsDone() && proj.NbPoints() > 0 )
{
-
Quantity_Parameter
u,v;
+
Standard_Real
u,v;
proj.LowerDistanceParameters( u,v );
if ( proj.LowerDistance() <= 0.1 * _grid->_tol )
proj.LowerDistanceParameters( u,v );
if ( proj.LowerDistance() <= 0.1 * _grid->_tol )
diff --git
a/src/StdMeshers/StdMeshers_Import_1D2D.cxx
b/src/StdMeshers/StdMeshers_Import_1D2D.cxx
index 0d4a369e881b5970018fe4e2d679ea76caefd457..d0906bfb08aafc90882d7f111634dea28fff15a3 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Import_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_Import_1D2D.cxx
@@
-411,7
+411,7
@@
bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
proj.Perform( gc );
if ( !proj.IsDone() || proj.NbPoints() < 1 )
continue;
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 );
proj.LowerDistanceParameters(U,V);
gp_XY uv( U,V );
classifier.Perform( geomFace, uv, clsfTol );
diff --git
a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
index ef472e49aedb00e20e3801668428cf71439ef8d4..dca977adc9b0cabc2504736e1c47b1fa22c86f05 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
+++ b/
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
@@
-51,7
+51,6
@@
#include <Geom_Surface.hxx>
#include <NCollection_DefineArray2.hxx>
#include <Precision.hxx>
#include <Geom_Surface.hxx>
#include <NCollection_DefineArray2.hxx>
#include <Precision.hxx>
-#include <Quantity_Parameter.hxx>
#include <TColStd_SequenceOfInteger.hxx>
#include <TColStd_SequenceOfReal.hxx>
#include <TColgp_SequenceOfXY.hxx>
#include <TColStd_SequenceOfInteger.hxx>
#include <TColStd_SequenceOfReal.hxx>
#include <TColgp_SequenceOfXY.hxx>
diff --git
a/src/StdMeshers/StdMeshers_ViscousLayers.cxx
b/src/StdMeshers/StdMeshers_ViscousLayers.cxx
index 76f96eae201a68043f9eea3c03060b53273102af..8b91716059ea81db6caeaae9ce1ae7f115135465 100644
(file)
--- a/
src/StdMeshers/StdMeshers_ViscousLayers.cxx
+++ b/
src/StdMeshers/StdMeshers_ViscousLayers.cxx
@@
-3691,7
+3691,7
@@
gp_XYZ _ViscousBuilder::getFaceNormal(const SMDS_MeshNode* node,
isOK = false;
return p.XYZ();
}
isOK = false;
return p.XYZ();
}
-
Quantity_Parameter
U,V;
+
Standard_Real
U,V;
projector.LowerDistanceParameters(U,V);
uv.SetCoord( U,V );
}
projector.LowerDistanceParameters(U,V);
uv.SetCoord( U,V );
}
diff --git
a/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx
b/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx
index ecd62abc20462cf179b9dd8fb116eb631d0b7dad..971cebf884654ad32cba271fd510264247012a62 100644
(file)
--- a/
src/StdMeshers/StdMeshers_ViscousLayers2D.cxx
+++ b/
src/StdMeshers/StdMeshers_ViscousLayers2D.cxx
@@
-1318,7
+1318,7
@@
void _ViscousBuilder2D::setLayerEdgeData( _LayerEdge& lEdge,
faceProj->Perform( p );
if ( !faceProj->IsDone() || faceProj->NbPoints() < 1 )
return setLayerEdgeData( lEdge, u, pcurve, curve, p, reverse, NULL );
faceProj->Perform( p );
if ( !faceProj->IsDone() || faceProj->NbPoints() < 1 )
return setLayerEdgeData( lEdge, u, pcurve, curve, p, reverse, NULL );
-
Quantity_Parameter
U,V;
+
Standard_Real
U,V;
faceProj->LowerDistanceParameters(U,V);
lEdge._normal2D.SetCoord( U - uv.X(), V - uv.Y() );
lEdge._normal2D.Normalize();
faceProj->LowerDistanceParameters(U,V);
lEdge._normal2D.SetCoord( U - uv.X(), V - uv.Y() );
lEdge._normal2D.Normalize();