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
23620: EDF 10301 - Completing Extrusion along a path
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_CartesianParameters3D.cxx
diff --git
a/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
b/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
index 6d8135590881ee261260d7d6b46cbcf9074255db..0081653ef13391fac68eddeb16222b082f3afda2 100644
(file)
--- a/
src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
+++ b/
src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-61,9
+61,8
@@
using namespace std;
//=======================================================================
StdMeshers_CartesianParameters3D::StdMeshers_CartesianParameters3D(int hypId,
//=======================================================================
StdMeshers_CartesianParameters3D::StdMeshers_CartesianParameters3D(int hypId,
- int studyId,
SMESH_Gen * gen)
SMESH_Gen * gen)
- : SMESH_Hypothesis(hypId,
studyId,
gen),
+ : SMESH_Hypothesis(hypId, gen),
_sizeThreshold( 4.0 ), // default according to the customer specification
_toAddEdges( false )
{
_sizeThreshold( 4.0 ), // default according to the customer specification
_toAddEdges( false )
{
@@
-792,58
+791,58
@@
std::ostream & StdMeshers_CartesianParameters3D::SaveTo(std::ostream & save)
//=======================================================================
//function : LoadFrom
//=======================================================================
//function : LoadFrom
-//purpose : resore my parameters from a stream
+//purpose : res
t
ore my parameters from a stream
//=======================================================================
std::istream & StdMeshers_CartesianParameters3D::LoadFrom(std::istream & load)
{
bool ok;
//=======================================================================
std::istream & StdMeshers_CartesianParameters3D::LoadFrom(std::istream & load)
{
bool ok;
- ok = ( load >> _sizeThreshold );
+ ok =
static_cast<bool>
( load >> _sizeThreshold );
for ( int ax = 0; ax < 3; ++ax )
{
if (ok)
{
size_t i = 0;
for ( int ax = 0; ax < 3; ++ax )
{
if (ok)
{
size_t i = 0;
- ok = (load >> i );
+ ok =
static_cast<bool>
(load >> i );
if ( i > 0 && ok )
{
_coords[ax].resize( i );
for ( i = 0; i < _coords[ax].size() && ok; ++i )
if ( i > 0 && ok )
{
_coords[ax].resize( i );
for ( i = 0; i < _coords[ax].size() && ok; ++i )
- ok = (load >> _coords[ax][i] );
+ ok =
static_cast<bool>
(load >> _coords[ax][i] );
}
}
if (ok)
{
size_t i = 0;
}
}
if (ok)
{
size_t i = 0;
- ok = (load >> i );
+ ok =
static_cast<bool>
(load >> i );
if ( i > 0 && ok )
{
_internalPoints[ax].resize( i );
for ( i = 0; i < _internalPoints[ax].size() && ok; ++i )
if ( i > 0 && ok )
{
_internalPoints[ax].resize( i );
for ( i = 0; i < _internalPoints[ax].size() && ok; ++i )
- ok = (load >> _internalPoints[ax][i] );
+ ok =
static_cast<bool>
(load >> _internalPoints[ax][i] );
}
}
if (ok)
{
size_t i = 0;
}
}
if (ok)
{
size_t i = 0;
- ok = (load >> i );
+ ok =
static_cast<bool>
(load >> i );
if ( i > 0 && ok )
{
_spaceFunctions[ax].resize( i );
for ( i = 0; i < _spaceFunctions[ax].size() && ok; ++i )
if ( i > 0 && ok )
{
_spaceFunctions[ax].resize( i );
for ( i = 0; i < _spaceFunctions[ax].size() && ok; ++i )
- ok = (load >> _spaceFunctions[ax][i] );
+ ok =
static_cast<bool>
(load >> _spaceFunctions[ax][i] );
}
}
}
}
}
}
- ok = ( load >> _toAddEdges );
+ ok =
static_cast<bool>
( load >> _toAddEdges );
for ( int i = 0; i < 9 && ok; ++i )
for ( int i = 0; i < 9 && ok; ++i )
- ok = ( load >> _axisDirs[i]);
+ ok =
static_cast<bool>
( load >> _axisDirs[i]);
for ( int i = 0; i < 3 && ok ; ++i )
for ( int i = 0; i < 3 && ok ; ++i )
- ok = ( load >> _fixedPoint[i]);
+ ok =
static_cast<bool>
( load >> _fixedPoint[i]);
return load;
}
return load;
}