From b1d2a14730e4340aae319544f8e3396ddfcfde1f Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 7 Nov 2007 09:57:17 +0000 Subject: [PATCH] PAL16202,16203 (Propagation 1D on edges group) remove useless includes --- src/SMESH_I/SMESH_Filter_i.cxx | 24 ++++---- src/SMESH_I/SMESH_Hypothesis_i.cxx | 2 +- src/SMESH_I/SMESH_subMesh_i.cxx | 6 +- src/StdMeshers/StdMeshers_Hexa_3D.cxx | 8 +-- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 16 +++-- .../StdMeshers_NumberOfSegments.cxx | 60 ++++++++++--------- src/StdMeshers/StdMeshers_Penta_3D.cxx | 6 +- src/StdMeshers/StdMeshers_Prism_3D.cxx | 8 +-- src/StdMeshers/StdMeshers_Projection_3D.cxx | 6 +- src/StdMeshers/StdMeshers_Propagation.cxx | 5 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 15 ++--- src/StdMeshers/StdMeshers_RadialPrism_3D.cxx | 11 ++-- src/StdMeshers/StdMeshers_Regular_1D.cxx | 6 +- 13 files changed, 88 insertions(+), 85 deletions(-) diff --git a/src/SMESH_I/SMESH_Filter_i.cxx b/src/SMESH_I/SMESH_Filter_i.cxx index aa04aff4b..de4d8d81d 100644 --- a/src/SMESH_I/SMESH_Filter_i.cxx +++ b/src/SMESH_I/SMESH_Filter_i.cxx @@ -37,29 +37,27 @@ #include "SMESHDS_Mesh.hxx" +#include +#include +#include +#include +#include #include #include #include -#include -#include #include -#include +#include #include +#include #include #include -#include #include -#include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include using namespace SMESH; using namespace SMESH::Controls; diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx index 4f9a90d25..e7fbae337 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.cxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx @@ -145,7 +145,7 @@ CORBA::Long SMESH_Hypothesis_i::GetId() ::SMESH_Hypothesis* SMESH_Hypothesis_i::GetImpl() { - MESSAGE( "SMESH_Hypothesis_i::GetImpl" ); + //MESSAGE( "SMESH_Hypothesis_i::GetImpl" ); return myBaseImpl; } diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx index d4e525821..a7d34a957 100644 --- a/src/SMESH_I/SMESH_subMesh_i.cxx +++ b/src/SMESH_I/SMESH_subMesh_i.cxx @@ -26,7 +26,6 @@ // Module : SMESH // $Header$ -using namespace std; #include "SMESH_subMesh_i.hxx" #include "SMESH_Gen_i.hxx" #include "SMESH_Mesh_i.hxx" @@ -36,9 +35,10 @@ using namespace std; #include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" -#include -#include #include +#include + +using namespace std; //============================================================================= /*! diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx index d1567ae08..33efea5e7 100644 --- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx @@ -45,13 +45,11 @@ #include "SMDS_VolumeOfNodes.hxx" #include +#include #include -#include #include -#include - -#include -#include +#include +#include #include #include "utilities.h" diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx index ebf208060..7b76b3545 100644 --- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx +++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx @@ -50,16 +50,20 @@ #include "utilities.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include using namespace std; diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index f4819f92c..a6364114a 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -63,8 +63,9 @@ const double PRECISION = 1e-7; */ //============================================================================= -StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId, int studyId, - SMESH_Gen * gen) +StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId, + int studyId, + SMESH_Gen * gen) : SMESH_Hypothesis(hypId, studyId, gen), _numberOfSegments(1), _distrType(DT_Regular), @@ -90,17 +91,20 @@ StdMeshers_NumberOfSegments::~StdMeshers_NumberOfSegments() * */ //============================================================================= -const std::vector& StdMeshers_NumberOfSegments::BuildDistributionExpr( const char* expr, int nbSeg, int conv ) -throw ( SALOME_Exception ) +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 ); return _distr; } -const std::vector& StdMeshers_NumberOfSegments::BuildDistributionTab( const std::vector& tab, - int nbSeg, int conv ) -throw ( SALOME_Exception ) +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 ); @@ -116,14 +120,13 @@ throw ( SALOME_Exception ) void StdMeshers_NumberOfSegments::SetNumberOfSegments(int segmentsNumber) throw(SALOME_Exception) { - int oldNumberOfSegments = _numberOfSegments; - if (segmentsNumber <= 0) - throw - SALOME_Exception(LOCALIZED("number of segments must be positive")); - _numberOfSegments = segmentsNumber; - - if (oldNumberOfSegments != _numberOfSegments) - NotifySubMeshesHypothesisModification(); + int oldNumberOfSegments = _numberOfSegments; + if (segmentsNumber <= 0) + throw SALOME_Exception(LOCALIZED("number of segments must be positive")); + _numberOfSegments = segmentsNumber; + + if (oldNumberOfSegments != _numberOfSegments) + NotifySubMeshesHypothesisModification(); } //============================================================================= @@ -134,7 +137,7 @@ throw(SALOME_Exception) int StdMeshers_NumberOfSegments::GetNumberOfSegments() const { - return _numberOfSegments; + return _numberOfSegments; } //================================================================================ @@ -177,7 +180,8 @@ void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor) throw(SALOME_Exception) { if (_distrType != DT_Scale) - throw SALOME_Exception(LOCALIZED("not a scale distribution")); + _distrType = DT_Scale; + //throw SALOME_Exception(LOCALIZED("not a scale distribution")); if (scaleFactor < PRECISION) throw SALOME_Exception(LOCALIZED("scale factor must be positive")); //if (fabs(scaleFactor - 1.0) < PRECISION) @@ -210,11 +214,12 @@ double StdMeshers_NumberOfSegments::GetScaleFactor() const */ //================================================================================ -void StdMeshers_NumberOfSegments::SetTableFunction(const std::vector& table) +void StdMeshers_NumberOfSegments::SetTableFunction(const vector& table) throw(SALOME_Exception) { if (_distrType != DT_TabFunc) - throw SALOME_Exception(LOCALIZED("not a table function distribution")); + _distrType = DT_TabFunc; + //throw SALOME_Exception(LOCALIZED("not a table function distribution")); if ( (table.size() % 2) != 0 ) throw SALOME_Exception(LOCALIZED("odd size of vector of table function")); @@ -282,7 +287,7 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const std::vector& ta */ //================================================================================ -const std::vector& StdMeshers_NumberOfSegments::GetTableFunction() const +const vector& StdMeshers_NumberOfSegments::GetTableFunction() const throw(SALOME_Exception) { if (_distrType != DT_TabFunc) @@ -396,7 +401,8 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr) throw(SALOME_Exception) { if (_distrType != DT_ExprFunc) - throw SALOME_Exception(LOCALIZED("not an expression function distribution")); + _distrType = DT_ExprFunc; + //throw SALOME_Exception(LOCALIZED("not an expression function distribution")); // remove white spaces TCollection_AsciiString str((Standard_CString)expr); @@ -428,7 +434,7 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr) return; } - std::string func = expr; + string func = expr; if( _func != func ) { _func = func; @@ -459,8 +465,8 @@ 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")); +// if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) +// throw SALOME_Exception(LOCALIZED("not a functional distribution")); if( conv != _convMode ) { @@ -478,8 +484,8 @@ 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")); +// if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) +// throw SALOME_Exception(LOCALIZED("not a functional distribution")); return _convMode; } @@ -675,10 +681,10 @@ bool StdMeshers_NumberOfSegments::SetParametersByMesh(const SMESH_Mesh* theMes int nbEdges = 0; TopTools_IndexedMapOfShape edgeMap; TopExp::MapShapes( theShape, TopAbs_EDGE, edgeMap ); + SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS(); for ( int i = 1; i <= edgeMap.Extent(); ++i ) { // get current segment length - SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS(); SMESHDS_SubMesh * eSubMesh = aMeshDS->MeshElements( edgeMap( i )); if ( eSubMesh && eSubMesh->NbElements()) _numberOfSegments += eSubMesh->NbElements(); diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index 6359f2905..4030cdfce 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.cxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx @@ -40,17 +40,13 @@ #include "SMESH_subMeshEventListener.hxx" #include "SMESH_Comment.hxx" -#include -#include #include -#include #include +#include #include #include -#include #include #include -#include #include #include #include diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx index 6d28721e3..4d818a468 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.cxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx @@ -38,17 +38,17 @@ #include "utilities.h" -#include -#include -#include #include #include #include +#include +#include #include +#include using namespace std; -#define RETURN_BAD_RESULT(msg) { MESSAGE(msg); return false; } +#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z()) #define SHOWYXZ(msg, xyz) // {\ // gp_Pnt p (xyz); \ diff --git a/src/StdMeshers/StdMeshers_Projection_3D.cxx b/src/StdMeshers/StdMeshers_Projection_3D.cxx index 4a3d9a630..af93f888d 100644 --- a/src/StdMeshers/StdMeshers_Projection_3D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_3D.cxx @@ -48,7 +48,11 @@ #include "utilities.h" -#define RETURN_BAD_RESULT(msg) { MESSAGE(msg); return false; } +#include +#include +#include + +#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z()) #define SHOWYXZ(msg, xyz) // {\ // gp_Pnt p (xyz); \ diff --git a/src/StdMeshers/StdMeshers_Propagation.cxx b/src/StdMeshers/StdMeshers_Propagation.cxx index 306ae1830..64ff66f35 100644 --- a/src/StdMeshers/StdMeshers_Propagation.cxx +++ b/src/StdMeshers/StdMeshers_Propagation.cxx @@ -34,9 +34,10 @@ #include "SMESH_Mesh.hxx" #include "SMESH_subMesh.hxx" -#include -#include #include +#include +#include +#include #define DBGMSG(txt) \ // cout << txt << endl; diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index 2c3c74128..12c132959 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -43,23 +43,16 @@ #include "SMDS_EdgePosition.hxx" #include "SMDS_FacePosition.hxx" -#include -#include -#include #include #include +#include #include -#include -#include -#include -#include -#include +#include #include -#include -#include #include #include -#include +#include +#include #include "utilities.h" #include "Utils_ExceptHandlers.hxx" diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx index 128b32077..cc1b4f89e 100644 --- a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx +++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx @@ -45,19 +45,20 @@ #include "utilities.h" -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include #include #include using namespace std; -#define RETURN_BAD_RESULT(msg) { MESSAGE(msg); return false; } +#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z()) typedef StdMeshers_ProjectionUtils TAssocTool; diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index ba5f74503..dffe2629f 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -54,12 +54,14 @@ #include #include -#include -#include #include #include #include #include +#include +#include +#include +#include #include -- 2.30.2