Using files from package LightApp instead of SalomeApp

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

diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
index acf7cb815df2119aba9ee34ffbe9c2a594285b18..f406022d264b4c852e47da78af1f6e5d218ae115 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
@@ -3,7 +3,7 @@
 #include <SUIT_Session.h>
 
 #include <SalomeApp_Study.h>
 #include <SUIT_Session.h>
 
 #include <SalomeApp_Study.h>

-#include <SalomeApp_DataOwner.h>
+#include <LightApp_DataOwner.h>

 
 SMESH_TypeFilter::SMESH_TypeFilter (MeshObjectType theType) 
 {
 
 SMESH_TypeFilter::SMESH_TypeFilter (MeshObjectType theType) 
 {


@@ -16,10 +16,10 @@ SMESH_TypeFilter::~SMESH_TypeFilter()
 
 bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
 {
 
 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);
+  const LightApp_DataOwner* owner =
+    dynamic_cast<const LightApp_DataOwner*>(theDataOwner);

   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>
     (SUIT_Session::session()->activeApplication()->activeStudy());
 
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>
     (SUIT_Session::session()->activeApplication()->activeStudy());
 


@@ -27,7 +27,9 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
     _PTR(Study) study = appStudy->studyDS();
     QString entry = owner->entry();
 
     _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();
     if (!obj) return false;
 
     _PTR(SObject) objFather = obj->GetFather();