ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 10:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022832: EDF GEOM: Bug with curve construction

Browse Source 
Additional commit: fix memory leak plus small redesign
This commit is contained in:
vsr 2014-12-18 18:11:55 +03:00
parent 8170166255
commit 3af8489874
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/GEOM_I/GEOM_Object_i.cc
View File

@ -366,14 +366,17 @@ bool GEOM_Object_i::IsShape()
bool GEOM_Object_i::IsSame(GEOM::GEOM_BaseObject_ptr other)
{
GEOM::GEOM_Object_ptr shapePtr = GEOM::GEOM_Object::_narrow( other );
if ( CORBA::is_nil( shapePtr ) )
return false;
TopoDS_Shape thisShape = _impl->GetValue();
TopoDS_Shape otherShape;
Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast
( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), shapePtr->GetEntry(), false ));
if ( !otherObject.IsNull() )
otherShape = otherObject->GetValue();
return thisShape.IsSame( otherShape );
bool result = false;
GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other );
if ( !CORBA::is_nil( shapePtr ) ) {
Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast
( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), shapePtr->GetEntry(), false ));
if ( !otherObject.IsNull() ) {
TopoDS_Shape thisShape = _impl->GetValue();
TopoDS_Shape otherShape = otherObject->GetValue();
result = !thisShape.IsNull() && !otherShape.IsNull() && thisShape.IsSame( otherShape );
}
}
return result;
}