Merge V9_dev branch into master

diff --git a/doc/salome/examples/netgendemo.py b/doc/salome/examples/netgendemo.py
index 2cc73a0ed84bb26b8d04ec54e1b3da11b755e90a..c2f31b0d4b1b0615af12f7befa6873974241607d 100644 (file)
--- a/doc/salome/examples/netgendemo.py
+++ b/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.)

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
index 6390806411143698e60146f2b66bea2e380433be..8f685b03834395f2a500336ec3880e44a8aa10e5 100644 (file)
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
@@ -838,10 +838,9 @@ void NETGENPluginGUI_HypothesisCreator::onSetSizeFile()
 
 GeomSelectionTools* NETGENPluginGUI_HypothesisCreator::getGeomSelectionTools()
 {
-  _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
-  if (myGeomSelectionTools == NULL || myGeomSelectionTools->getMyStudy() != aStudy) {
+  if (myGeomSelectionTools == NULL) {
     delete myGeomSelectionTools;
-    myGeomSelectionTools = new GeomSelectionTools(aStudy);
+    myGeomSelectionTools = new GeomSelectionTools();
   }
   return myGeomSelectionTools;
 }

diff --git a/src/NETGENPlugin/NETGENPluginBuilder.py b/src/NETGENPlugin/NETGENPluginBuilder.py
index 7334ae33351c9a3f94d5ed4cf8aec96bd3bed505..edf7df747d4525209244d66b67e7e54fcc4df1e7 100644 (file)
--- a/src/NETGENPlugin/NETGENPluginBuilder.py
+++ b/src/NETGENPlugin/NETGENPluginBuilder.py
@@ -105,7 +105,7 @@ class NETGEN_Algorithm(Mesh_Algorithm):
     #              if it is @c 0 (default), the algorithm is assigned to the main shape
     def __init__(self, mesh, geom=0):
         Mesh_Algorithm.__init__(self)
-        if noNETGENPlugin: print "Warning: NETGENPlugin module unavailable"
+        if noNETGENPlugin: print("Warning: NETGENPlugin module unavailable")
         if not mesh.GetMesh().HasShapeToMesh() and \
            self.meshMethod == "Triangle": # create a 2D remesher
             self.Create(mesh, geom, "NETGEN_Remesher_2D", LIBRARY)

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
index 9bd9ec8a7dceac0f44f48ffbd973c0678aff8632..abb5b6aacef9645611fac42ee8c775083dc665b0 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
@@ -40,9 +40,10 @@ 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()),

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
index 44f9095f162b70ee2965728270a7df87d89101db..8f1800ee0d5cda3dc78d150ca709f27ad39504a7 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
+++ b/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; }

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
index 5db50971f33989e1ad6f3fb88c867f0893e4715f..d7f52e846ac4b564ad0f2419fd04022860bb41e7 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
@@ -36,9 +36,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";
@@ -51,8 +51,8 @@ NETGENPlugin_Hypothesis_2D::NETGENPlugin_Hypothesis_2D (int hypId, int studyId,
  */
 //=============================================================================
 NETGENPlugin_RemesherHypothesis_2D::
-NETGENPlugin_RemesherHypothesis_2D (int hypId, int studyId, SMESH_Gen * gen)
-  : NETGENPlugin_Hypothesis(hypId, studyId, gen)
+NETGENPlugin_RemesherHypothesis_2D (int hypId, SMESH_Gen * gen)
+  : NETGENPlugin_Hypothesis(hypId, gen)
 {
   _name = "NETGEN_RemesherParameters_2D";
   _param_algo_dim = 2;

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
index cd0fe5c7ba85add332a710b20a84aba3924f40f0..877e99545fe90c58b4b566cdd3cc43d074736bfc 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
+++ b/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; }
@@ -65,7 +65,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_RemesherHypothesis_2D: public NETGENPlugi
 {
  public:
 
-  NETGENPlugin_RemesherHypothesis_2D(int hypId, int studyId, SMESH_Gen * gen);
+  NETGENPlugin_RemesherHypothesis_2D(int hypId, SMESH_Gen * gen);
 
   void SetRidgeAngle( double angle );
   double GetRidgeAngle() const;

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
index 341a7428f940b562a93dec6c509cdce4ed5a1067..784e8334cf86273576543c2ebe5cb1c6638fc6e5 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
+++ b/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);
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx
index 54dd6ea87a5ca91b6ab2061053442b09a359960c..de8d441727c1e5b5d463b782a0050dd6b3fcd89e 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx
+++ b/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();

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
index d9cbde484e7aa4e19c4fce7f809cb08bb368551d..2a2ffa3360248fb18f3a8f500d43d7d845c70d4e 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
@@ -40,16 +40,14 @@
 //=============================================================================
 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);
 }
 
