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
Copyright update 2021
[modules/smesh.git]
/
src
/
SMESHFiltersSelection
/
SMESH_NumberFilter.cxx
diff --git
a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
index ae06c0f10d8079eba81521ad13cb2674d78adc5b..1bfdd3eb5f11bced7d2c3078d430f5d7f544fe60 100644
(file)
--- a/
src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
+++ b/
src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-107,17
+107,14
@@
bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
return false;
// Get GEOM engine
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 ) )
+ GEOM::GEOM_Gen_var geomEngine = aGeomObj->GetGen();
+ if ( CORBA::is_nil( geomEngine ))
return false;
// Get shape from geom object and verify its parameters
GEOM_Client aGeomClient;
TopoDS_Shape aShape = aGeomClient.GetShape(geomEngine.in(), aGeomObj);
return false;
// Get shape from geom object and verify its parameters
GEOM_Client aGeomClient;
TopoDS_Shape aShape = aGeomClient.GetShape(geomEngine.in(), aGeomObj);
- if (aShape.IsNull() ||
- !myShapeTypes.Contains(aShape.ShapeType()))
+ if (aShape.IsNull() || !myShapeTypes.Contains(aShape.ShapeType()))
return false;
if (myIsClosedOnly && aShape.ShapeType() == TopAbs_SHELL && !aShape.Closed())
return false;
if (myIsClosedOnly && aShape.ShapeType() == TopAbs_SHELL && !aShape.Closed())
@@
-129,21
+126,16
@@
bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
if (aMainShape.IsNull())
return false;
if (aMainShape.IsNull())
return false;
- bool isFound = false;
- TopAbs_ShapeEnum aShapeType = aShape.ShapeType();
- TopExp_Explorer anExp (aMainShape, aShapeType);
- for (; anExp.More(); anExp.Next()) {
- if (anExp.Current() == aShape) {
- isFound = true;
+ TopExp_Explorer anExp (aMainShape, aShape.ShapeType());
+ for (; anExp.More(); anExp.Next())
+ if (anExp.Current() == aShape)
break;
break;
- }
- }
- if (!isFound)
+ if (!anExp.More())
return false;
}
// Verify number of sub-shapes
return false;
}
// Verify number of sub-shapes
- if (mySubShapeType == TopAbs_SHAPE)
;
+ if (mySubShapeType == TopAbs_SHAPE)
return true;
TopTools_IndexedMapOfShape aMap;
return true;
TopTools_IndexedMapOfShape aMap;