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
#16459 EDF 14133 - Complete Merge Nodes / Merge Elements operations
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_MaxLength.cxx
diff --git
a/src/StdMeshers/StdMeshers_MaxLength.cxx
b/src/StdMeshers/StdMeshers_MaxLength.cxx
index 9597001f505b75a707b2e940d6a72c7e2dcb925f..1051fce5a1ed6c43e8cc8c52b672b76155b3cf9f 100644
(file)
--- a/
src/StdMeshers/StdMeshers_MaxLength.cxx
+++ b/
src/StdMeshers/StdMeshers_MaxLength.cxx
@@
-1,9
+1,9
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// 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
@@
-17,7
+17,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_MaxLength.cxx
// Module : SMESH
//
// File : StdMeshers_MaxLength.cxx
// Module : SMESH
//
@@
-47,8
+47,8
@@
using namespace std;
*/
//=============================================================================
*/
//=============================================================================
-StdMeshers_MaxLength::StdMeshers_MaxLength(int hypId,
int studyId,
SMESH_Gen * gen)
- :SMESH_Hypothesis(hypId,
studyId,
gen)
+StdMeshers_MaxLength::StdMeshers_MaxLength(int hypId, SMESH_Gen * gen)
+ :SMESH_Hypothesis(hypId, gen)
{
_length = 1.;
_preestimated = 0.;
{
_length = 1.;
_preestimated = 0.;
@@
-158,20
+158,20
@@
istream & StdMeshers_MaxLength::LoadFrom(istream & load)
bool isOK = true;
double a;
bool isOK = true;
double a;
- isOK = (load >> a);
+ isOK =
static_cast<bool>
(load >> a);
if (isOK)
_length = a;
else
load.clear(ios::badbit | load.rdstate());
if (isOK)
_length = a;
else
load.clear(ios::badbit | load.rdstate());
- isOK = (load >> a);
+ isOK =
static_cast<bool>
(load >> a);
if (isOK)
_preestimated = a;
else
load.clear(ios::badbit | load.rdstate());
bool pre;
if (isOK)
_preestimated = a;
else
load.clear(ios::badbit | load.rdstate());
bool pre;
- isOK = (load >> pre);
+ isOK =
static_cast<bool>
(load >> pre);
if ( isOK )
_preestimation = pre;
else
if ( isOK )
_preestimation = pre;
else
@@
-213,7
+213,7
@@
bool StdMeshers_MaxLength::SetParametersByMesh(const SMESH_Mesh* theMesh,
SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS();
if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, 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;
}