From 1940817a984dd7d440ab8066fa4b89c855c8505d Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 12 Sep 2013 07:29:50 +0000 Subject: [PATCH] Fix linkage problem --- src/SMESHFiltersSelection/Makefile.am | 2 +- .../SMESH_NumberFilter.cxx | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/SMESHFiltersSelection/Makefile.am b/src/SMESHFiltersSelection/Makefile.am index 0b465b89a..bad3fccdc 100644 --- a/src/SMESHFiltersSelection/Makefile.am +++ b/src/SMESHFiltersSelection/Makefile.am @@ -61,6 +61,6 @@ libSMESHFiltersSelection_la_LDFLAGS = \ ../../idl/libSalomeIDLSMESH.la \ $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \ $(GUI_LDFLAGS) -lSalomeApp -lsuit -lLightApp \ - $(GEOM_LDFLAGS) -lGEOM -lGEOMClient \ + $(GEOM_LDFLAGS) -lGEOMClient -lSalomeIDLGEOM \ $(CAS_LDPATH) -lTKernel -lTKMath -lTKBRep \ $(QT_MT_LIBS) diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx index 13fda6a0a..0e66f83d4 100644 --- a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx @@ -25,12 +25,14 @@ // #include "SMESH_NumberFilter.hxx" +#include + #include "GEOM_Client.hxx" -#include "GeometryGUI.h" #include "SUIT_Application.h" #include "SUIT_Session.h" +#include "SalomeApp_Application.h" #include "SalomeApp_Study.h" #include "LightApp_DataOwner.h" @@ -104,11 +106,16 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const if (aGeomObj->_is_nil()) 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 GEOM_Client aGeomClient; - if ( CORBA::is_nil( GeometryGUI::GetGeomGen() ) && !GeometryGUI::InitGeomGen() ) - return false; - TopoDS_Shape aShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), aGeomObj); + TopoDS_Shape aShape = aGeomClient.GetShape(geomEngine.in(), aGeomObj); if (aShape.IsNull() || !myShapeTypes.Contains(aShape.ShapeType())) 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 if (!myMainObj->_is_nil()) { - TopoDS_Shape aMainShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), myMainObj); + TopoDS_Shape aMainShape = aGeomClient.GetShape(geomEngine.in(), myMainObj); if (aMainShape.IsNull()) return false; -- 2.30.2