@@ -100,14 +98,12 @@ CORBA::Boolean NETGENPlugin_Hypothesis_2D_i::IsDimSupported( SMESH::Dimension ty
 //=============================================================================
 NETGENPlugin_RemesherHypothesis_2D_i::
 NETGENPlugin_RemesherHypothesis_2D_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_RemesherHypothesis_2D (theGenImpl->GetANewId(),
-                                                         theStudyId,
                                                          theGenImpl);
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx
index 876a361fc5ce95d6520cf175cf468adf927884d0..a3bfa8dbcbde5fcb5e45b3cd79c711394e3f3be7 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx
+++ b/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();
@@ -79,7 +78,6 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_RemesherHypothesis_2D_i:
  public:
   // Constructor
   NETGENPlugin_RemesherHypothesis_2D_i( PortableServer::POA_ptr thePOA,
-                                        int                     theStudyId,
                                         ::SMESH_Gen*            theGenImpl);
 
   void SetRidgeAngle( CORBA::Double angle );

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
index ebab3bdee61aa5c57c52e0380d6523db243e53a0..8523ff33ec1fbb204c15aa7a0ad45239faa0a6fc 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
+++ b/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" );
 }

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx
index fcfbc5faa9403ab19580797b15a587927028f138..016f6f6d00e1ee8e5c3d9efcb8d052b2b39cf272 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx
+++ b/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

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
index 11461d6a0f1fa4270b78fe3c3d9c66f15134d792..63eb164091fb88698105298e74882947c543ca26 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
+++ b/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);
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
index e9b908db225b5e4e9a0f255191ca4873703c5276..84ad0beee5d3bfdedfa3bd19d78ed7855ddb1ffb 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
+++ b/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();

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index 3c902e3d457121e717fbc91b9b0e5a2d582b88db..647c1d11d8be4f338df14fc61975514402b274c1 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -310,28 +310,22 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
     const NETGENPlugin_Hypothesis::TLocalSize& localSizes = hyp->GetLocalSizesAndEntries();
     if ( !localSizes.empty() )
     {
-      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);
-      SALOMEDS::Study_var          myStudy = aStudyMgr->GetStudyByID(hyp->GetStudyId());
-      if ( !myStudy->_is_nil() )
+      SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
+      NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin();
+      for ( ; it != localSizes.end() ; it++)
       {
-        NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin();
-        for ( ; it != localSizes.end() ; it++)
-        {
-          std::string entry = (*it).first;
-          double        val = (*it).second;
-          // --
-          GEOM::GEOM_Object_var aGeomObj;
-          SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
-          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);
+        std::string entry = (*it).first;
+        double        val = (*it).second;
+        // --
+        GEOM::GEOM_Object_var aGeomObj;
+        SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() );
+        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);
       }
     }
   }
@@ -1899,7 +1893,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() )
@@ -3798,7 +3792,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;
@@ -4409,10 +4403,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;
-    aFiles->length(1);
-    aFiles[0] = aFileName.c_str();
+    SALOMEDS_Tool::ListOfFiles aFiles;
+    aFiles.reserve(1);
+    aFiles.push_back(aFileName.c_str());
 
-    SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true );
+    SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles, true );
   }
 }

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
index cc5bb1895014c26c64deac4f0e2f47b4080afb56..ae318072c3b01c780c072d6e72dae04ed359be61 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
+++ b/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

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
index aee85dd6adfd8b79563f74b33d2c6665cb897f4b..7eb235911eb5138d37ced4e7612835ad95a51682 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
+++ b/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,

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
index 3b5c529fd90157d3da44c4c9f35aded6529b667c..99f5994b8b6b285cd3bb65202042b23b8cb2a25b 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
+++ b/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";

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
index 0728470ad5f65fb0b2e071aee9cd5e3defceed6d..1f7e36add2e0e59c1c315b78667f8d1794f453ec 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
+++ b/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,

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
index ded96a974971e80ada7a35f230feb45a955b41a6..d3bb788c19c78994307c1093be156ff29759608b 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
+++ b/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 );
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
index 0e193ccfe73cdb4868d61263c0d094498fa057df..f16a0489978163f647a5ba547ce348460667bd78 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
+++ b/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();

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index 5f2b88fc9a0c5b8804e5c248a086b72f48b37cca..59baa3eb9b80b6e95b8b24c9b3a3728db415d981 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/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";
   

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
index 1144faf912a8afeb866debfeca389a8c211595a6..3ab8c92373415e0367a14bf208bd938afb7a7d14 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
+++ b/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,

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
index f5d83d3f7a2df7d29fb29ffa3170d81f4701cd49..0fec081e340ebb7101344f1fa9e3694dbd9ea8f5 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
+++ b/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 );
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
index ef6a3e923474ac746873a210a25f9503665dd223..905e585ec4668c96d8e78ebded0c01f3096d7898 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
+++ b/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();

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
index be39bd864f2f27f4fb7299fe7969de80c4809f08..12ffdc40d8afd615bd987d53a03d17671aa1fc24 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
@@ -39,7 +39,6 @@
 //=============================================================================
 
 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 ), 
@@ -47,7 +46,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 );
 }
 
