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
/
SMESHGUI
/
SMESHGUI_Selection.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Selection.cxx
b/src/SMESHGUI/SMESHGUI_Selection.cxx
index 8fff50e3ca6bd80df6765f8e38f7f5c948130ee1..efa3c236148fb3fdd621d82b67d9f9039fd4e99b 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Selection.cxx
@@
-551,7
+551,7
@@
int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
return -1;
if( objComponent->GetIOR()==obj->GetIOR() )
return -1;
if( objComponent->GetIOR()==obj->GetIOR() )
- return COMPONENT;
+ return
SMESH::
COMPONENT;
int aLevel = obj->Depth() - objComponent->Depth(),
aFTag = objFather->Tag(),
int aLevel = obj->Depth() - objComponent->Depth(),
aFTag = objFather->Tag(),
@@
-562,16
+562,16
@@
int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
{
case 1:
if (anOTag >= SMESH::Tag_FirstMeshRoot)
{
case 1:
if (anOTag >= SMESH::Tag_FirstMeshRoot)
- res = MESH;
+ res =
SMESH::
MESH;
break;
case 2:
switch (aFTag)
{
case SMESH::Tag_HypothesisRoot:
break;
case 2:
switch (aFTag)
{
case SMESH::Tag_HypothesisRoot:
- res = HYPOTHESIS;
+ res =
SMESH::
HYPOTHESIS;
break;
case SMESH::Tag_AlgorithmsRoot:
break;
case SMESH::Tag_AlgorithmsRoot:
- res = ALGORITHM;
+ res =
SMESH::
ALGORITHM;
break;
}
break;
break;
}
break;
@@
-579,25
+579,25
@@
int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
switch (aFTag)
{
case SMESH::Tag_SubMeshOnVertex:
switch (aFTag)
{
case SMESH::Tag_SubMeshOnVertex:
- res = SUBMESH_VERTEX;
+ res = S
MESH::S
UBMESH_VERTEX;
break;
case SMESH::Tag_SubMeshOnEdge:
break;
case SMESH::Tag_SubMeshOnEdge:
- res = SUBMESH_EDGE;
+ res = S
MESH::S
UBMESH_EDGE;
break;
case SMESH::Tag_SubMeshOnFace:
break;
case SMESH::Tag_SubMeshOnFace:
- res = SUBMESH_FACE;
+ res = S
MESH::S
UBMESH_FACE;
break;
case SMESH::Tag_SubMeshOnSolid:
break;
case SMESH::Tag_SubMeshOnSolid:
- res = SUBMESH_SOLID;
+ res = S
MESH::S
UBMESH_SOLID;
break;
case SMESH::Tag_SubMeshOnCompound:
break;
case SMESH::Tag_SubMeshOnCompound:
- res = SUBMESH_COMPOUND;
+ res = S
MESH::S
UBMESH_COMPOUND;
break;
default:
if (aFTag >= SMESH::Tag_FirstGroup)
break;
default:
if (aFTag >= SMESH::Tag_FirstGroup)
- res = GROUP;
+ res =
SMESH::
GROUP;
else
else
- res = SUBMESH;
+ res = S
MESH::S
UBMESH;
}
break;
}
}
break;
}
@@
-614,29
+614,29
@@
QString SMESHGUI_Selection::typeName( const int t )
{
switch( t )
{
{
switch( t )
{
- case HYPOTHESIS:
+ case
SMESH::
HYPOTHESIS:
return "Hypothesis";
return "Hypothesis";
- case ALGORITHM:
+ case
SMESH::
ALGORITHM:
return "Algorithm";
return "Algorithm";
- case MESH:
+ case
SMESH::
MESH:
return "Mesh";
return "Mesh";
- case SUBMESH:
+ case S
MESH::S
UBMESH:
return "SubMesh";
return "SubMesh";
- case MESHorSUBMESH:
+ case
SMESH::
MESHorSUBMESH:
return "Mesh or submesh";
return "Mesh or submesh";
- case SUBMESH_VERTEX:
+ case S
MESH::S
UBMESH_VERTEX:
return "Mesh vertex";
return "Mesh vertex";
- case SUBMESH_EDGE:
+ case S
MESH::S
UBMESH_EDGE:
return "Mesh edge";
return "Mesh edge";
- case SUBMESH_FACE:
+ case S
MESH::S
UBMESH_FACE:
return "Mesh face";
return "Mesh face";
- case SUBMESH_SOLID:
+ case S
MESH::S
UBMESH_SOLID:
return "Mesh solid";
return "Mesh solid";
- case SUBMESH_COMPOUND:
+ case S
MESH::S
UBMESH_COMPOUND:
return "Mesh compound";
return "Mesh compound";
- case GROUP:
+ case
SMESH::
GROUP:
return "Group";
return "Group";
- case COMPONENT:
+ case
SMESH::
COMPONENT:
return "Component";
default:
return "Unknown";
return "Component";
default:
return "Unknown";