-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 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
// 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
//
#include "SMESH_NumberFilter.hxx"
+#include <SALOME_LifeCycleCORBA.hxx>
+
#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"
if (aGeomObj->_is_nil())
return false;
+ // Get GEOM engine
+ 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;
- if ( CORBA::is_nil( GeometryGUI::GetGeomGen() ) && !GeometryGUI::InitGeomGen() )
- return false;
- TopoDS_Shape aShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), aGeomObj);
- if (aShape.IsNull() ||
- !myShapeTypes.Contains(aShape.ShapeType()))
+ TopoDS_Shape aShape = aGeomClient.GetShape(geomEngine.in(), aGeomObj);
+ if (aShape.IsNull() || !myShapeTypes.Contains(aShape.ShapeType()))
return false;
if (myIsClosedOnly && aShape.ShapeType() == TopAbs_SHELL && !aShape.Closed())
// 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;
- 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;
- }
- }
- if (!isFound)
+ if (!anExp.More())
return false;
}
// Verify number of sub-shapes
- if (mySubShapeType == TopAbs_SHAPE);
+ if (mySubShapeType == TopAbs_SHAPE)
return true;
TopTools_IndexedMapOfShape aMap;
_PTR(Study) study = appStudy->studyDS();
QString entry = owner->entry();
- _PTR(SObject) aSO( study->FindObjectID( entry.toLatin1().data() ) ), aRefSO;
+ _PTR(SObject) aSO( study->FindObjectID( entry.toUtf8().data() ) ), aRefSO;
if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) )
aSO = aRefSO;