X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_NumberOfSegments_i.cxx;h=57342432bce8585aadc1a7e034da31123900ddbc;hb=HEAD;hp=5a75bf78e45a6b2e7bc3d38b2193532f83a50593;hpb=7eec94a3aee21950eb470b656177016375d2b604;p=modules%2Fsmesh.git diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index 5a75bf78e..597f7a5c9 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses +// SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes // File : StdMeshers_NumberOfSegments_i.cxx // Moved here from SMESH_NumberOfSegments_i.cxx // Author : Paul RASCLE, EDF @@ -36,7 +36,6 @@ #include -using namespace std; //============================================================================= /*! * StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i @@ -46,14 +45,13 @@ using namespace std; //============================================================================= StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::POA_ptr thePOA, - int theStudyId, - ::SMESH_Gen* theGenImpl ) - : SALOME::GenericObj_i( thePOA ), - SMESH_Hypothesis_i( thePOA ) + ::SMESH_Gen* theGenImpl ) + : SALOME::GenericObj_i( thePOA ), + SMESH_Hypothesis_i( thePOA ), + StdMeshers_Reversible1D_i( this ) { myBaseImpl = new ::StdMeshers_NumberOfSegments( theGenImpl->GetANewId(), - theStudyId, - theGenImpl ); + theGenImpl ); } //============================================================================= @@ -78,7 +76,6 @@ StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i() SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const char* func, CORBA::Long nbSeg, CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try @@ -100,7 +97,6 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func, CORBA::Long nbSeg, CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); @@ -131,8 +127,7 @@ StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber ) - throw ( SALOME::SALOME_Exception ) +void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( SMESH::smIdType theSegmentsNumber ) { ASSERT( myBaseImpl ); try { @@ -163,177 +158,124 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments() //============================================================================= /*! - * StdMeshers_NumberOfSegments_i::SetReversedEdges - * - * Set edges to reverse */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetReversedEdges( const SMESH::long_array& theIds ) +void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ) { ASSERT( myBaseImpl ); try { - std::vector ids( theIds.length() ); - CORBA::Long iEnd = theIds.length(); - for ( CORBA::Long i = 0; i < iEnd; i++ ) - ids[ i ] = theIds[ i ]; + CORBA::Long oldType = (CORBA::Long) this->GetImpl()->GetDistrType(); - this->GetImpl()->SetReversedEdges( ids ); + this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ ); + + // Update Python script + if ( oldType != typ ) + SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); } - - // Update Python script - SMESH::TPythonDump() << _this() << ".SetReversedEdges( " << theIds << " )"; } //============================================================================= /*! - * StdMeshers_NumberOfSegments_i::SetObjectEntry - * - * Set the Entry for the Main Object */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetObjectEntry( const char* theEntry ) +CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType() { ASSERT( myBaseImpl ); - string entry(theEntry); // actually needed as theEntry is spoiled by moment of dumping - try { - this->GetImpl()->SetObjectEntry( entry.c_str() ); - } - catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); - } - // Update Python script - SMESH::TPythonDump() << _this() << ".SetObjectEntry( \"" << entry.c_str() << "\" )"; + return this->GetImpl()->GetDistrType(); } //============================================================================= /*! - * StdMeshers_NumberOfSegments_i::GetObjectEntry + * StdMeshers_NumberOfSegments_i::SetScaleFactor * - * Set the Entry for the Main Object + * Set scalar factor */ //============================================================================= -char* StdMeshers_NumberOfSegments_i::GetObjectEntry() +void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor ) { ASSERT( myBaseImpl ); - - const char* entry; try { - entry = this->GetImpl()->GetObjectEntry(); + this->GetImpl()->SetScaleFactor( theScaleFactor ); + // Update Python script + SMESH::TPythonDump() << _this() << ".SetScaleFactor( " << SMESH::TVar(theScaleFactor) << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); } - return CORBA::string_dup( entry ); } //============================================================================= /*! - * StdMeshers_NumberOfSegments_i::GetReversedEdges + * StdMeshers_NumberOfSegments_i::GetScaleFactor * - * Get reversed edges - */ -//============================================================================= - -SMESH::long_array* StdMeshers_NumberOfSegments_i::GetReversedEdges() -{ - ASSERT( myBaseImpl ); - SMESH::long_array_var anArray = new SMESH::long_array; - std::vector ids = this->GetImpl()->GetReversedEdges(); - anArray->length( ids.size() ); - for ( size_t i = 0; i < ids.size(); i++) - anArray [ i ] = ids [ i ]; - - return anArray._retn(); -} - -//============================================================================= -/*! + * Get scalar factor */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ) - throw ( SALOME::SALOME_Exception ) +CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() { ASSERT( myBaseImpl ); + double scale; try { - CORBA::Long oldType = (CORBA::Long) this->GetImpl()->GetDistrType(); - - this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ ); - - // Update Python script - if ( oldType != typ ) - SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )"; + scale = this->GetImpl()->GetScaleFactor(); } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); } + return scale; } //============================================================================= /*! - */ -//============================================================================= - -CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType() -{ - ASSERT( myBaseImpl ); - return this->GetImpl()->GetDistrType(); -} - -//============================================================================= -/*! - * StdMeshers_NumberOfSegments_i::SetScaleFactor + * StdMeshers_NumberOfSegments_i::SetBeta * - * Set scalar factor + * Set beta coefficient for Beta Law distribution */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor ) - throw ( SALOME::SALOME_Exception ) +void StdMeshers_NumberOfSegments_i::SetBeta(CORBA::Double beta) { - ASSERT( myBaseImpl ); + ASSERT(myBaseImpl); try { - this->GetImpl()->SetScaleFactor( theScaleFactor ); + this->GetImpl()->SetBeta(beta); // Update Python script - SMESH::TPythonDump() << _this() << ".SetScaleFactor( " << SMESH::TVar(theScaleFactor) << " )"; + SMESH::TPythonDump() << _this() << ".SetBeta( " << SMESH::TVar(beta) << " )"; } - catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + catch (SALOME_Exception& S_ex) { + THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); } } //============================================================================= /*! - * StdMeshers_NumberOfSegments_i::GetScaleFactor + * StdMeshers_NumberOfSegments_i::GetBeta * - * Get scalar factor + * Get beta coefficient for Beta Law distribution */ //============================================================================= -CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() - throw ( SALOME::SALOME_Exception ) +CORBA::Double StdMeshers_NumberOfSegments_i::GetBeta() { - ASSERT( myBaseImpl ); - double scale; + ASSERT(myBaseImpl); + + double beta = 1.0; try { - scale = this->GetImpl()->GetScaleFactor(); + beta = this->GetImpl()->GetBeta(); } - catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + catch (SALOME_Exception& S_ex) { + THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); } - return scale; + + return beta; } //============================================================================= @@ -342,7 +284,6 @@ CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() //============================================================================= void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& table) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); std::vector tbl( table.length() ); @@ -365,7 +306,6 @@ void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& //============================================================================= SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); const std::vector* tbl; @@ -388,7 +328,6 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction() //============================================================================= void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -408,7 +347,6 @@ void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr) //============================================================================= char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); const char* expr; @@ -428,7 +366,6 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() //============================================================================= void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -448,7 +385,6 @@ void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv ) //============================================================================= CORBA::Long StdMeshers_NumberOfSegments_i::ConversionMode() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); int conv; @@ -499,3 +435,30 @@ std::string StdMeshers_NumberOfSegments_i::getMethodOfParameter(const int paramI { return paramIndex == 0 ? "SetNumberOfSegments" : "SetScaleFactor"; } + + +//================================================================================ +/*! + * \brief Return geometry this hypothesis depends on. Return false if there is no geometry parameter + */ +//================================================================================ + +bool +StdMeshers_NumberOfSegments_i::getObjectsDependOn( std::vector< std::string > & entryArray, + std::vector< int > & subIDArray ) const +{ + return StdMeshers_Reversible1D_i::getObjectsDependOn( entryArray, subIDArray ); +} + +//================================================================================ +/*! + * \brief Set new geometry instead of that returned by getObjectsDependOn() + */ +//================================================================================ + +bool +StdMeshers_NumberOfSegments_i::setObjectsDependOn( std::vector< std::string > & entryArray, + std::vector< int > & subIDArray ) +{ + return StdMeshers_Reversible1D_i::setObjectsDependOn( entryArray, subIDArray ); +}