Implemented [bos #35094] [EDF] (2023-T1) X,Y,Z to U,V.

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

diff --git a/src/GEOM_I/GEOM_BaseObject_i.cc b/src/GEOM_I/GEOM_BaseObject_i.cc
index abf15301fffe862d86f1b3971cd49242e163738a..0a9bd821734d0303bc77c7ac4de2b7a3ae89c92e 100644 (file)
--- a/src/GEOM_I/GEOM_BaseObject_i.cc
+++ b/src/GEOM_I/GEOM_BaseObject_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  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
@@ -51,7 +51,7 @@
 
 GEOM_BaseObject_i::GEOM_BaseObject_i (PortableServer::POA_ptr thePOA,
                                       GEOM::GEOM_Gen_ptr      theEngine,
-                                      HANDLE_NAMESPACE(GEOM_BaseObject) theImpl)
+                                      Handle(::GEOM_BaseObject) theImpl)
   : SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
 {
 }
@@ -83,17 +83,6 @@ char* GEOM_BaseObject_i::GetEntry()
   return CORBA::string_dup(anEntstr);
 }
 
-//=============================================================================
-/*!
- *  GetStudyID
- */
-//=============================================================================
-
-CORBA::Long GEOM_BaseObject_i::GetStudyID()
-{
-   return _impl->GetDocID();
-}
-
 //=============================================================================
 /*!
  *  GetType
@@ -181,10 +170,10 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetDependency()
   TCollection_AsciiString anEntry;
 
   for (int i = 1; i<=aLength; i++) {
-    HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+    Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i));
     if (anObj.IsNull()) continue;
     TDF_Tool::Entry(anObj->GetEntry(), anEntry);
-    GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(), (char*) anEntry.ToCString());
+    GEOM::GEOM_BaseObject_var obj = _engine->GetObject((char*) anEntry.ToCString());
     aList[i-1] = obj;
   }
 
@@ -211,10 +200,9 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetLastDependency()
   TCollection_AsciiString anEntry;
 
   for (int i = 1; i<=aLength; i++) {
-     HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+     Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i));
      if (anObj.IsNull()) continue;
-     GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(),
-                                                        anObj->GetEntryString().ToCString());
+     GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetEntryString().ToCString());
      aList[i-1] = GEOM::GEOM_BaseObject::_duplicate( obj );
   }
 
@@ -277,8 +265,8 @@ GEOM::CreationInformationSeq* GEOM_BaseObject_i::GetCreationInformation()
   int nbI = 0;
   for ( int i = 1; i <= nbFun; ++i )
   {
-    HANDLE_NAMESPACE(GEOM_BaseDriver) driver =
-      HANDLE_NAMESPACE(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i ));
+    Handle(::GEOM_BaseDriver) driver =
+      Handle(::GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i ));
     if ( !driver.IsNull() )
     {
       std::vector<GEOM_Param> params;
@@ -300,22 +288,22 @@ GEOM::CreationInformationSeq* GEOM_BaseObject_i::GetCreationInformation()
 #ifdef _DEBUG_
         if ( operationName.empty() )
         {
-          cout << endl << endl << endl << "Warning: " << endl << "Dear developer!!!" << endl
-               << "  Consider implementing "
-               <<    typeid(*(driver.operator->())).name() << "::GetCreationInformation() " << endl
-               << "  for the case of operation which has created '" << GetName() << "' object" << endl
-               << "PLEEEEEEEASE" << endl
-               << "\tPLEEEEEEEASE" << endl
-               << "\t\tPLEEEEEEEASE" << endl
-               << "\t\t\tPLEEEEEEEASE" << endl
-               << "\t\t\t\tPLEEEEEEEASE" << endl;
+          std::cout << std::endl << std::endl << std::endl << "Warning: " << std::endl << "Dear developer!!!" << std::endl
+                    << "  Consider implementing "
+                    <<    typeid(*(driver.operator->())).name() << "::GetCreationInformation() " << std::endl
+                    << "  for the case of operation which has created '" << GetName() << "' object" << std::endl
+                    << "PLEEEEEEEASE" << std::endl
+                    << "\tPLEEEEEEEASE" << std::endl
+                    << "\t\tPLEEEEEEEASE" << std::endl
+                    << "\t\t\tPLEEEEEEEASE" << std::endl
+                    << "\t\t\t\tPLEEEEEEEASE" << std::endl;
         }
 #endif
       }
       catch(...)
       {
 #ifdef _DEBUG_
-        cout << "Ecxeption in GEOM_BaseObject_i::GetCreationInformation()" << endl;
+        std::cout << "Ecxeption in GEOM_BaseObject_i::GetCreationInformation()" << std::endl;
 #endif
       }
     }
@@ -324,3 +312,14 @@ GEOM::CreationInformationSeq* GEOM_BaseObject_i::GetCreationInformation()
 
   return info._retn();
 }
+
+//================================================================================
+/*!
+ * \brief Return the engine creating this object
+ */
+//================================================================================
+
+GEOM::GEOM_Gen_ptr GEOM_BaseObject_i::GetGen()
+{
+  return GEOM::GEOM_Gen::_duplicate( _engine );
+}