X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FStdMeshers_I%2FStdMeshers_NumberOfSegments_i.cxx;h=7b2d215a5f5fcdee169c1322aaafd62d777c114d;hb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;hp=69d5073466e1e343f2c73ae60916cd97bf7fd192;hpb=ea3e3193e3d50a44a4b3a069fc4fc1239c22f27b;p=modules%2Fsmesh.git diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index 69d507346..7b2d215a5 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -1,42 +1,42 @@ -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses +// Copyright (C) 2007-2008 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 // -// 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 +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // 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" #include +using namespace std; //============================================================================= /*! * StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i @@ -70,6 +70,60 @@ 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 ) + throw ( SALOME::SALOME_Exception ) +{ + 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 (int 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 ) + throw ( SALOME::SALOME_Exception ) +{ + ASSERT( myBaseImpl ); + + std::vector tbl( func.length() ); + for (int i = 0; i < func.length(); 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 (int 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 ); + } +} + //============================================================================= /*! * StdMeshers_NumberOfSegments_i::SetNumberOfSegments @@ -81,7 +135,6 @@ StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i() void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_NumberOfSegments_i::SetNumberOfSegments" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetNumberOfSegments( theSegmentsNumber ); @@ -92,11 +145,7 @@ void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegments } // 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( " << theSegmentsNumber << " )"; } //============================================================================= @@ -109,7 +158,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(); } @@ -122,10 +170,12 @@ 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 { this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ ); + + // Update Python script + SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), @@ -140,7 +190,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(); } @@ -156,10 +205,11 @@ 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( " << theScaleFactor << " )"; } catch ( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), @@ -178,7 +228,6 @@ 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 { @@ -199,13 +248,14 @@ 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++) 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(), @@ -221,7 +271,6 @@ 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 { @@ -246,10 +295,11 @@ 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(), @@ -265,7 +315,6 @@ 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 { @@ -283,13 +332,14 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction() */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetExponentMode(CORBA::Boolean isExp) +void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv ) throw ( SALOME::SALOME_Exception ) { - 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(), @@ -302,20 +352,19 @@ void StdMeshers_NumberOfSegments_i::SetExponentMode(CORBA::Boolean isExp) */ //============================================================================= -CORBA::Boolean StdMeshers_NumberOfSegments_i::IsExponentMode() +CORBA::Long StdMeshers_NumberOfSegments_i::ConversionMode() throw ( SALOME::SALOME_Exception ) { - 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 ); } - return isExp; + return conv; } //============================================================================= @@ -328,7 +377,6 @@ CORBA::Boolean StdMeshers_NumberOfSegments_i::IsExponentMode() ::StdMeshers_NumberOfSegments* StdMeshers_NumberOfSegments_i::GetImpl() { - MESSAGE( "StdMeshers_NumberOfSegments_i::GetImpl" ); return ( ::StdMeshers_NumberOfSegments* )myBaseImpl; }