bos #29468: Advanced geometry features: distance Edge-Edge & Face-Face

[modules/geom.git] / src / GEOM_I / GEOM_Object_i.cc

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 920aa557ad979f7078849e407354923fb4c01913..2845379c1978992a416c8ffb51bd838cbf1ed4e6 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  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
@@ -61,7 +61,7 @@
 //=============================================================================
 
 GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
-                             Handle(GEOM_Object) theImpl) :
+                             Handle(::GEOM_Object) theImpl) :
   SALOME::GenericObj_i( thePOA ),
   GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
   _impl( theImpl )
@@ -76,7 +76,7 @@ GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr
 
 GEOM_Object_i::~GEOM_Object_i()
 {
-  MESSAGE("GEOM_Object_i::~GEOM_Object_i");
+  //MESSAGE("GEOM_Object_i::~GEOM_Object_i");
 }
 
 //=============================================================================
@@ -169,7 +169,7 @@ char* GEOM_Object_i::GetSubShapeName(CORBA::Long subID)
 {
   CORBA::String_var name("");
 
-  Handle(GEOM_Function) aMainFun = _impl->GetLastFunction();
+  Handle(::GEOM_Function) aMainFun = _impl->GetLastFunction();
   if ( aMainFun.IsNull() ) return name._retn();
 
   const TDataStd_ListOfExtendedString& aListEntries = aMainFun->GetSubShapeReferences();
@@ -177,14 +177,14 @@ char* GEOM_Object_i::GetSubShapeName(CORBA::Long subID)
   for (; anIt.More(); anIt.Next())
   {
     TCollection_AsciiString anEntry = anIt.Value();
-    Handle(GEOM_BaseObject) anObj =
-      GEOM_Engine::GetEngine()->GetObject( _impl->GetDocID(), anEntry.ToCString(), false );
+    Handle(::GEOM_BaseObject) anObj =
+      GEOM_Engine::GetEngine()->GetObject( anEntry.ToCString(), false );
     if ( anObj.IsNull() ) continue;
 
     TCollection_AsciiString aSubName = anObj->GetName();
     if ( aSubName.IsEmpty() ) continue;
 
-    Handle(GEOM_Function) aFun = anObj->GetLastFunction();
+    Handle(::GEOM_Function) aFun = anObj->GetLastFunction();
     if ( aFun.IsNull() ) continue;
   
     GEOM_ISubShape ISS( aFun );
@@ -359,7 +359,7 @@ GEOM::ListOfLong* GEOM_Object_i::GetSubShapeIndices()
   GEOM::ListOfLong_var anIndices = new GEOM::ListOfLong;
 
   if(!_impl->IsMainShape()) {
-    Handle(GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last)  one)
+    Handle(::GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last)  one)
     if(aFunction.IsNull()) return anIndices._retn();
     GEOM_ISubShape ISS(aFunction);
     Handle(TColStd_HArray1OfInteger) anArray = ISS.GetIndices();
@@ -384,7 +384,7 @@ GEOM::GEOM_Object_ptr GEOM_Object_i::GetMainShape()
 {
   GEOM::GEOM_Object_var obj;
   if(!_impl->IsMainShape()) {
-    Handle(GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last)  one)
+    Handle(::GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last)  one)
     if(aFunction.IsNull()) return obj._retn();
     GEOM_ISubShape ISS(aFunction);
 
@@ -395,7 +395,7 @@ GEOM::GEOM_Object_ptr GEOM_Object_i::GetMainShape()
     TCollection_AsciiString anEntry;
     TDF_Tool::Entry(aLabel, anEntry);
     return GEOM::GEOM_Object::_narrow
-      ( _engine->GetObject(_impl->GetDocID(), anEntry.ToCString()) );
+      ( _engine->GetObject( anEntry.ToCString()) );
   }
 
   return obj._retn();
@@ -406,15 +406,20 @@ 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 ) ) {
-    Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast
-      ( GEOM_Engine::GetEngine()->GetObject( other->GetStudyID(), other->GetEntry(), false ));
-    if ( !otherObject.IsNull() )
-      otherShape = otherObject->GetValue();
+  bool result = false;
+
+  GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other );
+  if ( !CORBA::is_nil( shapePtr ) ) {
+    CORBA::String_var entry = shapePtr->GetEntry();
+    Handle(::GEOM_Object) otherObject = Handle(::GEOM_Object)::DownCast
+      ( GEOM_Engine::GetEngine()->GetObject( entry, 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;
 }