From 70e27dd9f15be3b1fc1baecf9a8944f3e7ddc1d9 Mon Sep 17 00:00:00 2001 From: imn Date: Fri, 14 Oct 2016 17:19:24 +0300 Subject: [PATCH] 0023299: [CEA] Finalize multi-study removal - delete study id parameter --- src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx | 8 ++++---- src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx | 4 ++-- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx | 4 ++-- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx | 6 ++---- src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx | 3 +-- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.cxx | 4 ++-- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx | 2 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx | 6 ++---- src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx | 3 +-- src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx | 2 +- 11 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx index 65569e3..c616938 100755 --- 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 fb7f245..fac13cb 100755 --- 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 2357fa6..a155f64 100755 --- 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 4a3fdde..d2d1cf9 100755 --- 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 836970c..fb229c9 100755 --- 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 768b929..ced5c7d 100755 --- 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 8d32bc6..ab5de54 100755 --- 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 656e319..113e7cd 100755 --- 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 cc8a630..14a10de 100755 --- 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 e95b42a..96a1175 100755 --- 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 4fbb1c5..cda44a2 100755 --- 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 ); -- 2.39.2