X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMFiltersSelection%2FGEOM_SelectionFilter.cxx;h=127251aef1223a0b4bb90ce1218924508d3512f1;hb=357991964c4929ef01edcf1d55eddd67f8512c29;hp=6e84554125febcf1c2d0c136cdbc3d31ad4b8785;hpb=a62a321c849518376e3aa4d24a0b902a24167c64;p=modules%2Fgeom.git

diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
index 6e8455412..127251aef 100644
--- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
@@ -1,22 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "GEOM_SelectionFilter.h"
 
 #include "GEOM_Client.hxx"
@@ -29,9 +32,6 @@
 
 #include <SUIT_Session.h>
 
-#include <SALOMEDSClient.hxx>
-
-
 //=======================================================================
 // function : GEOM_SelectionFilter
 // purpose  :
@@ -66,6 +66,19 @@ bool GEOM_SelectionFilter::isOk( const SUIT_DataOwner* sOwner ) const
     if ( getShape( obj, shape ) )
       return contains( shape.ShapeType() ) && isShapeOk( shape );
   }
+
+  // IMP 0020435: fine local selection
+  {
+    const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>(sOwner);
+    if (owner) {
+      QString entry = owner->entry();
+      int index = entry.lastIndexOf("_");
+      if (index > 0) {
+        return true;
+      }
+    }
+  }
+
   return false;
 }
 
@@ -73,7 +86,8 @@ bool GEOM_SelectionFilter::isOk( const SUIT_DataOwner* sOwner ) const
 // function : getObject
 // purpose  :
 //=======================================================================
-GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject( const SUIT_DataOwner* sOwner, const bool extractReference ) const
+GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject (const SUIT_DataOwner* sOwner,
+                                                       const bool extractReference) const
 {
   GEOM::GEOM_Object_var anObj;
 
@@ -84,7 +98,7 @@ GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject( const SUIT_DataOwner* sOw
     _PTR(Study) study = appStudy->studyDS();
     QString entry = owner->entry();
 
-    _PTR(SObject) aSO (study->FindObjectID(entry.latin1())), aRefSO;
+    _PTR(SObject) aSO (study->FindObjectID(entry.toStdString())), aRefSO;
     if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) )
       aSO = aRefSO;
 
@@ -118,17 +132,20 @@ bool GEOM_SelectionFilter::getShape (const GEOM::GEOM_Object_ptr& theObject,
     if ( app )
     {
       SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() );
-      Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" );
-      GEOM::GEOM_Gen_var geomGen = GEOM::GEOM_Gen::_narrow( comp );
+      static GEOM::GEOM_Gen_var geomGen;
+      if(CORBA::is_nil( geomGen )) {
+        Engines::EngineComponent_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" );
+        geomGen = GEOM::GEOM_Gen::_narrow( comp );
+      }
       if ( !CORBA::is_nil( geomGen ) )
       {
-	TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( geomGen, theObject );
+        TopoDS_Shape aTopoDSShape = GEOM_Client::get_client().GetShape( geomGen, theObject );
 
-	if ( !aTopoDSShape.IsNull() )
-	{
-	  theShape = aTopoDSShape;
-	  return true;
-	}
+        if ( !aTopoDSShape.IsNull() )
+        {
+          theShape = aTopoDSShape;
+          return true;
+        }
       }
     }
   }
@@ -161,7 +178,7 @@ void GEOM_SelectionFilter::add( const int type )
 void GEOM_SelectionFilter::remove( const int type )
 {
   if ( contains( type ) )
-    myTypes.remove( type );
+    myTypes.removeAll( type );
 }
 
 //=======================================================================