fix problems from GUI

diff --git a/doc/salome/kernel_salome.dox b/doc/salome/kernel_salome.dox
index 4fea5880dccce25f27dad6f660d35ed332d90987..da0acb4faefd8c3c0b1d2ff4426713d28933acc9 100644 (file)
--- a/doc/salome/kernel_salome.dox
+++ b/doc/salome/kernel_salome.dox
@@ -114,6 +114,9 @@ salome.myStudy.SaveAsASCII("/home/user/MyStudy.hdf", study, False)
 # clear study
 salome.myStudy.Clear()
 
+# init study
+salome.myStudy.Init()
+
 # find SALOMEDS component by its type
 scomponent = FindComponent("MyComponent")
 

diff --git a/src/MPIContainer/MPIContainer_i.cxx b/src/MPIContainer/MPIContainer_i.cxx
index 19f6f8fe0902cb013d069529d03b44c2968f1678..7a10855d4167ddd814b7d73e237d4a786ae8cc8c 100644 (file)
--- a/src/MPIContainer/MPIContainer_i.cxx
+++ b/src/MPIContainer/MPIContainer_i.cxx
@@ -272,7 +272,7 @@ Engines_MPIContainer_i::Lcreate_component_instance( const char* genericRegisterN
     PyObject *pyCont = PyDict_GetItemString(globals, "pyCont");
     PyObject *result = PyObject_CallMethod(pyCont,
                                            (char*)"create_component_instance",
-                                           (char*)"ssl",
+                                           (char*)"ss",
                                            aCompName.c_str(),
                                            instanceName.c_str());
     const char *ior;

diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx
index e4852f4f45e586d43873a19f6164fc068d7fd322..c6f041c810d4fc1436e747fba4ed3c3dc8c7e9b1 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx
+++ b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx
@@ -762,7 +762,7 @@ Engines_Parallel_Container_i::createPythonInstance(std::string genericRegisterNa
   PyObject *pyCont = PyDict_GetItemString(globals, "pyCont");
   PyObject *result = PyObject_CallMethod(pyCont,
                                          (char*)"create_component_instance",
-                                         (char*)"ssl",
+                                         (char*)"ss",
                                          genericRegisterName.c_str(),
                                          instanceName.c_str());
   const char *ior;

diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx
index e228a6161b33d3522d553524112fd20718bacb26..695992deb0208b3498cd914b929a83c9493f062f 100644 (file)
--- a/src/SALOMEDS/SALOMEDS.cxx
+++ b/src/SALOMEDS/SALOMEDS.cxx
@@ -115,7 +115,7 @@ extern "C"
       // Activate the objects.  This tells the POA that the objects are ready to accept requests.
       PortableServer::ObjectId_var aStudy_iid =  root_poa->activate_object(aStudy_i);
       aStudy = aStudy_i->_this();
-      namingService.Register(aStudy.in(), "/Study");
+      namingService.Register(aStudy, "/Study");
 
       // Assign the value of the IOR in the study->root
       CORBA::String_var IORStudy = orb->object_to_string(aStudy);

diff --git a/src/SALOMEDS/SALOMEDS_Study_i.cxx b/src/SALOMEDS/SALOMEDS_Study_i.cxx
index 23cc0c031f4388ca461950596152797fd1d327b6..63bf3c60f51632e4cbadd4b11f750a13951e2817 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Study_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx
@@ -165,10 +165,10 @@ namespace SALOMEDS
     {
       for (ObsListIter it (myObservers.begin()); it != myObservers.end(); ++it)
       {
-       if ( it->first->_is_equivalent(theObs) ) {
-         myObservers.erase( it );
-         break;
-       }
+           if ( it->first->_is_equivalent(theObs) ) {
+             myObservers.erase( it );
+             break;
+           }
       }
     }
 
@@ -308,7 +308,7 @@ void SALOMEDS_Study_i::Clear()
 {
   SALOMEDS::Locker lock;
   if (_closed)
-    throw SALOMEDS::Study::StudyInvalidReference();
+    return;
   //delete the builder servant
   PortableServer::POA_var poa=_builder->_default_POA();
   PortableServer::ObjectId_var anObjectId = poa->servant_to_id(_builder);
@@ -367,6 +367,7 @@ void SALOMEDS_Study_i::Clear()
   _impl->setNotifier(0);
   delete _notifier;
   delete _genObjRegister;
+  _notifier = NULL;
 
   _closed = true;
 }