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

Merge branch 'master' into V7_5_BR

Browse Source
This commit is contained in:
vsr 2014-12-18 18:12:39 +03:00
commit 3d1e657101
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/GEOM_I/GEOM_Object_i.cc
View File

@ -364,15 +364,19 @@ bool GEOM_Object_i::IsShape()
return !_impl->GetValue().IsNull() && _impl->GetType() != GEOM_MARKER;
}
bool GEOM_Object_i::IsSame(GEOM::GEOM_Object_ptr other)
bool GEOM_Object_i::IsSame(GEOM::GEOM_BaseObject_ptr other)
{
TopoDS_Shape thisShape = _impl->GetValue();
TopoDS_Shape otherShape;
if ( !CORBA::is_nil( other ) ) {
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( other->GetStudyID(), other->GetEntry(), false ));
if ( !otherObject.IsNull() )
otherShape = otherObject->GetValue();
( 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 thisShape.IsSame( otherShape );
return result;
}

2
src/GEOM_I/GEOM_Object_i.hh
View File

@ -75,7 +75,7 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public
virtual GEOM::GEOM_Object_ptr GetMainShape();
virtual bool IsSame(GEOM::GEOM_Object_ptr other);
virtual bool IsSame(GEOM::GEOM_BaseObject_ptr other);
virtual bool IsShape();