ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-05 06:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL16202,16203 (Propagation 1D on edges group)

Browse Source 
remove useless includes
This commit is contained in:
eap 2007-11-07 09:57:05 +00:00
parent a4deef590d
commit 42e8757bfc
10 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/StdMeshers/StdMeshers_Hexa_3D.cxx
View File

@ -45,13 +45,11 @@
#include "SMDS_VolumeOfNodes.hxx" #include "SMDS_VolumeOfNodes.hxx"
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TopTools_ListOfShape.hxx>
#include <TopoDS.hxx>
#include <BRep_Tool.hxx>
#include <Geom_Surface.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include "utilities.h" #include "utilities.h"

16
src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
View File

@ -50,16 +50,20 @@
#include "utilities.h" #include "utilities.h"
#include <TopoDS_Face.hxx>
#include <TopoDS_Edge.hxx>
#include <Geom_Surface.hxx>
#include <Geom2d_Curve.hxx>
#include <gp_Pnt2d.hxx>
#include <BRep_Tool.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <BRep_Tool.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom_Surface.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_ListOfShape.hxx> #include <TopTools_ListOfShape.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Iterator.hxx>
#include <gp_Pnt2d.hxx>
using namespace std; using namespace std;

58
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
View File

@ -63,8 +63,9 @@ const double PRECISION = 1e-7;
*/ */
//============================================================================= //=============================================================================
StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId, int studyId, StdMeshers_NumberOfSegments::StdMeshers_NumberOfSegments(int hypId,
SMESH_Gen * gen) int studyId,
SMESH_Gen * gen)
: SMESH_Hypothesis(hypId, studyId, gen), : SMESH_Hypothesis(hypId, studyId, gen),
_numberOfSegments(1), _numberOfSegments(1),
_distrType(DT_Regular), _distrType(DT_Regular),
@ -90,17 +91,20 @@ StdMeshers_NumberOfSegments::~StdMeshers_NumberOfSegments()
* *
*/ */
//============================================================================= //=============================================================================
const std::vector<double>& StdMeshers_NumberOfSegments::BuildDistributionExpr( const char* expr, int nbSeg, int conv ) const vector<double>&
throw ( SALOME_Exception ) 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 ) ) if( !buildDistribution( TCollection_AsciiString( ( Standard_CString )expr ), conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) )
_distr.resize( 0 ); _distr.resize( 0 );
return _distr; return _distr;
} }
const std::vector<double>& StdMeshers_NumberOfSegments::BuildDistributionTab( const std::vector<double>& tab, const vector<double>&
int nbSeg, int conv ) StdMeshers_NumberOfSegments::BuildDistributionTab( const vector<double>& tab,
throw ( SALOME_Exception ) int nbSeg,
int conv )
throw ( SALOME_Exception )
{ {
if( !buildDistribution( tab, conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) ) if( !buildDistribution( tab, conv, 0.0, 1.0, nbSeg, _distr, 1E-4 ) )
_distr.resize( 0 ); _distr.resize( 0 );
@ -116,14 +120,13 @@ throw ( SALOME_Exception )
void StdMeshers_NumberOfSegments::SetNumberOfSegments(int segmentsNumber) void StdMeshers_NumberOfSegments::SetNumberOfSegments(int segmentsNumber)
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
int oldNumberOfSegments = _numberOfSegments; int oldNumberOfSegments = _numberOfSegments;
if (segmentsNumber <= 0) if (segmentsNumber <= 0)
throw throw SALOME_Exception(LOCALIZED("number of segments must be positive"));
SALOME_Exception(LOCALIZED("number of segments must be positive")); _numberOfSegments = segmentsNumber;
_numberOfSegments = segmentsNumber;
if (oldNumberOfSegments != _numberOfSegments) if (oldNumberOfSegments != _numberOfSegments)
NotifySubMeshesHypothesisModification(); NotifySubMeshesHypothesisModification();
} }
//============================================================================= //=============================================================================
@ -134,7 +137,7 @@ throw(SALOME_Exception)
int StdMeshers_NumberOfSegments::GetNumberOfSegments() const int StdMeshers_NumberOfSegments::GetNumberOfSegments() const
{ {
return _numberOfSegments; return _numberOfSegments;
} }
//================================================================================ //================================================================================
@ -177,7 +180,8 @@ void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor)
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
if (_distrType != DT_Scale) 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) if (scaleFactor < PRECISION)
throw SALOME_Exception(LOCALIZED("scale factor must be positive")); throw SALOME_Exception(LOCALIZED("scale factor must be positive"));
//if (fabs(scaleFactor - 1.0) < PRECISION) //if (fabs(scaleFactor - 1.0) < PRECISION)
@ -210,11 +214,12 @@ double StdMeshers_NumberOfSegments::GetScaleFactor() const
*/ */
//================================================================================ //================================================================================
void StdMeshers_NumberOfSegments::SetTableFunction(const std::vector<double>& table) void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
if (_distrType != DT_TabFunc) 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 ) if ( (table.size() % 2) != 0 )
throw SALOME_Exception(LOCALIZED("odd size of vector of table function")); throw SALOME_Exception(LOCALIZED("odd size of vector of table function"));
@ -282,7 +287,7 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const std::vector<double>& ta
*/ */
//================================================================================ //================================================================================
const std::vector<double>& StdMeshers_NumberOfSegments::GetTableFunction() const const vector<double>& StdMeshers_NumberOfSegments::GetTableFunction() const
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
if (_distrType != DT_TabFunc) if (_distrType != DT_TabFunc)
@ -396,7 +401,8 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
if (_distrType != DT_ExprFunc) 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 // remove white spaces
TCollection_AsciiString str((Standard_CString)expr); TCollection_AsciiString str((Standard_CString)expr);
@ -428,7 +434,7 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
return; return;
} }
std::string func = expr; string func = expr;
if( _func != func ) if( _func != func )
{ {
_func = func; _func = func;
@ -459,8 +465,8 @@ const char* StdMeshers_NumberOfSegments::GetExpressionFunction() const
void StdMeshers_NumberOfSegments::SetConversionMode( int conv ) void StdMeshers_NumberOfSegments::SetConversionMode( int conv )
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) // if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc)
throw SALOME_Exception(LOCALIZED("not a functional distribution")); // throw SALOME_Exception(LOCALIZED("not a functional distribution"));
if( conv != _convMode ) if( conv != _convMode )
{ {
@ -478,8 +484,8 @@ void StdMeshers_NumberOfSegments::SetConversionMode( int conv )
int StdMeshers_NumberOfSegments::ConversionMode() const int StdMeshers_NumberOfSegments::ConversionMode() const
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc) // if (_distrType != DT_TabFunc && _distrType != DT_ExprFunc)
throw SALOME_Exception(LOCALIZED("not a functional distribution")); // throw SALOME_Exception(LOCALIZED("not a functional distribution"));
return _convMode; return _convMode;
} }
@ -675,10 +681,10 @@ bool StdMeshers_NumberOfSegments::SetParametersByMesh(const SMESH_Mesh* theMes
int nbEdges = 0; int nbEdges = 0;
TopTools_IndexedMapOfShape edgeMap; TopTools_IndexedMapOfShape edgeMap;
TopExp::MapShapes( theShape, TopAbs_EDGE, edgeMap ); TopExp::MapShapes( theShape, TopAbs_EDGE, edgeMap );
SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS();
for ( int i = 1; i <= edgeMap.Extent(); ++i ) for ( int i = 1; i <= edgeMap.Extent(); ++i )
{ {
// get current segment length // get current segment length
SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS();
SMESHDS_SubMesh * eSubMesh = aMeshDS->MeshElements( edgeMap( i )); SMESHDS_SubMesh * eSubMesh = aMeshDS->MeshElements( edgeMap( i ));
if ( eSubMesh && eSubMesh->NbElements()) if ( eSubMesh && eSubMesh->NbElements())
_numberOfSegments += eSubMesh->NbElements(); _numberOfSegments += eSubMesh->NbElements();

9
src/StdMeshers/StdMeshers_Penta_3D.cxx
View File

@ -40,25 +40,18 @@
#include "SMESH_subMeshEventListener.hxx" #include "SMESH_subMeshEventListener.hxx"
#include "SMESH_Comment.hxx" #include "SMESH_Comment.hxx"
#include <BRepTools.hxx>
#include <BRepTools_WireExplorer.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_ListOfShape.hxx> #include <TopTools_ListOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <TopoDS_Shell.hxx> #include <TopoDS_Shell.hxx>
#include <TopoDS_Vertex.hxx> #include <TopoDS_Vertex.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <BRepTools.hxx>
#include <BRepTools_WireExplorer.hxx>
#include <TopTools_MapOfShape.hxx>
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>

8
src/StdMeshers/StdMeshers_Prism_3D.cxx
View File

@ -38,17 +38,17 @@
#include "utilities.h" #include "utilities.h"
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_Curve2d.hxx>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <Geom2dAdaptor_Curve.hxx> #include <Geom2dAdaptor_Curve.hxx>
#include <Geom2d_Line.hxx> #include <Geom2d_Line.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopoDS.hxx>
using namespace std; 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 gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z())
#define SHOWYXZ(msg, xyz) // {\ #define SHOWYXZ(msg, xyz) // {\
// gp_Pnt p (xyz); \ // gp_Pnt p (xyz); \

6
src/StdMeshers/StdMeshers_Projection_3D.cxx
View File

@ -48,7 +48,11 @@
#include "utilities.h" #include "utilities.h"
#define RETURN_BAD_RESULT(msg) { MESSAGE(msg); return false; } #include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z()) #define gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z())
#define SHOWYXZ(msg, xyz) // {\ #define SHOWYXZ(msg, xyz) // {\
// gp_Pnt p (xyz); \ // gp_Pnt p (xyz); \

5
src/StdMeshers/StdMeshers_Propagation.cxx
View File

@ -34,9 +34,10 @@
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "SMESH_subMesh.hxx" #include "SMESH_subMesh.hxx"
#include <TopTools_MapOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <BRepTools_WireExplorer.hxx> #include <BRepTools_WireExplorer.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopoDS.hxx>
#define DBGMSG(txt) \ #define DBGMSG(txt) \
// cout << txt << endl; // cout << txt << endl;

15
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -43,23 +43,16 @@
#include "SMDS_EdgePosition.hxx" #include "SMDS_EdgePosition.hxx"
#include "SMDS_FacePosition.hxx" #include "SMDS_FacePosition.hxx"
#include <BRepAdaptor_Curve.hxx>
#include <BRep_Tool.hxx>
#include <BRepLProp.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <BRepTools_WireExplorer.hxx> #include <BRepTools_WireExplorer.hxx>
#include <BRep_Tool.hxx>
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <Geom_Curve.hxx> #include <NCollection_DefineArray2.hxx>
#include <Geom2d_Curve.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GCPnts_UniformAbscissa.hxx>
#include <TopExp.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <gp_Pnt2d.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <TColStd_SequenceOfReal.hxx> #include <TColStd_SequenceOfReal.hxx>
#include <TColgp_SequenceOfXY.hxx> #include <TColgp_SequenceOfXY.hxx>
#include <NCollection_DefineArray2.hxx> #include <TopExp.hxx>
#include <TopoDS.hxx>
#include "utilities.h" #include "utilities.h"
#include "Utils_ExceptHandlers.hxx" #include "Utils_ExceptHandlers.hxx"

11
src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
View File

@ -45,19 +45,20 @@
#include "utilities.h" #include "utilities.h"
#include <TopoDS_Solid.hxx>
#include <TopoDS_Shell.hxx>
#include <BRepTools.hxx>
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx> #include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepTools.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shell.hxx>
#include <TopoDS_Solid.hxx>
#include <gp.hxx> #include <gp.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
using namespace std; 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 gpXYZ(n) gp_XYZ(n->X(),n->Y(),n->Z())
typedef StdMeshers_ProjectionUtils TAssocTool; typedef StdMeshers_ProjectionUtils TAssocTool;

6
src/StdMeshers/StdMeshers_Regular_1D.cxx
View File

@ -54,12 +54,14 @@
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <TopoDS_Edge.hxx>
#include <TopExp_Explorer.hxx>
#include <GCPnts_AbscissaPoint.hxx> #include <GCPnts_AbscissaPoint.hxx>
#include <GCPnts_UniformAbscissa.hxx> #include <GCPnts_UniformAbscissa.hxx>
#include <GCPnts_UniformDeflection.hxx> #include <GCPnts_UniformDeflection.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Edge.hxx>
#include <string> #include <string>