Salome HOME
Restart from scratch
[modules/geom.git] / src / GEOM_I / GEOM_Gen_i.cc
index 6837a939818c0e8dacb68e3e01d3682d72143443..ccd876f743c265b05ec54ba5b5c67c946c64b5d4 100644 (file)
@@ -1,22 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2012  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 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifdef WNT
 #pragma warning( disable:4786 )
 #endif
 
 #include "GEOM_Gen_i.hh"
 #include "GEOM_Object_i.hh"
+#include "GEOM_version.h"
 
-#include <strstream>
+#include <set>
+#include <sstream>
 
 #include "Utils_CorbaException.hxx"
 #include "OpUtil.hxx"
@@ -36,6 +41,8 @@
 #include "GEOM_Object_i.hh"
 #include "GEOM_Object.hxx"
 #include "GEOM_Function.hxx"
+#include "GEOM_ISubShape.hxx"
+#include <GEOM_PythonDump.hxx>
 #include "GEOMImpl_Types.hxx"
 #include "GEOMImpl_CopyDriver.hxx"
 
 #include <BRepTools.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
+#include <TDF_ChildIDIterator.hxx>
+#include <TNaming_NamedShape.hxx>
+#include <TDataStd_Name.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TopAbs_ShapeEnum.hxx>
+//#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopExp.hxx>
 #include <OSD.hxx>
 
 #include "SALOMEDS_Tool.hxx"
 // function : GEOM_Gen_i()
 // purpose  : constructor to be called for servant creation.
 //============================================================================
-GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb,
-                      PortableServer::POA_ptr poa,
-                      PortableServer::ObjectId * contId,
-                      const char *instanceName,
-                      const char *interfaceName) :
+GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr            orb,
+                       PortableServer::POA_ptr   poa,
+                       PortableServer::ObjectId* contId,
+                       const char*               instanceName,
+                       const char*               interfaceName) :
   Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
 {
   _thisObj = this;
@@ -68,11 +80,25 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb,
 
   _impl = new ::GEOMImpl_Gen;
 
-  OSD::SetSignal( true );
+  //PAL10867: disable signals catching with "noexcepthandler" option
+  char* envNoCatchSignals = getenv("NOT_INTERCEPT_SIGNALS");
+  if (!envNoCatchSignals || !atoi(envNoCatchSignals))
+  {
+    //work around PAL12004, PAL12628
+    //OSD::SetSignal( true );
+    bool raiseFPE;
+#ifdef _DEBUG_
+    raiseFPE = true;
+    char* envDisableFPE = getenv("DISABLE_FPE");
+    if (envDisableFPE && atoi(envDisableFPE))
+      raiseFPE = false;
+#else
+    raiseFPE = false;
+#endif
+    OSD::SetSignal( raiseFPE );
+  }
 }
 
-
-
 //============================================================================
 // function : ~GEOM_Gen_i()
 // purpose  : destructor
@@ -88,13 +114,13 @@ GEOM_Gen_i::~GEOM_Gen_i() {
 // purpose  :
 //============================================================================
 char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
-                                        const char* IORString,
-                                        CORBA::Boolean isMultiFile,
-                                        CORBA::Boolean isASCII)
+                                         const char* IORString,
+                                         CORBA::Boolean isMultiFile,
+                                         CORBA::Boolean isASCII)
 {
   GEOM::GEOM_Object_var anObject = GEOM::GEOM_Object::_narrow(_orb->string_to_object(IORString));
   if (!CORBA::is_nil(anObject)) {
-    return strdup(anObject->GetEntry());
+    return CORBA::string_dup(anObject->GetEntry());
   }
   return 0;
 }
@@ -107,9 +133,9 @@ char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
 //          : The IOR (IORName) of object created is returned
 //============================================================================
 char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
-                                        const char* aLocalPersistentID,
-                                        CORBA::Boolean isMultiFile,
-                                        CORBA::Boolean isASCII)
+                                         const char* aLocalPersistentID,
+                                         CORBA::Boolean isMultiFile,
+                                         CORBA::Boolean isASCII)
 {
   SALOMEDS::Study_var aStudy = theSObject->GetStudy();
 
@@ -119,7 +145,7 @@ char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
   GEOM::GEOM_Object_var obj = GetObject(anObject->GetDocID(), anEntry.ToCString());
 
   CORBA::String_var aPersRefString = _orb->object_to_string(obj);
-  return strdup(aPersRefString);
+  return CORBA::string_dup(aPersRefString);
 }
 
 //============================================================================
@@ -138,14 +164,13 @@ bool GEOM_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
 // purpose  :
 //============================================================================
 SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
-                                                SALOMEDS::SObject_ptr theSObject,
-                                                CORBA::Object_ptr theObject,
-                                                const char* theName) throw (SALOME::SALOME_Exception)
+                                                 SALOMEDS::SObject_ptr theSObject,
+                                                 CORBA::Object_ptr theObject,
+                                                 const char* theName) throw (SALOME::SALOME_Exception)
 {
   Unexpect aCatch(SALOME_SalomeException);
   SALOMEDS::SObject_var aResultSO;
   if(CORBA::is_nil(theObject) || theStudy->_is_nil()) return aResultSO;
-
   GEOM::GEOM_Object_var aShape = GEOM::GEOM_Object::_narrow(theObject);
   if(aShape->_is_nil()) return aResultSO;
 
@@ -158,9 +183,12 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
     anAttr = aStudyBuilder->FindOrCreateAttribute(aFather, "AttributeName");
     SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
     aName->SetValue("Geometry");
+    aName->UnRegister();
     anAttr = aStudyBuilder->FindOrCreateAttribute(aFather, "AttributePixMap");
-    SALOMEDS::AttributePixMap::_narrow(anAttr)->SetPixMap("ICON_OBJBROWSER_Geometry");
-    aStudyBuilder->DefineComponentInstance(aFather, GEOM_Gen::_this());
+    SALOMEDS::AttributePixMap_var aPixMap=SALOMEDS::AttributePixMap::_narrow(anAttr);
+    aPixMap->SetPixMap("ICON_OBJBROWSER_Geometry");
+    aPixMap->UnRegister();
+    aStudyBuilder->DefineComponentInstance(aFather, (GEOM::GEOM_Gen_var)GEOM_Gen::_this());
   }
   if (aFather->_is_nil()) return aResultSO;
 
@@ -171,119 +199,317 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
       aResultSO = SALOMEDS::SObject::_duplicate(theSObject); //SRN: Added Aug 24,2004 : for  the method AddInStudy with theFather argumenet != NULL
       //THROW_SALOME_CORBA_EXCEPTION("Publish in study supervision graph error",SALOME::BAD_PARAM);
   }
-  anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeIOR");
-  SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-  char *aGeomObjIOR = _orb->object_to_string(theObject);
-  anIOR->SetValue(strdup(aGeomObjIOR));
+  CORBA::String_var aGeomObjIOR = _orb->object_to_string(theObject);
+  aResultSO->SetAttrString("AttributeIOR",aGeomObjIOR);
 
-  anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributePixMap");
-  SALOMEDS::AttributePixMap_var aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
   TCollection_AsciiString aShapeName("Shape_");
 
