Deleted Study parameter

diff --git a/doc/en/tutorials.rst b/doc/en/tutorials.rst
index a4bc7edb0e4e04103cac170ccf02714e86169b96..587a893d899974d261be7f39713a4ca355c57cd7 100644 (file)
--- a/doc/en/tutorials.rst
+++ b/doc/en/tutorials.rst
@@ -16,7 +16,6 @@ The loading of the module HOMARD is done in a way similar to the other modules.
 
   import HOMARD
   homard = salome.lcc.FindOrLoadComponent('FactoryServer','HOMARD')
-  homard.SetStudy(salome.myStudy)
 
 To use the module HOMARD within a distributed scheme YACS, the loading is made as follows:
 
@@ -25,7 +24,6 @@ To use the module HOMARD within a distributed scheme YACS, the loading is made a
   import HOMARD
   my_container.load_component_Library('HOMARD')
   homard = my_container.create_component_instance('HOMARD',0)
-  homard.SetStudy(salome.myStudy)
 
 Uniform refinement
 ******************

diff --git a/doc/files/tutorial_1.py b/doc/files/tutorial_1.py
index 6a8a0253d64dab7e06f2df3f79da9e7f2733ec82..51b46e37e0794402b3b00dcef14a04a7d5f0faab 100755 (executable)
--- a/doc/files/tutorial_1.py
+++ b/doc/files/tutorial_1.py
@@ -87,4 +87,4 @@ gzip_gunzip(DATA_TUTORIAL, 1, 1)
 # ==================================
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()

diff --git a/doc/files/tutorial_2.py b/doc/files/tutorial_2.py
index a615f4e814eacfc0cf796248c286ed23d7b691d3..8fe7b6a9e92e643581ef9753ba3197a0d8f47415 100755 (executable)
--- a/doc/files/tutorial_2.py
+++ b/doc/files/tutorial_2.py
@@ -97,4 +97,4 @@ gzip_gunzip(DATA_TUTORIAL, 2, 1)
 # ==================================
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()

diff --git a/doc/files/tutorial_3.py b/doc/files/tutorial_3.py
index ee4828bdaffa6e955b4ebb4d0d640b0bc4b408a2..61ffaae60fd68bca483d9251368296bf86935209 100755 (executable)
--- a/doc/files/tutorial_3.py
+++ b/doc/files/tutorial_3.py
@@ -126,4 +126,4 @@ gzip_gunzip(DATA_TUTORIAL, 3, 1)
 # ==================================
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()

diff --git a/doc/files/tutorial_4.py b/doc/files/tutorial_4.py
index 85b79a3f5a06841c1557accef09871af04c9b005..9b4751f168c044bc29f9bcc8f4fc6c5e7608caa2 100755 (executable)
--- a/doc/files/tutorial_4.py
+++ b/doc/files/tutorial_4.py
@@ -113,4 +113,4 @@ gzip_gunzip(DATA_TUTORIAL, 4, 1)
 # ==================================
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()

diff --git a/doc/files/tutorial_5.py b/doc/files/tutorial_5.py
index 9f34799694a7b4139bead6229ba1f18b9b0040aa..12bb4943ac951b4067d2d6d5a847f2a91540eed3 100755 (executable)
--- a/doc/files/tutorial_5.py
+++ b/doc/files/tutorial_5.py
@@ -97,4 +97,4 @@ gzip_gunzip(DATA_TUTORIAL, 5, 1)
 # ==================================
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()

diff --git a/idl/Gen.xml b/idl/Gen.xml
index 83d9ee4eed159ae48f5ad678fb5413b1fee09d36..b78c63cdb2ac380bac26ee611a230f6b5b27a1f7 100644 (file)
--- a/idl/Gen.xml
+++ b/idl/Gen.xml
@@ -18,7 +18,6 @@
             <component-author>EDF</component-author>
             <component-version>1.6</component-version>
             <component-comment>unknown</component-comment>
-            <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>
             <component-icone>HOMARD_2.png</component-icone>
             <constraint></constraint>

