0023299: [CEA] Finalize multi-study removal

- delete study id parameter

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
index 65569e37aa5b564462311534c3d7afdd082c3b97..c6169382f4cf26eb71704a63be8ffde786e7537a 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
@@ -1080,15 +1080,15 @@ HEXA_NS::Hexa* _block2Hexa( const _Block& block,
 //purpose  : 
 //=======================================================================
 
-// SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen)
-//   :SMESH_3D_Algo(hypId, studyId, gen)
+// SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, SMESH_Gen* gen)
+//   :SMESH_3D_Algo(hypId, gen)
 // {
 //   MESSAGE("SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D");
 //   _name = "HexaFromSkin_3D";
 // }
 
-SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen, HEXA_NS::Document* doc)
-  :SMESH_3D_Algo(hypId, studyId, gen),
+SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, SMESH_Gen* gen, HEXA_NS::Document* doc)
+  :SMESH_3D_Algo(hypId, gen),
   _doc( doc )
 {
   if(MYDEBUG) MESSAGE("SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D");

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
index fb7f2450963e72b830aa3d02e665c5f7a20b318c..fac13cb586b319d7188b22ff0c63b8922d978682 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
@@ -44,8 +44,8 @@
 class HEXABLOCKPLUGINENGINE_EXPORT SMESH_HexaFromSkin_3D : public SMESH_3D_Algo
 {
 public:
-//   SMESH_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen);
-  SMESH_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen, HEXA_NS::Document* doc);
+//   SMESH_HexaFromSkin_3D(int hypId, SMESH_Gen* gen);
+  SMESH_HexaFromSkin_3D(int hypId, SMESH_Gen* gen, HEXA_NS::Document* doc);
   virtual ~SMESH_HexaFromSkin_3D();
 
   virtual bool Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper);

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
index 2357fa6cc00d0c2e8e56a6a80b67bf3b92011612..a155f64b0bde5a276eaa913deb74203009c2222d 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
@@ -61,8 +61,8 @@ static int MYDEBUG = 0;
  */
 //=============================================================================
 
