ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-26 11:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid including of SALOMEDS classes

Browse Source
This commit is contained in:
jfa 2005-08-18 05:22:09 +00:00
parent e2e0cbee34
commit 4fbd5fabf5
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
View File

@ -10,13 +10,12 @@
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SALOMEDS_SObject.hxx> #include <SALOMEDSClient.hxx>
//======================================================================= //=======================================================================
// function : GEOM_SelectionFilter // function : GEOM_SelectionFilter
// purpose : // purpose :
//======================================================================= //=======================================================================
GEOM_SelectionFilter::GEOM_SelectionFilter( SalomeApp_Study* study, const bool theAll ) GEOM_SelectionFilter::GEOM_SelectionFilter( SalomeApp_Study* study, const bool theAll )
: SalomeApp_Filter(study) : SalomeApp_Filter(study)
@ -26,7 +25,7 @@ GEOM_SelectionFilter::GEOM_SelectionFilter( SalomeApp_Study* study, const bool t
//======================================================================= //=======================================================================
// function : ~GEOM_SelectionFilter // function : ~GEOM_SelectionFilter
// purpose : // purpose :
//======================================================================= //=======================================================================
GEOM_SelectionFilter::~GEOM_SelectionFilter() GEOM_SelectionFilter::~GEOM_SelectionFilter()
{ {
@ -34,7 +33,7 @@ GEOM_SelectionFilter::~GEOM_SelectionFilter()
//======================================================================= //=======================================================================
// function : isOk // function : isOk
// purpose : // purpose :
//======================================================================= //=======================================================================
bool GEOM_SelectionFilter::isOk( const SUIT_DataOwner* sOwner ) const bool GEOM_SelectionFilter::isOk( const SUIT_DataOwner* sOwner ) const
{ {
@ -53,48 +52,56 @@ bool GEOM_SelectionFilter::isOk( const SUIT_DataOwner* sOwner ) const
//======================================================================= //=======================================================================
// function : getObject // function : getObject
// purpose : // purpose :
//======================================================================= //=======================================================================
GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject( const SUIT_DataOwner* sOwner ) const GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject (const SUIT_DataOwner* sOwner) const
{ {
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*> ( sOwner ); const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*>(sOwner);
SalomeApp_Study* appStudy = getStudy(); SalomeApp_Study* appStudy = getStudy();
if ( owner && appStudy ) if (owner && appStudy)
{ {
_PTR(Study) study = appStudy->studyDS(); _PTR(Study) study = appStudy->studyDS();
QString entry = owner->entry(); QString entry = owner->entry();
_PTR(SObject) aSO( study->FindObjectID( entry.latin1() ) ); _PTR(SObject) aSO (study->FindObjectID(entry.latin1()));
if ( aSO ) if (aSO) {
anObj = GEOM::GEOM_Object::_narrow(dynamic_cast<SALOMEDS_SObject*>(aSO.get())->GetObject()); std::string aValue = aSO->GetIOR();
if (strcmp(aValue.c_str(), "") != 0) {
CORBA::ORB_ptr anORB = SalomeApp_Application::orb();
CORBA::Object_var aCorbaObj = anORB->string_to_object(aValue.c_str());
anObj = GEOM::GEOM_Object::_narrow(aCorbaObj);
}
}
} }
if ( !CORBA::is_nil( anObj ) ) if (!CORBA::is_nil(anObj))
return anObj._retn(); return anObj._retn();
return GEOM::GEOM_Object::_nil(); return GEOM::GEOM_Object::_nil();
} }
//======================================================================= //=======================================================================
// function : getShape // function : getShape
// purpose : // purpose :
//======================================================================= //=======================================================================
bool GEOM_SelectionFilter::getShape( const GEOM::GEOM_Object_ptr& theObject, TopoDS_Shape& theShape ) const bool GEOM_SelectionFilter::getShape (const GEOM::GEOM_Object_ptr& theObject,
TopoDS_Shape& theShape) const
{ {
if ( !CORBA::is_nil( theObject ) ) if ( !CORBA::is_nil( theObject ) )
{ {
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
( SUIT_Session::session()->activeApplication() );
if ( app ) if ( app )
{ {
SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() ); SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() );
Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" ); Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" );
GEOM::GEOM_Gen_var geomGen = GEOM::GEOM_Gen::_narrow( comp ); GEOM::GEOM_Gen_var geomGen = GEOM::GEOM_Gen::_narrow( comp );
if ( !CORBA::is_nil( geomGen ) ) if ( !CORBA::is_nil( geomGen ) )
{ {
TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( geomGen, theObject ); TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( geomGen, theObject );
if ( !aTopoDSShape.IsNull() ) if ( !aTopoDSShape.IsNull() )
{ {
theShape = aTopoDSShape; theShape = aTopoDSShape;
@ -108,7 +115,7 @@ bool GEOM_SelectionFilter::getShape( const GEOM::GEOM_Object_ptr& theObject, Top
//======================================================================= //=======================================================================
// function : contains // function : contains
// purpose : // purpose :
//======================================================================= //=======================================================================
bool GEOM_SelectionFilter::contains( const int type ) const bool GEOM_SelectionFilter::contains( const int type ) const
{ {
@ -117,7 +124,7 @@ bool GEOM_SelectionFilter::contains( const int type ) const
//======================================================================= //=======================================================================
// function : add // function : add
// purpose : // purpose :
//======================================================================= //=======================================================================
void GEOM_SelectionFilter::add( const int type ) void GEOM_SelectionFilter::add( const int type )
{ {
@ -127,7 +134,7 @@ void GEOM_SelectionFilter::add( const int type )
//======================================================================= //=======================================================================
// function : remove // function : remove
// purpose : // purpose :
//======================================================================= //=======================================================================
void GEOM_SelectionFilter::remove( const int type ) void GEOM_SelectionFilter::remove( const int type )
{ {
@ -137,7 +144,7 @@ void GEOM_SelectionFilter::remove( const int type )
//======================================================================= //=======================================================================
// function : setAll // function : setAll
// purpose : // purpose :
//======================================================================= //=======================================================================
void GEOM_SelectionFilter::setAll( const bool all ) void GEOM_SelectionFilter::setAll( const bool all )
{ {
@ -146,7 +153,7 @@ void GEOM_SelectionFilter::setAll( const bool all )
//======================================================================= //=======================================================================
// function : isAll // function : isAll
// purpose : // purpose :
//======================================================================= //=======================================================================
bool GEOM_SelectionFilter::isAll() const bool GEOM_SelectionFilter::isAll() const
{ {
@ -155,10 +162,9 @@ bool GEOM_SelectionFilter::isAll() const
//======================================================================= //=======================================================================
// function : isShapeOk // function : isShapeOk
// purpose : // purpose :
//======================================================================= //=======================================================================
bool GEOM_SelectionFilter::isShapeOk( const TopoDS_Shape& ) const bool GEOM_SelectionFilter::isShapeOk( const TopoDS_Shape& ) const
{ {
return true; return true;
} }

7
src/GEOMFiltersSelection/Makefile.in
View File

@ -36,7 +36,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
# Libraries targets # Libraries targets
LIB = libGEOMFiltersSelection.la LIB = libGEOMFiltersSelection.la
LIB_SRC = GEOM_SelectionFilter.cxx \ LIB_SRC = GEOM_SelectionFilter.cxx \
GEOM_EdgeFilter.cxx \ GEOM_EdgeFilter.cxx \
GEOM_FaceFilter.cxx \ GEOM_FaceFilter.cxx \
@ -45,7 +45,7 @@ LIB_SRC = GEOM_SelectionFilter.cxx \
GEOM_LogicalFilter.cxx \ GEOM_LogicalFilter.cxx \
GEOM_OCCFilter.cxx GEOM_OCCFilter.cxx
# header files # header files
EXPORT_HEADERS= GEOM_SelectionFilter.h \ EXPORT_HEADERS= GEOM_SelectionFilter.h \
GEOM_EdgeFilter.h \ GEOM_EdgeFilter.h \
GEOM_FaceFilter.h \ GEOM_FaceFilter.h \
@ -60,7 +60,7 @@ LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome
CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome
LDFLAGS += -L$(GUI_ROOT_DIR)/lib/salome -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit -lSalomeApp -lSalomeDS LDFLAGS += -L$(GUI_ROOT_DIR)/lib/salome -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit -lSalomeApp
# additional file to be cleaned # additional file to be cleaned
MOSTLYCLEAN = MOSTLYCLEAN =
@ -68,4 +68,3 @@ CLEAN =
DISTCLEAN = DISTCLEAN =
@CONCLUDE@ @CONCLUDE@