+// 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
+// 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
+// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
#include "GEOM_SelectionFilter.h"
#include "GEOM_Client.hxx"
#include <SUIT_Session.h>
-#include <SALOMEDSClient.hxx>
-
-
//=======================================================================
// function : GEOM_SelectionFilter
// purpose :
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;
}
// 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;
_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;
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;
+ }
}
}
}
void GEOM_SelectionFilter::remove( const int type )
{
if ( contains( type ) )
- myTypes.remove( type );
+ myTypes.removeAll( type );
}
//=======================================================================