[Bug PAL7444] display mesh takes a lot of more memory in 2.1.0 than in 2.0.0.

[modules/smesh.git] / src / SMESH_I / SMESH_Gen_i.cxx

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index db273b20366fbf0c7af485c3ff6e336df52fedbf..8cb0c86c1caf8e712a3218406f7467114a1b5373 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -418,6 +418,7 @@ void SMESH_Gen_i::SetCurrentStudy( SALOMEDS::Study_ptr theStudy )
   if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() ) {
     myStudyContextMap[ studyId ] = new StudyContext;      
   }
+  SetStudyID(studyId);
   // set current study for geom engine
   /*
   if ( !CORBA::is_nil( GetGeomEngine() ) )
@@ -490,6 +491,9 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj
      throw ( SALOME::SALOME_Exception )
 {
   Unexpect aCatch(SALOME_SalomeException);
+  using namespace SMESH;
+  FactoryHandler aFactory;
+
   if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" );
   // create mesh
   SMESH::SMESH_Mesh_var mesh = this->createMesh();
@@ -500,6 +504,15 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj
   // publish mesh in the study
   if ( CanPublishInStudy( mesh ) )
     PublishMesh( myCurrentStudy, mesh.in() );
+
+  CORBA::String_var anEntry = theShapeObject->GetEntry();
+  aFactory->Register(TInvocationID(TResultCont(1,meshServant->GetID()),
+                                  GetID(),
+                                  "SMESH_Mesh",
+                                  "CreateMesh",
+                                  TArgumentCont(),
+                                  anEntry.in()));
+
   return mesh._retn();
 }
 
@@ -542,6 +555,9 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
      throw ( SALOME::SALOME_Exception )
 {
   Unexpect aCatch(SALOME_SalomeException);
+  using namespace SMESH;
+  FactoryHandler aFactory;
+
   if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMeshFromMED" );
 
   // Retrieve mesh names from the file
@@ -554,6 +570,7 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
   theStatus = (SMESH::DriverMED_ReadStatus)aStatus;
   if(theStatus == SMESH::DRS_OK){
     aResult->length( aNames.size() );
+    TResultCont aResultCont;
     int i = 0;
     
     // Iterate through all meshes and create mesh objects
@@ -574,7 +591,15 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
        theStatus = status1;
 
       aResult[i++] = SMESH::SMESH_Mesh::_duplicate( mesh );
+
+      aResultCont.push_back(meshServant->GetID());
     }
+    aFactory->Register(TInvocationID(aResultCont,
+                                    GetID(),
+                                    "SMESH_Mesh",
+                                    "CreateMeshesFromMED",
+                                    TArgumentCont(1,std::string(theFileName)),
+                                    ""));
   }
   return aResult._retn();
 }
@@ -778,6 +803,10 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 {
   INFOS( "SMESH_Gen_i::Save" );
 
+  CORBA::Boolean anIsValidScript;
+  SALOMEDS::Study_var aStudy = theComponent->GetStudy(); 
+  SALOMEDS::TMPFile_var aDump = DumpPython(aStudy,false,anIsValidScript);
+
 //  ASSERT( theComponent->GetStudy()->StudyId() == myCurrentStudy->StudyId() )
   // san -- in case <myCurrentStudy> differs from theComponent's study,
   // use that of the component