@@ -87,7 +85,6 @@ NETGENPlugin_NETGEN_2D_i::~NETGENPlugin_NETGEN_2D_i()
 //=============================================================================
 
 NETGENPlugin_Remesher_2D_i::NETGENPlugin_Remesher_2D_i( PortableServer::POA_ptr thePOA,
-                                                        int                     theStudyId,
                                                         ::SMESH_Gen*            theGenImpl )
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA ),
@@ -95,7 +92,6 @@ NETGENPlugin_Remesher_2D_i::NETGENPlugin_Remesher_2D_i( PortableServer::POA_ptr
     SMESH_2D_Algo_i( thePOA )
 {
   myBaseImpl = new ::NETGENPlugin_Remesher_2D( theGenImpl->GetANewId(),
-                                               theStudyId,
                                                theGenImpl );
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
index ea9f210c732b053a206a8ff0a546e962338a716d..f32c9a91fb796ce2f1e182851751a46f7925deef 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
+++ b/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();
@@ -66,7 +65,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Remesher_2D_i:
 public:
   // Constructor
   NETGENPlugin_Remesher_2D_i( PortableServer::POA_ptr thePOA,
-                              int                     theStudyId,
                               ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~NETGENPlugin_Remesher_2D_i();

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index c9872561693dc4ec7749da3625d7b46aca5bdc1e..dee55a6380fcbc72451e0ec83f32ad9271735f4c 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -99,9 +99,8 @@ using namespace std;
  */
 //=============================================================================
 
-NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, int studyId,
-                             SMESH_Gen* gen)
-  : SMESH_3D_Algo(hypId, studyId, gen)
+NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, SMESH_Gen* gen)
+  : SMESH_3D_Algo(hypId, gen)
 {
   _name = "NETGEN_3D";
   _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
index 679a29b23971f6243dfda2316d0a49ec6f95c9d9..f3d17af358384076b33a263a0207605c13f81164 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
+++ b/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,

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
index 0b53170fdd81a7574369b6921e43ac7173bda833..a90943dda0b5faf95c7ee52e3e7fe4b96512c8b3 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
+++ b/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 );
 }
 
 //=============================================================================

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
index 8952f123c38e62107f715fe316a17183c0395481..af3df0fe35aefb72883c74487e3f64db943bbbaa 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
+++ b/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();
  

diff --git a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
index 030d571d7497836e1869b7227012c5f47cae2efe..aff9f00f5cbc165c3b08da5e900896c355aa4c2c 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
@@ -463,8 +463,8 @@ namespace
  */
 //=============================================================================
 
-NETGENPlugin_Remesher_2D::NETGENPlugin_Remesher_2D(int hypId, int studyId, SMESH_Gen* gen)
-  : SMESH_2D_Algo(hypId, studyId, gen)
+NETGENPlugin_Remesher_2D::NETGENPlugin_Remesher_2D(int hypId, SMESH_Gen* gen)
+  : SMESH_2D_Algo(hypId, gen)
 {
   _name = "NETGEN_Remesher_2D";
   _shapeType = (1 << TopAbs_FACE); // 1 bit /shape type

diff --git a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx
index be9a1614c63ca34aec2c7c293fe50adf93b01405..3a0ef6240bf74ec9c5a14edb755931838522b3ca 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx
@@ -35,7 +35,7 @@
 class NETGENPLUGIN_EXPORT NETGENPlugin_Remesher_2D: public SMESH_2D_Algo
 {
  public:
-  NETGENPlugin_Remesher_2D(int hypId, int studyId, SMESH_Gen* gen);
+  NETGENPlugin_Remesher_2D(int hypId, SMESH_Gen* gen);
 
   virtual bool CheckHypothesis(SMESH_Mesh&                          theMesh,
                                const TopoDS_Shape&                  theShape,

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
index b13aa799e16445c667c6044601112a546f72fbd0..19a64e815a81dde0da4c2f88d65840310468b1f8 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
+++ b/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.),

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
index 28ceb304d626710628c7680723789f91e30ebba2..43c0f36da97548baaa1d4594ab274a34261117a0 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
+++ b/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

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
index dab006aafe61e24008ec7f5edd48808515abe0fb..e434f847844d2868b84f0e68f762df0f769b3675 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
+++ b/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);
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
index 06ba90d4ae53f0e0623c5312130d74dc7270b05e..50bbc5f2dde562090218530a75adbb91f3dea369 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
+++ b/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();

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
index 376a5ad62abd698281380b4f3c8b29ef0fc8fe11..0a64db4533616ef464c89472d938107169974dd4 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
+++ b/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";

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
index 149465272ef9839335794adc522b1bd3c4fef925..34d0713c22082ce3ade4671a360e95a9c62ee5d9 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
+++ b/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();
 

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
index ec5b2168996664db8727857cf72a84337499c0de..f851b530d1f4078442d1026e13a201a396af520a 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
+++ b/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);
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx
index 940a80701c7d11f3d69043500a25a4068fd96898..4cf259b069b09a6604c07878880416ff0df94978 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx
+++ b/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();