X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FControls%2FSMESH_ControlsDef.hxx;h=36b86c9de5bfc21a731a2b0bf0ec241859676d8c;hb=ea8a0289f14641c23d515de68aa4fdc24a6208ba;hp=587f5b6d609bf79b6c09b933764aaaf81758953b;hpb=1067ffa6e7e5c394e3a1b17219d8b355a57607cd;p=modules%2Fsmesh.git diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index 587f5b6d6..36b86c9de 100644 --- a/src/Controls/SMESH_ControlsDef.hxx +++ b/src/Controls/SMESH_ControlsDef.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2014 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 @@ -6,7 +6,7 @@ // 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. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,29 +23,29 @@ #ifndef _SMESH_CONTROLSDEF_HXX_ #define _SMESH_CONTROLSDEF_HXX_ -#include -#include -#include +#include "SMESH_Controls.hxx" -#include +#include "SMDS_MeshNode.hxx" +#include "SMESH_TypeDefs.hxx" -#include -#include +#include +#include #include -#include +#include +#include #include +#include #include #include -#include #include -#include -#include +#include +#include -#include "SMDSAbs_ElementType.hxx" -#include "SMDS_MeshNode.hxx" -#include "SMESH_TypeDefs.hxx" +#include +#include +#include -#include "SMESH_Controls.hxx" +#include class SMDS_MeshElement; class SMDS_MeshFace; @@ -125,7 +125,8 @@ namespace SMESH{ std::vector& nbEvents, std::vector& funValues, const std::vector& elements, - const double* minmax=0); + const double* minmax=0, + const bool isLogarithmic = false); virtual SMDSAbs_ElementType GetType() const = 0; virtual double GetBadRate( double Value, int nbNodes ) const = 0; long GetPrecision() const; @@ -244,7 +245,6 @@ namespace SMESH{ virtual SMDSAbs_ElementType GetType() const; }; - /* Class : Skew Description : Functor for calculating skew in degrees @@ -302,7 +302,7 @@ namespace SMESH{ /* Class : MultiConnection - Description : Functor for calculating number of faces conneted to the edge + Description : Functor for calculating number of faces connected to the edge */ class SMESHCONTROLS_EXPORT MultiConnection: public virtual NumericalFunctor{ public: @@ -314,7 +314,7 @@ namespace SMESH{ /* Class : MultiConnection2D - Description : Functor for calculating number of faces conneted to the edge + Description : Functor for calculating number of faces connected to the edge */ class SMESHCONTROLS_EXPORT MultiConnection2D: public virtual NumericalFunctor{ public: @@ -428,6 +428,28 @@ namespace SMESH{ const SMDS_Mesh* myMesh; }; + /* + Class : ElemEntityType + Description : Functor for calculating entity type + */ + class SMESHCONTROLS_EXPORT ElemEntityType: public virtual Predicate{ + public: + ElemEntityType(); + virtual void SetMesh( const SMDS_Mesh* theMesh ); + virtual bool IsSatisfy( long theElementId ); + void SetType( SMDSAbs_ElementType theType ); + virtual SMDSAbs_ElementType GetType() const; + void SetElemEntityType( SMDSAbs_EntityType theEntityType ); + SMDSAbs_EntityType GetElemEntityType() const; + + private: + const SMDS_Mesh* myMesh; + SMDSAbs_ElementType myType; + SMDSAbs_EntityType myEntityType; + }; + typedef boost::shared_ptr ElemEntityTypePtr; + + /* BareBorderVolume */ @@ -820,30 +842,121 @@ namespace SMESH{ const SMDSAbs_ElementType theType); private: - void addShape (const TopoDS_Shape& theShape); - void process(); - void process (const SMDS_MeshElement* theElem); - private: - TMeshModifTracer myMeshModifTracer; - TColStd_MapOfInteger myIds; - SMDSAbs_ElementType myType; - TopoDS_Shape myShape; - double myToler; - bool myAllNodesFlag; + struct TClassifier + { + TClassifier(const TopoDS_Shape& s, double tol) { Init(s,tol); } + void Init(const TopoDS_Shape& s, double tol); + bool IsOut(const gp_Pnt& p); + TopAbs_ShapeEnum ShapeType() const; + private: + bool isOutOfSolid (const gp_Pnt& p); + bool isOutOfBox (const gp_Pnt& p); + bool isOutOfFace (const gp_Pnt& p); + bool isOutOfEdge (const gp_Pnt& p); + bool isOutOfVertex(const gp_Pnt& p); + bool isBox (const TopoDS_Shape& s); + + bool (TClassifier::* myIsOutFun)(const gp_Pnt& p); + BRepClass3d_SolidClassifier mySolidClfr; + Bnd_B3d myBox; + GeomAPI_ProjectPointOnSurf myProjFace; + GeomAPI_ProjectPointOnCurve myProjEdge; + gp_Pnt myVertexXYZ; + TopoDS_Shape myShape; + double myTol; + }; + void clearClassifiers(); + + std::vector< TClassifier* > myClassifiers; + const SMDS_Mesh* myMesh; + SMDSAbs_ElementType myType; + TopoDS_Shape myShape; + double myToler; + bool myAllNodesFlag; - TopTools_MapOfShape myShapesMap; - TopAbs_ShapeEnum myCurShapeType; // type of current sub-shape - BRepClass3d_SolidClassifier myCurSC; // current SOLID - GeomAPI_ProjectPointOnSurf myCurProjFace; // current FACE - TopoDS_Face myCurFace; // current FACE - GeomAPI_ProjectPointOnCurve myCurProjEdge; // current EDGE - gp_Pnt myCurPnt; // current VERTEX }; typedef boost::shared_ptr ElementsOnShapePtr; + /* + Class : BelongToGeom + Description : Predicate for verifying whether entiy belong to + specified geometrical support + */ + class SMESHCONTROLS_EXPORT BelongToGeom: public virtual Predicate + { + public: + BelongToGeom(); + + virtual void SetMesh( const SMDS_Mesh* theMesh ); + virtual void SetGeom( const TopoDS_Shape& theShape ); + + virtual bool IsSatisfy( long theElementId ); + + virtual void SetType( SMDSAbs_ElementType theType ); + virtual SMDSAbs_ElementType GetType() const; + + TopoDS_Shape GetShape(); + const SMESHDS_Mesh* GetMeshDS() const; + + void SetTolerance( double ); + double GetTolerance(); + + private: + virtual void init(); + + TopoDS_Shape myShape; + const SMESHDS_Mesh* myMeshDS; + SMDSAbs_ElementType myType; + bool myIsSubshape; + double myTolerance; // only if myIsSubshape == false + Controls::ElementsOnShapePtr myElementsOnShapePtr; // only if myIsSubshape == false + }; + typedef boost::shared_ptr BelongToGeomPtr; + + /* + Class : LyingOnGeom + Description : Predicate for verifying whether entiy lying or partially lying on + specified geometrical support + */ + class SMESHCONTROLS_EXPORT LyingOnGeom: public virtual Predicate + { + public: + LyingOnGeom(); + + virtual void SetMesh( const SMDS_Mesh* theMesh ); + virtual void SetGeom( const TopoDS_Shape& theShape ); + + virtual bool IsSatisfy( long theElementId ); + + virtual void SetType( SMDSAbs_ElementType theType ); + virtual SMDSAbs_ElementType GetType() const; + + TopoDS_Shape GetShape(); + const SMESHDS_Mesh* GetMeshDS() const; + + void SetTolerance( double ); + double GetTolerance(); + + virtual bool Contains( const SMESHDS_Mesh* theMeshDS, + const TopoDS_Shape& theShape, + const SMDS_MeshElement* theElem, + TopAbs_ShapeEnum theFindShapeEnum, + TopAbs_ShapeEnum theAvoidShapeEnum = TopAbs_SHAPE ); + private: + virtual void init(); + + TopoDS_Shape myShape; + const SMESHDS_Mesh* myMeshDS; + SMDSAbs_ElementType myType; + bool myIsSubshape; + double myTolerance; // only if myIsSubshape == false + Controls::ElementsOnShapePtr myElementsOnShapePtr; // only if myIsSubshape == false + }; + typedef boost::shared_ptr LyingOnGeomPtr; + /* Class : FreeFaces Description : Predicate for free faces @@ -912,7 +1025,7 @@ namespace SMESH{ void SetType( SMDSAbs_ElementType theType ); virtual SMDSAbs_ElementType GetType() const; void SetGeomType( SMDSAbs_GeometryType theType ); - virtual SMDSAbs_GeometryType GetGeomType() const; + SMDSAbs_GeometryType GetGeomType() const; private: const SMDS_Mesh* myMesh; @@ -946,10 +1059,43 @@ namespace SMESH{ }; typedef boost::shared_ptr CoplanarFacesPtr; + /* + Class : ConnectedElements + Description : Predicate to get elements of one domain + */ + class SMESHCONTROLS_EXPORT ConnectedElements: public virtual Predicate + { + public: + ConnectedElements(); + void SetNode( int nodeID ); + void SetPoint( double x, double y, double z ); + int GetNode() const; + std::vector GetPoint() const; + + void SetType( SMDSAbs_ElementType theType ); + virtual SMDSAbs_ElementType GetType() const; + + virtual void SetMesh( const SMDS_Mesh* theMesh ); + virtual bool IsSatisfy( long theElementId ); + + //const std::set& GetDomainIDs() const { return myOkIDs; } + + private: + int myNodeID; + std::vector myXYZ; + SMDSAbs_ElementType myType; + TMeshModifTracer myMeshModifTracer; + + void clearOkIDs(); + bool myOkIDsReady; + std::set< int > myOkIDs; // empty means that there is one domain + }; + typedef boost::shared_ptr ConnectedElementsPtr; + /* FILTER */ - class SMESHCONTROLS_EXPORT Filter{ + class SMESHCONTROLS_EXPORT Filter { public: Filter(); virtual ~Filter();