Merge multi-study removal branch.

doc/salome/examples/netgendemo.py

@@ -4,11 +4,11 @@ import salome
 salome.salome_init()
 import GEOM
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 # create a box
 box = geompy.MakeBoxDXDYDZ(10., 10., 10.)

src/GUI/NETGENPluginGUI_HypothesisCreator.cxx

@@ -767,10 +767,9 @@ void NETGENPluginGUI_HypothesisCreator::onSetSizeFile()
 
 GeomSelectionTools* NETGENPluginGUI_HypothesisCreator::getGeomSelectionTools()
 {
-  _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+  if (myGeomSelectionTools == NULL) {
-  if (myGeomSelectionTools == NULL || myGeomSelectionTools->getMyStudy() != aStudy) {
     delete myGeomSelectionTools;
-    myGeomSelectionTools = new GeomSelectionTools(aStudy);
+    myGeomSelectionTools = new GeomSelectionTools();
   }
   return myGeomSelectionTools;
 }

src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx

@@ -40,9 +40,9 @@ using namespace std;
  *  
  */
 //=============================================================================
-NETGENPlugin_Hypothesis::NETGENPlugin_Hypothesis (int hypId, int studyId,
+NETGENPlugin_Hypothesis::NETGENPlugin_Hypothesis (int hypId,
                                                   SMESH_Gen * gen)
-  : SMESH_Hypothesis(hypId, studyId, gen),
+  : SMESH_Hypothesis(hypId, gen),
     _maxSize         (GetDefaultMaxSize()),
     _minSize         (0),
     _growthRate      (GetDefaultGrowthRate()),

src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx

@@ -45,7 +45,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis: public SMESH_Hypothesis
 {
 public:
 
-  NETGENPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen * gen);
+  NETGENPlugin_Hypothesis(int hypId, SMESH_Gen * gen);
 
   void SetMaxSize(double theSize);
   double GetMaxSize() const { return _maxSize; }

src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx

@@ -37,9 +37,9 @@ using namespace std;
  *  
  */
 //=============================================================================
-NETGENPlugin_Hypothesis_2D::NETGENPlugin_Hypothesis_2D (int hypId, int studyId,
+NETGENPlugin_Hypothesis_2D::NETGENPlugin_Hypothesis_2D (int hypId,
                                                         SMESH_Gen * gen)
-  : NETGENPlugin_Hypothesis(hypId, studyId, gen)/*,
+  : NETGENPlugin_Hypothesis(hypId, gen)/*,
     _quadAllowed (GetDefaultQuadAllowed())*/
 {
   _name = "NETGEN_Parameters_2D";

src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx

@@ -43,7 +43,7 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_Hypothesis_2D: public NETGENPlugin_Hypot
 {
 public:
 
-  NETGENPlugin_Hypothesis_2D(int hypId, int studyId, SMESH_Gen * gen);
+  NETGENPlugin_Hypothesis_2D(int hypId, SMESH_Gen * gen);
 
   // void SetQuadAllowed(bool theVal);
   // bool GetQuadAllowed() const { return _quadAllowed; }

src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx

@@ -38,14 +38,12 @@
 //=============================================================================
 NETGENPlugin_Hypothesis_2D_ONLY_i::
 NETGENPlugin_Hypothesis_2D_ONLY_i (PortableServer::POA_ptr thePOA,
-                                   int                     theStudyId,
                                    ::SMESH_Gen*            theGenImpl)
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA ),
-    NETGENPlugin_Hypothesis_2D_i( thePOA, theStudyId, theGenImpl )
+    NETGENPlugin_Hypothesis_2D_i( thePOA, theGenImpl )
 {
   myBaseImpl = new ::NETGENPlugin_Hypothesis_2D (theGenImpl->GetANewId(),
-                                                 theStudyId,
                                                  theGenImpl);
 }
 

src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx

@@ -46,7 +46,6 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_Hypothesis_2D_ONLY_i:
  public:
   // Constructor
   NETGENPlugin_Hypothesis_2D_ONLY_i (PortableServer::POA_ptr thePOA,
-                                     int                     theStudyId,
                                      ::SMESH_Gen*            theGenImpl);
   // Destructor
   virtual ~NETGENPlugin_Hypothesis_2D_ONLY_i();

src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx

@@ -45,16 +45,14 @@ using namespace std;
 //=============================================================================
 NETGENPlugin_Hypothesis_2D_i::
 NETGENPlugin_Hypothesis_2D_i (PortableServer::POA_ptr thePOA,
-                              int                     theStudyId,
                               ::SMESH_Gen*            theGenImpl)
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA ),
-    NETGENPlugin_Hypothesis_i( thePOA, theStudyId, theGenImpl )
+    NETGENPlugin_Hypothesis_i( thePOA, theGenImpl )
 {
   if (myBaseImpl)
     delete (::NETGENPlugin_Hypothesis*)myBaseImpl;
   myBaseImpl = new ::NETGENPlugin_Hypothesis_2D (theGenImpl->GetANewId(),
-                                                 theStudyId,
                                                  theGenImpl);
 }
 

src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx

@@ -49,7 +49,6 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_Hypothesis_2D_i:
  public:
   // Constructor
   NETGENPlugin_Hypothesis_2D_i (PortableServer::POA_ptr thePOA,
-                                int                     theStudyId,
                                 ::SMESH_Gen*            theGenImpl);
   // Destructor
   virtual ~NETGENPlugin_Hypothesis_2D_i();

src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx

@@ -40,11 +40,10 @@ using namespace std;
 //=============================================================================
 NETGENPlugin_Hypothesis_3D_i::
 NETGENPlugin_Hypothesis_3D_i (PortableServer::POA_ptr thePOA,
-                              int                     theStudyId,
                               ::SMESH_Gen*            theGenImpl)
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA ),
-    NETGENPlugin_Hypothesis_i( thePOA, theStudyId, theGenImpl )
+    NETGENPlugin_Hypothesis_i( thePOA, theGenImpl )
 {
   //MESSAGE( "NETGENPlugin_Hypothesis_3D_i::NETGENPlugin_Hypothesis_3D_i" );
 }

src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx

@@ -46,7 +46,6 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_Hypothesis_3D_i:
  public:
   // Constructor
   NETGENPlugin_Hypothesis_3D_i (PortableServer::POA_ptr thePOA,
-                                int                     theStudyId,
                                 ::SMESH_Gen*            theGenImpl);
 
   // Get type name of hypothesis

src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx

@@ -59,14 +59,12 @@ bool NETGENPlugin_Hypothesis_i::isToSetParameter<double>(double curValue,
 //=============================================================================
 NETGENPlugin_Hypothesis_i::
 NETGENPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
-                           int                     theStudyId,
                            ::SMESH_Gen*            theGenImpl)
   : SALOME::GenericObj_i( thePOA ), 
     SMESH_Hypothesis_i( thePOA ),
     mySetMethodFlags(0)
 {
   myBaseImpl = new ::NETGENPlugin_Hypothesis (theGenImpl->GetANewId(),
-                                              theStudyId,
                                               theGenImpl);
 }
 

src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx

@@ -50,7 +50,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_i:
  public:
   // Constructor
   NETGENPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
-                             int                     theStudyId,
                              ::SMESH_Gen*            theGenImpl);
   // Destructor
   virtual ~NETGENPlugin_Hypothesis_i();

src/NETGENPlugin/NETGENPlugin_Mesher.cxx

@@ -298,28 +298,23 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
     mparams.meshsizefilename= hyp->GetMeshSizeFile().empty() ? 0 : hyp->GetMeshSizeFile().c_str();
 
     SMESH_Gen_i*              smeshGen_i = SMESH_Gen_i::GetSMESHGen();
-    CORBA::Object_var           anObject = smeshGen_i->GetNS()->Resolve("/myStudyManager");
+
-    SALOMEDS::StudyManager_var aStudyMgr = SALOMEDS::StudyManager::_narrow(anObject);
+    const NETGENPlugin_Hypothesis::TLocalSize   localSizes = hyp->GetLocalSizesAndEntries();
-    SALOMEDS::Study_var          myStudy = aStudyMgr->GetStudyByID(hyp->GetStudyId());
+    NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin();
-    if ( !myStudy->_is_nil() )
+    for ( ; it != localSizes.end() ; it++)
     {
-      const NETGENPlugin_Hypothesis::TLocalSize   localSizes = hyp->GetLocalSizesAndEntries();
+      std::string entry = (*it).first;
-      NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin();
+      double        val = (*it).second;
-      for ( ; it != localSizes.end() ; it++)
+      // --
-      {
+      GEOM::GEOM_Object_var aGeomObj;
-        std::string entry = (*it).first;
+      SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() );
-        double        val = (*it).second;
+      if ( !aSObj->_is_nil() ) {
-        // --
+        CORBA::Object_var obj = aSObj->GetObject();
-        GEOM::GEOM_Object_var aGeomObj;
+        aGeomObj = GEOM::GEOM_Object::_narrow(obj);
-        SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
+        aSObj->UnRegister();
-        if ( !aSObj->_is_nil() ) {
-          CORBA::Object_var obj = aSObj->GetObject();
-          aGeomObj = GEOM::GEOM_Object::_narrow(obj);
-          aSObj->UnRegister();
-        }
-        TopoDS_Shape S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
-        ::SetLocalSize(S, val);
       }
+      TopoDS_Shape S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
+      ::SetLocalSize(S, val);
     }
   }
 }
