ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix linkage problem

Browse Source
This commit is contained in:
vsr 2013-09-12 07:29:50 +00:00
parent 29dba0dc2d
commit 1940817a98
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESHFiltersSelection/Makefile.am
View File

@ -61,6 +61,6 @@ libSMESHFiltersSelection_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \ ../../idl/libSalomeIDLSMESH.la \
$(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \ $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \
$(GUI_LDFLAGS) -lSalomeApp -lsuit -lLightApp \ $(GUI_LDFLAGS) -lSalomeApp -lsuit -lLightApp \
$(GEOM_LDFLAGS) -lGEOM -lGEOMClient \ $(GEOM_LDFLAGS) -lGEOMClient -lSalomeIDLGEOM \
$(CAS_LDPATH) -lTKernel -lTKMath -lTKBRep \ $(CAS_LDPATH) -lTKernel -lTKMath -lTKBRep \
$(QT_MT_LIBS) $(QT_MT_LIBS)

17
src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
View File

@ -25,12 +25,14 @@
// //
#include "SMESH_NumberFilter.hxx" #include "SMESH_NumberFilter.hxx"
#include <SALOME_LifeCycleCORBA.hxx>
#include "GEOM_Client.hxx" #include "GEOM_Client.hxx"
#include "GeometryGUI.h"
#include "SUIT_Application.h" #include "SUIT_Application.h"
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "SalomeApp_Study.h" #include "SalomeApp_Study.h"
#include "LightApp_DataOwner.h" #include "LightApp_DataOwner.h"
@ -104,11 +106,16 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
if (aGeomObj->_is_nil()) if (aGeomObj->_is_nil())
return false; return false;
// Get GEOM engine
Engines::EngineComponent_var comp =
SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "GEOM" );
GEOM::GEOM_Gen_var geomEngine = GEOM::GEOM_Gen::_narrow( comp );
if ( CORBA::is_nil( geomEngine ) )
return false;
// Get shape from geom object and verify its parameters // Get shape from geom object and verify its parameters
GEOM_Client aGeomClient; GEOM_Client aGeomClient;
if ( CORBA::is_nil( GeometryGUI::GetGeomGen() ) && !GeometryGUI::InitGeomGen() ) TopoDS_Shape aShape = aGeomClient.GetShape(geomEngine.in(), aGeomObj);
return false;
TopoDS_Shape aShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), aGeomObj);
if (aShape.IsNull() || if (aShape.IsNull() ||
!myShapeTypes.Contains(aShape.ShapeType())) !myShapeTypes.Contains(aShape.ShapeType()))
return false; return false;
@ -118,7 +125,7 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
// Verify whether shape of entry object is sub-shape of myMainObj // Verify whether shape of entry object is sub-shape of myMainObj
if (!myMainObj->_is_nil()) { if (!myMainObj->_is_nil()) {
TopoDS_Shape aMainShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), myMainObj); TopoDS_Shape aMainShape = aGeomClient.GetShape(geomEngine.in(), myMainObj);
if (aMainShape.IsNull()) if (aMainShape.IsNull())
return false; return false;