-  if ( aShape->GetType() == GEOM_GROUP ) {
+  CORBA::Long mytype=aShape->GetType();
+  if ( mytype == GEOM_GROUP ) {
     GEOM::GEOM_IGroupOperations_var anOp = GetIGroupOperations( theStudy->StudyId() );
     switch ( (TopAbs_ShapeEnum)anOp->GetType( aShape ) ) {
     case TopAbs_VERTEX:
-      aPixmap->SetPixMap( "ICON_OBJBROWSER_GROUP_PNT" );
+      aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_GROUP_PNT" );
       aShapeName = "Group_Of_Vertices_";
       break;
     case TopAbs_EDGE:
-      aPixmap->SetPixMap( "ICON_OBJBROWSER_GROUP_EDGE" );
+      aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_GROUP_EDGE");
       aShapeName = "Group_Of_Edges_";
       break;
     case TopAbs_FACE:
-      aPixmap->SetPixMap( "ICON_OBJBROWSER_GROUP_FACE" );
+      aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_GROUP_FACE");
       aShapeName = "Group_Of_Faces_";
       break;
     case TopAbs_SOLID:
-      aPixmap->SetPixMap( "ICON_OBJBROWSER_GROUP_SOLID" );
+      aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_GROUP_SOLID");
       aShapeName = "Group_Of_Solids_";
       break;
     }
-  } else if ( aShape->GetType() == GEOM_MARKER ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_LCS" );
+  } else if ( mytype == GEOM_MARKER ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_LCS");
     aShapeName = "LocalCS_";
-  } else if ( aShape->GetShapeType() == GEOM::COMPOUND ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_COMPOUND" );
+  } else if ( mytype > ADVANCED_BASE ) {
+    char buf[20];
+    sprintf( buf, "%d", aShape->GetType() );
+    std::string advId = "ICON_OBJBROWSER_ADVANCED_"; advId += buf;
+    aResultSO->SetAttrString("AttributePixMap",advId.c_str());
+    aShapeName = "Advanced_";
+  } else {
+    GEOM::shape_type myshapetype=aShape->GetShapeType();
+    if ( myshapetype == GEOM::COMPOUND ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_COMPOUND" );
     aShapeName = "Compound_";
-  } else if ( aShape->GetShapeType() == GEOM::COMPSOLID ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_COMPSOLID" );
+  } else if ( myshapetype == GEOM::COMPSOLID ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_COMPSOLID");
     aShapeName = "Compsolid_";
-  } else if ( aShape->GetShapeType() == GEOM::SOLID ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_SOLID" );
+  } else if ( myshapetype == GEOM::SOLID ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_SOLID");
     aShapeName = "Solid_";
-  } else if ( aShape->GetShapeType() == GEOM::SHELL ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_SHELL" );
+  } else if ( myshapetype == GEOM::SHELL ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_SHELL");
     aShapeName = "Shell_";
-  } else if ( aShape->GetShapeType() == GEOM::FACE ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_FACE" );
+  } else if ( myshapetype == GEOM::FACE ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_FACE");
     aShapeName = "Face_";
-  } else if ( aShape->GetShapeType() == GEOM::WIRE ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_WIRE" );
+  } else if ( myshapetype == GEOM::WIRE ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_WIRE");
     aShapeName = "Wire_";
-  } else if ( aShape->GetShapeType() == GEOM::EDGE ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_EDGE" );
+  } else if ( myshapetype == GEOM::EDGE ) {
+    aResultSO->SetAttrString("AttributePixMap", "ICON_OBJBROWSER_EDGE");
     aShapeName = "Edge_";
-  } else if ( aShape->GetShapeType() == GEOM::VERTEX ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_VERTEX" );
+  } else if ( myshapetype == GEOM::VERTEX ) {
+    aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_VERTEX" );
     aShapeName = "Vertex_";
   }
+  }
   //if (strlen(theName) == 0) aShapeName += TCollection_AsciiString(aResultSO->Tag());
-  //else aShapeName = TCollection_AsciiString(strdup(theName));
-
-  // asv : 11.11.04 Introducing a more sofisticated method of name creation, just as
-  //       it is done in GUI in GEOMBase::GetDefaultName() - not just add a Tag() == number
-  //       of objects in the study, but compute a number of objects with the same prefix
-  //       and build a new name as Prefix_N+1
-  if ( strlen( theName ) == 0 ) { // MOST PROBABLY CALLED FROM BATCHMODE OR SUPERVISOR
-    int i = 0;                    // (WITH EMPTY NEW NAME)
-    SALOMEDS::SObject_var obj;
-    TCollection_AsciiString aNewShapeName;
-    do {
-      aNewShapeName = aShapeName + TCollection_AsciiString(++i);
-      obj = theStudy->FindObject( aNewShapeName.ToCString() );
+  //else aShapeName = TCollection_AsciiString(CORBA::string_dup(theName));
+
+  // BEGIN: try to find existed name for current shape
+  bool HasName = false;
+  // recieve current TopoDS shape
+  CORBA::String_var entry = aShape->GetEntry();
+  Handle(GEOM_Object) aGShape = _impl->GetObject(aShape->GetStudyID(), entry);
+  TopoDS_Shape TopoSh = aGShape->GetValue();
+  // find label of main shape
+  GEOM::GEOM_Object_var aMainSh = aShape;
+  while( !aMainSh->IsMainShape() ) {
+    aMainSh = aMainSh->GetMainShape();
+  }
+  entry = aMainSh->GetEntry();
+  Handle(GEOM_Object) anObj = _impl->GetObject(aMainSh->GetStudyID(), entry);
+  TDF_Label aMainLbl = anObj->GetFunction(1)->GetNamingEntry();
+
+  // check all named shapes using iterator
+  TDF_ChildIDIterator anIt (aMainLbl, TNaming_NamedShape::GetID(), Standard_True);
+
+  for (; anIt.More() && !HasName; anIt.Next()) {
+    Handle(TNaming_NamedShape) anAttr =
+      Handle(TNaming_NamedShape)::DownCast(anIt.Value());
+    if (anAttr.IsNull()) continue;
+    TopoDS_Shape S = anAttr->Get();
+    if (S.IsEqual(TopoSh)) {
+      TDF_Label L = anAttr->Label();
+      Handle(TDataStd_Name) aName;
+      if (L.FindAttribute(TDataStd_Name::GetID(), aName)) {
+        aShapeName = aName->Get();
+        HasName = true;
+      }
     }
-    while ( !obj->_is_nil() );
-    aShapeName = aNewShapeName;
   }
-  else // MOST PROBABLY CALLED FROM GEOM GUI (ALREADY WITH VALID NAME)
-    aShapeName = TCollection_AsciiString(strdup(theName));
+  // END: try to find existed name for current shape
+
+  if (!HasName) {
+    // asv : 11.11.04 Introducing a more sofisticated method of name creation, just as
+    //       it is done in GUI in GEOMBase::GetDefaultName() - not just add a Tag() == number
+    //       of objects in the study, but compute a number of objects with the same prefix
+    //       and build a new name as Prefix_N+1
+    if ( strlen( theName ) == 0 ) { // MOST PROBABLY CALLED FROM BATCHMODE OR SUPERVISOR
+      int i = 0;                    // (WITH EMPTY NEW NAME)
+      SALOMEDS::SObject_var obj;
+      TCollection_AsciiString aNewShapeName;
+      do {
+        aNewShapeName = aShapeName + TCollection_AsciiString(++i);
+        obj = theStudy->FindObject( aNewShapeName.ToCString() );
+      }
+      while ( !obj->_is_nil() );
+      aShapeName = aNewShapeName;
+    }
+    else // MOST PROBABLY CALLED FROM GEOM GUI (ALREADY WITH VALID NAME)
+      aShapeName = TCollection_AsciiString((char*)theName);
+  }
 
   //Set the study entry as a name of  the published GEOM_Object
-  aShape->SetStudyEntry(aResultSO->GetID());
+  CORBA::String_var anID =aResultSO->GetID();
+  aShape->SetStudyEntry(anID.in());
 
   //Set a name of the added shape
-  anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeName");
-  SALOMEDS::AttributeName_var aNameAttrib = SALOMEDS::AttributeName::_narrow(anAttr);
-  aNameAttrib->SetValue(aShapeName.ToCString());
+  aResultSO->SetAttrString("AttributeName",aShapeName.ToCString());
+
+  //Set NoteBook variables used in the object creation
+  TCollection_AsciiString aVars;
+  CORBA::String_var aString=aShape->GetParameters();
+  SALOMEDS::ListOfListOfStrings_var aSections = theStudy->ParseVariables(aString);
+  for(int i = 0, n = aSections->length(); i < n; i++) {
+    SALOMEDS::ListOfStrings aListOfVars = aSections[i];
+    for(int j = 0, m = aListOfVars.length(); j < m; j++) {
+      if(theStudy->IsVariable(aListOfVars[j].in()))
+        aVars += TCollection_AsciiString(aListOfVars[j].in());
+      if(j != m-1)
+        aVars += ":";
+    }
+    if(i != n-1)
+      aVars += "|";
+  }
+  aResultSO->SetAttrString("AttributeString",aVars.ToCString());
+
+  aFather->UnRegister();
+
+  //Set a name of the GEOM object
+  aShape->SetName(aShapeName.ToCString());
 
   return aResultSO._retn();
 }
 
 
+//============================================================================
+// function : CreateAndPublishGroup
+// purpose  : auxilary for PublishNamedShapesInStudy
+//============================================================================
+void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy,
+                                       GEOM::GEOM_Object_var theMainShape,
+                                       const TopTools_IndexedMapOfShape& anIndices,
+                                       const TopTools_SequenceOfShape& SeqS,
+                                       const TColStd_SequenceOfAsciiString& SeqN,
+                                       const Standard_CString& GrName,
+                                       GEOM::ListOfGO_var aResList)
+{
+  CORBA::String_var entry = theMainShape->GetEntry();
+  Handle(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry);
+  Handle(TColStd_HArray1OfInteger) anArray;
+  if(SeqS.Length()>0) {
+    // create a group
+    GEOM::GEOM_IGroupOperations_var GOp = GetIGroupOperations(theStudy->StudyId());
+    GEOM::GEOM_Object_ptr GrObj =
+      GOp->CreateGroup( theMainShape, SeqS.Value(1).ShapeType() );
+    AddInStudy(theStudy, GrObj, GrName, theMainShape._retn());
+    CORBA::String_var GrEntry = GrObj->GetEntry();
+    Handle(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry);
+    // add named objects
+    //Handle(GEOM_Object) anObj;
+    for(int i=1; i<=SeqS.Length(); i++) {
+      TopoDS_Shape aValue = SeqS.Value(i);
+      //anArray = new TColStd_HArray1OfInteger(1,1);
+      Standard_Integer anIndex = anIndices.FindIndex(aValue);
+      //anArray->SetValue(1, anIndex);
+      GOp->AddObject(GrObj,anIndex);
+      //anObj = GEOM_Engine::GetEngine()->AddObject(aMainShape->GetDocID(), GEOM_SUBSHAPE);
+      //if (anObj.IsNull()) continue;
+      //Handle(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1);
+      //if (aFunction.IsNull()) continue;
+      //GEOM_ISubShape aSSI(aFunction);
+      //aSSI.SetMainShape(aMainShape->GetLastFunction());
+      //aSSI.SetIndices(anArray);
+      //aFunction->SetValue(aValue);
+      //GOp->UnionIDs(GrObj, anIndex);
+      //SALOMEDS::SObject_var aResultSO;
+      //TCollection_AsciiString anEntry;
+      //TDF_Tool::Entry(anObj->GetEntry(),anEntry);
+      //GEOM::GEOM_Object_var aGObj = GetObject(anObj->GetDocID(), anEntry.ToCString());
+      //AddInStudy(theStudy, aGObj._retn(), SeqN.Value(i).ToCString(), GrObj);
+    }
+  }
+}
+
+
+//============================================================================
+// function : PublishNamedShapesInStudy
+// purpose  :
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::
+            PublishNamedShapesInStudy(SALOMEDS::Study_ptr theStudy,
+                                      //SALOMEDS::SObject_ptr theSObject,
+                                      CORBA::Object_ptr theObject)
+{
+  //Unexpect aCatch(SALOME_SalomeException);
+  GEOM::ListOfGO_var aResList = new GEOM::ListOfGO;
+
+  //CORBA::Object_var theObject = theSObject->GetObject();
+  GEOM::GEOM_Object_var theMainShape = GEOM::GEOM_Object::_narrow(theObject);
+  if(theMainShape->_is_nil()) return aResList._retn();
+
+  CORBA::String_var entry = theMainShape->GetEntry();
+  Handle(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry);
+  if (aMainShape.IsNull()) return aResList._retn();
+  TopoDS_Shape MainSh = aMainShape->GetValue();
+
+  TDF_Label aMainLbl = aMainShape->GetEntry();
+  TopTools_SequenceOfShape SolidSeqS, FaceSeqS, EdgeSeqS, VertSeqS;
+  TColStd_SequenceOfAsciiString SolidSeqN, FaceSeqN, EdgeSeqN, VertSeqN;
+  TDF_ChildIDIterator anIt(aMainLbl, TNaming_NamedShape::GetID(), Standard_True);
+  for(; anIt.More(); anIt.Next()) {
+    Handle(TNaming_NamedShape) anAttr =
+      Handle(TNaming_NamedShape)::DownCast(anIt.Value());
+    if(anAttr.IsNull()) continue;
+    TopoDS_Shape S = anAttr->Get();
+    TDF_Label L = anAttr->Label();
+    //if(S.IsEqual(MainSh)) continue;
+    Handle(TDataStd_Name) aName;
+    if(L.FindAttribute(TDataStd_Name::GetID(),aName)) {
+      TCollection_ExtendedString EName = aName->Get();
+      if(S.ShapeType()==TopAbs_SOLID) {
+        SolidSeqS.Append(S);
+        SolidSeqN.Append(aName->Get());
+      }
+      else if(S.ShapeType()==TopAbs_FACE) {
+        FaceSeqS.Append(S);
+        FaceSeqN.Append(aName->Get());
+      }
+      else if(S.ShapeType()==TopAbs_EDGE) {
+        EdgeSeqS.Append(S);
+        EdgeSeqN.Append(aName->Get());
+      }
+      else if(S.ShapeType()==TopAbs_VERTEX) {
+        VertSeqS.Append(S);
+        VertSeqN.Append(aName->Get());
+      }
+    }
+  }
+
+  TopTools_IndexedMapOfShape anIndices;
+  TopExp::MapShapes(MainSh, anIndices);
+
+  CreateAndPublishGroup(theStudy, theMainShape, anIndices, SolidSeqS, SolidSeqN,
+                        "Group_Of_Named_Solids", aResList);
+
+  CreateAndPublishGroup(theStudy, theMainShape, anIndices, FaceSeqS, FaceSeqN,
+                        "Group_Of_Named_Faces", aResList);
+
+  CreateAndPublishGroup(theStudy, theMainShape, anIndices, EdgeSeqS, EdgeSeqN,
+                        "Group_Of_Named_Edges", aResList);
+
+  CreateAndPublishGroup(theStudy, theMainShape, anIndices, VertSeqS, VertSeqN,
+                        "Group_Of_Named_Vertices", aResList);
+
+  return aResList._retn();
+}
+
+
 //============================================================================
 // function : Save()
 // purpose  : save OCAF/Geom document
 //============================================================================
 SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
-                                   const char* theURL,
-                                   bool isMultiFile) {
+                                    const char* theURL,
+                                    bool isMultiFile) {
   SALOMEDS::TMPFile_var aStreamFile;
   // Get a temporary directory to store a file
   std::string aTmpDir = (isMultiFile)?theURL:SALOMEDS_Tool::GetTmpDir();
+
+  // OCCT BUG: cannot save a document (in current folder)
+  // if directory name is empty
+  if (aTmpDir.size() == 0) {
+#ifdef WNT
+    aTmpDir = ".\\";
+#else
+    aTmpDir = "./";
+#endif
+  }
+
   // Create a list to store names of created files
   SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames;
   aSeq->length(1);
   // Prepare a file name to open
   TCollection_AsciiString aNameWithExt("");
   if (isMultiFile)
-    aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL())).c_str());
+    aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath
+                                                   (theComponent->GetStudy()->URL())).c_str());
   aNameWithExt += TCollection_AsciiString("_GEOM.sgd");
   aSeq[0] = CORBA::string_dup(aNameWithExt.ToCString());
   // Build a full file name of temporary file
   TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt;
   // Save GEOM component in this file
-  _impl->Save(theComponent->GetStudy()->StudyId(), aFullName.ToCString());
+  _impl->Save(theComponent->GetStudy()->StudyId(),(char*) aFullName.ToCString());
   // Conver a file to the byte stream
   aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq.in(), isMultiFile);
   // Remove the created file and tmp directory
@@ -299,8 +525,8 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
 // purpose  :
 //============================================================================
 SALOMEDS::TMPFile* GEOM_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
-                                        const char* theURL,
-                                        bool isMultiFile) {
+                                         const char* theURL,
+                                         bool isMultiFile) {
   SALOMEDS::TMPFile_var aStreamFile = Save(theComponent, theURL, isMultiFile);
   return aStreamFile._retn();
 }
@@ -311,9 +537,9 @@ SALOMEDS::TMPFile* GEOM_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
 // purpose  :
 //============================================================================
 CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
