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
Replaced NMTTools map with NCollection map for removing dependencies from GEOM module.
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Mesh.cxx
diff --git
a/src/SMESH/SMESH_Mesh.cxx
b/src/SMESH/SMESH_Mesh.cxx
index c473bd61291d1e30cf64bf204a9f8edeec377003..d4497448fd32b96f40963be8cfc1e179cf23d757 100644
(file)
--- a/
src/SMESH/SMESH_Mesh.cxx
+++ b/
src/SMESH/SMESH_Mesh.cxx
@@
-1080,11
+1080,10
@@
void SMESH_Mesh::RemoveGroup (const int theGroupID)
//=============================================================================
const SMESH_Hypothesis* SMESH_Mesh::IsLocal1DHypothesis (const TopoDS_Shape& theEdge)
{
//=============================================================================
const SMESH_Hypothesis* SMESH_Mesh::IsLocal1DHypothesis (const TopoDS_Shape& theEdge)
{
- SMESH_HypoFilter filter( SMESH_HypoFilter::HasDim( 1 ));
- filter.AndNot( SMESH_HypoFilter::IsAlgo() );
- filter.AndNot( SMESH_HypoFilter::IsGlobal( GetMeshDS()->ShapeToMesh() ));
+ SMESH_HypoFilter hypo ( SMESH_HypoFilter::HasDim( 1 ));
+ hypo.AndNot( hypo.IsAlgo() ).AndNot( hypo.IsAssignedTo( GetMeshDS()->ShapeToMesh() ));
- return GetHypothesis( theEdge,
filter
, true );
+ return GetHypothesis( theEdge,
hypo
, true );
}
//=============================================================================
}
//=============================================================================
@@
-1107,7
+1106,8
@@
bool SMESH_Mesh::IsPropagatedHypothesis (const TopoDS_Shape& theEdge,
{
int nbChains = _mapPropagationChains.Extent();
for (int i = 1; i <= nbChains; i++) {
{
int nbChains = _mapPropagationChains.Extent();
for (int i = 1; i <= nbChains; i++) {
- const TopTools_IndexedMapOfShape& aChain = _mapPropagationChains.FindFromIndex(i);
+ //const TopTools_IndexedMapOfShape& aChain = _mapPropagationChains.FindFromIndex(i);
+ const SMESH_IndexedMapOfShape& aChain = _mapPropagationChains.FindFromIndex(i);
if (aChain.Contains(theEdge)) {
theMainEdge = _mapPropagationChains.FindKey(i);
return true;
if (aChain.Contains(theEdge)) {
theMainEdge = _mapPropagationChains.FindKey(i);
return true;
@@
-1128,7
+1128,7
@@
bool SMESH_Mesh::IsReversedInChain (const TopoDS_Shape& theEdge,
if ( !theMainEdge.IsNull() && !theEdge.IsNull() &&
_mapPropagationChains.Contains( theMainEdge ))
{
if ( !theMainEdge.IsNull() && !theEdge.IsNull() &&
_mapPropagationChains.Contains( theMainEdge ))
{
- const
TopTools
_IndexedMapOfShape& aChain =
+ const
SMESH
_IndexedMapOfShape& aChain =
_mapPropagationChains.FindFromKey( theMainEdge );
int index = aChain.FindIndex( theEdge );
if ( index )
_mapPropagationChains.FindFromKey( theMainEdge );
int index = aChain.FindIndex( theEdge );
if ( index )
@@
-1144,7
+1144,7
@@
bool SMESH_Mesh::IsReversedInChain (const TopoDS_Shape& theEdge,
//=============================================================================
void SMESH_Mesh::CleanMeshOnPropagationChain (const TopoDS_Shape& theMainEdge)
{
//=============================================================================
void SMESH_Mesh::CleanMeshOnPropagationChain (const TopoDS_Shape& theMainEdge)
{
- const
TopTools
_IndexedMapOfShape& aChain = _mapPropagationChains.FindFromKey(theMainEdge);
+ const
SMESH
_IndexedMapOfShape& aChain = _mapPropagationChains.FindFromKey(theMainEdge);
int i, nbEdges = aChain.Extent();
for (i = 1; i <= nbEdges; i++) {
TopoDS_Shape anEdge = aChain.FindKey(i);
int i, nbEdges = aChain.Extent();
for (i = 1; i <= nbEdges; i++) {
TopoDS_Shape anEdge = aChain.FindKey(i);
@@
-1211,7
+1211,7
@@
bool SMESH_Mesh::RemovePropagationChain (const TopoDS_Shape& theMainEdge)
TopoDS_Vertex anEmptyShape;
BRep_Builder BB;
BB.MakeVertex(anEmptyShape, gp_Pnt(0,0,0), 0.1);
TopoDS_Vertex anEmptyShape;
BRep_Builder BB;
BB.MakeVertex(anEmptyShape, gp_Pnt(0,0,0), 0.1);
-
TopTools
_IndexedMapOfShape anEmptyMap;
+
SMESH
_IndexedMapOfShape anEmptyMap;
_mapPropagationChains.Substitute(i, anEmptyShape, anEmptyMap);
}
_mapPropagationChains.Substitute(i, anEmptyShape, anEmptyMap);
}
@@
-1229,7
+1229,7
@@
bool SMESH_Mesh::BuildPropagationChain (const TopoDS_Shape& theMainEdge)
// Add new chain, if there is no
if (!_mapPropagationChains.Contains(theMainEdge)) {
// Add new chain, if there is no
if (!_mapPropagationChains.Contains(theMainEdge)) {
-
TopTools
_IndexedMapOfShape aNewChain;
+
SMESH
_IndexedMapOfShape aNewChain;
_mapPropagationChains.Add(theMainEdge, aNewChain);
}
_mapPropagationChains.Add(theMainEdge, aNewChain);
}
@@
-1241,7
+1241,7
@@
bool SMESH_Mesh::BuildPropagationChain (const TopoDS_Shape& theMainEdge)
}
// Edges, on which the 1D hypothesis will be propagated from <theMainEdge>
}
// Edges, on which the 1D hypothesis will be propagated from <theMainEdge>
-
TopTools
_IndexedMapOfShape& aChain = _mapPropagationChains.ChangeFromKey(theMainEdge);
+
SMESH
_IndexedMapOfShape& aChain = _mapPropagationChains.ChangeFromKey(theMainEdge);
if (aChain.Extent() > 0) {
CleanMeshOnPropagationChain(theMainEdge);
aChain.Clear();
if (aChain.Extent() > 0) {
CleanMeshOnPropagationChain(theMainEdge);
aChain.Clear();
@@
-1426,4
+1426,4
@@
ostream& SMESH_Mesh::Dump(ostream& save)
SMDSAbs_ElementType SMESH_Mesh::GetElementType( const int id, const bool iselem )
{
return _myMeshDS->GetElementType( id, iselem );
SMDSAbs_ElementType SMESH_Mesh::GetElementType( const int id, const bool iselem )
{
return _myMeshDS->GetElementType( id, iselem );
-}
\ No newline at end of file
+}