]> SALOME platform Git repositories - plugins/netgenplugin.git/commitdiff
Salome HOME
0023299: [CEA] Finalize multi-study removal
authorimn <imn@opencascade.com>
Fri, 14 Oct 2016 14:01:39 +0000 (17:01 +0300)
committerimn <imn@opencascade.com>
Fri, 14 Oct 2016 14:01:39 +0000 (17:01 +0300)
- delete study id parameter

37 files changed:
src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx

index fe4c2eeae63b139c4a7459ef02af4ecccac5212e..5ec88e3e4b944e08709d5823b7d318d634f66a85 100644 (file)
@@ -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()),
index 7d6da32fcd776601914ef29e7a3321ea6d136c23..21129dc931d345add16049a77a5409e17a63a5c9 100644 (file)
@@ -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; }
index 056c5928ba70b5b395517631f4b82a1fc5102d6a..6dfa5acce5428977222df93dfab8b104062b6810 100644 (file)
@@ -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";
index b73a3bab4e0a040c512cdb57cee42c166b38f0ae..a249442b0cc8b66f57c0c294c100d8a83e26d2e7 100644 (file)
@@ -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; }
index 98f2dc4b137d16ae2720964c8a0432e619ad20b9..15fa3dced31b0251347b0754c7c3a1e4490a0737 100644 (file)
 //=============================================================================
 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 )
 {
   MESSAGE( "NETGENPlugin_Hypothesis_2D_ONLY_i::NETGENPlugin_Hypothesis_2D_ONLY_i" );
   myBaseImpl = new ::NETGENPlugin_Hypothesis_2D (theGenImpl->GetANewId(),
-                                                 theStudyId,
                                                  theGenImpl);
 }
 
index 54dd6ea87a5ca91b6ab2061053442b09a359960c..de8d441727c1e5b5d463b782a0050dd6b3fcd89e 100644 (file)
@@ -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();
index e889033058eb60a1402151cc237f1ddcec104bad..58683c6d54f363ac4304114159ea115f3a528ec7 100644 (file)
@@ -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);
 }
 
index 55b1c3f608a7143c3715e122a38491a908072ad9..6d0fabe2554cb31d38b4ffd7d042d3e4f1389479 100644 (file)
@@ -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();
index f9fe24094ebf6ae5f0afc4a524f08a78bbf087f9..0fe377a935e50a99945224e918c17f6496a9e71c 100644 (file)
@@ -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" );
 }
index fcfbc5faa9403ab19580797b15a587927028f138..016f6f6d00e1ee8e5c3d9efcb8d052b2b39cf272 100644 (file)
@@ -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
index d60d666040ee615b061bebda29157443f0fd983c..3b585de07249ef15e668296e1cf22fea7ff7d6fd 100644 (file)
@@ -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);
 }
 
index 12ffa7b31453132fe7d4bae18d59dd3d82517273..1ca6ee2ef3a63f413d7af8a39793bfebfa273db0 100644 (file)
@@ -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();
index 5d5c401002498e3878c19df461a38adc993caf63..e58bea5fc5788731bd8f1606e96c3fdcca7da120 100644 (file)
@@ -287,9 +287,8 @@ 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);
-    SALOMEDS::Study_var          myStudy = aStudyMgr->GetStudyByID(hyp->GetStudyId());
+    CORBA::Object_var           anObject = smeshGen_i->GetNS()->Resolve("/Study");
+    SALOMEDS::Study_var          myStudy = SALOMEDS::Study::_narrow(anObject);
     if ( !myStudy->_is_nil() )
     {
       const NETGENPlugin_Hypothesis::TLocalSize   localSizes = hyp->GetLocalSizesAndEntries();
index cc5bb1895014c26c64deac4f0e2f47b4080afb56..ae318072c3b01c780c072d6e72dae04ed359be61 100644 (file)
@@ -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
index aee85dd6adfd8b79563f74b33d2c6665cb897f4b..7eb235911eb5138d37ced4e7612835ad95a51682 100644 (file)
@@ -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,
index 284ea6c3c93ac35f5b56a2f18e7d691e7ccf2172..4797cc7314bf62057db83769bd561b2ece5fdd4f 100644 (file)
@@ -53,9 +53,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";
index 23ca46f1bc8f8bbcee7aa8dc7069f2eb3334397d..e95e3b76fedc3f838f90a830103ac4f57ace7a44 100644 (file)
@@ -39,7 +39,7 @@ class NETGENPlugin_Mesher;
 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,
index b95c0f4fc25c9c1cce5781334cf354037e1060dd..e74baa1e0db16f1a45492d54ab10a745b6f7eace 100644 (file)
@@ -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 );
 }
 