-                               const SALOMEDS::TMPFile& theStream,
-                               const char* theURL,
-                               bool isMultiFile) {
+                                const SALOMEDS::TMPFile& theStream,
+                                const char* theURL,
+                                bool isMultiFile) {
 
   if (theStream.length() <= 9) {
     MESSAGE("The TMPFile is too short : " << theStream.length() << " bytes ");
@@ -322,24 +548,37 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
 
   // Get a temporary directory for a file
   std::string aTmpDir = isMultiFile?theURL:SALOMEDS_Tool::GetTmpDir();
+
+  // OCCT BUG: cannot load a document (from current folder)
+  // if directory name is empty
+  if (aTmpDir.size() == 0) {
+#ifdef WNT
+    aTmpDir = ".\\";
+#else
+    aTmpDir = "./";
+#endif
+  }
+
   // Conver the byte stream theStream to a file and place it in tmp directory
-  SALOMEDS::ListOfFileNames_var aSeq = SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.c_str(), isMultiFile);
+  SALOMEDS::ListOfFileNames_var aSeq =
+    SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.c_str(), isMultiFile);
 
   // Prepare a file name to open
   TCollection_AsciiString aNameWithExt("");
   if (isMultiFile)
-    aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL())).c_str());
+    aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath
+                                                   (theComponent->GetStudy()->URL())).c_str());
   aNameWithExt += TCollection_AsciiString("_GEOM.sgd");
   TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt);
 
   // Open document
-  if (!_impl->Load(theComponent->GetStudy()->StudyId(), aFullName.ToCString())) return false;
+  if (!_impl->Load(theComponent->GetStudy()->StudyId(),(char*) aFullName.ToCString())) return false;
 
   // Remove the created file and tmp directory
   if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq.in(), true);
 
   SALOMEDS::Study_var Study = theComponent->GetStudy();
-  TCollection_AsciiString name( strdup(Study->Name()) );
+  TCollection_AsciiString name (Study->Name());
 
   return true;
 }
@@ -350,9 +589,9 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
 // purpose  :
 //============================================================================
 CORBA::Boolean GEOM_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
-                                    const SALOMEDS::TMPFile& theStream,
-                                    const char* theURL,
-                                    bool isMultiFile) {
+                                     const SALOMEDS::TMPFile& theStream,
+                                     const char* theURL,
+                                     bool isMultiFile) {
   return Load(theComponent, theStream, theURL, isMultiFile);
 }
 
@@ -363,7 +602,8 @@ CORBA::Boolean GEOM_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
 //============================================================================
 void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
 {
-  _impl->Close(theComponent->GetStudy()->StudyId());
+  SALOMEDS::Study_var aStudy= theComponent->GetStudy();
+  _impl->Close(aStudy->StudyId());
 }
 
 //============================================================================