@@ -1724,7 +1719,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInSolids(const netgen::OCCGeometry&
   ofstream py(DUMP_TRIANGLES_SCRIPT);
   py << "import SMESH"<< endl
      << "from salome.smesh import smeshBuilder"<<endl
-     << "smesh = smeshBuilder.New(salome.myStudy)"<<endl
+     << "smesh = smeshBuilder.New()"<<endl
      << "m = smesh.Mesh(name='triangles')" << endl;
 #endif
   if ((int) nodeVec.size() < ngMesh.GetNP() )
@@ -3618,7 +3613,7 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh )
 
   outfile << "import salome, SMESH" << endl
           << "from salome.smesh import smeshBuilder" << endl
-          << "smesh = smeshBuilder.New(salome.myStudy)" << endl
+          << "smesh = smeshBuilder.New()" << endl
           << "mesh = smesh.Mesh()" << endl << endl;
 
   using namespace netgen;
@@ -4229,10 +4224,10 @@ void NETGENPlugin_NetgenLibWrapper::removeOutputFile()
     }
     string    tmpDir = SALOMEDS_Tool::GetDirFromPath ( _outputFileName );
     string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out";
-    SALOMEDS::ListOfFileNames_var aFiles = new SALOMEDS::ListOfFileNames;
+    SALOMEDS_Tool::ListOfFiles aFiles;
-    aFiles->length(1);
+    aFiles.reserve(1);
-    aFiles[0] = aFileName.c_str();
+    aFiles.push_back(aFileName.c_str());
 