diff --git a/resources/HOMARDCatalog.xml.in b/resources/HOMARDCatalog.xml.in
index 304c924add2cd71a9b3eb32cbdc379ee4bb837c3..ad8774cd2ff0276a55af2c6adfff938ef63b3782 100644 (file)
--- a/resources/HOMARDCatalog.xml.in
+++ b/resources/HOMARDCatalog.xml.in
@@ -54,7 +54,6 @@
             <component-author>HOMARD team - EDF RD</component-author>
             <component-version>1.4</component-version>
             <component-comment>unknown</component-comment>
-            <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>
             <component-icone>HOMARD_2.png</component-icone>
             <constraint></constraint>
@@ -1085,22 +1084,6 @@
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
-                    <component-service>
-                        <service-name>SetCurrentStudy</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>theStudy</inParameter-name>
-                                <inParameter-type>Study</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list></outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
                     <component-service>
                         <service-name>PublishBoundaryUnderCase</service-name>
                         <service-author>HOMARD team - EDF RD</service-author>

diff --git a/src/HOMARDGUI/HOMARDGUI.h b/src/HOMARDGUI/HOMARDGUI.h
index a2acb26a16182990711b04a5555880e785e65ad7..cddac1cb7bb9288afd07f51cace33b02e0ba7178 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.h
+++ b/src/HOMARDGUI/HOMARDGUI.h
@@ -90,7 +90,6 @@ private:
 
    virtual void createPreferences();
    HOMARD::HOMARD_Gen_var myComponentHomard;
-   SALOMEDS::Study_var       myStudy;
 
    int anId;
    QString _ObjectName;

diff --git a/src/HOMARDGUI/HOMARDGUI_Utils.cxx b/src/HOMARDGUI/HOMARDGUI_Utils.cxx
index 3b8b4ac03a1bbd0f6cd9dd2cfec07a67294d8c0a..1f5abdc0b64c296c457ef5de219a533279f801b8 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI_Utils.cxx
+++ b/src/HOMARDGUI/HOMARDGUI_Utils.cxx
@@ -48,15 +48,6 @@
 
 SALOME_ListIO HOMARD_UTILS::mySelected;
 
-//================================================================
-// Function : GetCStudy
-// Returne un pointeur sur l'etude courante
-//================================================================
- _PTR(Study) HOMARD_UTILS::GetCStudy(const SalomeApp_Study* theStudy)
-{
-    return theStudy->studyDS();
-}
-
 //================================================================
 // Function : GetActiveStudy
 // Returne un pointeur sur l'etude active
@@ -71,17 +62,15 @@ SUIT_Study* HOMARD_UTILS::GetActiveStudy()
 }
 
 //================================================================
-// Function : GetActiveStudyDocument
+// Function : getStudy
 // Returne un pointeur sur l'etude active
 //================================================================
-_PTR(Study) HOMARD_UTILS::GetActiveStudyDocument()
+_PTR(Study) HOMARD_UTILS::getStudy()
 {
-    SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(GetActiveStudy());
-    if (aStudy){
-      return aStudy->studyDS();
-    }
-    else
-      return _PTR(Study)();
+  static _PTR(Study) _study;
+  if(!_study)
+    _study = SalomeApp_Application::getStudy();
+  return _study;
 }
 
 //================================================================