@@ -377,7 +617,10 @@ CORBA::Boolean GEOM_Gen_i::CanCopy(SALOMEDS::SObject_ptr theObject) {
 
   SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
 
-  GEOM::GEOM_Object_var anObject = GEOM::GEOM_Object::_narrow(_orb->string_to_object(anIOR->Value()));
+  CORBA::String_var aString=anIOR->Value();
+  anIOR->UnRegister();
+  CORBA::Object_var anObj = _orb->string_to_object(aString);
+  GEOM::GEOM_Object_var anObject = GEOM::GEOM_Object::_narrow(anObj);
   // If the object is null one it can't be copied: return false
   if (anObject->_is_nil()) return false;
   return true;
@@ -387,14 +630,16 @@ CORBA::Boolean GEOM_Gen_i::CanCopy(SALOMEDS::SObject_ptr theObject) {
 // function : CopyFrom()
 // purpose  :
 //============================================================================
-SALOMEDS::TMPFile* GEOM_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID) {
+SALOMEDS::TMPFile* GEOM_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID)
+{
   // Declare a sequence of the byte to store the copied object
   SALOMEDS::TMPFile_var aStreamFile = new SALOMEDS::TMPFile;
 
   // Try to get GEOM_Object object by given SObject
   SALOMEDS::GenericAttribute_var anAttr;
   if (!theObject->FindAttribute(anAttr, "AttributeIOR")) return aStreamFile._retn();
-  GEOM::GEOM_Object_var anObject =  GEOM::GEOM_Object::_narrow(_orb->string_to_object(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value()));
+  GEOM::GEOM_Object_var anObject = GEOM::GEOM_Object::_narrow
+    (_orb->string_to_object(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value()));
   if (anObject->_is_nil()) return aStreamFile._retn();
 
   aStreamFile = anObject->GetShapeStream();
@@ -422,15 +667,15 @@ CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long th
 // purpose  :
 //============================================================================
 SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream,
-                                           CORBA::Long theObjectID,
-                                           SALOMEDS::SObject_ptr theObject) {
+                                            CORBA::Long theObjectID,
+                                            SALOMEDS::SObject_ptr theObject) {
   // Find the current Study and StudyBuilder
   SALOMEDS::Study_var aStudy = theObject->GetStudy();
   SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
 
   // Retrieve a TopoDS_Shape from byte stream
   TopoDS_Shape aTopology;
-  istrstream aStreamedBrep((char*) &theStream[0], theStream.length());
+  std::istringstream aStreamedBrep((char*) &theStream[0]);
   BRep_Builder aBuilder;
   try {
     BRepTools::Read(aTopology, aStreamedBrep, aBuilder);
@@ -454,10 +699,15 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream,
   TDF_Tool::Entry(anObj->GetEntry(), anEntry);
   GEOM::GEOM_Object_var obj = GetObject(anObj->GetDocID(), anEntry.ToCString());
 
+  //Set the study entry of the published GEOM_Object
+  obj->SetStudyEntry(aNewSO->GetID());
+
   // Add IORAttribute to the Study and set IOR of the created GEOM_Object to it
   SALOMEDS::GenericAttribute_var anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSO, "AttributeIOR");
   SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-  anIOR->SetValue(_orb->object_to_string(obj));
+  CORBA::String_var objStr = _orb->object_to_string(obj);
+  anIOR->SetValue(objStr.in());
+  anIOR->UnRegister();
 
   // Return the created in the Study SObject
   return aNewSO._retn();
@@ -469,26 +719,30 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream,
 //============================================================================
 char* GEOM_Gen_i::ComponentDataType()
 {
-  return strdup("GEOM");
+  return CORBA::string_dup("GEOM");
 }
 
 //============================================================================
 // function : AddInStudy
 // purpose  :
 //============================================================================
-SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_ptr theObject, const char* theName, GEOM::GEOM_Object_ptr theFather)
+SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy (SALOMEDS::Study_ptr theStudy,
+                                              GEOM::GEOM_Object_ptr theObject,
+                                              const char* theName,
+                                              GEOM::GEOM_Object_ptr theFather)
 {
   SALOMEDS::SObject_var aResultSO;
   if(theObject->_is_nil() || theStudy->_is_nil()) return aResultSO;
 
   SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
-  char* IOR;
+  CORBA::String_var IOR;
 
   if(!theFather->_is_nil()) {
     IOR = _orb->object_to_string(theFather);
-    SALOMEDS::SObject_var aFatherSO = theStudy->FindObjectIOR(IOR);
+    SALOMEDS::SObject_var aFatherSO = theStudy->FindObjectIOR(IOR.in());
     if(aFatherSO->_is_nil()) return aResultSO._retn();
     aResultSO = aStudyBuilder->NewObject(aFatherSO);
+    aFatherSO->UnRegister();
     //aStudyBuilder->Addreference(aResultSO, aResultSO);
   }
 
@@ -500,27 +754,1272 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy(SALOMEDS::Study_ptr theStudy, GEOM:
   if(aLength < 1) return aResultSO._retn();
 
   //Publish the arguments
+  TCollection_AsciiString aPrevID; // to avoid multiple references to same object
   for(Standard_Integer i = 0; i< aLength; i++) {
     GEOM::GEOM_Object_var anObject = aList[i];
     if(anObject->_is_nil()) continue;
     IOR = _orb->object_to_string(anObject);
-    SALOMEDS::SObject_var aSO =  theStudy->FindObjectIOR(IOR);
+    SALOMEDS::SObject_var aSO =  theStudy->FindObjectIOR(IOR.in());
     if(aSO->_is_nil()) continue;
+    CORBA::String_var anID = aSO->GetID();
+    if ( aPrevID == anID.in() ) continue;
+    aPrevID = anID.in();
     SALOMEDS::SObject_var aSubSO = aStudyBuilder->NewObject(aResultSO);
     aStudyBuilder->Addreference(aSubSO, aSO);
+    aSO->UnRegister();
+    aSubSO->UnRegister();
   }
 
   return aResultSO._retn();
 }
 
+//============================================================================
+// function : RestoreSubShapesO
+// purpose  : Publish sub-shapes, standing for arguments and sub-shapes of arguments.
+//            To be used from python scripts out of geompy.addToStudy (non-default usage)
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesO (SALOMEDS::Study_ptr     theStudy,
+                                               GEOM::GEOM_Object_ptr   theObject,
+                                               const GEOM::ListOfGO&   theArgs,
+                                               GEOM::find_shape_method theFindMethod,
+                                               CORBA::Boolean          theInheritFirstArg,
+                                               CORBA::Boolean          theAddPrefix)
+{
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject))
+    return aParts._retn();
+
+  // find SObject in the study if it is already published
+  CORBA::String_var anIORo = _orb->object_to_string(theObject);
+  SALOMEDS::SObject_var aSO = theStudy->FindObjectIOR(anIORo.in());
+  //PTv, IMP 0020001, The salome object <aSO>
+  // is not obligatory in case of invokation from script
+  // if (CORBA::is_nil(aSO))
+  //  return aParts._retn();
+
+  aParts = RestoreSubShapes(theStudy, theObject, aSO, theArgs,
+                            theFindMethod, theInheritFirstArg, theAddPrefix);
+  if (!CORBA::is_nil(aSO)) aSO->UnRegister();
+  return aParts._retn();
+}
+
+//============================================================================
+// function : RestoreGivenSubShapesO
+// purpose  : Publish sub-shapes, standing for arguments and sub-shapes of arguments.
+//            To be used from python scripts, generated by Dump Python.
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesO (SALOMEDS::Study_ptr     theStudy,
+                                                    GEOM::GEOM_Object_ptr   theObject,
+                                                    const GEOM::ListOfGO&   theArgs,
+                                                    GEOM::find_shape_method theFindMethod,
+                                                    CORBA::Boolean          theInheritFirstArg,
+                                                    CORBA::Boolean          theAddPrefix)
+{
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject))
+    return aParts._retn();
+
+  // find SObject in the study if it is already published
+  CORBA::String_var anIORo = _orb->object_to_string(theObject);
+  SALOMEDS::SObject_var aSO = theStudy->FindObjectIOR(anIORo.in());
+  //PTv, IMP 0020001, The salome object <aSO>
+  // is not obligatory in case of invokation from script
+  // if (CORBA::is_nil(aSO))
+  //  return aParts._retn();
+
+  aParts = RestoreGivenSubShapes(theStudy, theObject, aSO, theArgs,
+                                 theFindMethod, theInheritFirstArg, theAddPrefix);
+  if (!CORBA::is_nil(aSO)) aSO->UnRegister();
+  return aParts._retn();
+}
+
+//============================================================================
+// function : RestoreSubShapesSO
+// purpose  : Publish sub-shapes, standing for arguments and sub-shapes of arguments.
+//            To be used from GUI and from geompy.addToStudy
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesSO (SALOMEDS::Study_ptr     theStudy,
+                                                SALOMEDS::SObject_ptr   theSObject,
+                                                const GEOM::ListOfGO&   theArgs,
+                                                GEOM::find_shape_method theFindMethod,
+                                                CORBA::Boolean          theInheritFirstArg,
+                                                CORBA::Boolean          theAddPrefix)
+{
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theSObject))
+    return aParts._retn();
+
+  SALOMEDS::GenericAttribute_var anAttr;
+  if (!theSObject->FindAttribute(anAttr, "AttributeIOR"))
+    return aParts._retn();
+
+  SALOMEDS::AttributeIOR_var anAttrIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+  CORBA::String_var anIORso = anAttrIOR->Value();
+
+  // get Object from SObject
+  GEOM::GEOM_Object_var anO = GEOM::GEOM_Object::_narrow(_orb->string_to_object(anIORso));
+  if (CORBA::is_nil(anO))
+    return aParts._retn();
+
+  aParts = RestoreSubShapes(theStudy, anO, theSObject, theArgs,
+                            theFindMethod, theInheritFirstArg, theAddPrefix);
+  return aParts._retn();
+}
+
+//============================================================================
+// function : addToListOfGO
+// purpose  : static local function
+//============================================================================
+static void addToListOfGO( GEOM::GEOM_Object_ptr theObject,
+                           GEOM::ListOfGO& theList )
+{
+  const int oldLen = theList.length();
+  theList.length(oldLen + 1);
+  theList[ oldLen ] = GEOM::GEOM_Object::_duplicate( theObject );
+}
+
+//============================================================================
+// function : addToListOfGO
+// purpose  : static local function
+//============================================================================
+static void addToListOfGO( const GEOM::ListOfGO& theSrcList,
+                           GEOM::ListOfGO& theTrgList )
+{
+  const int oldLen = theTrgList.length();
+  const int srcLen = theSrcList.length();
+  theTrgList.length(oldLen + srcLen);
+  for( int i = 0; i < srcLen; i++ )
+    theTrgList[ oldLen + i ] = GEOM::GEOM_Object::_duplicate( theSrcList[ i ] );
+}
+
+//============================================================================
+// function : RestoreSubShapes
+// purpose  : Private method. Works only if both theObject and theSObject
+//            are defined, and does not check, if they correspond to each other.
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr     theStudy,
+                                             GEOM::GEOM_Object_ptr   theObject,
+                                             SALOMEDS::SObject_ptr   theSObject,
+                                             const GEOM::ListOfGO&   theArgs,
+                                             GEOM::find_shape_method theFindMethod,
+                                             CORBA::Boolean          theInheritFirstArg,
+                                             CORBA::Boolean          theAddPrefix)
+{
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  //PTv, IMP 0020001, The salome object <theSObject>
+  //     is not obligatory in case of invokation from script
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
+    return aParts._retn();
+
+  // For Dump Python (mantis issue 0020768)
+  GEOM::ListOfGO_var anOutArgs = new GEOM::ListOfGO;
+
+  // Arguments to be published
+  GEOM::ListOfGO_var aList;
+
+  // If theArgs list is empty, we try to publish all arguments,
+  // otherwise publish only passed args
+  Standard_Integer nbArgsActual = -1; // -1 means unknown
+  Standard_Integer aLength = theArgs.length();
+  if (aLength > 0) {
+    aList = new GEOM::ListOfGO;
+    aList->length(aLength);
+    for (int i = 0; i < aLength; i++) {
+      aList[i] = GEOM::GEOM_Object::_duplicate( theArgs[i] );
+    }
+  }
+  else {
+    // Get all arguments
+    aList = theObject->GetDependency();
+    aLength = aList->length();
+    nbArgsActual = aLength;
+  }
+
+  if (aLength < 1)
+    return aParts._retn();
+
+  if (theInheritFirstArg || (nbArgsActual == 1)) {
+    // Do not publish argument's reflection,
+    // but only reconstruct its published sub-shapes
+
+    CORBA::String_var anIOR = _orb->object_to_string(aList[0]);
+    SALOMEDS::SObject_var anArgSO = theStudy->FindObjectIOR(anIOR.in());
+
+    // remember restored objects for Python Dump
+    addToListOfGO(aList[0], anOutArgs);
+
+    aParts = RestoreSubShapesOneLevel(theStudy, anArgSO, theSObject, theObject,
+                                      anOutArgs, theFindMethod, theAddPrefix);
+
+    // set the color of the transformed shape to the color of initial shape
+    theObject->SetColor(aList[0]->GetColor());
+    // set the texture
+    if (theObject->GetShapeType() == GEOM::VERTEX) {
+      theObject->SetMarkerStd(aList[0]->GetMarkerType(), aList[0]->GetMarkerSize());
+      if (aList[0]->GetMarkerType() == GEOM::MT_USER)
+        theObject->SetMarkerTexture(aList[0]->GetMarkerTexture());
+    }
+
+    anArgSO->UnRegister();
+  }
+  else {
+    // Get interface, containing method, which we will use to reconstruct sub-shapes
+    GEOM::GEOM_IShapesOperations_var  aShapesOp = GetIShapesOperations(theStudy->StudyId());
+    GEOM::GEOM_IGroupOperations_var    aGroupOp = GetIGroupOperations(theStudy->StudyId());
+    GEOM::GEOM_ITransformOperations_var aTrsfOp = GetITransformOperations(theStudy->StudyId());
+
+    // Reconstruct arguments and tree of sub-shapes of the arguments
+    CORBA::String_var anIOR;
+    SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+    for (Standard_Integer i = 0; i < aLength; i++)
+    {
+      GEOM::GEOM_Object_var anArgO = aList[i];
+      if (!CORBA::is_nil(anArgO)) {
+        anIOR = _orb->object_to_string(anArgO);
+        SALOMEDS::SObject_var anArgSO = theStudy->FindObjectIOR(anIOR.in());
+        TCollection_AsciiString anArgName;
+        if (CORBA::is_nil(anArgSO)) {
+          anArgName = "arg_";
+          anArgName += TCollection_AsciiString(i);
+        }
+        else {
+          anArgName = anArgSO->GetName();
+        }
+
+        // Find a sub-shape of theObject in place of the argument
+        GEOM::GEOM_Object_var aSubO;
+        switch (theFindMethod) {
+        case GEOM::FSM_GetInPlace:
+          {
+            // Use GetInPlace
+            aSubO = aShapesOp->GetInPlace(theObject, anArgO);
+          }
+          break;
+        case GEOM::FSM_MultiTransformed:
+          {
+            // Only for Multi-transformations
+            GEOM::GEOM_Object_var anArgOTrsf = aTrsfOp->TransformLikeOtherCopy(anArgO, theObject);
+            if (!CORBA::is_nil(anArgOTrsf)) {
+              CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
+              Handle(GEOM_Object) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+              Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+              anArgOTrsfFun->SetDescription("");
+              aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf);
+            }
+            /*
+            Handle(GEOM_Function) anOFun = theObject->GetLastFunction();
+            if (!anOFun.IsNull()) {
+              CORBA::String_var entryArg = anArgO->GetEntry();
+              Handle(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg);
+              if (!anArgOImpl.IsNull()) {
+                TopoDS_Shape anArgOShape = anArgOImpl->GetValue();
+                TopoDS_Shape aMultiArgShape;
+                //GEOM::GEOM_Object_var anArgOMulti; // ???
+                switch (anOFun->GetType()) {
+                case TRANSLATE_1D:
+                  {
+                    GEOMImpl_ITranslate aTI (anOFun);
+                    aMultiArgShape = GEOMImpl_ITransformOperations::TranslateShape1D(anArgOShape, &aTI);
+                    //anArgOMulti = aTrsfOp->Translate1D(anArgO, , , );
+                  }
+                  break;
+                case TRANSLATE_2D:
+                  {
+                    GEOMImpl_ITranslate aTI (anOFun);
+                    aMultiArgShape = GEOMImpl_ITransformOperations::TranslateShape2D(anArgOShape, &aTI);
+                  }
+                  break;
+                case ROTATE_1D:
+                  {
+                    GEOMImpl_IRotate aTI (anOFun);
+                    //aMultiArgShape = GEOMImpl_ITransformOperations::TranslateShape2D(anArgOShape, &aTI);
+                  }
+                  break;
+                case ROTATE_2D:
+                  {
+                    GEOMImpl_IRotate aTI (anOFun);
+                    //aMultiArgShape = GEOMImpl_ITransformOperations::TranslateShape2D(anArgOShape, &aTI);
+                  }
+                  break;
+                default:
+                  {}
+                }
+                GEOM::GEOM_Object_var anArgOMulti = (aMultiArgShape); // TODO
+                Handle(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction();
+                anArgOMultiFun->SetDescription("");
+                aSubO = aShapesOp->GetInPlace(theObject, anArgOMulti);
+              }
+            }
+            */
+          }
+          break;
+        case GEOM::FSM_Transformed:
+          {
+            // transformation, cannot use GetInPlace, operate with indices
+            GEOM::ListOfLong_var anIDs = anArgO->GetSubShapeIndices();
+            if (anIDs->length() > 1) {
+              // group
+              aSubO = aGroupOp->CreateGroup(theObject, aGroupOp->GetType(anArgO));
+              if (!CORBA::is_nil(aSubO))
+                aGroupOp->UnionIDs(aSubO, anIDs);
+            }
+            else if (anIDs->length() > 0) {
+              // single sub-shape
+              aSubO = aShapesOp->GetSubShape(theObject, anIDs[0]);
+            }
+          }
+          break;
+        case GEOM::FSM_GetSame:
+          {
+            // Use GetSame
+            aSubO = aShapesOp->GetSame(theObject, anArgO);
+          }
+          break;
+        case GEOM::FSM_GetShapesOnShape:
+          {
+            // Use GetShapesOnShape. Can work only on solids, so it has sense to search only solids
+            aSubO = aShapesOp->GetShapesOnShapeAsCompound(anArgO, theObject,
+              (short)GEOM::SOLID, GEOM::ST_ONIN);
+          }
+          break;
+        case GEOM::FSM_GetInPlaceByHistory:
+          {
+            // Use GetInPlaceByHistory
+            aSubO = aShapesOp->GetInPlaceByHistory(theObject, anArgO);
+          }
+          break;
+        default:
+          {}
+        }
+
+        if (!CORBA::is_nil(aSubO)) {
+          // remember restored objects for Python Dump
+          addToListOfGO(anArgO, anOutArgs);
+
+          // add to parts list
+          addToListOfGO( aSubO, aParts );
+
+          // Publish the sub-shape
+          SALOMEDS::SObject_var aSubSO;
+          if (!CORBA::is_nil(theSObject)) {
+            TCollection_AsciiString aSubName;
+            if (theAddPrefix) {
+              aSubName = "from_";
+            }
+            aSubName += anArgName;
+            aSubSO = aStudyBuilder->NewObject(theSObject);
+            aSubSO = PublishInStudy(theStudy, aSubSO, aSubO, aSubName.ToCString());
+            // Restore color
+            aSubO->SetColor(anArgO->GetColor());
+            // set the texture
+            if (aSubO->GetShapeType() == GEOM::VERTEX) {
+              aSubO->SetMarkerStd(anArgO->GetMarkerType(), anArgO->GetMarkerSize());
+              if (anArgO->GetMarkerType() == GEOM::MT_USER)
+                aSubO->SetMarkerTexture(anArgO->GetMarkerTexture());
+            }
+          }
+
+          if (!CORBA::is_nil(anArgSO)) {
+            // Restore published sub-shapes of the argument
+            GEOM::ListOfGO_var aSubParts;
+            if (theFindMethod == GEOM::FSM_GetInPlaceByHistory)
+              // pass theObject, because only it has the history
+              aSubParts = RestoreSubShapesOneLevel(theStudy, anArgSO, aSubSO,
+                                                   theObject, anOutArgs, theFindMethod, theAddPrefix);
+            else
+              aSubParts = RestoreSubShapesOneLevel(theStudy, anArgSO, aSubSO,
+                                                   aSubO, anOutArgs, theFindMethod, theAddPrefix);
+            // add to parts list
+            addToListOfGO( aSubParts, aParts );
+          }
+        }
+        else { // GetInPlace failed, try to build from published parts
+          if (!CORBA::is_nil(anArgSO)) {
+            SALOMEDS::SObject_var aSubSO;
+            if (!CORBA::is_nil(theSObject))
+              aSubSO = aStudyBuilder->NewObject(theSObject);
+
+            // Restore published sub-shapes of the argument
+            GEOM::ListOfGO_var aSubParts =
+              RestoreSubShapesOneLevel(theStudy, anArgSO, aSubSO,
+                                       theObject, anOutArgs, theFindMethod, theAddPrefix);
+
+            // add to parts list
+            addToListOfGO( aSubParts, aParts );
+
+            if (aSubParts->length() > 0) {
+              // remember restored objects for Python Dump
+              addToListOfGO(anArgO, anOutArgs);
+
+              // try to build an argument from a set of its sub-shapes,
+              // that published and will be reconstructed
+              if (aSubParts->length() > 1) {
+                aSubO = aShapesOp->MakeCompound(aSubParts);
+                // add to parts list
+                addToListOfGO( aSubO, aParts );
+              }
+              else {
+                aSubO = aSubParts[0];
+              }
+              if (!CORBA::is_nil(aSubO) && !CORBA::is_nil(aSubSO)) {
+                // Publish the sub-shape
+                TCollection_AsciiString aSubName;
+                if (theAddPrefix) {
+                  aSubName = "from_parts_of_";
+                }
+                aSubName += anArgName;
+                aSubSO = PublishInStudy(theStudy, aSubSO, aSubO, aSubName.ToCString());
+                // Restore color
+                aSubO->SetColor(anArgO->GetColor());
+                // set the texture
+                if (aSubO->GetShapeType() == GEOM::VERTEX) {
+                  aSubO->SetMarkerStd(anArgO->GetMarkerType(), anArgO->GetMarkerSize());
+                  if (anArgO->GetMarkerType() == GEOM::MT_USER)
+                    aSubO->SetMarkerTexture(anArgO->GetMarkerTexture());
+                }
+              }
+            }
+            else if (!CORBA::is_nil(aSubSO)) {
+              // remove created aSubSO, because no parts have been found
+              aStudyBuilder->RemoveObject(aSubSO);
+            }
+          }
+        } // try to build from published parts
+        anArgSO->UnRegister();
+      }
+    } // process arguments
+  }
+  std::set<std::string> anObjEntryMap;
+  GEOM::ListOfGO_var aResParts = new GEOM::ListOfGO;
+  int nbRes = 0;
+  int nb = aParts->length();
+  aResParts->length(nb);
+  if (nb > 0)
+  {
+    Handle(GEOM_Object) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    Handle(GEOM_Function) aFunction = aMainObj->GetLastFunction();
+    GEOM::TPythonDump pd (aFunction, true);
+    pd <<"[";
+    int i = 0, j = 0;
+    for ( ; i < nb; i++ )
+    {
+      GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_duplicate( aParts[ i ] );
+      if (CORBA::is_nil(anObj))
+        continue;
+      char* anEntry = anObj->GetEntry();
+      if (anObjEntryMap.count(anEntry))
+        continue; // already treated
+      anObjEntryMap.insert(anEntry);
+      aResParts[nbRes++] = anObj;
+      // clear python dump of object
+      Handle(GEOM_Object) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
+      Handle(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
+      if ( !anObjFun.IsNull() )
+        anObjFun->SetDescription( "" );
+      if ( j > 0 )
+        pd << ", ";
+      pd << aGeomObj;
+      j++;
+    }
+    pd <<"]" << " = geompy.RestoreGivenSubShapes(" << aMainObj << ", " << "[";
+    //i = 0; nb = theArgs.length(); j = 0;
+    i = 0; nb = anOutArgs->length(); j = 0;
+    for ( ; i < nb; i++ )
+    {
+      //GEOM::GEOM_Object_var anObj = theArgs[ i ];
+      GEOM::GEOM_Object_var anObj = anOutArgs[ i ];
+      if (CORBA::is_nil(anObj))
+        continue;
+      Handle(GEOM_Object) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
+      if ( j > 0 )
+        pd << ", ";
+      pd << aGeomObj;
+      j++;
+    }
+    pd <<"]" << ", " <<"geompy.GEOM.";
+    switch (theFindMethod) {
+    case GEOM::FSM_GetInPlace:
+      pd << "FSM_GetInPlace"; break;
+    case GEOM::FSM_MultiTransformed:
+      pd << "FSM_MultiTransformed"; break;
+    case GEOM::FSM_Transformed:
+      pd << "FSM_Transformed"; break;
+    case GEOM::FSM_GetSame:
+      pd << "FSM_GetSame"; break;
+    case GEOM::FSM_GetShapesOnShape:
+      pd << "FSM_GetShapesOnShape"; break;
+    case GEOM::FSM_GetInPlaceByHistory:
+    default:
+      pd << "FSM_GetInPlaceByHistory"; break;
+    }
+    pd << ", " << theInheritFirstArg << ", " << theAddPrefix << ")";
+  }
+  aResParts->length(nbRes);
+  return aResParts._retn();
+}
+
+//============================================================================
+// function : RestoreSubShapesOneLevel
+// purpose  : Private method
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::Study_ptr     theStudy,
+                                                      SALOMEDS::SObject_ptr   theOldSO,
+                                                      SALOMEDS::SObject_ptr   theNewSO,
+                                                      GEOM::GEOM_Object_ptr   theNewO,
+                                                      GEOM::ListOfGO&         theOutArgs,
+                                                      GEOM::find_shape_method theFindMethod,
+                                                      CORBA::Boolean          theAddPrefix)
+{
+  int i = 0;
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  GEOM::ListOfGO_var aNewParts = new GEOM::ListOfGO;
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theOldSO) ||
+      CORBA::is_nil(theNewO) /*|| CORBA::is_nil(theNewSO)*/)
+    return aParts._retn();
+
+  SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+
+  // Get interface, containing method, which we will use to reconstruct sub-shapes
+  GEOM::GEOM_IShapesOperations_var  aShapesOp = GetIShapesOperations(theStudy->StudyId());
+  GEOM::GEOM_IGroupOperations_var    aGroupOp = GetIGroupOperations(theStudy->StudyId());
+  GEOM::GEOM_ITransformOperations_var aTrsfOp = GetITransformOperations(theStudy->StudyId());
+
+  // Reconstruct published sub-shapes
+  SALOMEDS::ChildIterator_var it = theStudy->NewChildIterator(theOldSO);
+
+  int aLen = 0;
+  for (it->Init(); it->More(); it->Next()) {
+    aLen++;
+  }
+  aParts->length(aLen);
+
+  for (it->Init(); it->More(); it->Next()) {
+    SALOMEDS::SObject_var anOldSubSO = it->Value();
+
+    TCollection_AsciiString anArgName = anOldSubSO->GetName();
+
+    SALOMEDS::GenericAttribute_var anAttr;
+    if (anOldSubSO->FindAttribute(anAttr, "AttributeIOR")) {
+      SALOMEDS::AttributeIOR_var anAttrIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+      GEOM::GEOM_Object_var anOldSubO =
+        GEOM::GEOM_Object::_narrow(_orb->string_to_object(anAttrIOR->Value()));
+      if (!CORBA::is_nil(anOldSubO)) {
+        // Find a sub-shape of theNewO in place of anOldSubO
+        GEOM::GEOM_Object_var aNewSubO;
+        switch (theFindMethod) {
+        case GEOM::FSM_GetInPlace:
+          {
+            // Use GetInPlace
+            aNewSubO = aShapesOp->GetInPlace(theNewO, anOldSubO);
+          }
+          break;
+        case GEOM::FSM_MultiTransformed:
+          {
+            // Only for Multi-transformations
+            GEOM::GEOM_Object_var anArgOTrsf = aTrsfOp->TransformLikeOtherCopy(anOldSubO, theNewO);
+            if (!CORBA::is_nil(anArgOTrsf)) {
+              CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
+              Handle(GEOM_Object) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+              Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+              anArgOTrsfFun->SetDescription("");
+              aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf);
+            }
+          }
+          break;
+        case GEOM::FSM_Transformed:
+          {
+            // transformation, cannot use GetInPlace, operate with indices
+            GEOM::ListOfLong_var anIDs = anOldSubO->GetSubShapeIndices();
+            if (anIDs->length() > 1) {
+              // group
+              aNewSubO = aGroupOp->CreateGroup(theNewO, aGroupOp->GetType(anOldSubO));
+              if (!CORBA::is_nil(aNewSubO))
+                aGroupOp->UnionIDs(aNewSubO, anIDs);
+            }
+            else {
+              // single sub-shape
+              aNewSubO = aShapesOp->GetSubShape(theNewO, anIDs[0]);
+            }
+          }
+          break;
+        case GEOM::FSM_GetSame:
+          {
+            // Use GetSame
+            aNewSubO = aShapesOp->GetSame(theNewO, anOldSubO);
+          }
+          break;
+        case GEOM::FSM_GetShapesOnShape:
+          {
+            // Use GetShapesOnShape. Can work only on solids, so it has sense to search only solids
+            aNewSubO = aShapesOp->GetShapesOnShapeAsCompound(anOldSubO, theNewO,
+                                                             (short)GEOM::SOLID, GEOM::ST_ONIN);
+          }
+          break;
+        case GEOM::FSM_GetInPlaceByHistory:
+          {
+            // Use GetInPlaceByHistory
+            aNewSubO = aShapesOp->GetInPlaceByHistory(theNewO, anOldSubO);
+          }
+          break;
+        default:
+          {}
+        }
+
+        if (!CORBA::is_nil(aNewSubO)) {
+          // remember restored objects for Python Dump
+          addToListOfGO(anOldSubO, theOutArgs);
+
+          // add the part to the list
+          aParts[i] = aNewSubO;
+          i++;
+          // add to parts list
+          addToListOfGO( aNewSubO, aNewParts );
+
+          SALOMEDS::SObject_var aNewSubSO;
+          if (!CORBA::is_nil(theNewSO)) {
+              // Publish the sub-shape
+            TCollection_AsciiString aSubName;
+            if (theAddPrefix) {
+              aSubName = "from_";
+            }
+            aSubName += anArgName;
+            aNewSubSO = aStudyBuilder->NewObject(theNewSO);
+            aNewSubSO = PublishInStudy(theStudy, aNewSubSO, aNewSubO, aSubName.ToCString());
+            // Restore color
+            aNewSubO->SetColor(anOldSubO->GetColor());
+            // set the texture
+            if (aNewSubO->GetShapeType() == GEOM::VERTEX) {
+              aNewSubO->SetMarkerStd(anOldSubO->GetMarkerType(), anOldSubO->GetMarkerSize());
+              if (anOldSubO->GetMarkerType() == GEOM::MT_USER)
+                aNewSubO->SetMarkerTexture(anOldSubO->GetMarkerTexture());
+            }
+          }
+          // Restore published sub-shapes of the argument
+          GEOM::ListOfGO_var aSubParts;
+          if (theFindMethod == GEOM::FSM_GetInPlaceByHistory)
+            // pass the main shape as Object, because only it has the history
+            aSubParts = RestoreSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO,
+                                                 theNewO, theOutArgs, theFindMethod, theAddPrefix);
+          else
+            aSubParts = RestoreSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO,
+                                                 aNewSubO, theOutArgs, theFindMethod, theAddPrefix);
+          // add to parts list
+          addToListOfGO( aSubParts, aNewParts );
+        }
+        else { // GetInPlace failed, try to build from published parts
+          SALOMEDS::SObject_var aNewSubSO;
+          if (!CORBA::is_nil(theNewSO))
+            aNewSubSO = aStudyBuilder->NewObject(theNewSO);
+
+          // Restore published sub-shapes of the argument
+          GEOM::ListOfGO_var aSubParts =
+            RestoreSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO,
+                                     theNewO, theOutArgs, theFindMethod, theAddPrefix);
+          // add to parts list
+          addToListOfGO( aSubParts, aNewParts );
+
+          if (aSubParts->length() > 0) {
+            // remember restored objects for Python Dump
+            addToListOfGO(anOldSubO, theOutArgs);
+
+            // try to build an object from a set of its sub-shapes,
+            // that published and will be reconstructed
+            if (aSubParts->length() > 1) {
+              aNewSubO = aShapesOp->MakeCompound(aSubParts);
+              // add to parts list
+              addToListOfGO( aNewSubO, aNewParts );
+            }
+            else {
+              aNewSubO = aSubParts[0];
+            }
+
+            if (!CORBA::is_nil(aNewSubO)) {
+              // add the part to the list
+              aSubParts[i] = aNewSubO;
+              i++;
+
+              // Publish the sub-shape
+              if (!CORBA::is_nil(aNewSubSO)) {
+                TCollection_AsciiString aSubName;
+                if (theAddPrefix) {
+                  aSubName = "from_parts_of_";
+                }
+                aSubName += anArgName;
+                aNewSubSO = PublishInStudy(theStudy, aNewSubSO, aNewSubO, aSubName.ToCString());
+                // Restore color
+                aNewSubO->SetColor(anOldSubO->GetColor());
+                // set the texture
+                if (aNewSubO->GetShapeType() == GEOM::VERTEX) {
+                  aNewSubO->SetMarkerStd(anOldSubO->GetMarkerType(), anOldSubO->GetMarkerSize());
+                  if (anOldSubO->GetMarkerType() == GEOM::MT_USER)
+                    aNewSubO->SetMarkerTexture(anOldSubO->GetMarkerTexture());
+                }
+              }
+            }
+          }
+          else if (!CORBA::is_nil(aNewSubSO)) {
+            // remove created aSubSO, because no parts have been found
+            aStudyBuilder->RemoveObject(aNewSubSO);
+          }
+        } // try to build from published parts
+      }
+    }
+  } // iterate on published sub-shapes
+
+  aParts->length(i);
+  // add to parts list
+  addToListOfGO( aNewParts, aParts );
+  return aParts._retn();
+}
+
+//============================================================================
+// function : RestoreGivenSubShapes
+// purpose  : Private method. Works only if both theObject and theSObject
+//            are defined, and does not check, if they correspond to each other.
+//            List theArgs in this case contains not only operation arguments,
+//            but also all subshapes, which must be published.
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr     theStudy,
+                                                  GEOM::GEOM_Object_ptr   theObject,
+                                                  SALOMEDS::SObject_ptr   theSObject,
+                                                  const GEOM::ListOfGO&   theArgs,
+                                                  GEOM::find_shape_method theFindMethod,
+                                                  CORBA::Boolean          theInheritFirstArg,
+                                                  CORBA::Boolean          theAddPrefix)
+{
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  //PTv, IMP 0020001, The salome object <theSObject>
+  //     is not obligatory in case of invokation from script
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
+    return aParts._retn();
+
+  // If theArgs list is empty, nothing to do
+  Standard_Integer aLength = theArgs.length();
+  if (aLength == 0)
+    return aParts._retn();
+
+  // Get all arguments
+  GEOM::ListOfGO_var anOpArgsList = theObject->GetDependency();
+  Standard_Integer nbArgsActual = anOpArgsList->length();
+
+  // If anOpArgsList list is empty, nothing to do
+  if (nbArgsActual == 0)
+    return aParts._retn();
+
+  // Entries of arguments and subshapes
+  std::set<std::string> anArgs;
+  for (int i = 0; i < aLength; i++) {
+    CORBA::String_var anEntry = theArgs[i]->GetEntry();
+    anArgs.insert(anEntry.in());
+  }
+
+  // Arguments to be published
+  // We try to publish all arguments, that are in theArgs list
+  GEOM::ListOfGO_var aList = new GEOM::ListOfGO;
+  aList->length(nbArgsActual);
+
+  int k = 0;
+  for (int j = 0; j < nbArgsActual; j++) {
+    CORBA::String_var anEntry = anOpArgsList[j]->GetEntry();
+    if (anArgs.count(anEntry.in())) {
+      aList[k] = GEOM::GEOM_Object::_duplicate(anOpArgsList[j]);
+      k++;
+    }
+  }
+  nbArgsActual = k;
+  //aList->length(nbArgsActual);
+
+  if (nbArgsActual < 1)
+    return aParts._retn();
+
+  if (theInheritFirstArg || (nbArgsActual == 1)) {
+    // Do not publish argument's reflection,
+    // but only reconstruct its published sub-shapes
+
+    CORBA::String_var anIOR = _orb->object_to_string(aList[0]);
+    SALOMEDS::SObject_var anArgSO = theStudy->FindObjectIOR(anIOR.in());
+
+    aParts = RestoreGivenSubShapesOneLevel(theStudy, anArgSO, theSObject, theObject,
+                                           anArgs, theFindMethod, theAddPrefix);
+
+    // set the color of the transformed shape to the color of initial shape
+    theObject->SetColor(aList[0]->GetColor());
+    // set the texture
+    if (theObject->GetShapeType() == GEOM::VERTEX) {
+      theObject->SetMarkerStd(aList[0]->GetMarkerType(), aList[0]->GetMarkerSize());
+      if (aList[0]->GetMarkerType() == GEOM::MT_USER)
+        theObject->SetMarkerTexture(aList[0]->GetMarkerTexture());
+    }
+
+    anArgSO->UnRegister();
+  }
+  else {
+    // Get interface, containing method, which we will use to reconstruct sub-shapes
+    GEOM::GEOM_IShapesOperations_var  aShapesOp = GetIShapesOperations(theStudy->StudyId());
+    GEOM::GEOM_IGroupOperations_var    aGroupOp = GetIGroupOperations(theStudy->StudyId());
+    GEOM::GEOM_ITransformOperations_var aTrsfOp = GetITransformOperations(theStudy->StudyId());
+
+    // Reconstruct arguments and tree of sub-shapes of the arguments
+    CORBA::String_var anIOR;
+    SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+    for (Standard_Integer i = 0; i < nbArgsActual; i++)
+    {
+      GEOM::GEOM_Object_var anArgO = aList[i];
+      if (!CORBA::is_nil(anArgO)) {
+        anIOR = _orb->object_to_string(anArgO);
+        SALOMEDS::SObject_var anArgSO = theStudy->FindObjectIOR(anIOR.in());
+        TCollection_AsciiString anArgName;
+        if (CORBA::is_nil(anArgSO)) {
+          anArgName = "arg_";
+          anArgName += TCollection_AsciiString(i);
+        }
+        else {
+          anArgName = anArgSO->GetName();
+        }
+
+        // Find a sub-shape of theObject in place of the argument
+        GEOM::GEOM_Object_var aSubO;
+        switch (theFindMethod) {
+        case GEOM::FSM_GetInPlace:
+          {
+            // Use GetInPlace
+            aSubO = aShapesOp->GetInPlace(theObject, anArgO);
+          }
+          break;
+        case GEOM::FSM_MultiTransformed:
+          {
+            // Only for Multi-transformations
+            GEOM::GEOM_Object_var anArgOTrsf = aTrsfOp->TransformLikeOtherCopy(anArgO, theObject);
+            if (!CORBA::is_nil(anArgOTrsf)) {
+              CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
+              Handle(GEOM_Object) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+              Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+              anArgOTrsfFun->SetDescription("");
+              aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf);
+            }
+          }
+          break;
+        case GEOM::FSM_Transformed:
+          {
+            // transformation, cannot use GetInPlace, operate with indices
+            GEOM::ListOfLong_var anIDs = anArgO->GetSubShapeIndices();
+            if (anIDs->length() > 1) {
+              // group
+              aSubO = aGroupOp->CreateGroup(theObject, aGroupOp->GetType(anArgO));
+              if (!CORBA::is_nil(aSubO))
+                aGroupOp->UnionIDs(aSubO, anIDs);
+            }
+            else if (anIDs->length() > 0) {
+              // single sub-shape
+              aSubO = aShapesOp->GetSubShape(theObject, anIDs[0]);
+            }
+          }
+          break;
+        case GEOM::FSM_GetSame:
+          {
+            // Use GetSame
+            aSubO = aShapesOp->GetSame(theObject, anArgO);
+          }
+          break;
+        case GEOM::FSM_GetShapesOnShape:
+          {
+            // Use GetShapesOnShape. Can work only on solids, so it has sense to search only solids
+            aSubO = aShapesOp->GetShapesOnShapeAsCompound(anArgO, theObject,
+              (short)GEOM::SOLID, GEOM::ST_ONIN);
+          }
+          break;
+        case GEOM::FSM_GetInPlaceByHistory:
+          {
+            // Use GetInPlaceByHistory
+            aSubO = aShapesOp->GetInPlaceByHistory(theObject, anArgO);
+          }
+          break;
+        default:
+          {}
+        }
+
+        if (!CORBA::is_nil(aSubO)) {
+          // add to parts list
+          addToListOfGO( aSubO, aParts );
+
+          // Publish the sub-shape
+          SALOMEDS::SObject_var aSubSO;
+          if (!CORBA::is_nil(theSObject)) {
+            TCollection_AsciiString aSubName;
+            if (theAddPrefix) {
+              aSubName = "from_";
+            }
+            aSubName += anArgName;
+            aSubSO = aStudyBuilder->NewObject(theSObject);
+            aSubSO = PublishInStudy(theStudy, aSubSO, aSubO, aSubName.ToCString());
+            // Restore color
+            aSubO->SetColor(anArgO->GetColor());
+            // set the texture
+            if (aSubO->GetShapeType() == GEOM::VERTEX) {
+              aSubO->SetMarkerStd(anArgO->GetMarkerType(), anArgO->GetMarkerSize());
+              if (anArgO->GetMarkerType() == GEOM::MT_USER)
+                aSubO->SetMarkerTexture(anArgO->GetMarkerTexture());
+            }
+          }
+
+          if (!CORBA::is_nil(anArgSO)) {
+            // Restore published sub-shapes of the argument
+            GEOM::ListOfGO_var aSubParts;
+            if (theFindMethod == GEOM::FSM_GetInPlaceByHistory)
+              // pass theObject, because only it has the history
+              aSubParts = RestoreGivenSubShapesOneLevel(theStudy, anArgSO, aSubSO,
+                                                        theObject, anArgs, theFindMethod, theAddPrefix);
+            else
+              aSubParts = RestoreGivenSubShapesOneLevel(theStudy, anArgSO, aSubSO,
+                                                        aSubO, anArgs, theFindMethod, theAddPrefix);
+            // add to parts list
+            addToListOfGO( aSubParts, aParts );
+          }
+        }
+        else { // GetInPlace failed, try to build from published parts
+          if (!CORBA::is_nil(anArgSO)) {
+            SALOMEDS::SObject_var aSubSO;
+            if (!CORBA::is_nil(theSObject))
+              aSubSO = aStudyBuilder->NewObject(theSObject);
+
+            // Restore published sub-shapes of the argument
+            GEOM::ListOfGO_var aSubParts =
+              RestoreGivenSubShapesOneLevel(theStudy, anArgSO, aSubSO,
+                                            theObject, anArgs, theFindMethod, theAddPrefix);
+
+            // add to parts list
+            addToListOfGO( aSubParts, aParts );
+
+            if (aSubParts->length() > 0) {
+              // try to build an argument from a set of its sub-shapes,
+              // that published and will be reconstructed
+              if (aSubParts->length() > 1) {
+                aSubO = aShapesOp->MakeCompound(aSubParts);
+                // add to parts list
+                addToListOfGO( aSubO, aParts );
+              }
+              else {
+                aSubO = aSubParts[0];
+              }
+              if (!CORBA::is_nil(aSubO) && !CORBA::is_nil(aSubSO)) {
+                // Publish the sub-shape
+                TCollection_AsciiString aSubName;
+                if (theAddPrefix) {
+                  aSubName = "from_parts_of_";
+                }
+                aSubName += anArgName;
+                aSubSO = PublishInStudy(theStudy, aSubSO, aSubO, aSubName.ToCString());
+                // Restore color
+                aSubO->SetColor(anArgO->GetColor());
+                // set the texture
+                if (aSubO->GetShapeType() == GEOM::VERTEX) {
+                  aSubO->SetMarkerStd(anArgO->GetMarkerType(), anArgO->GetMarkerSize());
+                  if (anArgO->GetMarkerType() == GEOM::MT_USER)
+                    aSubO->SetMarkerTexture(anArgO->GetMarkerTexture());
+                }
+              }
+            }
+            else if (!CORBA::is_nil(aSubSO)) {
+              // remove created aSubSO, because no parts have been found
+              aStudyBuilder->RemoveObject(aSubSO);
+            }
+          }
+        } // try to build from published parts
+        anArgSO->UnRegister();
+      }
+    } // process arguments
+  }
+  std::set<std::string> anObjEntryMap;
+  GEOM::ListOfGO_var aResParts = new GEOM::ListOfGO;
+  int nbRes = 0;
+  int nb = aParts->length();
+  aResParts->length(nb);
+  if (nb > 0)
+  {
+    Handle(GEOM_Object) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    Handle(GEOM_Function) aFunction = aMainObj->GetLastFunction();
+    GEOM::TPythonDump pd (aFunction, true);
+    pd <<"[";
+    int i = 0, j = 0;
+    for ( ; i < nb; i++ )
+    {
+      GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_duplicate( aParts[ i ] );
+      if (CORBA::is_nil(anObj))
+        continue;
+      char* anEntry = anObj->GetEntry();
+      if (anObjEntryMap.count(anEntry))
+        continue; // already treated
+      anObjEntryMap.insert(anEntry);
+      aResParts[nbRes++] = anObj;
+      // clear python dump of object
+      Handle(GEOM_Object) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
+      Handle(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
+      if ( !anObjFun.IsNull() )
+        anObjFun->SetDescription( "" );
+      if ( j > 0 )
+        pd << ", ";
+      pd << aGeomObj;
+      j++;
+    }
+    pd <<"]" << " = geompy.RestoreGivenSubShapes(" << aMainObj << ", " << "[";
+    i = 0; nb = theArgs.length(); j = 0;
+    for ( ; i < nb; i++ )
+    {
+      GEOM::GEOM_Object_var anObj = theArgs[ i ];
+      if (CORBA::is_nil(anObj))
+        continue;
+      Handle(GEOM_Object) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
+      if ( j > 0 )
+        pd << ", ";
+      pd << aGeomObj;
+      j++;
+    }
+    pd <<"]" << ", " <<"geompy.GEOM.";
+    switch (theFindMethod) {
+    case GEOM::FSM_GetInPlace:
+      pd << "FSM_GetInPlace"; break;
+    case GEOM::FSM_MultiTransformed:
+      pd << "FSM_MultiTransformed"; break;
+    case GEOM::FSM_Transformed:
+      pd << "FSM_Transformed"; break;
+    case GEOM::FSM_GetSame:
+      pd << "FSM_GetSame"; break;
+    case GEOM::FSM_GetShapesOnShape:
+      pd << "FSM_GetShapesOnShape"; break;
+    case GEOM::FSM_GetInPlaceByHistory:
+    default:
+      pd << "FSM_GetInPlaceByHistory"; break;
+    }
+    pd << ", " << theInheritFirstArg << ", " << theAddPrefix << ")";
+  }
+  aResParts->length(nbRes);
+  return aResParts._retn();
+}
+
+//============================================================================
+// function : RestoreGivenSubShapesOneLevel
+// purpose  : Private method
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::Study_ptr     theStudy,
+                                                           SALOMEDS::SObject_ptr   theOldSO,
+                                                           SALOMEDS::SObject_ptr   theNewSO,
+                                                           GEOM::GEOM_Object_ptr   theNewO,
+                                                           std::set<std::string>   theArgs,
+                                                           GEOM::find_shape_method theFindMethod,
+                                                           CORBA::Boolean          theAddPrefix)
+{
+  int i = 0;
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  GEOM::ListOfGO_var aNewParts = new GEOM::ListOfGO;
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theOldSO) ||
+      CORBA::is_nil(theNewO) /*|| CORBA::is_nil(theNewSO)*/)
+    return aParts._retn();
+
+  SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+
+  // Get interface, containing method, which we will use to reconstruct sub-shapes
+  GEOM::GEOM_IShapesOperations_var  aShapesOp = GetIShapesOperations(theStudy->StudyId());
+  GEOM::GEOM_IGroupOperations_var    aGroupOp = GetIGroupOperations(theStudy->StudyId());
+  GEOM::GEOM_ITransformOperations_var aTrsfOp = GetITransformOperations(theStudy->StudyId());
+
+  // Reconstruct published sub-shapes
+  SALOMEDS::ChildIterator_var it = theStudy->NewChildIterator(theOldSO);
+
+  int aLen = 0;
+  for (it->Init(); it->More(); it->Next()) {
+    aLen++;
+  }
+  aParts->length(aLen);
+
+  for (it->Init(); it->More(); it->Next()) {
+    SALOMEDS::SObject_var anOldSubSO = it->Value();
+
+    TCollection_AsciiString anArgName = anOldSubSO->GetName();
+
+    SALOMEDS::GenericAttribute_var anAttr;
+    if (anOldSubSO->FindAttribute(anAttr, "AttributeIOR")) {
+      SALOMEDS::AttributeIOR_var anAttrIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+      GEOM::GEOM_Object_var anOldSubO =
+        GEOM::GEOM_Object::_narrow(_orb->string_to_object(anAttrIOR->Value()));
+
+      bool okToContinue = false;
+
+      if (!CORBA::is_nil(anOldSubO)) {
+        CORBA::String_var anEntry = anOldSubO->GetEntry();
+        okToContinue = theArgs.count(anEntry.in());
+      }
+
+      if (okToContinue) {
+        // Find a sub-shape of theNewO in place of anOldSubO
+        GEOM::GEOM_Object_var aNewSubO;
+        switch (theFindMethod) {
+        case GEOM::FSM_GetInPlace:
+          {
+            // Use GetInPlace
+            aNewSubO = aShapesOp->GetInPlace(theNewO, anOldSubO);
+          }
+          break;
+        case GEOM::FSM_MultiTransformed:
+          {
+            // Only for Multi-transformations
+            GEOM::GEOM_Object_var anArgOTrsf = aTrsfOp->TransformLikeOtherCopy(anOldSubO, theNewO);
+            if (!CORBA::is_nil(anArgOTrsf)) {
+              CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
+              Handle(GEOM_Object) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+              Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+              anArgOTrsfFun->SetDescription("");
+              aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf);
+            }
+          }
+          break;
+        case GEOM::FSM_Transformed:
+          {
+            // transformation, cannot use GetInPlace, operate with indices
+            GEOM::ListOfLong_var anIDs = anOldSubO->GetSubShapeIndices();
+            if (anIDs->length() > 1) {
+              // group
+              aNewSubO = aGroupOp->CreateGroup(theNewO, aGroupOp->GetType(anOldSubO));
+              if (!CORBA::is_nil(aNewSubO))
+                aGroupOp->UnionIDs(aNewSubO, anIDs);
+            }
+            else {
+              // single sub-shape
+              aNewSubO = aShapesOp->GetSubShape(theNewO, anIDs[0]);
+            }
+          }
+          break;
+        case GEOM::FSM_GetSame:
+          {
+            // Use GetSame
+            aNewSubO = aShapesOp->GetSame(theNewO, anOldSubO);
+          }
+          break;
+        case GEOM::FSM_GetShapesOnShape:
+          {
+            // Use GetShapesOnShape. Can work only on solids, so it has sense to search only solids
+            aNewSubO = aShapesOp->GetShapesOnShapeAsCompound(anOldSubO, theNewO,
+                                                             (short)GEOM::SOLID, GEOM::ST_ONIN);
+          }
+          break;
+        case GEOM::FSM_GetInPlaceByHistory:
+          {
+            // Use GetInPlaceByHistory
+            aNewSubO = aShapesOp->GetInPlaceByHistory(theNewO, anOldSubO);
+          }
+          break;
+        default:
+          {}
+        }
+
+        if (!CORBA::is_nil(aNewSubO)) {
+          // add the part to the list
+          aParts[i] = aNewSubO;
+          i++;
+          // add to parts list
+          addToListOfGO( aNewSubO, aNewParts );
+
+          SALOMEDS::SObject_var aNewSubSO;
+          if (!CORBA::is_nil(theNewSO)) {
+              // Publish the sub-shape
+            TCollection_AsciiString aSubName;
+            if (theAddPrefix) {
+              aSubName = "from_";
+            }
+            aSubName += anArgName;
+            aNewSubSO = aStudyBuilder->NewObject(theNewSO);
+            aNewSubSO = PublishInStudy(theStudy, aNewSubSO, aNewSubO, aSubName.ToCString());
+            // Restore color
+            aNewSubO->SetColor(anOldSubO->GetColor());
+            // set the texture
+            if (aNewSubO->GetShapeType() == GEOM::VERTEX) {
+              aNewSubO->SetMarkerStd(anOldSubO->GetMarkerType(), anOldSubO->GetMarkerSize());
+              if (anOldSubO->GetMarkerType() == GEOM::MT_USER)
+                aNewSubO->SetMarkerTexture(anOldSubO->GetMarkerTexture());
+            }
+          }
+          // Restore published sub-shapes of the argument
+          GEOM::ListOfGO_var aSubParts;
+          if (theFindMethod == GEOM::FSM_GetInPlaceByHistory)
+            // pass the main shape as Object, because only it has the history
+            aSubParts = RestoreGivenSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO,
+                                                      theNewO, theArgs, theFindMethod, theAddPrefix);
+          else
+            aSubParts = RestoreGivenSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO,
+                                                      aNewSubO, theArgs, theFindMethod, theAddPrefix);
+          // add to parts list
+          addToListOfGO( aSubParts, aNewParts );
+        }
+        else { // GetInPlace failed, try to build from published parts
+          SALOMEDS::SObject_var aNewSubSO;
+          if (!CORBA::is_nil(theNewSO))
+            aNewSubSO = aStudyBuilder->NewObject(theNewSO);
+
+          // Restore published sub-shapes of the argument
+          GEOM::ListOfGO_var aSubParts =
+            RestoreGivenSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO,
+                                          theNewO, theArgs, theFindMethod, theAddPrefix);
+          // add to parts list
+          addToListOfGO( aSubParts, aNewParts );
+
+          if (aSubParts->length() > 0) {
+            // try to build an object from a set of its sub-shapes,
+            // that published and will be reconstructed
+            if (aSubParts->length() > 1) {
+              aNewSubO = aShapesOp->MakeCompound(aSubParts);
+              // add to parts list
+              addToListOfGO( aNewSubO, aNewParts );
+            }
+            else {
+              aNewSubO = aSubParts[0];
+            }
+
+            if (!CORBA::is_nil(aNewSubO)) {
+              // add the part to the list
+              aSubParts[i] = aNewSubO;
+              i++;
+
+              // Publish the sub-shape
+              if (!CORBA::is_nil(aNewSubSO)) {
+                TCollection_AsciiString aSubName;
+                if (theAddPrefix) {
+                  aSubName = "from_parts_of_";
+                }
+                aSubName += anArgName;
+                aNewSubSO = PublishInStudy(theStudy, aNewSubSO, aNewSubO, aSubName.ToCString());
+                // Restore color
+                aNewSubO->SetColor(anOldSubO->GetColor());
+                // set the texture
+                if (aNewSubO->GetShapeType() == GEOM::VERTEX) {
+                  aNewSubO->SetMarkerStd(anOldSubO->GetMarkerType(), anOldSubO->GetMarkerSize());
+                  if (anOldSubO->GetMarkerType() == GEOM::MT_USER)
+                    aNewSubO->SetMarkerTexture(anOldSubO->GetMarkerTexture());
+                }
+              }
+            }
+          }
+          else if (!CORBA::is_nil(aNewSubSO)) {
+            // remove created aSubSO, because no parts have been found
+            aStudyBuilder->RemoveObject(aNewSubSO);
+          }
+        } // try to build from published parts
+      }
+    }
+  } // iterate on published sub-shapes
+
+  aParts->length(i);
+  // add to parts list
+  addToListOfGO( aNewParts, aParts );
+  return aParts._retn();
+}
+
 //============================================================================
 // function : register()
 // purpose  : register 'name' in 'name_service'
 //============================================================================
 void GEOM_Gen_i::register_name(char * name)
 {
-  GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(_this());
-  name_service->Register(g, strdup(name));
+  GEOM::GEOM_Gen_var g = _this();
+  name_service->Register(g, name);
 }
 
 //============================================================================