-    SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true );
+    SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles, true );
   }
 }

src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx

@@ -54,9 +54,9 @@ using namespace std;
  */
 //=============================================================================
 
-NETGENPlugin_NETGEN_2D::NETGENPlugin_NETGEN_2D(int hypId, int studyId,
+NETGENPlugin_NETGEN_2D::NETGENPlugin_NETGEN_2D(int hypId,
                                                SMESH_Gen* gen)
-  : SMESH_2D_Algo(hypId, studyId, gen)
+  : SMESH_2D_Algo(hypId, gen)
 {
   _name = "NETGEN_2D";
   _shapeType = (1 << TopAbs_FACE); // 1 bit /shape type

src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx

@@ -40,7 +40,7 @@ class NETGENPlugin_Mesher;
 class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D: public SMESH_2D_Algo
 {
 public:
-  NETGENPlugin_NETGEN_2D(int hypId, int studyId, SMESH_Gen* gen);
+  NETGENPlugin_NETGEN_2D(int hypId, SMESH_Gen* gen);
   virtual ~NETGENPlugin_NETGEN_2D();
 
   virtual bool CheckHypothesis(SMESH_Mesh& aMesh,

src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx

@@ -55,9 +55,9 @@ using namespace std;
  */
 //=============================================================================
 
-NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D(int hypId, int studyId,
+NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D(int hypId,
                                                    SMESH_Gen* gen)
-  : SMESH_3D_Algo(hypId, studyId, gen)
+  : SMESH_3D_Algo(hypId, gen)
 {
   //MESSAGE("NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D");
   _name = "NETGEN_2D3D";

src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx

@@ -40,7 +40,7 @@ class StdMeshers_ViscousLayers;
 class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D3D: public SMESH_3D_Algo
 {
 public:
-  NETGENPlugin_NETGEN_2D3D(int hypId, int studyId, SMESH_Gen* gen);
+  NETGENPlugin_NETGEN_2D3D(int hypId, SMESH_Gen* gen);
   virtual ~NETGENPlugin_NETGEN_2D3D();
 
   virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,

src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx

@@ -43,7 +43,6 @@ using namespace std;
 //=============================================================================
 
 NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i( PortableServer::POA_ptr thePOA,
-                                                        int                     theStudyId,
                                                         ::SMESH_Gen*            theGenImpl )
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA ), 
@@ -52,7 +51,6 @@ NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i( PortableServer::POA_ptr
 {
   //MESSAGE( "NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i" );
   myBaseImpl = new ::NETGENPlugin_NETGEN_2D3D( theGenImpl->GetANewId(),
-                                               theStudyId,
                                                theGenImpl );
 }
 

src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx

@@ -47,7 +47,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D3D_i:
 public:
   // Constructor
   NETGENPlugin_NETGEN_2D3D_i( PortableServer::POA_ptr thePOA,
-                              int                     theStudyId,
                               ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~NETGENPlugin_NETGEN_2D3D_i();

src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx

@@ -86,9 +86,8 @@ using namespace nglib;
 //=============================================================================
 
 NETGENPlugin_NETGEN_2D_ONLY::NETGENPlugin_NETGEN_2D_ONLY(int        hypId,
-                                                         int        studyId,
                                                          SMESH_Gen* gen)
-  : SMESH_2D_Algo(hypId, studyId, gen)
+  : SMESH_2D_Algo(hypId, gen)
 {
   _name = "NETGEN_2D_ONLY";
   

src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx

@@ -42,7 +42,7 @@ class NETGENPlugin_Hypothesis_2D;
 class NETGENPlugin_NETGEN_2D_ONLY: public SMESH_2D_Algo
 {
 public:
-  NETGENPlugin_NETGEN_2D_ONLY(int hypId, int studyId, SMESH_Gen* gen);
+  NETGENPlugin_NETGEN_2D_ONLY(int hypId, SMESH_Gen* gen);
   virtual ~NETGENPlugin_NETGEN_2D_ONLY();
 
   virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,

src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx

@@ -36,15 +36,13 @@
 //=============================================================================
 
 NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPlugin_NETGEN_2D_ONLY_i( PortableServer::POA_ptr thePOA,
-                                      int                     theStudyId,
+                                                              ::SMESH_Gen*            theGenImpl )
-                                      ::SMESH_Gen*            theGenImpl )
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA ), 
        SMESH_Algo_i( thePOA ),
        SMESH_2D_Algo_i( thePOA )
 {
   myBaseImpl = new ::NETGENPlugin_NETGEN_2D_ONLY( theGenImpl->GetANewId(),
-                                                  theStudyId,
                                                   theGenImpl );
 }
 

src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx

@@ -41,7 +41,6 @@ class NETGENPlugin_NETGEN_2D_ONLY_i:
 public:
   // Constructor
   NETGENPlugin_NETGEN_2D_ONLY_i( PortableServer::POA_ptr thePOA,
-                                 int                     theStudyId,
                                  ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~NETGENPlugin_NETGEN_2D_ONLY_i();

src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx

@@ -43,7 +43,6 @@ using namespace std;
 //=============================================================================
 
 NETGENPlugin_NETGEN_2D_i::NETGENPlugin_NETGEN_2D_i( PortableServer::POA_ptr thePOA,
-                                                    int                     theStudyId,
                                                     ::SMESH_Gen*            theGenImpl )
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA ), 
@@ -51,7 +50,6 @@ NETGENPlugin_NETGEN_2D_i::NETGENPlugin_NETGEN_2D_i( PortableServer::POA_ptr theP
        SMESH_2D_Algo_i( thePOA )
 {
   myBaseImpl = new ::NETGENPlugin_NETGEN_2D( theGenImpl->GetANewId(),
-                                             theStudyId,
                                              theGenImpl );
 }
 

src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx

@@ -47,7 +47,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D_i:
 public:
   // Constructor
   NETGENPlugin_NETGEN_2D_i( PortableServer::POA_ptr thePOA,
-                            int                     theStudyId,
                             ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~NETGENPlugin_NETGEN_2D_i();

src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx

@@ -99,9 +99,8 @@ using namespace std;
  */
 //=============================================================================
 
-NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, int studyId,
+NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, SMESH_Gen* gen)
-                             SMESH_Gen* gen)
+  : SMESH_3D_Algo(hypId, gen)
-  : SMESH_3D_Algo(hypId, studyId, gen)
 {
   _name = "NETGEN_3D";
   _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type

src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx

@@ -44,7 +44,7 @@ class NETGENPlugin_Hypothesis;
 class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
 {
  public:
-  NETGENPlugin_NETGEN_3D(int hypId, int studyId, SMESH_Gen* gen);
+  NETGENPlugin_NETGEN_3D(int hypId, SMESH_Gen* gen);
   virtual ~NETGENPlugin_NETGEN_3D();
 
   virtual bool CheckHypothesis(SMESH_Mesh& aMesh,

src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx

@@ -44,16 +44,14 @@ using namespace std;
 //=============================================================================
 
 NETGENPlugin_NETGEN_3D_i::NETGENPlugin_NETGEN_3D_i( PortableServer::POA_ptr thePOA,
-                                      int                     theStudyId,
+                                                    ::SMESH_Gen*            theGenImpl )
-                                      ::SMESH_Gen*            theGenImpl )
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA ), 
        SMESH_Algo_i( thePOA ),
        SMESH_3D_Algo_i( thePOA )
 {
   myBaseImpl = new ::NETGENPlugin_NETGEN_3D( theGenImpl->GetANewId(),
-                                      theStudyId,
+                                             theGenImpl );
-                                      theGenImpl );
 }
 
 //=============================================================================

src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx

@@ -48,8 +48,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_i:
 public:
   // Constructor
   NETGENPlugin_NETGEN_3D_i( PortableServer::POA_ptr thePOA,
-                     int                     theStudyId,
+                            ::SMESH_Gen*            theGenImpl );
-                     ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~NETGENPlugin_NETGEN_3D_i();
  

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx

@@ -43,9 +43,8 @@ using namespace std;
  */
 //=============================================================================
 NETGENPlugin_SimpleHypothesis_2D::NETGENPlugin_SimpleHypothesis_2D (int         hypId,
-                                                                    int         studyId,
                                                                     SMESH_Gen * gen)
-  : SMESH_Hypothesis(hypId, studyId, gen),
+  : SMESH_Hypothesis(hypId, gen),
     _nbSegments ((int)NETGENPlugin_Hypothesis::GetDefaultNbSegPerEdge()),
     _segmentLength(0),
     _area         (0.),

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx

@@ -40,7 +40,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_2D: public SMESH_Hypothe
 {
 public:
 
-  NETGENPlugin_SimpleHypothesis_2D(int hypId, int studyId, SMESH_Gen * gen);
+  NETGENPlugin_SimpleHypothesis_2D(int hypId, SMESH_Gen * gen);
 
   /*!
    * Sets <number of segments> value

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx

@@ -45,14 +45,12 @@ using namespace std;
 //=============================================================================
 NETGENPlugin_SimpleHypothesis_2D_i::
 NETGENPlugin_SimpleHypothesis_2D_i (PortableServer::POA_ptr thePOA,
-                                    int                     theStudyId,
                                     ::SMESH_Gen*            theGenImpl)
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA )
 {
   //MESSAGE( "NETGENPlugin_SimpleHypothesis_2D_i::NETGENPlugin_SimpleHypothesis_2D_i" );
   myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_2D (theGenImpl->GetANewId(),
-                                                       theStudyId,
                                                        theGenImpl);
 }
 

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx

@@ -45,7 +45,6 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_SimpleHypothesis_2D_i:
  public:
   // Constructor
   NETGENPlugin_SimpleHypothesis_2D_i (PortableServer::POA_ptr thePOA,
-                                      int                     theStudyId,
                                       ::SMESH_Gen*            theGenImpl);
   // Destructor
   virtual ~NETGENPlugin_SimpleHypothesis_2D_i();

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx

@@ -45,9 +45,8 @@ using namespace std;
  */
 //=============================================================================
 NETGENPlugin_SimpleHypothesis_3D::NETGENPlugin_SimpleHypothesis_3D (int         hypId,
-                                                                    int         studyId,
                                                                     SMESH_Gen * gen)
-  : NETGENPlugin_SimpleHypothesis_2D(hypId, studyId, gen),
+  : NETGENPlugin_SimpleHypothesis_2D(hypId, gen),
   _volume(0)
 {
   _name = "NETGEN_SimpleParameters_3D";

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx

@@ -40,7 +40,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_3D: public NETGENPlugin_
 {
 public:
 
-  NETGENPlugin_SimpleHypothesis_3D(int hypId, int studyId, SMESH_Gen * gen);
+  NETGENPlugin_SimpleHypothesis_3D(int hypId, SMESH_Gen * gen);
 
   void LengthFromFaces();
 

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx

@@ -43,17 +43,15 @@ using namespace std;
 //=============================================================================
 NETGENPlugin_SimpleHypothesis_3D_i::
 NETGENPlugin_SimpleHypothesis_3D_i (PortableServer::POA_ptr thePOA,
-                                    int                     theStudyId,
                                     ::SMESH_Gen*            theGenImpl)
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA ),
-    NETGENPlugin_SimpleHypothesis_2D_i( thePOA,theStudyId,theGenImpl )
+    NETGENPlugin_SimpleHypothesis_2D_i( thePOA,theGenImpl )
 {
   //MESSAGE( "NETGENPlugin_SimpleHypothesis_3D_i::NETGENPlugin_SimpleHypothesis_3D_i" );
   if ( myBaseImpl )
     delete myBaseImpl;
   myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_3D (theGenImpl->GetANewId(),
-                                                       theStudyId,
                                                        theGenImpl);
 }
 

src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx

@@ -44,7 +44,6 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_SimpleHypothesis_3D_i:
  public:
   // Constructor
   NETGENPlugin_SimpleHypothesis_3D_i (PortableServer::POA_ptr thePOA,
-                                      int                     theStudyId,
                                       ::SMESH_Gen*            theGenImpl);
   // Destructor
   virtual ~NETGENPlugin_SimpleHypothesis_3D_i();