PAL10332 - references are interpreted as original objects in filters, dialogs, etc.

[modules/smesh.git] / src / SMESHFiltersSelection / SMESH_TypeFilter.cxx

diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
index 5e98287df5541ea4724d70b505dc72a3e64c321d..b99f4d1d7d1798c9414ef20ae51f0ec130a13346 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
@@ -16,7 +16,7 @@ SMESH_TypeFilter::~SMESH_TypeFilter()
 
 bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
 {
-  bool Ok = false;
+  bool Ok = false, extractReference = true;
 
   const SalomeApp_DataOwner* owner =
     dynamic_cast<const SalomeApp_DataOwner*>(theDataOwner);
@@ -27,26 +27,34 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
     _PTR(Study) study = appStudy->studyDS();
     QString entry = owner->entry();
 
-    _PTR(SObject) obj (study->FindObjectID(entry.latin1()));
+    _PTR(SObject) obj (study->FindObjectID(entry.latin1())), aRefSO;
+    if( extractReference && obj && obj->ReferencedObject( aRefSO ) )
+      obj = aRefSO;
     if (!obj) return false;
 
     _PTR(SObject) objFather = obj->GetFather();
     _PTR(SComponent) objComponent = obj->GetFatherComponent();
 
+    if( objComponent->ComponentDataType()!="SMESH" )
+      return false;
+
     int aLevel = obj->Depth() - objComponent->Depth();
 
-    // Max level under the component is 4:
+    // Max level under the component is 5:
     //
     // 0    Mesh Component
     // 1    |- Hypotheses
     // 2    |  |- Regular 1D
     //      |- Algorithms
     //      |- Mesh 1
+    //         |- * Main Shape
     //         |- Applied Hypotheses
     //         |- Applied Algorithms
     //         |- Submeshes on Face
     // 3       |  |- SubmeshFace
+    // 4       |     |- * Face 1
     // 4       |     |- Applied algorithms ( selectable in Use Case Browser )
+    // 5       |          |- Regular 1D
     //         |- Group Of Nodes
 
     if (aLevel <= 0)
@@ -56,13 +64,21 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
       {
       case HYPOTHESIS:
        {
-         if ( aLevel == 2 && ( objFather->Tag() == 1 ))
+         if ( aLevel == 2 && ( objFather->Tag() == 1 )) // hypo definition
+           Ok = true;
+         else if ( aLevel == 3 && ( objFather->Tag() == 2 )) // applied global hypo
+           Ok = true;
+         else if ( aLevel == 5 && ( objFather->Tag() == 2 )) // applied local hypo
            Ok = true;
          break;
        }
       case ALGORITHM:
        {
-         if ( aLevel == 2 && ( objFather->Tag() == 2 ))
+         if ( aLevel == 2 && ( objFather->Tag() == 2 )) // algo definition
+           Ok = true;
+         else if ( aLevel == 3 && ( objFather->Tag() == 3 )) // applied global algo
+           Ok = true;
+         else if ( aLevel == 5 && ( objFather->Tag() == 3 )) // applied local algo
            Ok = true;
          break;
        }