index 0e193ccfe73cdb4868d61263c0d094498fa057df..f16a0489978163f647a5ba547ce348460667bd78 100644 (file)
@@ -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();
index 16baad443a8091906207d676ee791b7f6ac416e6..74aaf0a3b474acb3ef991040855041d901ae0aa8 100644 (file)
@@ -83,9 +83,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";
   
index 1144faf912a8afeb866debfeca389a8c211595a6..3ab8c92373415e0367a14bf208bd938afb7a7d14 100644 (file)
@@ -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,
index 008a99cea6a38d069d67f3ffa6cad25d69638fae..e0c5481123b432a9fd4f3c888bfd6315b839f51c 100644 (file)
@@ -36,8 +36,7 @@
 //=============================================================================
 
 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 ),
@@ -45,7 +44,6 @@ NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPlugin_NETGEN_2D_ONLY_i( PortableServer::PO
 {
   MESSAGE( "NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPlugin_NETGEN_2D_ONLY_i" );
   myBaseImpl = new ::NETGENPlugin_NETGEN_2D_ONLY( theGenImpl->GetANewId(),
-                                                  theStudyId,
                                                   theGenImpl );
 }
 
index ef6a3e923474ac746873a210a25f9503665dd223..905e585ec4668c96d8e78ebded0c01f3096d7898 100644 (file)
@@ -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();
index 96d1f0789d4359818bbd3d04522ee56d21fca137..437cf3e2eee01176ab906a9a6efe3873156c616b 100644 (file)
@@ -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 );
 }
 
index 695ff80208fc3abe2391edcef466b1614e92f5b3..bfebf5fbaaefad1b1b616770010241d778cd1079 100644 (file)
@@ -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();
index 8fe43bb2a07b8d59574a5f5df73f3e8b7aaeb396..eeeb1b6735e1bbb7a5023c9ce13533c8948e3eb8 100644 (file)
@@ -93,9 +93,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
index 679a29b23971f6243dfda2316d0a49ec6f95c9d9..f3d17af358384076b33a263a0207605c13f81164 100644 (file)
@@ -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,
index 0b53170fdd81a7574369b6921e43ac7173bda833..a90943dda0b5faf95c7ee52e3e7fe4b96512c8b3 100644 (file)
@@ -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 );
 }
 
 //=============================================================================
index 8952f123c38e62107f715fe316a17183c0395481..af3df0fe35aefb72883c74487e3f64db943bbbaa 100644 (file)
@@ -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();
  
index b13aa799e16445c667c6044601112a546f72fbd0..19a64e815a81dde0da4c2f88d65840310468b1f8 100644 (file)
@@ -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.),
index 28ceb304d626710628c7680723789f91e30ebba2..43c0f36da97548baaa1d4594ab274a34261117a0 100644 (file)
@@ -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
index f54481aca2454180f00618256ee70be25cc5a0a6..ba2f4b8bb0358e73a824e364a0748562d7d1448b 100644 (file)
@@ -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);
 }
 
index 06ba90d4ae53f0e0623c5312130d74dc7270b05e..50bbc5f2dde562090218530a75adbb91f3dea369 100644 (file)
@@ -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();
index 376a5ad62abd698281380b4f3c8b29ef0fc8fe11..0a64db4533616ef464c89472d938107169974dd4 100644 (file)
@@ -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";
index 149465272ef9839335794adc522b1bd3c4fef925..34d0713c22082ce3ade4671a360e95a9c62ee5d9 100644 (file)
@@ -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();
 
index 6d804a145f6167b41e30d029e1a489e058eaabd0..05dc66b850035d15d65c733aa0fc10e1c817c414 100644 (file)
@@ -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);
 }
 
index 940a80701c7d11f3d69043500a25a4068fd96898..4cf259b069b09a6604c07878880416ff0df94978 100644 (file)
@@ -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();