Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright information
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Algo.cxx
diff --git
a/src/SMESH/SMESH_Algo.cxx
b/src/SMESH/SMESH_Algo.cxx
index e509dd1b9fbe52afabc4d779c685b967b413d1ae..98e8af4691b3b2f2b5afc5a69591cdffc01c91cf 100644
(file)
--- a/
src/SMESH/SMESH_Algo.cxx
+++ b/
src/SMESH/SMESH_Algo.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-24,7
+24,7
@@
// File : SMESH_Algo.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// File : SMESH_Algo.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
-//
+
#include "SMESH_Algo.hxx"
#include "SMDS_EdgePosition.hxx"
#include "SMESH_Algo.hxx"
#include "SMDS_EdgePosition.hxx"
@@
-40,6
+40,8
@@
#include "SMESH_Mesh.hxx"
#include "SMESH_TypeDefs.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_TypeDefs.hxx"
+#include <Basics_OCCTVersion.hxx>
+
#include <BRepAdaptor_Curve.hxx>
#include <BRepLProp.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepLProp.hxx>
#include <BRep_Tool.hxx>
@@
-79,7
+81,7
@@
SMESH_Algo::SMESH_Algo (int hypId, int studyId, SMESH_Gen * gen)
{
gen->_mapAlgo[hypId] = this;
{
gen->_mapAlgo[hypId] = this;
- _onlyUnaryInput = _requireD
escret
Boundary = _requireShape = true;
+ _onlyUnaryInput = _requireD
iscrete
Boundary = _requireShape = true;
_quadraticMesh = _supportSubmeshes = false;
_error = COMPERR_OK;
}
_quadraticMesh = _supportSubmeshes = false;
_error = COMPERR_OK;
}
@@
-437,7
+439,7
@@
bool SMESH_Algo::GetSortedNodesOnEdge(const SMESHDS_Mesh* theM
return false;
const SMDS_EdgePosition* epos =
static_cast<const SMDS_EdgePosition*>(node->GetPosition());
return false;
const SMDS_EdgePosition* epos =
static_cast<const SMDS_EdgePosition*>(node->GetPosition());
- theNodes.insert( make_pair( epos->GetUParameter(), node ));
+ theNodes.insert(
theNodes.end(),
make_pair( epos->GetUParameter(), node ));
//MESSAGE("U " << epos->GetUParameter() << " ID " << node->GetID());
++nbNodes;
}
//MESSAGE("U " << epos->GetUParameter() << " ID " << node->GetID());
++nbNodes;
}
@@
-512,7
+514,7
@@
GeomAbs_Shape SMESH_Algo::Continuity(TopoDS_Edge E1,
Standard_Real tol = BRep_Tool::Tolerance( V );
Standard_Real angTol = 2e-3;
try {
Standard_Real tol = BRep_Tool::Tolerance( V );
Standard_Real angTol = 2e-3;
try {
-#if
(OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x0601
00
+#if
OCC_VERSION_LARGE > 0x060100
00
OCC_CATCH_SIGNALS;
#endif
return BRepLProp::Continuity(C1, C2, u1, u2, tol, angTol);
OCC_CATCH_SIGNALS;
#endif
return BRepLProp::Continuity(C1, C2, u1, u2, tol, angTol);