Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_NumberOfSegments.cxx
diff --git
a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
index fc8da4162a1618b2844191f981091f90394ce84c..eb125cae23c5b35223a604f6c9c6b7a94f7b5569 100644
(file)
--- a/
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
+++ b/
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-59,9
+59,8
@@
const double PRECISION = 1e-7;
//=============================================================================
StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId,
//=============================================================================
StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId,
- int studyId,
SMESH_Gen * gen)
SMESH_Gen * gen)
- : S
MESH_Hypothesis(hypId, study
Id, gen),
+ : S
tdMeshers_Reversible1D(hyp
Id, gen),
_numberOfSegments(15),//issue 19923
_distrType(DT_Regular),
_scaleFactor(1.),
_numberOfSegments(15),//issue 19923
_distrType(DT_Regular),
_scaleFactor(1.),
@@
-88,7
+87,6
@@
StdMeshers_NumberOfSegments::~StdMeshers_NumberOfSegments()
//=============================================================================
const vector<double>&
StdMeshers_NumberOfSegments::BuildDistributionExpr( const char* expr,int nbSeg,int conv )
//=============================================================================
const vector<double>&
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 );
{
if( !buildDistribution( TCollection_AsciiString( ( Standard_CString )expr ), conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) )
_distr.resize( 0 );
@@
-99,7
+97,6
@@
const vector<double>&
StdMeshers_NumberOfSegments::BuildDistributionTab( const vector<double>& tab,
int nbSeg,
int conv )
StdMeshers_NumberOfSegments::BuildDistributionTab( const vector<double>& tab,
int nbSeg,
int conv )
- throw ( SALOME_Exception )
{
if( !buildDistribution( tab, conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) )
_distr.resize( 0 );
{
if( !buildDistribution( tab, conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) )
_distr.resize( 0 );
@@
-112,10
+109,9
@@
StdMeshers_NumberOfSegments::BuildDistributionTab( const vector<double>& 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;
if (segmentsNumber <= 0)
throw SALOME_Exception(LOCALIZED("number of segments must be positive"));
_numberOfSegments = segmentsNumber;
@@
-130,7
+126,7
@@
throw(SALOME_Exception)
*/
//=============================================================================
*/
//=============================================================================
-
int
StdMeshers_NumberOfSegments::GetNumberOfSegments() const
+
smIdType
StdMeshers_NumberOfSegments::GetNumberOfSegments() const
{
return _numberOfSegments;
}
{
return _numberOfSegments;
}
@@
-142,7
+138,6
@@
int StdMeshers_NumberOfSegments::GetNumberOfSegments() const
//================================================================================
void StdMeshers_NumberOfSegments::SetDistrType(DistrType typ)
//================================================================================
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"));
{
if (typ < DT_Regular || typ > DT_ExprFunc)
throw SALOME_Exception(LOCALIZED("distribution type is out of range"));
@@
-172,7
+167,6
@@
StdMeshers_NumberOfSegments::DistrType StdMeshers_NumberOfSegments::GetDistrType
//================================================================================
void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor)
//================================================================================
void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor)
- throw(SALOME_Exception)
{
if (scaleFactor < PRECISION)
throw SALOME_Exception(LOCALIZED("scale factor must be positive"));
{
if (scaleFactor < PRECISION)
throw SALOME_Exception(LOCALIZED("scale factor must be positive"));
@@
-198,7
+192,6
@@
void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor)
//================================================================================
double StdMeshers_NumberOfSegments::GetScaleFactor() const
//================================================================================
double StdMeshers_NumberOfSegments::GetScaleFactor() const
- throw(SALOME_Exception)
{
if (_distrType != DT_Scale)
throw SALOME_Exception(LOCALIZED("not a scale distribution"));
{
if (_distrType != DT_Scale)
throw SALOME_Exception(LOCALIZED("not a scale distribution"));
@@
-212,7
+205,6
@@
double StdMeshers_NumberOfSegments::GetScaleFactor() const
//================================================================================
void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
//================================================================================
void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
- throw(SALOME_Exception)
{
if (_distrType != DT_TabFunc)
_distrType = DT_TabFunc;
{
if (_distrType != DT_TabFunc)
_distrType = DT_TabFunc;
@@
-234,7
+226,7
@@
void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
OCC_CATCH_SIGNALS;
val = pow( 10.0, val );
}
OCC_CATCH_SIGNALS;
val = pow( 10.0, val );
}
- catch(Standard_Failure) {
+ catch(Standard_Failure
&
) {
throw SALOME_Exception( LOCALIZED( "invalid value"));
return;
}
throw SALOME_Exception( LOCALIZED( "invalid value"));
return;
}
@@
-277,7
+269,6
@@
void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
//================================================================================
const vector<double>& StdMeshers_NumberOfSegments::GetTableFunction() const
//================================================================================
const vector<double>& StdMeshers_NumberOfSegments::GetTableFunction() const
- throw(SALOME_Exception)
{
if (_distrType != DT_TabFunc)
throw SALOME_Exception(LOCALIZED("not a table function distribution"));
{
if (_distrType != DT_TabFunc)
throw SALOME_Exception(LOCALIZED("not a table function distribution"));
@@
-328,7
+319,7
@@
bool process( const TCollection_AsciiString& str, int convMode,
OCC_CATCH_SIGNALS;
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( str.ToCString() );
OCC_CATCH_SIGNALS;
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( str.ToCString() );
- } catch(Standard_Failure) {
+ } catch(Standard_Failure
&
) {
parsed_ok = false;
}
parsed_ok = false;
}
@@
-381,7
+372,6
@@
bool process( const TCollection_AsciiString& str, int convMode,
//================================================================================
void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
//================================================================================
void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
- throw(SALOME_Exception)
{
if (_distrType != DT_ExprFunc)
_distrType = DT_ExprFunc;
{
if (_distrType != DT_ExprFunc)
_distrType = DT_ExprFunc;
@@
-403,7
+393,6
@@
void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
std::string
StdMeshers_NumberOfSegments::CheckExpressionFunction( const std::string& expr,
const int convMode)
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());
{
// remove white spaces
TCollection_AsciiString str((Standard_CString)expr.c_str());
@@
-443,7
+432,6
@@
StdMeshers_NumberOfSegments::CheckExpressionFunction( const std::string& expr,
//================================================================================
const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const
//================================================================================
const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const
- throw(SALOME_Exception)
{
if (_distrType != DT_ExprFunc)
throw SALOME_Exception(LOCALIZED("not an expression function distribution"));
{
if (_distrType != DT_ExprFunc)
throw SALOME_Exception(LOCALIZED("not an expression function distribution"));
@@
-457,7
+445,6
@@
const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const
//================================================================================
void StdMeshers_NumberOfSegments::SetConversionMode( int conv )
//================================================================================
void StdMeshers_NumberOfSegments::SetConversionMode( int conv )
- throw(SALOME_Exception)
{
// if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc)
// throw SALOME_Exception(LOCALIZED("not a functional distribution"));
{
// if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc)
// throw SALOME_Exception(LOCALIZED("not a functional distribution"));
@@
-476,7
+463,6
@@
void StdMeshers_NumberOfSegments::SetConversionMode( int conv )
//================================================================================
int StdMeshers_NumberOfSegments::ConversionMode() const
//================================================================================
int StdMeshers_NumberOfSegments::ConversionMode() const
- throw(SALOME_Exception)
{
// if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc)
// throw SALOME_Exception(LOCALIZED("not a functional distribution"));
{
// if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc)
// throw SALOME_Exception(LOCALIZED("not a functional distribution"));
@@
-491,7
+477,7
@@
int StdMeshers_NumberOfSegments::ConversionMode() const
ostream & StdMeshers_NumberOfSegments::SaveTo(ostream & save)
{
ostream & StdMeshers_NumberOfSegments::SaveTo(ostream & save)
{
-
in
t listSize = _edgeIDs.size();
+
size_
t listSize = _edgeIDs.size();
save << _numberOfSegments << " " << (int)_distrType;
switch (_distrType)
{
save << _numberOfSegments << " " << (int)_distrType;
switch (_distrType)
{
@@
-516,7
+502,7
@@
ostream & StdMeshers_NumberOfSegments::SaveTo(ostream & save)
if ( _distrType != DT_Regular && listSize > 0 ) {
save << " " << listSize;
if ( _distrType != DT_Regular && listSize > 0 ) {
save << " " << listSize;
- for (
in
t i = 0; i < listSize; i++ )
+ for (
size_
t i = 0; i < listSize; i++ )
save << " " << _edgeIDs[i];
save << " " << _objEntry;
}
save << " " << _edgeIDs[i];
save << " " << _objEntry;
}
@@
-547,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 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 di
s
tribution type, which is integer
double scale_factor;
isOK = static_cast<bool>(load >> scale_factor);
a = (int)scale_factor;
double scale_factor;
isOK = static_cast<bool>(load >> scale_factor);
a = (int)scale_factor;
- // try to interpret
e di
tribution type,
+ // try to interpret
dis
tribution type,
// supposing that this hypothesis was written in the new format
if (isOK)
{
// supposing that this hypothesis was written in the new format
if (isOK)
{
@@
-722,19
+708,3
@@
bool StdMeshers_NumberOfSegments::SetParametersByDefaults(const TDefaults& dflt
{
return (_numberOfSegments = dflts._nbSegments );
}
{
return (_numberOfSegments = dflts._nbSegments );
}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
-void StdMeshers_NumberOfSegments::SetReversedEdges( std::vector<int>& ids )
-{
- if ( ids != _edgeIDs ) {
- _edgeIDs = ids;
-
- NotifySubMeshesHypothesisModification();
- }
-}
-