X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FControls%2FSMESH_ControlsDef.hxx;h=cd39ab3d95d820f98bc0a86e633d3821d8a50607;hp=7c01c4b281911567b393eb4368b860fe9f588a55;hb=1a3a88cfc996394b2c79f2cf374c8f3c4140f036;hpb=251f8c052dd12dd29922210dc901b295fe999a0e diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index 7c01c4b28..cd39ab3d9 100644 --- a/src/Controls/SMESH_ControlsDef.hxx +++ b/src/Controls/SMESH_ControlsDef.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -25,7 +25,6 @@ #include "SMESH_Controls.hxx" -#include "SMDS_MeshNode.hxx" #include "SMESH_TypeDefs.hxx" #include @@ -37,7 +36,6 @@ #include #include #include -#include #include #include @@ -54,6 +52,7 @@ class SMDS_Mesh; class SMESHDS_Mesh; class SMESHDS_SubMesh; +class SMESHDS_GroupBase; class gp_Pnt; @@ -67,7 +66,7 @@ namespace SMESH{ public: TSequenceOfXYZ(); - TSequenceOfXYZ(size_type n); + explicit TSequenceOfXYZ(size_type n); TSequenceOfXYZ(size_type n, const gp_XYZ& t); @@ -92,8 +91,16 @@ namespace SMESH{ size_type size() const; + + void setElement(const SMDS_MeshElement* e) { myElem = e; } + + const SMDS_MeshElement* getElement() const { return myElem; } + + SMDSAbs_EntityType getElementEntity() const; + private: - std::vector myArray; + std::vector myArray; + const SMDS_MeshElement* myElem; }; /*! @@ -344,6 +351,17 @@ namespace SMESH{ virtual SMDSAbs_ElementType GetType() const; }; + /* + Class : NodeConnectivityNumber + Description : Functor returning number of elements connected to a node + */ + class SMESHCONTROLS_EXPORT NodeConnectivityNumber: public virtual NumericalFunctor{ + public: + virtual double GetValue( long theNodeId ); + virtual double GetBadRate( double Value, int nbNodes ) const; + virtual SMDSAbs_ElementType GetType() const; + }; + /* PREDICATES @@ -356,6 +374,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT CoincidentNodes: public Predicate { public: CoincidentNodes(); + //virtual Predicate* clone() const { return new CoincidentNodes( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; @@ -387,14 +406,17 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT CoincidentElements1D: public CoincidentElements { public: virtual SMDSAbs_ElementType GetType() const; + //virtual Predicate* clone() const { return new CoincidentElements1D( *this ); } }; class SMESHCONTROLS_EXPORT CoincidentElements2D: public CoincidentElements { public: virtual SMDSAbs_ElementType GetType() const; + //virtual Predicate* clone() const { return new CoincidentElements2D( *this ); } }; class SMESHCONTROLS_EXPORT CoincidentElements3D: public CoincidentElements { public: virtual SMDSAbs_ElementType GetType() const; + //virtual Predicate* clone() const { return new CoincidentElements3D( *this ); } }; /* @@ -404,6 +426,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT FreeBorders: public virtual Predicate{ public: FreeBorders(); + //virtual Predicate* clone() const { return new FreeBorders( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; @@ -420,6 +443,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT BadOrientedVolume: public virtual Predicate{ public: BadOrientedVolume(); + //virtual Predicate* clone() const { return new BadOrientedVolume( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; @@ -435,6 +459,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT ElemEntityType: public virtual Predicate{ public: ElemEntityType(); + //virtual Predicate* clone() const { return new ElemEntityType( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); void SetType( SMDSAbs_ElementType theType ); @@ -457,6 +482,7 @@ namespace SMESH{ { public: BareBorderVolume():myMesh(0) {} + virtual Predicate* clone() const { return new BareBorderVolume( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ) { myMesh = theMesh; } virtual SMDSAbs_ElementType GetType() const { return SMDSAbs_Volume; } virtual bool IsSatisfy( long theElementId ); @@ -472,6 +498,7 @@ namespace SMESH{ { public: BareBorderFace():myMesh(0) {} + //virtual Predicate* clone() const { return new BareBorderFace( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ) { myMesh = theMesh; } virtual SMDSAbs_ElementType GetType() const { return SMDSAbs_Face; } virtual bool IsSatisfy( long theElementId ); @@ -488,6 +515,7 @@ namespace SMESH{ { public: OverConstrainedVolume():myMesh(0) {} + virtual Predicate* clone() const { return new OverConstrainedVolume( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ) { myMesh = theMesh; } virtual SMDSAbs_ElementType GetType() const { return SMDSAbs_Volume; } virtual bool IsSatisfy( long theElementId ); @@ -503,6 +531,7 @@ namespace SMESH{ { public: OverConstrainedFace():myMesh(0) {} + //virtual Predicate* clone() const { return new OverConstrainedFace( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ) { myMesh = theMesh; } virtual SMDSAbs_ElementType GetType() const { return SMDSAbs_Face; } virtual bool IsSatisfy( long theElementId ); @@ -518,6 +547,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT FreeEdges: public virtual Predicate{ public: FreeEdges(); + //virtual Predicate* clone() const { return new FreeEdges( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; @@ -545,6 +575,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT FreeNodes: public virtual Predicate{ public: FreeNodes(); + //virtual Predicate* clone() const { return new FreeNodes( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theNodeId ); virtual SMDSAbs_ElementType GetType() const; @@ -565,7 +596,8 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT RangeOfIds: public virtual Predicate { public: - RangeOfIds(); + RangeOfIds(); + //virtual Predicate* clone() const { return new RangeOfIds( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theNodeId ); virtual SMDSAbs_ElementType GetType() const; @@ -617,6 +649,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LessThan: public virtual Comparator{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new LessThan( *this ); } }; @@ -627,6 +660,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT MoreThan: public virtual Comparator{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new MoreThan( *this ); } }; @@ -637,6 +671,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT EqualTo: public virtual Comparator{ public: EqualTo(); + //virtual Predicate* clone() const { return new EqualTo( *this ); } virtual bool IsSatisfy( long theElementId ); virtual void SetTolerance( double theTol ); virtual double GetTolerance(); @@ -654,6 +689,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LogicalNOT: public virtual Predicate{ public: LogicalNOT(); + //virtual Predicate* clone() const { return new LogicalNOT( *this ); } virtual ~LogicalNOT(); virtual bool IsSatisfy( long theElementId ); virtual void SetMesh( const SMDS_Mesh* theMesh ); @@ -693,6 +729,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LogicalAND: public virtual LogicalBinary{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new LogicalAND( *this ); } }; @@ -703,6 +740,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LogicalOR: public virtual LogicalBinary{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new LogicalOR( *this ); } }; @@ -739,6 +777,7 @@ namespace SMESH{ ManifoldPart(); ~ManifoldPart(); + //virtual Predicate* clone() const { return new ManifoldPart( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); // inoke when all parameters already set virtual bool IsSatisfy( long theElementId ); @@ -763,8 +802,8 @@ namespace SMESH{ TMapOfLink& theNonManifold, SMDS_MeshFace* theNextFace ) const; - void getFacesByLink( const Link& theLink, - TVectorOfFacePtr& theFaces ) const; + void getFacesByLink( const Link& theLink, + TVectorOfFacePtr& theFaces ) const; private: const SMDS_Mesh* myMesh; @@ -779,6 +818,28 @@ namespace SMESH{ }; typedef boost::shared_ptr ManifoldPartPtr; + /* + Class : BelongToMeshGroup + Description : Verify whether a mesh element is included into a mesh group + */ + class SMESHCONTROLS_EXPORT BelongToMeshGroup : public virtual Predicate + { + public: + BelongToMeshGroup(); + //virtual Predicate* clone() const { return new BelongToMeshGroup( *this ); } + virtual void SetMesh( const SMDS_Mesh* theMesh ); + virtual bool IsSatisfy( long theElementId ); + virtual SMDSAbs_ElementType GetType() const; + + void SetGroup( SMESHDS_GroupBase* g ); + void SetStoreName( const std::string& sn ); + const SMESHDS_GroupBase* GetGroup() const { return myGroup; } + + private: + SMESHDS_GroupBase* myGroup; + std::string myStoreName; + }; + typedef boost::shared_ptr BelongToMeshGroupPtr; /* Class : ElementsOnSurface @@ -789,6 +850,7 @@ namespace SMESH{ public: ElementsOnSurface(); ~ElementsOnSurface(); + //virtual Predicate* clone() const { return new ElementsOnSurface( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; @@ -809,7 +871,6 @@ namespace SMESH{ TMeshModifTracer myMeshModifTracer; TColStd_MapOfInteger myIds; SMDSAbs_ElementType myType; - //Handle(Geom_Surface) mySurf; TopoDS_Face mySurf; double myToler; bool myUseBoundaries; @@ -824,12 +885,13 @@ namespace SMESH{ Description : Predicate elements that lying on indicated shape (1D, 2D or 3D) */ - class SMESHCONTROLS_EXPORT ElementsOnShape : public virtual Predicate + class SMESHCONTROLS_EXPORT ElementsOnShape : public Predicate { public: ElementsOnShape(); ~ElementsOnShape(); + virtual Predicate* clone() const; virtual void SetMesh (const SMDS_Mesh* theMesh); virtual bool IsSatisfy (long theElementId); virtual SMDSAbs_ElementType GetType() const; @@ -843,42 +905,24 @@ namespace SMESH{ private: - 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; - }; + struct Classifier; + struct OctreeClassifier; + void clearClassifiers(); bool getNodeIsOut( const SMDS_MeshNode* n, bool& isOut ); void setNodeIsOut( const SMDS_MeshNode* n, bool isOut ); - std::vector< TClassifier* > myClassifiers; - SMDSAbs_ElementType myType; - TopoDS_Shape myShape; - double myToler; - bool myAllNodesFlag; - - TMeshModifTracer myMeshModifTracer; - std::vector myNodeIsChecked; - std::vector myNodeIsOut; + std::vector< Classifier > myClassifiers; + std::vector< Classifier* > myWorkClassifiers; + OctreeClassifier* myOctree; + SMDSAbs_ElementType myType; + TopoDS_Shape myShape; + double myToler; + bool myAllNodesFlag; + + TMeshModifTracer myMeshModifTracer; + std::vector myNodeIsChecked; + std::vector myNodeIsOut; }; typedef boost::shared_ptr ElementsOnShapePtr; @@ -893,6 +937,7 @@ namespace SMESH{ { public: BelongToGeom(); + virtual Predicate* clone() const; virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual void SetGeom( const TopoDS_Shape& theShape ); @@ -912,6 +957,7 @@ namespace SMESH{ virtual void init(); TopoDS_Shape myShape; + TColStd_MapOfInteger mySubShapesIDs; const SMESHDS_Mesh* myMeshDS; SMDSAbs_ElementType myType; bool myIsSubshape; @@ -929,6 +975,7 @@ namespace SMESH{ { public: LyingOnGeom(); + virtual Predicate* clone() const; virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual void SetGeom( const TopoDS_Shape& theShape ); @@ -944,15 +991,11 @@ namespace SMESH{ 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: + private: virtual void init(); TopoDS_Shape myShape; + TColStd_MapOfInteger mySubShapesIDs; const SMESHDS_Mesh* myMeshDS; SMDSAbs_ElementType myType; bool myIsSubshape; @@ -968,6 +1011,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT FreeFaces: public virtual Predicate{ public: FreeFaces(); + //virtual Predicate* clone() const { return new FreeFaces( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; @@ -983,6 +1027,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LinearOrQuadratic: public virtual Predicate{ public: LinearOrQuadratic(); + //virtual Predicate* clone() const { return new LinearOrQuadratic( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); void SetType( SMDSAbs_ElementType theType ); @@ -996,11 +1041,12 @@ namespace SMESH{ /* Class : GroupColor - Description : Functor for check color of group to whic mesh element belongs to + Description : Functor for check color of group to which mesh element belongs to */ class SMESHCONTROLS_EXPORT GroupColor: public virtual Predicate{ public: GroupColor(); + //virtual Predicate* clone() const { return new GroupColor( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); void SetType( SMDSAbs_ElementType theType ); @@ -1024,6 +1070,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT ElemGeomType: public virtual Predicate{ public: ElemGeomType(); + //virtual Predicate* clone() const { return new ElemGeomType( *this ); } virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); void SetType( SMDSAbs_ElementType theType ); @@ -1046,6 +1093,7 @@ namespace SMESH{ { public: CoplanarFaces(); + //virtual Predicate* clone() const { return new CoplanarFaces( *this ); } void SetFace( long theID ) { myFaceID = theID; } long GetFace() const { return myFaceID; } void SetTolerance (const double theToler) { myToler = theToler; } @@ -1059,7 +1107,7 @@ namespace SMESH{ TMeshModifTracer myMeshModifTracer; long myFaceID; double myToler; - std::set< long > myCoplanarIDs; + TColStd_MapOfInteger myCoplanarIDs; }; typedef boost::shared_ptr CoplanarFacesPtr; @@ -1071,6 +1119,7 @@ namespace SMESH{ { public: ConnectedElements(); + //virtual Predicate* clone() const { return new ConnectedElements( *this ); } void SetNode( int nodeID ); void SetPoint( double x, double y, double z ); int GetNode() const;