X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_NumberOfSegments.cxx;h=eb125cae23c5b35223a604f6c9c6b7a94f7b5569;hp=675bbad0399d31175987ea4d845d0281bb42148a;hb=b09372829929f8f561495d6c16527134971a1909;hpb=a17b36970bc61da1d664453c615754997c925b18 diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index 675bbad03..eb125cae2 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 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 : implementaion of SMESH idl descriptions +// SMESH SMESH : implementation of SMESH idl descriptions // File : StdMeshers_NumberOfSegments.cxx // Moved here from SMESH_NumberOfSegments.cxx // Author : Paul RASCLE, EDF @@ -28,10 +28,11 @@ // #include "StdMeshers_NumberOfSegments.hxx" -#include "StdMeshers_Distribution.hxx" +#include "SMESHDS_Mesh.hxx" #include "SMESHDS_SubMesh.hxx" -#include "SMESH_Mesh.hxx" #include "SMESH_Comment.hxx" +#include "SMESH_Mesh.hxx" +#include "StdMeshers_Distribution.hxx" #include #include @@ -41,15 +42,8 @@ #include #include -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 -#define NO_CAS_CATCH -#endif - #include - -#ifdef NO_CAS_CATCH #include -#endif #include @@ -65,9 +59,8 @@ const double PRECISION = 1e-7; //============================================================================= StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId, - int studyId, SMESH_Gen * gen) - : SMESH_Hypothesis(hypId, studyId, gen), + : StdMeshers_Reversible1D(hypId, gen), _numberOfSegments(15),//issue 19923 _distrType(DT_Regular), _scaleFactor(1.), @@ -94,7 +87,6 @@ StdMeshers_NumberOfSegments::~StdMeshers_NumberOfSegments() //============================================================================= const vector& StdMeshers_NumberOfSegments::BuildDistributionExpr( const char* expr,int nbSeg,int conv ) - throw ( SALOME_Exception ) { if( !buildDistribution( TCollection_AsciiString( ( Standard_CString )expr ), conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) ) _distr.resize( 0 ); @@ -105,7 +97,6 @@ const vector& StdMeshers_NumberOfSegments::BuildDistributionTab( const vector& tab, int nbSeg, int conv ) - throw ( SALOME_Exception ) { if( !buildDistribution( tab, conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) ) _distr.resize( 0 ); @@ -118,10 +109,9 @@ StdMeshers_NumberOfSegments::BuildDistributionTab( const vector& tab, */ //============================================================================= -void StdMeshers_NumberOfSegments::SetNumberOfSegments(int segmentsNumber) -throw(SALOME_Exception) +void StdMeshers_NumberOfSegments::SetNumberOfSegments(smIdType segmentsNumber) { - int oldNumberOfSegments = _numberOfSegments; + smIdType oldNumberOfSegments = _numberOfSegments; if (segmentsNumber <= 0) throw SALOME_Exception(LOCALIZED("number of segments must be positive")); _numberOfSegments = segmentsNumber; @@ -136,7 +126,7 @@ throw(SALOME_Exception) */ //============================================================================= -int StdMeshers_NumberOfSegments::GetNumberOfSegments() const +smIdType StdMeshers_NumberOfSegments::GetNumberOfSegments() const { return _numberOfSegments; } @@ -148,7 +138,6 @@ int StdMeshers_NumberOfSegments::GetNumberOfSegments() const //================================================================================ void StdMeshers_NumberOfSegments::SetDistrType(DistrType typ) - throw(SALOME_Exception) { if (typ < DT_Regular || typ > DT_ExprFunc) throw SALOME_Exception(LOCALIZED("distribution type is out of range")); @@ -178,7 +167,6 @@ StdMeshers_NumberOfSegments::DistrType StdMeshers_NumberOfSegments::GetDistrType //================================================================================ void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor) - throw(SALOME_Exception) { if (scaleFactor < PRECISION) throw SALOME_Exception(LOCALIZED("scale factor must be positive")); @@ -204,7 +192,6 @@ void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor) //================================================================================ double StdMeshers_NumberOfSegments::GetScaleFactor() const - throw(SALOME_Exception) { if (_distrType != DT_Scale) throw SALOME_Exception(LOCALIZED("not a scale distribution")); @@ -218,7 +205,6 @@ double StdMeshers_NumberOfSegments::GetScaleFactor() const //================================================================================ void StdMeshers_NumberOfSegments::SetTableFunction(const vector& table) - throw(SALOME_Exception) { if (_distrType != DT_TabFunc) _distrType = DT_TabFunc; @@ -237,13 +223,10 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const vector& table) if( _convMode==0 ) { try { -#ifdef NO_CAS_CATCH OCC_CATCH_SIGNALS; -#endif val = pow( 10.0, val ); } - catch(Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + catch(Standard_Failure&) { throw SALOME_Exception( LOCALIZED( "invalid value")); return; } @@ -286,7 +269,6 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const vector& table) //================================================================================ const vector& StdMeshers_NumberOfSegments::GetTableFunction() const - throw(SALOME_Exception) { if (_distrType != DT_TabFunc) throw SALOME_Exception(LOCALIZED("not a table function distribution")); @@ -334,13 +316,10 @@ bool process( const TCollection_AsciiString& str, int convMode, bool parsed_ok = true; Handle( ExprIntrp_GenExp ) myExpr; try { -#ifdef NO_CAS_CATCH OCC_CATCH_SIGNALS; -#endif myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( str.ToCString() ); - } catch(Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + } catch(Standard_Failure&) { parsed_ok = false; } @@ -393,7 +372,6 @@ bool process( const TCollection_AsciiString& str, int convMode, //================================================================================ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr) - throw(SALOME_Exception) { if (_distrType != DT_ExprFunc) _distrType = DT_ExprFunc; @@ -415,7 +393,6 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr) std::string StdMeshers_NumberOfSegments::CheckExpressionFunction( const std::string& expr, const int convMode) - throw (SALOME_Exception) { // remove white spaces TCollection_AsciiString str((Standard_CString)expr.c_str()); @@ -455,7 +432,6 @@ StdMeshers_NumberOfSegments::CheckExpressionFunction( const std::string& expr, //================================================================================ const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const - throw(SALOME_Exception) { if (_distrType != DT_ExprFunc) throw SALOME_Exception(LOCALIZED("not an expression function distribution")); @@ -469,7 +445,6 @@ const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const //================================================================================ void StdMeshers_NumberOfSegments::SetConversionMode( int conv ) - throw(SALOME_Exception) { // if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) // throw SALOME_Exception(LOCALIZED("not a functional distribution")); @@ -488,7 +463,6 @@ void StdMeshers_NumberOfSegments::SetConversionMode( int conv ) //================================================================================ int StdMeshers_NumberOfSegments::ConversionMode() const - throw(SALOME_Exception) { // if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) // throw SALOME_Exception(LOCALIZED("not a functional distribution")); @@ -503,7 +477,7 @@ int StdMeshers_NumberOfSegments::ConversionMode() const ostream & StdMeshers_NumberOfSegments::SaveTo(ostream & save) { - int listSize = _edgeIDs.size(); + size_t listSize = _edgeIDs.size(); save << _numberOfSegments << " " << (int)_distrType; switch (_distrType) { @@ -528,7 +502,7 @@ ostream & StdMeshers_NumberOfSegments::SaveTo(ostream & save) if ( _distrType != DT_Regular && listSize > 0 ) { save << " " << listSize; - for ( int i = 0; i < listSize; i++ ) + for ( size_t i = 0; i < listSize; i++ ) save << " " << _edgeIDs[i]; save << " " << _objEntry; } @@ -559,12 +533,12 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load) // we wait here the scale factor, which is double. // 2. If the hypothesis is stored in new format // (nb.segments, distr.type, some other params.), - // we wait here the ditribution type, which is integer + // we wait here the distribution type, which is integer double scale_factor; isOK = static_cast(load >> scale_factor); a = (int)scale_factor; - // try to interprete ditribution type, + // try to interpret distribution type, // supposing that this hypothesis was written in the new format if (isOK) { @@ -734,19 +708,3 @@ bool StdMeshers_NumberOfSegments::SetParametersByDefaults(const TDefaults& dflt { return (_numberOfSegments = dflts._nbSegments ); } - -//============================================================================= -/*! - * - */ -//============================================================================= - -void StdMeshers_NumberOfSegments::SetReversedEdges( std::vector& ids ) -{ - if ( ids != _edgeIDs ) { - _edgeIDs = ids; - - NotifySubMeshesHypothesisModification(); - } -} -