@@ -553,9 +2052,11 @@ GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations(CORBA::Long theS
 
   GEOM::GEOM_Gen_ptr engine = _this();
 
+  //transfer reference on engine
   GEOM_IBasicOperations_i* aServant =
     new GEOM_IBasicOperations_i(_poa, engine, _impl->GetIBasicOperations(theStudyID));
 
+  PortableServer::ObjectId_var id = _poa->activate_object(aServant);
   // activate the CORBA servant
   GEOM::GEOM_IBasicOperations_var operations = aServant->_this();
   return operations._retn();
@@ -595,6 +2096,7 @@ GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations(CORBA::Long th
 
   GEOM_I3DPrimOperations_i* aServant =
     new GEOM_I3DPrimOperations_i(_poa, engine, _impl->GetI3DPrimOperations(theStudyID));
+  PortableServer::ObjectId_var id = _poa->activate_object(aServant);
 
   // activate the CORBA servant
   GEOM::GEOM_I3DPrimOperations_var operations = aServant->_this();
@@ -781,22 +2283,64 @@ GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations(CORBA::Long theS
   return operations._retn();
 }
 
+//============================================================================
+// function : GetIAdvancedOperations
+// purpose  :
+//============================================================================
+GEOM::GEOM_IAdvancedOperations_ptr GEOM_Gen_i::GetIAdvancedOperations(CORBA::Long theStudyID)
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  MESSAGE( "GEOM_Gen_i::GetIAdvancedOperations" );
+
+  GEOM::GEOM_Gen_ptr engine = _this();
+
+  GEOM_IAdvancedOperations_i* aServant =
+    new GEOM_IAdvancedOperations_i(_poa, engine, _impl->GetIAdvancedOperations(theStudyID));
+
+  // activate the CORBA servant
+  GEOM::GEOM_IAdvancedOperations_var operations = aServant->_this();
+  return operations._retn();
+}
+
+//============================================================================
+// function : GetIImportExportOperations
+// purpose  :
+//============================================================================
+GEOM::GEOM_IImportExportOperations_ptr GEOM_Gen_i::GetIImportExportOperations(CORBA::Long theStudyID)
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  MESSAGE( "GEOM_Gen_i::GetIAdvancedOperations" );
+
+  GEOM::GEOM_Gen_ptr engine = _this();
+
+  GEOM_IImportExportOperations_i* aServant =
+    new GEOM_IImportExportOperations_i(_poa, engine, _impl->GetIImportExportOperations(theStudyID));
+
+  // activate the CORBA servant
+  GEOM::GEOM_IImportExportOperations_var operations = aServant->_this();
+  return operations._retn();
+}
+
 //=============================================================================
 /*!
  *  AddSubShape
  */
 //=============================================================================
 GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainShape,
