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 'occ/shaper2smesh'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Geometric1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Geometric1D.cxx
b/src/StdMeshers/StdMeshers_Geometric1D.cxx
index 8d2be979c0e63d93ee02ecd04482fb3eb25771b5..e8d9eaea6f3ccfd79e91295471e8de35cf941aca 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Geometric1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Geometric1D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-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_Geometric1D.cxx
// Module : SMESH
//
// File : StdMeshers_Geometric1D.cxx
// Module : SMESH
//
@@
-42,8
+42,8
@@
*/
//=============================================================================
*/
//=============================================================================
-StdMeshers_Geometric1D::StdMeshers_Geometric1D(int hypId,
int studyId,
SMESH_Gen * gen)
- :StdMeshers_Reversible1D(hypId,
studyId,
gen)
+StdMeshers_Geometric1D::StdMeshers_Geometric1D(int hypId, SMESH_Gen * gen)
+ :StdMeshers_Reversible1D(hypId, gen)
{
_begLength = 1.;
_ratio = 1.;
{
_begLength = 1.;
_ratio = 1.;
@@
-114,7
+114,7
@@
double StdMeshers_Geometric1D::GetCommonRatio() const
*/
//=============================================================================
*/
//=============================================================================
-
ostream & StdMeshers_Geometric1D::SaveTo(
ostream & save)
+
std::ostream & StdMeshers_Geometric1D::SaveTo(std::
ostream & save)
{
save << _begLength << " " << _ratio << " ";
{
save << _begLength << " " << _ratio << " ";
@@
-129,11
+129,11
@@
ostream & StdMeshers_Geometric1D::SaveTo(ostream & save)
*/
//=============================================================================
*/
//=============================================================================
-
istream & StdMeshers_Geometric1D::LoadFrom(
istream & load)
+
std::istream & StdMeshers_Geometric1D::LoadFrom(std::
istream & load)
{
bool isOK = true;
{
bool isOK = true;
- isOK = (load >> _begLength);
- isOK = (load >> _ratio);
+ isOK =
static_cast<bool>
(load >> _begLength);
+ isOK =
static_cast<bool>
(load >> _ratio);
if (isOK)
StdMeshers_Reversible1D::LoadFrom( load );
if (isOK)
StdMeshers_Reversible1D::LoadFrom( load );
@@
-166,7
+166,7
@@
bool StdMeshers_Geometric1D::SetParametersByMesh(const SMESH_Mesh* theMesh,
const TopoDS_Edge& edge = TopoDS::Edge( edgeMap( i ));
BRepAdaptor_Curve C( edge );
const TopoDS_Edge& edge = TopoDS::Edge( edgeMap( i ));
BRepAdaptor_Curve C( edge );
- vector< double > params;
+
std::
vector< double > params;
if ( SMESH_Algo::GetNodeParamOnEdge( theMesh->GetMeshDS(), edge, params ))
{
nbEdges++;
if ( SMESH_Algo::GetNodeParamOnEdge( theMesh->GetMeshDS(), edge, params ))
{
nbEdges++;