Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ZCRACKS: Small modifications in the doc
[modules/smesh.git]
/
src
/
SMESHFiltersSelection
/
SMESH_NumberFilter.cxx
diff --git
a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
index 13fda6a0a1cb169d7cd60231c35b46448ef0d0e7..9cbe280aedc73e220a27c46a0c2d8bbaafb6a7c8 100644
(file)
--- a/
src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
+++ b/
src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-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_Session.h"
#include "SUIT_Application.h"
#include "SUIT_Session.h"
+#include "SalomeApp_Application.h"
#include "SalomeApp_Study.h"
#include "LightApp_DataOwner.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;
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;
// 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;
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()) {
// Verify whether shape of entry object is sub-shape of myMainObj
if (!myMainObj->_is_nil()) {
- TopoDS_Shape aMainShape = aGeomClient.GetShape(
GeometryGUI::GetGeomGe
n(), myMainObj);
+ TopoDS_Shape aMainShape = aGeomClient.GetShape(
geomEngine.i
n(), myMainObj);
if (aMainShape.IsNull())
return false;
if (aMainShape.IsNull())
return false;