From: rnv <rnv@opencascade.com>
Date: Thu, 8 Jun 2017 15:40:59 +0000 (+0300)
Subject: Merge multi-study removal branch.
X-Git-Tag: Before_python3_27062017
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1b359b696a744f5cefdd5185651b466a78e5812f;p=plugins%2Fnetgenplugin.git

Merge multi-study removal branch.
---

1b359b696a744f5cefdd5185651b466a78e5812f
diff --cc src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
index 341a742,15fa3dc..784e833
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
@@@ -41,11 -41,10 +41,9 @@@ NETGENPlugin_Hypothesis_2D_ONLY_i (Port
                                     ::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);
  }
  
diff --cc src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
index ebab3bd,0fe377a..8523ff3
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
@@@ -43,10 -43,9 +43,9 @@@ NETGENPlugin_Hypothesis_3D_i (PortableS
                                ::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" );
 +  //MESSAGE( "NETGENPlugin_Hypothesis_3D_i::NETGENPlugin_Hypothesis_3D_i" );
  }
  
  //=============================================================================
diff --cc src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index dc3afe7,01f9c8c..73e8c6d
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@@ -3616,9 -3477,9 +3611,9 @@@ void NETGENPlugin_Mesher::toPython( con
    ofstream outfile( pyFile, ios::out );
    if ( !outfile ) return;
  
 -  outfile << "import SMESH" << endl
 +  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;
diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
index 3b5c529,4797cc7..99f5994
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
@@@ -55,11 -53,11 +55,11 @@@ 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");
 +  //MESSAGE("NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D");
    _name = "NETGEN_2D3D";
    _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type
    _compatibleHypothesis.push_back("NETGEN_Parameters");
diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
index 0728470,e95e3b7..1f7e36a
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
@@@ -40,14 -39,14 +40,14 @@@ 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,
 +  virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,
                                 const TopoDS_Shape& aShape,
 -                               SMESH_Hypothesis::Hypothesis_Status& aStatus);
 +                               Hypothesis_Status&  aStatus);
  
 -  virtual bool Compute(SMESH_Mesh& aMesh,
 +  virtual bool Compute(SMESH_Mesh&         aMesh,
                         const TopoDS_Shape& aShape);
  
    virtual void CancelCompute();
diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
index ded96a9,e74baa1..d3bb788
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
@@@ -50,9 -49,8 +49,8 @@@ NETGENPlugin_NETGEN_2D3D_i::NETGENPlugi
         SMESH_Algo_i( thePOA ),
         SMESH_3D_Algo_i( thePOA )
  {
 -  MESSAGE( "NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i" );
 +  //MESSAGE( "NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i" );
    myBaseImpl = new ::NETGENPlugin_NETGEN_2D3D( theGenImpl->GetANewId(),
-                                                theStudyId,
                                                 theGenImpl );
  }
  
diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
index f5d83d3,e0c5481..0fec081
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
@@@ -43,8 -42,8 +42,7 @@@ NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPl
         SMESH_Algo_i( thePOA ),
         SMESH_2D_Algo_i( thePOA )
  {
 -  MESSAGE( "NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPlugin_NETGEN_2D_ONLY_i" );
    myBaseImpl = new ::NETGENPlugin_NETGEN_2D_ONLY( theGenImpl->GetANewId(),
-                                                   theStudyId,
                                                    theGenImpl );
  }
  
diff --cc src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
index dab006a,ba2f4b8..e434f84
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
@@@ -50,9 -49,8 +49,8 @@@ NETGENPlugin_SimpleHypothesis_2D_i (Por
    : SALOME::GenericObj_i( thePOA ),
      SMESH_Hypothesis_i( thePOA )
  {
 -  MESSAGE( "NETGENPlugin_SimpleHypothesis_2D_i::NETGENPlugin_SimpleHypothesis_2D_i" );
 +  //MESSAGE( "NETGENPlugin_SimpleHypothesis_2D_i::NETGENPlugin_SimpleHypothesis_2D_i" );
    myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_2D (theGenImpl->GetANewId(),
-                                                        theStudyId,
                                                         theGenImpl);
  }
  
diff --cc src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
index ec5b216,05dc66b..f851b53
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
@@@ -46,10 -46,9 +46,9 @@@ NETGENPlugin_SimpleHypothesis_3D_i (Por
                                      ::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" );
 +  //MESSAGE( "NETGENPlugin_SimpleHypothesis_3D_i::NETGENPlugin_SimpleHypothesis_3D_i" );
    if ( myBaseImpl )
      delete myBaseImpl;
    myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_3D (theGenImpl->GetANewId(),