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
Merge branch 'V9_9_BR'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_LocalLength.cxx
diff --git
a/src/StdMeshers/StdMeshers_LocalLength.cxx
b/src/StdMeshers/StdMeshers_LocalLength.cxx
index 6546c4492327b14b87930083fab74ba612eed91a..d0e03e092410c001ac44bdc1d43069277c138167 100644
(file)
--- a/
src/StdMeshers/StdMeshers_LocalLength.cxx
+++ b/
src/StdMeshers/StdMeshers_LocalLength.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_LocalLength.cxx
// Moved here from SMESH_LocalLength.cxx
// Author : Paul RASCLE, EDF
// File : StdMeshers_LocalLength.cxx
// Moved here from SMESH_LocalLength.cxx
// Author : Paul RASCLE, EDF
@@
-52,8
+52,8
@@
using namespace std;
*/
//=============================================================================
*/
//=============================================================================
-StdMeshers_LocalLength::StdMeshers_LocalLength(int hypId,
int studyId,
SMESH_Gen * gen)
- :SMESH_Hypothesis(hypId,
studyId,
gen)
+StdMeshers_LocalLength::StdMeshers_LocalLength(int hypId, SMESH_Gen * gen)
+ :SMESH_Hypothesis(hypId, gen)
{
_length = 1.;
_precision = Precision::Confusion();
{
_length = 1.;
_precision = Precision::Confusion();
@@
-77,7
+77,7
@@
StdMeshers_LocalLength::~StdMeshers_LocalLength()
*/
//=============================================================================
*/
//=============================================================================
-void StdMeshers_LocalLength::SetLength(double length)
throw(SALOME_Exception)
+void StdMeshers_LocalLength::SetLength(double length)
{
double oldLength = _length;
if (length <= 0)
{
double oldLength = _length;
if (length <= 0)
@@
-104,7
+104,7
@@
double StdMeshers_LocalLength::GetLength() const
*
*/
//=============================================================================
*
*/
//=============================================================================
-void StdMeshers_LocalLength::SetPrecision (double thePrecision)
throw(SALOME_Exception)
+void StdMeshers_LocalLength::SetPrecision (double thePrecision)
{
double oldPrecision = _precision;
if (_precision < 0)
{
double oldPrecision = _precision;
if (_precision < 0)
@@
-148,13
+148,13
@@
istream & StdMeshers_LocalLength::LoadFrom(istream & load)
bool isOK = true;
double a;
bool isOK = true;
double a;
- isOK = (load >> a);
+ isOK =
static_cast<bool>
(load >> a);
if (isOK)
this->_length = a;
else
load.clear(ios::badbit | load.rdstate());
if (isOK)
this->_length = a;
else
load.clear(ios::badbit | load.rdstate());
- isOK = (load >> a);
+ isOK =
static_cast<bool>
(load >> a);
if (isOK)
this->_precision = a;
else
if (isOK)
this->_precision = a;
else
@@
-216,13
+216,15
@@
bool StdMeshers_LocalLength::SetParametersByMesh(const SMESH_Mesh* theMesh,
{
const TopoDS_Edge& edge = TopoDS::Edge( edgeMap( iE ));
Handle(Geom_Curve) C = BRep_Tool::Curve( edge, L, UMin, UMax );
{
const TopoDS_Edge& edge = TopoDS::Edge( edgeMap( iE ));
Handle(Geom_Curve) C = BRep_Tool::Curve( edge, L, UMin, UMax );
+ if ( C.IsNull() )
+ continue;
GeomAdaptor_Curve AdaptCurve(C, UMin, UMax);
vector< double > params;
SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS();
if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params ))
{
GeomAdaptor_Curve AdaptCurve(C, UMin, UMax);
vector< double > params;
SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS();
if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params ))
{
- for (
in
t i = 1; i < params.size(); ++i )
+ for (
size_
t i = 1; i < params.size(); ++i )
_length += GCPnts_AbscissaPoint::Length( AdaptCurve, params[ i-1 ], params[ i ]);
nbEdges += params.size() - 1;
}
_length += GCPnts_AbscissaPoint::Length( AdaptCurve, params[ i-1 ], params[ i ]);
nbEdges += params.size() - 1;
}