diff --git a/src/HOMARDGUI/HOMARDGUI_Utils.h b/src/HOMARDGUI/HOMARDGUI_Utils.h
index 81182a0d051c33b3a71d8924cf6d7c5645b49b18..2946cf541ed463454169bcba15333903e51721e0 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI_Utils.h
+++ b/src/HOMARDGUI/HOMARDGUI_Utils.h
@@ -53,12 +53,8 @@ class LightApp_SelectionMgr;
 
 namespace HOMARD_UTILS {
 
-  HOMARD_EXPORT
-  _PTR(Study)
-  GetCStudy(const SalomeApp_Study* theStudy);
-
   HOMARD_EXPORT SUIT_Study* GetActiveStudy();
-  HOMARD_EXPORT _PTR(Study) GetActiveStudyDocument();
+  HOMARD_EXPORT _PTR(Study) getStudy();
 
   HOMARD_EXPORT void updateObjBrowser();
 

diff --git a/src/HOMARDGUI/HomardQtCommun.cxx b/src/HOMARDGUI/HomardQtCommun.cxx
index 08e2a4d27a5edc32408a1f48db2f423dd253780c..44f6f7648fef1be65229aa96352b5f6e52c02c8f 100644 (file)
--- a/src/HOMARDGUI/HomardQtCommun.cxx
+++ b/src/HOMARDGUI/HomardQtCommun.cxx
@@ -75,7 +75,7 @@ QString HOMARD_QT_COMMUN::SelectionArbreEtude(QString commentaire, int option )
   if ( aIO->hasEntry() )
   {
 //     MESSAGE("aIO->getEntry() = " << aIO->getEntry());
-    _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument();
+    _PTR(Study) aStudy = HOMARD_UTILS::getStudy();
     _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) );
     _PTR(GenericAttribute) anAttr;
     if (aSO->FindAttribute(anAttr, "AttributeComment") )
@@ -127,7 +127,7 @@ QString HOMARD_QT_COMMUN::SelectionCasEtude()
   Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject();
   if ( aIO->hasEntry() )
   {
-       _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument();
+       _PTR(Study) aStudy = HOMARD_UTILS::getStudy();
        _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) );
         _PTR(SObject) aSObjCas = aSO->GetFather();
        _PTR(GenericAttribute) anAttr;
@@ -179,7 +179,7 @@ QString HOMARD_QT_COMMUN::PushNomFichier(bool avertir, QString TypeFichier)
     Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject();
     if ( aIO->hasEntry() )
     {
-      _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument();
+      _PTR(Study) aStudy = HOMARD_UTILS::getStudy();
       _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) );
       _PTR(GenericAttribute) anAttr;
       _PTR(AttributeFileType) aFileType;

diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx
index 8bf929490608900de7af2d687d4654d3750f65fa..b3ea5b883dc7f7025232e630e23b978c57b9767f 100644 (file)
--- a/src/HOMARD_I/HOMARD_Gen_i.cxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.cxx
@@ -38,6 +38,7 @@
 #include "SALOMEDS_Tool.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"
 #include "SALOMEconfig.h"
+#include <SMESH_Gen_i.hxx>
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 #include CORBA_CLIENT_HEADER(SMESH_Gen)
 
@@ -99,8 +100,7 @@ Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
   ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting());
   _NS->init_orb(_orb);
 
-  CORBA::Object_var aStudyObject = _NS->Resolve( "/Study" );
-  myStudy = SALOMEDS::Study::_narrow( aStudyObject );
+  myStudy = SALOMEDS::Study::_duplicate( SMESH_Gen_i::getStudyServant() );
 
   _tag_gene = 0 ;
   _tag_boun = 0 ;
@@ -4319,13 +4319,12 @@ SALOMEDS::TMPFile* HOMARD_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
   // get temporary directory name
   std::string tmpDir = isMultiFile ? std::string(theURL) : SALOMEDS_Tool::GetTmpDir();
 
-  SALOMEDS::Study_var aStudy = theComponent->GetStudy();
   StudyContext& context = myStudyContext;
 
   // HOMARD data file name
   std::string aFileName = "";
   if (isMultiFile)
-    aFileName = SALOMEDS_Tool::GetNameFromPath(aStudy->URL());
+    aFileName = SALOMEDS_Tool::GetNameFromPath(SMESH_Gen_i::getStudyServant()->URL());
   aFileName += "_HOMARD.dat";
 
   // initialize sequence of file names