-HEXABLOCKPlugin_HEXABLOCK::HEXABLOCKPlugin_HEXABLOCK(int hypId, int studyId, SMESH_Gen* gen)
-  : SMESH_3D_Algo(hypId, studyId, gen)
+HEXABLOCKPlugin_HEXABLOCK::HEXABLOCKPlugin_HEXABLOCK(int hypId, SMESH_Gen* gen)
+  : SMESH_3D_Algo(hypId, gen)
 {
   if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::HEXABLOCKPlugin_HEXABLOCK");
   _name = "HEXABLOCK_3D";

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
index 4a3fdde95d3e3bdd7c55ad7950a967b2de655863..d2d1cf97be0701c72ed18a623315d2ceb16f99b4 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
@@ -37,7 +37,7 @@ class HEXABLOCKPlugin_Hypothesis;
 class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_HEXABLOCK: public SMESH_3D_Algo
 {
 public:
-  HEXABLOCKPlugin_HEXABLOCK(int hypId, int studyId, SMESH_Gen* gen);
+  HEXABLOCKPlugin_HEXABLOCK(int hypId, SMESH_Gen* gen);
   virtual ~HEXABLOCKPlugin_HEXABLOCK();
 
   virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
index 836970cd317312a8a5ba8aef61d312bc75ad8bfc..fb229c9f449d5671a8585e225847fe32c5eb6662 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
@@ -47,8 +47,7 @@ using namespace std;
 //=============================================================================
 
 HEXABLOCKPlugin_HEXABLOCK_i::HEXABLOCKPlugin_HEXABLOCK_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 ),
@@ -56,8 +55,7 @@ HEXABLOCKPlugin_HEXABLOCK_i::HEXABLOCKPlugin_HEXABLOCK_i (PortableServer::POA_pt
 {
   if(MYDEBUG) MESSAGE( "HEXABLOCKPlugin_HEXABLOCK_i::HEXABLOCKPlugin_HEXABLOCK_i" );
   myBaseImpl = new ::HEXABLOCKPlugin_HEXABLOCK (theGenImpl->GetANewId(),
-                                        theStudyId,
-                                        theGenImpl );
+                                                theGenImpl );
 }
 
 //=============================================================================

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
index 768b929a0f1422cd7e454476f1cbe597822fd905..ced5c7d167cdc842784724f697b9cab6205510df 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
@@ -43,8 +43,7 @@ class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_HEXABLOCK_i:
 public:
   // Constructor
   HEXABLOCKPlugin_HEXABLOCK_i (PortableServer::POA_ptr thePOA,
-                       int                     theStudyId,
-                       ::SMESH_Gen*            theGenImpl );
+                               ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~HEXABLOCKPlugin_HEXABLOCK_i();
  

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx
index 8d32bc6e30b625b4daeb4a059451e72bb7a11541..ab5de5433d4623705e5e9f96cd286043814a773c 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx
@@ -30,8 +30,8 @@
 //function : HEXABLOCKPlugin_Hypothesis
 //=======================================================================
 
-HEXABLOCKPlugin_Hypothesis::HEXABLOCKPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen * gen)
-  : SMESH_Hypothesis(hypId, studyId, gen)
+HEXABLOCKPlugin_Hypothesis::HEXABLOCKPlugin_Hypothesis(int hypId, SMESH_Gen * gen)
+  : SMESH_Hypothesis(hypId, gen)
 {
    hexa_root     = HEXA_NS::Hex::getInstance ();
    hyp_document  = NULL;

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
index 656e31933f6a89a4255bd4ef2ff9bb00ba284f42..113e7cd6e07043f15a8e4304170fa530dc8b0422 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
@@ -40,7 +40,7 @@ class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_Hypothesis: public SMESH_Hypo
 {
 public:
 
-  HEXABLOCKPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen * gen);
+  HEXABLOCKPlugin_Hypothesis(int hypId, SMESH_Gen * gen);
 
   /*!
    * Define the document to be meshed, mandatory

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
index cc8a630ba69c15badaf04a6b098851f2b78c2c0b..14a10defb1e4f080a9f3b81e710484e91515dff1 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
@@ -44,15 +44,13 @@ static int MYDEBUG = 0;
 //=======================================================================
 
 HEXABLOCKPlugin_Hypothesis_i::HEXABLOCKPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
-                                  int             theStudyId,
-                                  ::SMESH_Gen*    theGenImpl)
+                                                            ::SMESH_Gen*    theGenImpl)
   : SALOME::GenericObj_i( thePOA ), 
     SMESH_Hypothesis_i( thePOA )
 {
   if(MYDEBUG) MESSAGE( "HEXABLOCKPlugin_Hypothesis_i::HEXABLOCKPlugin_Hypothesis_i" );
   myBaseImpl = new ::HEXABLOCKPlugin_Hypothesis (theGenImpl->GetANewId(),
-                                              theStudyId,
-                                              theGenImpl);
+                                                 theGenImpl);
   _poa = PortableServer::POA::_duplicate(thePOA);
 }
 

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
index e95b42a71dda75a6401efdf18d9b7b1e62ccbf12..96a11753fe5c3d5decb7bbd7e4e57097661f924a 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
@@ -45,8 +45,7 @@ class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_Hypothesis_i:
  public:
   // Constructor
   HEXABLOCKPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
-                            int                     theStudyId,
-                            ::SMESH_Gen*            theGenImpl);
+                                ::SMESH_Gen*            theGenImpl);
   // Destructor
   virtual ~HEXABLOCKPlugin_Hypothesis_i();
 

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
index 4fbb1c5251ff010ada2492b157528e33bc97f791..cda44a20e80d2b4c87f1e109b829fe8efe0bae07 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
@@ -1055,7 +1055,7 @@ bool SMESH_HexaBlocks::computeHexa( HEXA_NS::Document* doc )
   aHelper.SetElementsOnShape( true );
 
   SMESH_Gen* gen = _theMesh->GetGen();
-  SMESH_HexaFromSkin_3D algo( gen->GetANewId(), 0, gen, doc );
+  SMESH_HexaFromSkin_3D algo( 0, gen, doc );
   algo.InitComputeError();
   try {
       ok = algo.Compute( *_theMesh, &aHelper, _volumesOnHexa, _node );