X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_NumberOfSegments_i.cxx;h=57342432bce8585aadc1a7e034da31123900ddbc;hp=c9047fb7ae7a57c14af5e83ff977a42957d2509b;hb=refs%2Ftags%2FV9_7_0b1;hpb=6bac08c1a81f34d3f21c550bd92f83654b2546a5 diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index c9047fb7a..57342432b 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, 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,15 +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 ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i" ); myBaseImpl = new ::StdMeshers_NumberOfSegments( theGenImpl->GetANewId(), - theStudyId, - theGenImpl ); + theGenImpl ); } //============================================================================= @@ -67,7 +64,6 @@ StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::PO StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i() { - MESSAGE( "StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i" ); } //============================================================================= @@ -80,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 @@ -88,7 +83,7 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const SMESH::double_array_var aRes = new SMESH::double_array(); const std::vector& res = this->GetImpl()->BuildDistributionExpr( func, nbSeg, conv ); aRes->length( res.size() ); - for (int i = 0; i < res.size(); i++) + for (size_t i = 0; i < res.size(); i++) aRes[i] = res[i]; return aRes._retn(); } @@ -98,23 +93,23 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const } } -SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func, - CORBA::Long nbSeg, - CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) +SMESH::double_array* +StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func, + CORBA::Long nbSeg, + CORBA::Long conv ) { ASSERT( myBaseImpl ); std::vector tbl( func.length() ); - for (int i = 0; i < func.length(); i++) + for ( size_t i = 0; i < tbl.size(); i++ ) tbl[i] = func[i]; try { - SMESH::double_array_var aRes = new SMESH::double_array(); + SMESH::double_array_var aRes = new SMESH::double_array(); const std::vector& res = this->GetImpl()->BuildDistributionTab( tbl, nbSeg, conv ); aRes->length( res.size() ); - for (int i = 0; i < res.size(); i++) + for (size_t i = 0; i < res.size(); i++) aRes[i] = res[i]; return aRes._retn(); } @@ -132,8 +127,7 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionTab( const */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber ) - throw ( SALOME::SALOME_Exception ) +void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( SMESH::smIdType theSegmentsNumber ) { ASSERT( myBaseImpl ); try { @@ -162,115 +156,22 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments() return this->GetImpl()->GetNumberOfSegments(); } -//============================================================================= -/*! - * StdMeshers_NumberOfSegments_i::SetReversedEdges - * - * Set edges to reverse - */ -//============================================================================= - -void StdMeshers_NumberOfSegments_i::SetReversedEdges( const SMESH::long_array& theIds ) -{ - 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 ]; - - this->GetImpl()->SetReversedEdges( ids ); - } - 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 ) -{ - 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() << "\" )"; -} - -//============================================================================= -/*! - * StdMeshers_NumberOfSegments_i::GetObjectEntry - * - * Set the Entry for the Main Object - */ -//============================================================================= - -char* StdMeshers_NumberOfSegments_i::GetObjectEntry() -{ - ASSERT( myBaseImpl ); - - const char* entry; - try { - entry = this->GetImpl()->GetObjectEntry(); - } - catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); - } - return CORBA::string_dup( entry ); -} - -//============================================================================= -/*! - * StdMeshers_NumberOfSegments_i::GetReversedEdges - * - * Get reversed edges - */ -//============================================================================= - -SMESH::long_array* StdMeshers_NumberOfSegments_i::GetReversedEdges() -{ - MESSAGE( "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 ( CORBA::Long i = 0; i < ids.size(); i++) - anArray [ i ] = ids [ i ]; - - return anArray._retn(); -} - //============================================================================= /*! */ //============================================================================= void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { + CORBA::Long oldType = (CORBA::Long) this->GetImpl()->GetDistrType(); + this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ ); // Update Python script - SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )"; + if ( oldType != typ ) + SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), @@ -298,7 +199,6 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType() //============================================================================= void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -321,7 +221,6 @@ void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor //============================================================================= CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); double scale; @@ -341,11 +240,10 @@ 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() ); - for (int i = 0; i < table.length(); i++) + for ( CORBA::ULong i = 0; i < table.length(); i++) tbl[i] = table[i]; try { this->GetImpl()->SetTableFunction( tbl ); @@ -364,7 +262,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; @@ -372,12 +269,11 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction() tbl = &this->GetImpl()->GetTableFunction(); } catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); } SMESH::double_array_var aRes = new SMESH::double_array(); aRes->length(tbl->size()); - for (int i = 0; i < tbl->size(); i++) + for ( size_t i = 0; i < tbl->size(); i++ ) aRes[i] = (*tbl)[i]; return aRes._retn(); } @@ -388,7 +284,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 +303,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 +322,6 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() //============================================================================= void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv ) - throw ( SALOME::SALOME_Exception ) { ASSERT( myBaseImpl ); try { @@ -448,7 +341,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 +391,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 ); +}