-                                              const GEOM::ListOfLong& theIndices)
+                                               const GEOM::ListOfLong& theIndices)
 {
-  if(theMainShape == NULL || theIndices.length() < 1) return GEOM::GEOM_Object::_nil();
-  Handle(GEOM_Object) aMainsShape = _impl->GetObject(theMainShape->GetStudyID(), theMainShape->GetEntry());
-  if (aMainsShape.IsNull()) return GEOM::GEOM_Object::_nil();
+  if (CORBA::is_nil(theMainShape) || theIndices.length() < 1)
+    return GEOM::GEOM_Object::_nil();
+  CORBA::String_var entry = theMainShape->GetEntry();
+  Handle(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry);
+  if (aMainShape.IsNull()) return GEOM::GEOM_Object::_nil();
 
   Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1, theIndices.length());
   for(Standard_Integer i = 0; i<theIndices.length(); i++) anArray->SetValue(i+1, theIndices[i]);
 
-  Handle(GEOM_Object) anObject = _impl->AddSubShape(aMainsShape, anArray, true);
+  Handle(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true);
   if(anObject.IsNull()) return GEOM::GEOM_Object::_nil();
 
   TCollection_AsciiString anEntry;
@@ -811,7 +2355,8 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainShap
 //=============================================================================
 void GEOM_Gen_i::RemoveObject(GEOM::GEOM_Object_ptr theObject)
 {
-  Handle(GEOM_Object) anObject = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false);
   if (anObject.IsNull()) return;
   _impl->RemoveObject(anObject);
   return;
