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 from V6_main 13/12/2012
[modules/smesh.git]
/
src
/
SMESHFiltersSelection
/
SMESH_TypeFilter.cxx
diff --git
a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
index e9b83166c25add1125c1dc2b2298a27f95208d5d..9df3ed861ebc83c2ecb3bda035f79302d1c7308f 100644
(file)
--- a/
src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
+++ b/
src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
@@
-30,7
+30,7
@@
#include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SMESH_Gen)
#include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SMESH_Gen)
-SMESH_TypeFilter::SMESH_TypeFilter (MeshObjectType theType)
+SMESH_TypeFilter::SMESH_TypeFilter (
SMESH::
MeshObjectType theType)
{
myType = theType;
}
{
myType = theType;
}
@@
-88,7
+88,7
@@
bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
switch (myType)
{
switch (myType)
{
- case HYPOTHESIS:
+ case
SMESH::
HYPOTHESIS:
{
if (aLevel == 2 && (objFather->Tag() == SMESH::Tag_HypothesisRoot))
// hypo definition
{
if (aLevel == 2 && (objFather->Tag() == SMESH::Tag_HypothesisRoot))
// hypo definition
@@
-101,7
+101,7
@@
bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
Ok = true;
break;
}
Ok = true;
break;
}
- case ALGORITHM:
+ case
SMESH::
ALGORITHM:
{
if (aLevel == 2 && (objFather->Tag() == SMESH::Tag_AlgorithmsRoot))
// algo definition
{
if (aLevel == 2 && (objFather->Tag() == SMESH::Tag_AlgorithmsRoot))
// algo definition
@@
-114,13
+114,13
@@
bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
Ok = true;
break;
}
Ok = true;
break;
}
- case MESH:
+ case
SMESH::
MESH:
{
if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
Ok = true;
break;
}
{
if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
Ok = true;
break;
}
- case SUBMESH:
+ case S
MESH::S
UBMESH:
{
// see SMESH_Gen_i.cxx for tag numbers
if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstSubMesh &&
{
// see SMESH_Gen_i.cxx for tag numbers
if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstSubMesh &&
@@
-128,7
+128,7
@@
bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
Ok = true;
break;
}
Ok = true;
break;
}
- case MESHorSUBMESH:
+ case
SMESH::
MESHorSUBMESH:
{
if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
Ok = true; // mesh
{
if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
Ok = true; // mesh
@@
-137,82
+137,82
@@
bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
Ok = true;
break;
}
Ok = true;
break;
}
- case SUBMESH_VERTEX: // Label "SubMeshes on vertexes"
+ case S
MESH::S
UBMESH_VERTEX: // Label "SubMeshes on vertexes"
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnVertex))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnVertex))
Ok = true;
break;
}
- case SUBMESH_EDGE:
+ case S
MESH::S
UBMESH_EDGE:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnEdge))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnEdge))
Ok = true;
break;
}
- case SUBMESH_FACE:
+ case S
MESH::S
UBMESH_FACE:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnFace))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnFace))
Ok = true;
break;
}
- case SUBMESH_SOLID:
+ case S
MESH::S
UBMESH_SOLID:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnSolid))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnSolid))
Ok = true;
break;
}
- case SUBMESH_COMPOUND:
+ case S
MESH::S
UBMESH_COMPOUND:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnCompound))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnCompound))
Ok = true;
break;
}
- case GROUP:
+ case
SMESH::
GROUP:
{
if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstGroup))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstGroup))
Ok = true;
break;
}
- case GROUP_NODE:
+ case
SMESH::
GROUP_NODE:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_NodeGroups))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_NodeGroups))
Ok = true;
break;
}
- case GROUP_EDGE:
+ case
SMESH::
GROUP_EDGE:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_EdgeGroups))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_EdgeGroups))
Ok = true;
break;
}
- case GROUP_FACE:
+ case
SMESH::
GROUP_FACE:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_FaceGroups))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_FaceGroups))
Ok = true;
break;
}
- case GROUP_VOLUME:
+ case
SMESH::
GROUP_VOLUME:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_VolumeGroups))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_VolumeGroups))
Ok = true;
break;
}
- case GROUP_0D:
+ case
SMESH::
GROUP_0D:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_0DElementsGroups))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_0DElementsGroups))
Ok = true;
break;
}
- case GROUP_BALL:
+ case
SMESH::
GROUP_BALL:
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_BallElementsGroups))
Ok = true;
break;
}
{
if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_BallElementsGroups))
Ok = true;
break;
}
- case IDSOURCE:
+ case
SMESH::
IDSOURCE:
{
{
- Ok = ( SMESH_TypeFilter(MESHorSUBMESH).isOk( theDataOwner ) ||
- SMESH_TypeFilter(GROUP) .isOk( theDataOwner ));
+ Ok = ( SMESH_TypeFilter(
SMESH::
MESHorSUBMESH).isOk( theDataOwner ) ||
+ SMESH_TypeFilter(
SMESH::
GROUP) .isOk( theDataOwner ));
break;
}
}
break;
}
}
@@
-220,7
+220,7
@@
bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
return Ok;
}
return Ok;
}
-MeshObjectType SMESH_TypeFilter::type() const
+
SMESH::
MeshObjectType SMESH_TypeFilter::type() const
{
return myType;
}
{
return myType;
}