@@ -4434,7 +4433,6 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
                                   CORBA::Boolean isMultiFile)
 {
   MESSAGE ("Load pour theURL = "<< theURL);
-  SALOMEDS::Study_var aStudy = theComponent->GetStudy();
 
   // set current study
   if (myStudy->_is_nil())
@@ -4450,7 +4448,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
   // HOMARD data file name
   std::string aFileName = "";
   if (isMultiFile)
-    aFileName = SALOMEDS_Tool::GetNameFromPath(aStudy->URL());
+    aFileName = SALOMEDS_Tool::GetNameFromPath(SMESH_Gen_i::getStudyServant()->URL());
   aFileName = tmpDir + aFileName + "_HOMARD.dat";
 
   StudyContext& context = myStudyContext;
@@ -4570,9 +4568,6 @@ CORBA::Boolean HOMARD_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
 //===========================================================================
 void HOMARD_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
 {
-  if (theComponent->GetStudy())
-    // - nullify myStudy
-    myStudy = SALOMEDS::Study::_nil();
 };
 
 //===========================================================================
@@ -4708,18 +4703,14 @@ PortableServer::ServantBase_var HOMARD_Gen_i::GetServant(CORBA::Object_ptr theOb
 }
 
 //==========================================================================
-Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
-                                       CORBA::Boolean isPublished,
-                                       CORBA::Boolean isMultiFile,
-                                       CORBA::Boolean& isValidScript)
+Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished,
+                                           CORBA::Boolean isMultiFile,
+                                           CORBA::Boolean& isValidScript)
 {
    MESSAGE ("Entree dans DumpPython");
    isValidScript=1;
-   SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow(theStudy);
-   if(CORBA::is_nil(aStudy))
-     return new Engines::TMPFile(0);
 
-   SALOMEDS::SObject_var aSO = aStudy->FindComponent("HOMARD");
+   SALOMEDS::SObject_var aSO = SMESH_Gen_i::getStudyServant()->FindComponent("HOMARD");
    if(CORBA::is_nil(aSO))
       return new Engines::TMPFile(0);
 
@@ -4888,7 +4879,7 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
 void HOMARD_Gen_i::IsValidStudy( )
 {
 //   MESSAGE( "IsValidStudy" );
-  if (CORBA::is_nil(myStudy))
+  if (CORBA::is_nil(SMESH_Gen_i::getStudyServant()))
   {
     SALOME::ExceptionStruct es;
     es.type = SALOME::BAD_PARAM;

diff --git a/src/HOMARD_I/HOMARD_Gen_i.hxx b/src/HOMARD_I/HOMARD_Gen_i.hxx
index bfe697dd625187f8a663ddf19d4be3d3e161e91a..856e25f148c0b497c83b9c0a3e40b10e21436e1a 100644 (file)
--- a/src/HOMARD_I/HOMARD_Gen_i.hxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.hxx
@@ -297,10 +297,9 @@ private:
   HOMARD::HOMARD_Zone_ptr         newZone();
 
 
-  virtual Engines::TMPFile*       DumpPython(CORBA::Object_ptr theStudy,
-                                            CORBA::Boolean isPublished,
-                                            CORBA::Boolean isMultiFile,
-                                            CORBA::Boolean& isValidScript);
+  virtual Engines::TMPFile*       DumpPython(CORBA::Boolean isPublished,
+                                                                CORBA::Boolean isMultiFile,
+                                                                CORBA::Boolean& isValidScript);
 
   virtual char*                   getVersion();
   std::string GetStringInTexte( const std::string Texte, const std::string String, int option ) ;

diff --git a/src/tests/Test/test_1.py b/src/tests/Test/test_1.py
index 3e6c238ad3c138d72b54b86613d8919da38cc326..4267c919271f021bbc0b5fea39662b4eba7cd18e 100755 (executable)
--- a/src/tests/Test/test_1.py
+++ b/src/tests/Test/test_1.py
@@ -62,7 +62,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -202,7 +202,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -215,6 +215,6 @@ DESTROY_DIR = not DEBUG
 test_results(REP_DATA, TEST_NAME, DIRCASE, N_ITER_TEST_FILE, N_REP_TEST_FILE, DESTROY_DIR)
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/test_2.py b/src/tests/Test/test_2.py
index 1dd59653e914bd1b88e4af6bb1b8ceab6c8bf0cc..3b903cc70b8e9794635af1a59b9a76c63ca9ef8c 100755 (executable)
--- a/src/tests/Test/test_2.py
+++ b/src/tests/Test/test_2.py
@@ -62,7 +62,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -174,7 +174,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -187,6 +187,6 @@ DESTROY_DIR = not DEBUG
 test_results(REP_DATA, TEST_NAME, DIRCASE, N_ITER_TEST_FILE, N_REP_TEST_FILE, DESTROY_DIR)
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/test_3.py b/src/tests/Test/test_3.py
index 7ec7586c03cd322b658a0e0bf783e8f06d704011..15ddbd7d9d30c50591442437ea564b8271317d9c 100755 (executable)
--- a/src/tests/Test/test_3.py
+++ b/src/tests/Test/test_3.py
@@ -63,7 +63,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -208,7 +208,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -221,6 +221,6 @@ DESTROY_DIR = not DEBUG
 test_results(REP_DATA, TEST_NAME, DIRCASE, N_ITER_TEST_FILE, N_REP_TEST_FILE, DESTROY_DIR)
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/test_4.py b/src/tests/Test/test_4.py
index 3c243f7b07d1786ea30cb3cd57879c63b9f8a304..f294ceaf0c7b326d6dc43821238fd627f9809abc 100755 (executable)
--- a/src/tests/Test/test_4.py
+++ b/src/tests/Test/test_4.py
@@ -78,7 +78,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def geom_smesh_exec(theStudy):
+def geom_smesh_exec():
   """
 Python script for GEOM and SMESH
   """
@@ -86,7 +86,7 @@ Python script for GEOM and SMESH
 #
   while not error :
   #
-    geompy = geomBuilder.New(theStudy)
+    geompy = geomBuilder.New()
   #
   # Creation of the box
   # ===================
@@ -94,7 +94,7 @@ Python script for GEOM and SMESH
 
   # Creation of the mesh
   # ====================
-    smesh = smeshBuilder.New(theStudy)
+    smesh = smeshBuilder.New()
     box_m = smesh.Mesh(box_g)
     smesh.SetName(box_m.GetMesh(), 'MESH')
   #
@@ -139,7 +139,7 @@ Python script for GEOM and SMESH
 #========================================================================
 #
 #========================================================================
-def field_exec(theStudy, niter):
+def field_exec(niter):
   """
 Python script for MEDCoupling
   """
@@ -185,7 +185,7 @@ Python script for MEDCoupling
 
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -290,7 +290,7 @@ Python script for HOMARD
 
   # Creation of the iteration 3
   #
-    error = field_exec(theStudy, 2)
+    error = field_exec(2)
     if error :
       error = 30
       break
@@ -317,7 +317,7 @@ Python script for HOMARD
 # Geometry and Mesh
 #
 try :
-  ERROR = geom_smesh_exec(salome.myStudy)
+  ERROR = geom_smesh_exec()
   if ERROR :
     raise Exception('Pb in geom_smesh_exec')
 except Exception, eee:
@@ -330,7 +330,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -343,6 +343,6 @@ DESTROY_DIR = not DEBUG
 test_results(REP_DATA, TEST_NAME, DIRCASE, N_ITER_TEST_FILE, N_REP_TEST_FILE, DESTROY_DIR)
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/test_5.py b/src/tests/Test/test_5.py
index 2f0bdc170582a3889acd31696d739ef6fe932738..afcb13e11003f9eba361f8b17ee5fe17c06ac8b5 100755 (executable)
--- a/src/tests/Test/test_5.py
+++ b/src/tests/Test/test_5.py
@@ -77,7 +77,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def mesh_exec(theStudy):
+def mesh_exec():
   """
 Python script for MED
   """
@@ -178,7 +178,7 @@ Python script for MED
 #========================================================================
 #
 #========================================================================
-def field_exec(theStudy, niter):
+def field_exec(niter):
   """
 Python script for MEDCoupling
   """
@@ -233,7 +233,7 @@ Python script for MEDCoupling
 
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -274,7 +274,7 @@ Python script for HOMARD
     #
     # Creation of the indicator
     #
-      error, ficmed_indic = field_exec(theStudy, niter)
+      error, ficmed_indic = field_exec(niter)
       if error :
         error = 10
         break
@@ -305,7 +305,7 @@ Python script for HOMARD
 # Geometry and Mesh
 #
 try :
-  ERROR = mesh_exec(salome.myStudy)
+  ERROR = mesh_exec()
   if ERROR :
     raise Exception('Pb in mesh_exec')
 except Exception, eee:
@@ -318,7 +318,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -331,6 +331,6 @@ DESTROY_DIR = not DEBUG
 test_results(REP_DATA, TEST_NAME, DIRCASE, N_ITER_TEST_FILE, N_REP_TEST_FILE, DESTROY_DIR)
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/tutorial_1.py b/src/tests/Test/tutorial_1.py
index fdcddf2fb55eabe0fd5fda1f4f69e7f449638960..5b49365cbdab24be4cd52602114bf03c8e85c9b6 100755 (executable)
--- a/src/tests/Test/tutorial_1.py
+++ b/src/tests/Test/tutorial_1.py
@@ -69,7 +69,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -120,7 +120,7 @@ homard.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -137,6 +137,6 @@ gzip_gunzip(DATA_TUTORIAL, 1, 1)
 # ==================================
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/tutorial_2.py b/src/tests/Test/tutorial_2.py
index c1d29e8f998157c0d8a13dfa754b7dd545399c37..6c486104d4e608131ba081c4238aff9f17a28890 100755 (executable)
--- a/src/tests/Test/tutorial_2.py
+++ b/src/tests/Test/tutorial_2.py
@@ -69,7 +69,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -131,7 +131,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -148,6 +148,6 @@ gzip_gunzip(DATA_TUTORIAL, 2, 1)
 # ==================================
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/tutorial_3.py b/src/tests/Test/tutorial_3.py
index d7b3b523635d4c4c7fbbb6a83f5108dc570a21f8..337dd83d5504bc57797ee7b193f082f84d48fc2c 100755 (executable)
--- a/src/tests/Test/tutorial_3.py
+++ b/src/tests/Test/tutorial_3.py
@@ -69,7 +69,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -160,7 +160,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -177,6 +177,6 @@ gzip_gunzip(DATA_TUTORIAL, 3, 1)
 # ==================================
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/tutorial_4.py b/src/tests/Test/tutorial_4.py
index be7ebcfa94a97cc5433e71dd318217ee5350e1f6..12cddf95aca252f89c5f9d5f54f90da5830e1168 100755 (executable)
--- a/src/tests/Test/tutorial_4.py
+++ b/src/tests/Test/tutorial_4.py
@@ -69,7 +69,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -147,7 +147,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -164,6 +164,6 @@ gzip_gunzip(DATA_TUTORIAL, 4, 1)
 # ==================================
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)
 

diff --git a/src/tests/Test/tutorial_5.py b/src/tests/Test/tutorial_5.py
index 4561695e84fb603686046f13e299af99acf413ab..d5ffc6949c5b15d02fb8aca60140d538bbfa6d87 100755 (executable)
--- a/src/tests/Test/tutorial_5.py
+++ b/src/tests/Test/tutorial_5.py
@@ -69,7 +69,7 @@ IPAR.append("AP_MODULES_LIST", "Homard")
 #
 #========================================================================
 #========================================================================
-def homard_exec(theStudy):
+def homard_exec():
   """
 Python script for HOMARD
   """
@@ -131,7 +131,7 @@ HOMARD.SetLanguageShort("fr")
 # Exec of HOMARD-SALOME
 #
 try :
-  ERROR = homard_exec(salome.myStudy)
+  ERROR = homard_exec()
   if ERROR :
     raise Exception('Pb in homard_exec at iteration %d' %ERROR )
 except Exception, eee:
@@ -148,6 +148,6 @@ gzip_gunzip(DATA_TUTORIAL, 5, 1)
 # ==================================
 #
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)