@@ -849,7 +2394,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const char*
 {
   GEOM::GEOM_Object_var obj;
   Handle(GEOM_Object) handle_object = _impl->GetObject(theStudyID, (char*)theEntry);
-  if (handle_object.IsNull()) return NULL;
+  if (handle_object.IsNull()) return obj._retn();
 
   TCollection_AsciiString stringIOR = handle_object->GetIOR();
   if (stringIOR.Length() > 1) {
@@ -859,31 +2404,202 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const char*
   }
 
   GEOM::GEOM_Gen_ptr engine = _this();
+  //transfer the reference to GEOM_Object_i
   GEOM_Object_i* servant = new GEOM_Object_i (_poa, engine, handle_object);
+  PortableServer::ObjectId_var id = _poa->activate_object(servant);
 
   obj = servant->_this();
-  stringIOR = _orb->object_to_string(obj);
-  handle_object->SetIOR(stringIOR);
+  CORBA::String_var objStr = _orb->object_to_string(obj);
+  TCollection_AsciiString anAscii( (char *)objStr.in() );
+  handle_object->SetIOR( anAscii );
   return obj._retn();
 }
 
+//=================================================================================
+// function : hasObjectInfo()
+// purpose  : shows if module provides information for its objects
+//=================================================================================
+bool GEOM_Gen_i::hasObjectInfo()
+{
+  return true;
+}
+
+//=================================================================================
+// function : getObjectInfo()
+// purpose  : returns an information for a given object by its entry
+//=================================================================================
+char* GEOM_Gen_i::getObjectInfo(CORBA::Long studyId, const char* entry)
+{
+  GEOM::GEOM_Object_var aGeomObject;
+
+  CORBA::Object_var aSMObject = name_service->Resolve( "/myStudyManager" );
+  SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow( aSMObject );
+  SALOMEDS::Study_var aStudy = aStudyManager->GetStudyByID( studyId );
+  SALOMEDS::SObject_var aSObj = aStudy->FindObjectID( entry );
+  SALOMEDS::SObject_var aResultSObj;
+  if (aSObj->ReferencedObject(aResultSObj))
+    aSObj = aResultSObj;
+
+  SALOMEDS::GenericAttribute_var anAttr;
+  if (!aSObj->_is_nil() && aSObj->FindAttribute(anAttr, "AttributeIOR")) {
+    SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+    CORBA::String_var aVal = anIOR->Value();
+    anIOR->UnRegister();
+    CORBA::Object_var anObject = aStudy->ConvertIORToObject(aVal);
+    aGeomObject = GEOM::GEOM_Object::_narrow(anObject);
+  }
+  if (!aSObj->_is_nil() )
+    aSObj->UnRegister();
+
+  const char* aTypeInfo = "Object";
+  if ( !aGeomObject->_is_nil() ) {
+    GEOM::GEOM_IKindOfShape::shape_kind aKind;
+    GEOM::ListOfLong_var anInts;
+    GEOM::ListOfDouble_var aDbls;
+
+    GEOM::GEOM_IMeasureOperations_var anOp = GetIMeasureOperations( studyId );
+    aKind = anOp->KindOfShape( aGeomObject, anInts, aDbls );
+
+    if ( anOp->IsDone() ) {
+      switch ( aKind ) {
+      case GEOM::GEOM_IKindOfShape::COMPOUND:
+        aTypeInfo = "Compound";
+        break;
+      case GEOM::GEOM_IKindOfShape::COMPSOLID:
+        aTypeInfo = "CompSolid";
+        break;
+      case GEOM::GEOM_IKindOfShape::SHELL:
+        aTypeInfo = "Shell";
+        break;
+      case GEOM::GEOM_IKindOfShape::WIRE:
+        if ( anInts[0] == 1 )
+          aTypeInfo = "Closed Wire";
+        else if ( anInts[0] == 2 )
+          aTypeInfo = "Opened Wire";
+        else
+          aTypeInfo = "Wire";
+        break;
+        // SOLIDs
+      case GEOM::GEOM_IKindOfShape::SPHERE:
+        aTypeInfo = "Sphere";
+        break;
+      case GEOM::GEOM_IKindOfShape::CYLINDER:
+        aTypeInfo = "Cylinder";
+        break;
+      case GEOM::GEOM_IKindOfShape::BOX:
+      case GEOM::GEOM_IKindOfShape::ROTATED_BOX:
+        aTypeInfo = "Box";
+        break;
+      case GEOM::GEOM_IKindOfShape::TORUS:
+        aTypeInfo = "Torus";
+        break;
+      case GEOM::GEOM_IKindOfShape::CONE:
+        aTypeInfo = "Cone";
+        break;
+      case GEOM::GEOM_IKindOfShape::POLYHEDRON:
+        aTypeInfo = "Polyhedron";
+        break;
+      case GEOM::GEOM_IKindOfShape::SOLID:
+        aTypeInfo = "Solid";
+        break;
+        // FACEs
+      case GEOM::GEOM_IKindOfShape::SPHERE2D:
+        aTypeInfo = "Spherical Face";
+        break;
+      case GEOM::GEOM_IKindOfShape::CYLINDER2D:
+        aTypeInfo = "Cylindrical Face";
+        break;
+      case GEOM::GEOM_IKindOfShape::TORUS2D:
+        aTypeInfo = "Toroidal Face";
+        break;
+      case GEOM::GEOM_IKindOfShape::CONE2D:
+        aTypeInfo = "Conical Face";
+        break;
+      case GEOM::GEOM_IKindOfShape::DISK_CIRCLE:
+        aTypeInfo = "Disk";
+        break;
+      case GEOM::GEOM_IKindOfShape::DISK_ELLIPSE:
+        aTypeInfo = "Elliptical Face";
+        break;
+      case GEOM::GEOM_IKindOfShape::POLYGON:
+        aTypeInfo = "Polygon";
+        break;
+      case GEOM::GEOM_IKindOfShape::PLANE:
+        aTypeInfo = "Plane";
+        break;
+      case GEOM::GEOM_IKindOfShape::PLANAR:
+        aTypeInfo = "Planar Face";
+        break;
+      case GEOM::GEOM_IKindOfShape::FACE:
+        aTypeInfo = "Face";
+        break;
+        // EDGEs
+      case GEOM::GEOM_IKindOfShape::CIRCLE:
+        aTypeInfo = "Circle";
+        break;
+      case GEOM::GEOM_IKindOfShape::ARC_CIRCLE:
+        aTypeInfo = "Arc Circle";
+        break;
+      case GEOM::GEOM_IKindOfShape::ELLIPSE:
+        aTypeInfo = "Ellipse";
+        break;
+      case GEOM::GEOM_IKindOfShape::ARC_ELLIPSE:
+        aTypeInfo = "Arc Ellipse";
+        break;
+      case GEOM::GEOM_IKindOfShape::LINE:
+        aTypeInfo = "Line";
+        break;
+      case GEOM::GEOM_IKindOfShape::SEGMENT:
+        aTypeInfo = "Segment";
+        break;
+      case GEOM::GEOM_IKindOfShape::EDGE:
+        aTypeInfo = "Edge";
+        break;
+      case GEOM::GEOM_IKindOfShape::VERTEX:
+        aTypeInfo = "Vertex";
+        break;
+      default:
+        break;
+      }
+    }
+  }
+
+  char* anInfo = new char[strlen("Module ") + strlen(ComponentDataType()) + strlen(", ") + strlen(aTypeInfo) + 3];
+  sprintf(anInfo, "Module %s, %s", ComponentDataType(), aTypeInfo);
+
+  char* ret = CORBA::string_dup(anInfo);
+  delete [] anInfo;
+  return ret;
+}
+
+// Version information
+char* GEOM_Gen_i::getVersion()
+{
+#if GEOM_DEVELOPMENT
+  return CORBA::string_dup(GEOM_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(GEOM_VERSION_STR);
+#endif
+}
 
 //=====================================================================================
 // EXPORTED METHODS
 //=====================================================================================
 extern "C"
 {
-#ifdef WNT
-       __declspec( dllexport )
-#endif
-  PortableServer::ObjectId * GEOMEngine_factory(CORBA::ORB_ptr orb,
-                                               PortableServer::POA_ptr poa,
-                                               PortableServer::ObjectId * contId,
-                                               const char *instanceName,
-                                               const char * interfaceName)
+  /*
+  GEOM_I_EXPORT
+  PortableServer::ObjectId* GEOMEngine_factory(CORBA::ORB*, PortableServer::POA*, PortableServer::ObjectId*, const char*, const char*);
+  */
+
+  GEOM_I_EXPORT
+  PortableServer::ObjectId* GEOMEngine_factory(CORBA::ORB_ptr            orb,
+                                               PortableServer::POA_ptr   poa,
+                                               PortableServer::ObjectId* contId,
+                                               const char*               instanceName,
+                                               const char*               interfaceName)
   {
-   GEOM_Gen_i * myGEOM_Gen_i = new GEOM_Gen_i(orb, poa, contId, instanceName, interfaceName);
-   myGEOM_Gen_i->register_name("/myGEOM_Gen"); // NRI : 11/07/2002 : Add for Supervision example
-   return myGEOM_Gen_i->getId();
+    GEOM_Gen_i* myGEOM_Gen_i = new GEOM_Gen_i(orb, poa, contId, instanceName, interfaceName);
+    return myGEOM_Gen_i->getId();
   }
 }