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
Protection for the case of python command wrapped over several lines
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_NumberOfLayers.cxx
diff --git
a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
index d3e0b5277df28cda7d9bb1db6e5793a767477b23..289239c9c9708f60aed54e1a9452adfbedab17d1 100644
(file)
--- a/
src/StdMeshers/StdMeshers_NumberOfLayers.cxx
+++ b/
src/StdMeshers/StdMeshers_NumberOfLayers.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-42,9
+42,9
@@
using namespace std;
*/
//=============================================================================
*/
//=============================================================================
-StdMeshers_NumberOfLayers::StdMeshers_NumberOfLayers(int hypId,
int studyId,
+StdMeshers_NumberOfLayers::StdMeshers_NumberOfLayers(int hypId,
SMESH_Gen * gen)
SMESH_Gen * gen)
- : SMESH_Hypothesis(hypId,
studyId,
gen)
+ : SMESH_Hypothesis(hypId, gen)
{
_name = "NumberOfLayers"; // used by RadialPrism_3D
_param_algo_dim = 3; // 3D
{
_name = "NumberOfLayers"; // used by RadialPrism_3D
_param_algo_dim = 3; // 3D
@@
-61,7
+61,6
@@
StdMeshers_NumberOfLayers::StdMeshers_NumberOfLayers(int hypId, int studyId,
StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers()
{
StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers()
{
- MESSAGE( "StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers" );
}
//=============================================================================
}
//=============================================================================
@@
-77,7
+76,7
@@
void StdMeshers_NumberOfLayers::SetNumberOfLayers(int numberOfLayers)
{
if ( _nbLayers != numberOfLayers ) {
if ( numberOfLayers <= 0 )
{
if ( _nbLayers != numberOfLayers ) {
if ( numberOfLayers <= 0 )
- throw SALOME_Exception(LOCALIZED("numberOfLayers must be
positive
"));
+ throw SALOME_Exception(LOCALIZED("numberOfLayers must be
more than zero
"));
_nbLayers = numberOfLayers;
NotifySubMeshesHypothesisModification();
_nbLayers = numberOfLayers;
NotifySubMeshesHypothesisModification();
@@
-118,7
+117,7
@@
ostream & StdMeshers_NumberOfLayers::SaveTo(ostream & save)
istream & StdMeshers_NumberOfLayers::LoadFrom(istream & load)
{
bool isOK = true;
istream & StdMeshers_NumberOfLayers::LoadFrom(istream & load)
{
bool isOK = true;
- isOK = (load >> _nbLayers);
+ isOK =
static_cast<bool>
(load >> _nbLayers);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;