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 'hydro/imps_2015' into V7_dev
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Propagation.cxx
diff --git
a/src/StdMeshers/StdMeshers_Propagation.cxx
b/src/StdMeshers/StdMeshers_Propagation.cxx
index 49177ddf01621f02bd1e0cd67a4338614deafaaa..bf67b7a0a416096db3444d72a3695f698519d7e9 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Propagation.cxx
+++ b/
src/StdMeshers/StdMeshers_Propagation.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-226,6
+226,8
@@
namespace {
static SMESH_HypoFilter hypo;
hypo.Init( hypo.HasDim( 1 )).
AndNot ( hypo.IsAlgo() ).
static SMESH_HypoFilter hypo;
hypo.Init( hypo.HasDim( 1 )).
AndNot ( hypo.IsAlgo() ).
+ AndNot ( hypo.HasName( StdMeshers_Propagation::GetName() )).
+ AndNot ( hypo.HasName( StdMeshers_PropagOfDistribution::GetName() )).
AndNot ( hypo.IsAssignedTo( theSubMesh->GetFather()->GetShapeToMesh() ));
return theSubMesh->GetFather()->GetHypothesis( theSubMesh, hypo, true, theSssignedTo );
AndNot ( hypo.IsAssignedTo( theSubMesh->GetFather()->GetShapeToMesh() ));
return theSubMesh->GetFather()->GetHypothesis( theSubMesh, hypo, true, theSssignedTo );
@@
-302,7
+304,7
@@
namespace {
// Get ordered edges and find index of anE in a sequence
edges.clear();
BRepTools_WireExplorer aWE (TopoDS::Wire(itA.Value()));
// Get ordered edges and find index of anE in a sequence
edges.clear();
BRepTools_WireExplorer aWE (TopoDS::Wire(itA.Value()));
-
in
t edgeIndex = 0;
+
size_
t edgeIndex = 0;
for (; aWE.More(); aWE.Next()) {
TopoDS_Edge edge = aWE.Current();
edge.Orientation( aWE.Orientation() );
for (; aWE.More(); aWE.Next()) {
TopoDS_Edge edge = aWE.Current();
edge.Orientation( aWE.Orientation() );
@@
-323,8
+325,8
@@
namespace {
else {
// count nb sides
TopoDS_Edge prevEdge = anE;
else {
// count nb sides
TopoDS_Edge prevEdge = anE;
-
in
t nbSide = 0, eIndex = edgeIndex + 1;
- for (
in
t i = 0; i < edges.size(); ++i, ++eIndex )
+
size_
t nbSide = 0, eIndex = edgeIndex + 1;
+ for (
size_
t i = 0; i < edges.size(); ++i, ++eIndex )
{
if ( eIndex == edges.size() )
eIndex = 0;
{
if ( eIndex == edges.size() )
eIndex = 0;
@@
-631,7
+633,11
@@
namespace {
}
return;
}
}
return;
}
+ case MEANINGLESS_LAST: {
+ break;
+ }
} // switch by SubMeshState
} // switch by SubMeshState
- }
+
+ } // ProcessEvent()
} // namespace
} // namespace