X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHFiltersSelection%2FSMESH_TypeFilter.cxx;h=9f17ae1b4e0f5d40ff6a9821af3ef69f10d2380b;hb=refs%2Ftags%2FOCC-V2_1_0c;hp=3a14178e53c688edff7154bab06f937e2be8034f;hpb=8b4ba0cdff7660465a9ea7b26ef0df0757afed97;p=modules%2Fsmesh.git

diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
index 3a14178e5..9f17ae1b4 100644
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
@@ -1,4 +1,3 @@
-using namespace std;
 //  File      : SMESH_TypeFilter.cxx
 //  Created   : Fri Dec 07 09:57:24 2001
 //  Author    : Nicolas REJNERI
@@ -17,6 +16,7 @@ using namespace std;
 #include "QAD_Desktop.h"
 #include "QAD_Study.h"
 
+using namespace std;
 
 SMESH_TypeFilter::SMESH_TypeFilter(MeshObjectType aType) 
 {
@@ -25,115 +25,111 @@ SMESH_TypeFilter::SMESH_TypeFilter(MeshObjectType aType)
 
 Standard_Boolean SMESH_TypeFilter::IsOk(const Handle(SALOME_InteractiveObject)& anObj) const 
 {
-  Handle(SALOME_TypeFilter) meshFilter = new SALOME_TypeFilter( "MESH" );
+  Handle(SALOME_TypeFilter) meshFilter = new SALOME_TypeFilter( "SMESH" );
   if ( !meshFilter->IsOk(anObj) ) 
     return false;
 
+  bool Ok = false;
+
   if ( anObj->hasEntry() ) {
     QAD_Study* ActiveStudy = QAD_Application::getDesktop()->getActiveStudy();
     SALOMEDS::Study_var aStudy = ActiveStudy->getStudyDocument();
     SALOMEDS::SObject_var obj = aStudy->FindObjectID( anObj->getEntry() );
 
-    bool Ok = false;
+    SALOMEDS::SObject_var objFather = obj->GetFather();
+    SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
+    
+    int aLevel = obj->Depth() - objComponent->Depth();
+
+    // Max level under the component is 4:
+    //
+    // 0    Mesh Component
+    // 1    |- Hypotheses
+    // 2    |  |- Regular 1D
+    //      |- Algorithms
+    //      |- Mesh 1
+    //         |- Applied Hypotheses
+    //         |- Applied Algorithms
+    //         |- Submeshes on Face
+    // 3       |  |- SubmeshFace
+    // 4       |     |- Applied algorithms ( selectable in Use Case Browser )
+    //         |- Group Of Nodes
+
+    if ( aLevel <= 0 )
+      return false;
 
     switch ( myKind )
       {
       case HYPOTHESIS:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  if (( objFather->Tag() == 1 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
+	  if ( aLevel == 2 && ( objFather->Tag() == 1 ))
 	    Ok = true;
 	  break;
 	}
       case ALGORITHM:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  if (( objFather->Tag() == 2 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
+	  if ( aLevel == 2 && ( objFather->Tag() == 2 ))
 	    Ok = true;
 	  break;
 	}
       case MESH:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( obj->Tag() >= 3 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) == 0 ) )
+	  if ( aLevel == 1 && ( obj->Tag() >= 3 ))
 	    Ok = true;
 	  break;
 	}
       case SUBMESH:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( objFather->Tag() >= 4 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
+	  // see SMESH_Gen_i.cxx for tag numbers
+	  if ( aLevel == 3 && ( objFather->Tag() >= 4 && objFather->Tag() <= 10 ))
 	    Ok = true;
 	  break;
 	}
       case MESHorSUBMESH:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( obj->Tag() >= 3 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) == 0 ) )
-	    Ok = true;
-
-	   if (( objFather->Tag() >= 4 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
+	  if ( aLevel == 1 && ( obj->Tag() >= 3 ))
+	    Ok = true; // mesh
+          else if ( aLevel == 3 && ( objFather->Tag() >= 4 && objFather->Tag() <= 10 ))
 	    Ok = true;
-
 	  break;
 	}
-      case SUBMESH_VERTEX:
+      case SUBMESH_VERTEX:  // Label "SubMeshes on vertexes"
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( obj->Tag() == 4 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
+	  if ( aLevel == 3 && ( objFather->Tag() == 4 ))
 	    Ok = true;
 	  break;
 	}
       case SUBMESH_EDGE:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( obj->Tag() == 5 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
+	  if ( aLevel == 3 && ( objFather->Tag() == 5 ))
 	    Ok = true;
 	  break;
 	}
       case SUBMESH_FACE:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( obj->Tag() == 6 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
+	  if ( aLevel == 3 && ( objFather->Tag() == 7 ))
 	    Ok = true;
 	  break;
 	}
       case SUBMESH_SOLID:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( obj->Tag() == 7 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
+	  if ( aLevel == 3 && ( objFather->Tag() == 9 ))
 	    Ok = true;
 	  break;
 	}
       case SUBMESH_COMPOUND:
 	{
-	  SALOMEDS::SObject_var objFather = obj->GetFather();
-	  SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-	  
-	  if (( obj->Tag() == 8 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
+	  if ( aLevel == 3 && ( objFather->Tag() == 10 ))
+	    Ok = true;
+	  break;
+	}
+      case GROUP:
+	{
+	  if ( aLevel == 3 && ( objFather->Tag() > 10 ))
 	    Ok = true;
 	  break;
 	}
       }
-
-    if ( Ok )
-      return true;
   }
-  return false;
+  return Ok;
 }