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=69d5073466e1e343f2c73ae60916cd97bf7fd192;hb=refs%2Ftags%2FV9_7_0b1;hpb=ea3e3193e3d50a44a4b3a069fc4fc1239c22f27b diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index 69d507346..57342432b 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -1,36 +1,35 @@ -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. // +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// 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 // Module : SMESH -// $Header$ - -using namespace std; +// #include "StdMeshers_NumberOfSegments_i.hxx" #include "SMESH_Gen_i.hxx" #include "SMESH_Gen.hxx" +#include "SMESH_PythonDump.hxx" #include "Utils_CorbaException.hxx" #include "utilities.h" @@ -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,59 @@ StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i( PortableServer::PO StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i() { - MESSAGE( "StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i" ); +} + +//============================================================================= +/*! + * StdMeshers_NumberOfSegments_i::BuildDistribution + * + * Builds point distribution according to passed function + */ +//============================================================================= +SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const char* func, + CORBA::Long nbSeg, + CORBA::Long conv ) +{ + ASSERT( myBaseImpl ); + try + { + SMESH::double_array_var aRes = new SMESH::double_array(); + const std::vector& res = this->GetImpl()->BuildDistributionExpr( func, nbSeg, conv ); + aRes->length( res.size() ); + for (size_t i = 0; i < res.size(); i++) + aRes[i] = res[i]; + return aRes._retn(); + } + catch( SALOME_Exception& S_ex ) + { + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); + } +} + +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 ( size_t i = 0; i < tbl.size(); i++ ) + tbl[i] = func[i]; + + try + { + SMESH::double_array_var aRes = new SMESH::double_array(); + const std::vector& res = this->GetImpl()->BuildDistributionTab( tbl, nbSeg, conv ); + aRes->length( res.size() ); + for (size_t i = 0; i < res.size(); i++) + aRes[i] = res[i]; + return aRes._retn(); + } + catch( SALOME_Exception& S_ex ) + { + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); + } } //============================================================================= @@ -78,25 +127,19 @@ StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i() */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber ) - throw ( SALOME::SALOME_Exception ) +void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( SMESH::smIdType theSegmentsNumber ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::SetNumberOfSegments" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetNumberOfSegments( theSegmentsNumber ); } catch (SALOME_Exception& S_ex) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } // Update Python script - TCollection_AsciiString aStr, aStrNb ((int)theSegmentsNumber); - SMESH_Gen_i::AddObject(aStr, _this()) += ".SetNumberOfSegments("; - aStr += aStrNb + ")"; - - SMESH_Gen_i::AddToCurrentPyScript(aStr); + SMESH::TPythonDump() << _this() << ".SetNumberOfSegments( " << SMESH::TVar(theSegmentsNumber) << " )"; } //============================================================================= @@ -109,7 +152,6 @@ void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegments CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments() { - MESSAGE( "StdMeshers_NumberOfSegments_i::GetNumberOfSegments" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetNumberOfSegments(); } @@ -120,16 +162,20 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments() //============================================================================= void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ) - throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::SetDistrType" ); ASSERT( myBaseImpl ); 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 << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } } @@ -140,7 +186,6 @@ void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ) CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType() { - MESSAGE( "StdMeshers_NumberOfSegments_i::GetDistrType" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetDistrType(); } @@ -154,16 +199,16 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType() //============================================================================= void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor ) - throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::SetScaleFactor" ); ASSERT( myBaseImpl ); try { 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 ); + SALOME::BAD_PARAM ); } } @@ -176,9 +221,7 @@ void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor //============================================================================= CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() - throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::GetScaleFactor" ); ASSERT( myBaseImpl ); double scale; try { @@ -186,7 +229,7 @@ CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } return scale; } @@ -197,19 +240,19 @@ CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor() //============================================================================= void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& table) - throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::SetTableFunction" ); 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 ); + // Update Python script + SMESH::TPythonDump() << _this() << ".SetTableFunction( " << table << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } } @@ -219,21 +262,18 @@ void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& //============================================================================= SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction() - throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::GetTableFunction" ); ASSERT( myBaseImpl ); const std::vector* tbl; try { 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(); } @@ -244,16 +284,16 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction() //============================================================================= void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr) - throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::SetExpressionFunction" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetExpressionFunction( expr ); + // Update Python script + SMESH::TPythonDump() << _this() << ".SetExpressionFunction( '" << expr << "' )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } } @@ -263,9 +303,7 @@ void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr) //============================================================================= char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() - throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::GetExpressionFunction" ); ASSERT( myBaseImpl ); const char* expr; try { @@ -273,7 +311,7 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } return CORBA::string_dup(expr); } @@ -283,17 +321,17 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetExponentMode(CORBA::Boolean isExp) - throw ( SALOME::SALOME_Exception ) +void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::SetExponentMode" ); ASSERT( myBaseImpl ); try { - this->GetImpl()->SetExponentMode( isExp ); + this->GetImpl()->SetConversionMode( conv ); + // Update Python script + SMESH::TPythonDump() << _this() << ".SetConversionMode( " << conv << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } } @@ -302,20 +340,18 @@ void StdMeshers_NumberOfSegments_i::SetExponentMode(CORBA::Boolean isExp) */ //============================================================================= -CORBA::Boolean StdMeshers_NumberOfSegments_i::IsExponentMode() - throw ( SALOME::SALOME_Exception ) +CORBA::Long StdMeshers_NumberOfSegments_i::ConversionMode() { - MESSAGE( "StdMeshers_NumberOfSegments_i::IsExponentMode" ); ASSERT( myBaseImpl ); - bool isExp; + int conv; try { - isExp = this->GetImpl()->IsExponentMode(); + conv = this->GetImpl()->ConversionMode(); } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); + SALOME::BAD_PARAM ); } - return isExp; + return conv; } //============================================================================= @@ -328,7 +364,6 @@ CORBA::Boolean StdMeshers_NumberOfSegments_i::IsExponentMode() ::StdMeshers_NumberOfSegments* StdMeshers_NumberOfSegments_i::GetImpl() { - MESSAGE( "StdMeshers_NumberOfSegments_i::GetImpl" ); return ( ::StdMeshers_NumberOfSegments* )myBaseImpl; } @@ -346,3 +381,40 @@ CORBA::Boolean StdMeshers_NumberOfSegments_i::IsDimSupported( SMESH::Dimension t return type == SMESH::DIM_1D; } +//================================================================================ +/*! + * \brief Return method name corresponding to index of variable parameter + */ +//================================================================================ + +std::string StdMeshers_NumberOfSegments_i::getMethodOfParameter(const int paramIndex, int ) const +{ + 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 ); +}