Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8302fc4
)
eliminate compilation warning
author
eap
<eap@opencascade.com>
Wed, 20 May 2009 15:45:16 +0000
(15:45 +0000)
committer
eap
<eap@opencascade.com>
Wed, 20 May 2009 15:45:16 +0000
(15:45 +0000)
src/StdMeshers/StdMeshers_FaceSide.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_MaxElementArea.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_NumberOfLayers.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
patch
|
blob
|
history
diff --git
a/src/StdMeshers/StdMeshers_FaceSide.cxx
b/src/StdMeshers/StdMeshers_FaceSide.cxx
index f7af6c560d85f070d4035279eda92605958b7d75..13cc6b7897d2c0949db837d8a36db32be1c7cf71 100644
(file)
--- a/
src/StdMeshers/StdMeshers_FaceSide.cxx
+++ b/
src/StdMeshers/StdMeshers_FaceSide.cxx
@@
-33,7
+33,7
@@
#include "SMESHDS_SubMesh.hxx"
//#include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESHDS_SubMesh.hxx"
//#include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx"
-#include "SMESH_Mesh
Edito
r.hxx"
+#include "SMESH_Mesh
erHelpe
r.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_Block.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_Block.hxx"
diff --git
a/src/StdMeshers/StdMeshers_MaxElementArea.cxx
b/src/StdMeshers/StdMeshers_MaxElementArea.cxx
index f91be37a688d93f2ea341a62c549307dfd90792d..495905f915463c4286ab3e4142fc201f91043f95 100644
(file)
--- a/
src/StdMeshers/StdMeshers_MaxElementArea.cxx
+++ b/
src/StdMeshers/StdMeshers_MaxElementArea.cxx
@@
-24,8
+24,8
@@
// Moved here from SMESH_MaxElementArea.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// Moved here from SMESH_MaxElementArea.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
-// $Header$
//
//
+
#include "StdMeshers_MaxElementArea.hxx"
#include "SMESH_ControlsDef.hxx"
#include "StdMeshers_MaxElementArea.hxx"
#include "SMESH_ControlsDef.hxx"
diff --git
a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
index fc8ff074222453dc64dd80b0d5444544218c6f4b..a064eb21b329381d76f38ee71cbb5ed6aa0d7b6d 100644
(file)
--- a/
src/StdMeshers/StdMeshers_NumberOfLayers.cxx
+++ b/
src/StdMeshers/StdMeshers_NumberOfLayers.cxx
@@
-23,11
+23,11
@@
// File : StdMeshers_NumberOfLayers.cxx
// Author : Edward AGAPOV
// Module : SMESH
// File : StdMeshers_NumberOfLayers.cxx
// Author : Edward AGAPOV
// Module : SMESH
-// $Header$
//
#include "StdMeshers_NumberOfLayers.hxx"
//
#include "StdMeshers_NumberOfLayers.hxx"
+#include "SMESH_Mesh.hxx"
#include "utilities.h"
using namespace std;
#include "utilities.h"
using namespace std;
diff --git
a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
index 4c153a7a8e63fd74062825f1f8d43ab51bae6757..37fc8f88d40edb7b9cfee048d22095f5bf038913 100644
(file)
--- a/
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
+++ b/
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
@@
-24,7
+24,6
@@
// Moved here from SMESH_NumberOfSegments.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// Moved here from SMESH_NumberOfSegments.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
-// $Header$
//
#include "StdMeshers_NumberOfSegments.hxx"
//
#include "StdMeshers_NumberOfSegments.hxx"
@@
-64,7
+63,7
@@
StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId,
int studyId,
SMESH_Gen * gen)
: SMESH_Hypothesis(hypId, studyId, gen),
int studyId,
SMESH_Gen * gen)
: SMESH_Hypothesis(hypId, studyId, gen),
- _numberOfSegments(1
),
+ _numberOfSegments(1
5),//issue 19923
_distrType(DT_Regular),
_scaleFactor(1.),
_convMode(1) //cut negative by default
_distrType(DT_Regular),
_scaleFactor(1.),
_convMode(1) //cut negative by default
@@
-679,5
+678,7
@@
bool StdMeshers_NumberOfSegments::SetParametersByMesh(const SMESH_Mesh* theMes
if ( nbEdges )
_numberOfSegments /= nbEdges;
if ( nbEdges )
_numberOfSegments /= nbEdges;
+ if (_numberOfSegments == 0) _numberOfSegments = 1;
+
return nbEdges;
}
return nbEdges;
}