X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FControls%2FSMESH_ControlsDef.hxx;h=d41d9531c26b1ca0ba6ae58667aec40cfcc86550;hp=c7398b0ef4d0364f7d49480b2e8e5aa3924a85f7;hb=HEAD;hpb=5482b99d07dd144fd5be299e722f39a81de3b5be diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index c7398b0ef..456f4b30a 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-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -25,17 +25,15 @@ #include "SMESH_Controls.hxx" -#include "SMDS_MeshNode.hxx" #include "SMESH_TypeDefs.hxx" -#include #include #include #include #include #include -#include #include +#include #include #include #include @@ -55,8 +53,14 @@ class SMESHDS_Mesh; class SMESHDS_SubMesh; class SMESHDS_GroupBase; +class BRepClass3d_SolidClassifier; +class ShapeAnalysis_Surface; +class gp_Pln; class gp_Pnt; +typedef NCollection_Map< smIdType, smIdHasher > TIDsMap; +typedef NCollection_Sequence TIDsSeq; + namespace SMESH{ namespace Controls{ @@ -128,20 +132,22 @@ namespace SMESH{ NumericalFunctor(); virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual double GetValue( long theElementId ); - virtual double GetValue(const TSequenceOfXYZ& thePoints) { return -1.0;}; - void GetHistogram(int nbIntervals, - std::vector& nbEvents, - std::vector& funValues, - const std::vector& elements, - const double* minmax=0, - const bool isLogarithmic = false); + virtual double GetValue(const TSequenceOfXYZ& /*thePoints*/) { return -1.0;}; + void GetHistogram(int nbIntervals, + std::vector& nbEvents, + std::vector& funValues, + const std::vector<::smIdType>& elements, + const double* minmax=0, + const bool isLogarithmic = false); + bool IsApplicable( long theElementId ) const; + virtual bool IsApplicable( const SMDS_MeshElement* element ) const; virtual SMDSAbs_ElementType GetType() const = 0; virtual double GetBadRate( double Value, int nbNodes ) const = 0; long GetPrecision() const; void SetPrecision( const long thePrecision ); double Round( const double & value ); - bool GetPoints(const int theId, TSequenceOfXYZ& theRes) const; + bool GetPoints(const ::smIdType theId, TSequenceOfXYZ& theRes) const; static bool GetPoints(const SMDS_MeshElement* theElem, TSequenceOfXYZ& theRes); protected: const SMDS_Mesh* myMesh; @@ -175,8 +181,8 @@ namespace SMESH{ virtual double GetBadRate( double Value, int nbNodes ) const; virtual SMDSAbs_ElementType GetType() const; }; - - + + /* Class : MaxElementLength3D Description : Functor calculating maximum length of 3D element @@ -211,6 +217,7 @@ namespace SMESH{ virtual double GetValue( const TSequenceOfXYZ& thePoints ); virtual double GetBadRate( double Value, int nbNodes ) const; virtual SMDSAbs_ElementType GetType() const; + virtual bool IsApplicable( const SMDS_MeshElement* element ) const; }; @@ -224,6 +231,7 @@ namespace SMESH{ virtual double GetValue( const TSequenceOfXYZ& thePoints ); virtual double GetBadRate( double Value, int nbNodes ) const; virtual SMDSAbs_ElementType GetType() const; + virtual bool IsApplicable( const SMDS_MeshElement* element ) const; }; @@ -236,10 +244,37 @@ namespace SMESH{ virtual double GetValue( const TSequenceOfXYZ& thePoints ); virtual double GetBadRate( double Value, int nbNodes ) const; virtual SMDSAbs_ElementType GetType() const; + virtual bool IsApplicable( const SMDS_MeshElement* element ) const; + + protected: + double ComputeA( const gp_XYZ&, const gp_XYZ&, const gp_XYZ&, const gp_XYZ& ) const; + double ComputeValue( const TSequenceOfXYZ& thePoints ) const; + }; + + /* + Class : Warping3D + Description : Functor for calculating warping + */ + class SMESHCONTROLS_EXPORT Warping3D: public virtual Warping { + public: + virtual bool IsApplicable(const SMDS_MeshElement* element) const; + virtual double GetValue(const TSequenceOfXYZ& thePoints); + virtual double GetValue(long theId); + virtual SMDSAbs_ElementType GetType() const; + struct Value { + double myWarp; + std::vector myPntIds; + bool operator<(const Value& x) const; + }; + + typedef std::vector WValues; + void GetValues(WValues& theValues); + private: - double ComputeA( const gp_XYZ&, const gp_XYZ&, const gp_XYZ&, const gp_XYZ& ) const; + void ProcessVolumeELement(WValues& theValues); }; + typedef boost::shared_ptr Warping3DPtr; /* @@ -251,6 +286,7 @@ namespace SMESH{ virtual double GetValue( const TSequenceOfXYZ& thePoints ); virtual double GetBadRate( double Value, int nbNodes ) const; virtual SMDSAbs_ElementType GetType() const; + virtual bool IsApplicable( const SMDS_MeshElement* element ) const; }; /* @@ -262,6 +298,7 @@ namespace SMESH{ virtual double GetValue( const TSequenceOfXYZ& thePoints ); virtual double GetBadRate( double Value, int nbNodes ) const; virtual SMDSAbs_ElementType GetType() const; + virtual bool IsApplicable( const SMDS_MeshElement* element ) const; }; @@ -290,11 +327,13 @@ namespace SMESH{ /* Class : Length2D - Description : Functor for calculating length of edge + Description : Functor for calculating minimal length of edges of element */ class SMESHCONTROLS_EXPORT Length2D: public virtual NumericalFunctor{ public: - virtual double GetValue( long theElementId ); + Length2D( SMDSAbs_ElementType type = SMDSAbs_Face ); + virtual bool IsApplicable( const SMDS_MeshElement* element ) const; + virtual double GetValue( const TSequenceOfXYZ& thePoints ); virtual double GetBadRate( double Value, int nbNodes ) const; virtual SMDSAbs_ElementType GetType() const; struct Value{ @@ -305,9 +344,38 @@ namespace SMESH{ }; typedef std::set TValues; void GetValues(TValues& theValues); + + private: + SMDSAbs_ElementType myType; }; typedef boost::shared_ptr Length2DPtr; + /* + Class : Length2D + Description : Functor for calculating minimal length of edges of 3D element + */ + class SMESHCONTROLS_EXPORT Length3D: public virtual Length2D { + public: + Length3D(); + }; + typedef boost::shared_ptr Length3DPtr; + + /* + Class : Deflection2D + Description : Functor for calculating distance between a face and geometry + */ + class SMESHCONTROLS_EXPORT Deflection2D: public virtual NumericalFunctor{ + public: + virtual void SetMesh( const SMDS_Mesh* theMesh ); + virtual double GetValue( const TSequenceOfXYZ& thePoints ); + virtual double GetBadRate( double Value, int nbNodes ) const; + virtual SMDSAbs_ElementType GetType() const; + private: + Handle(ShapeAnalysis_Surface) mySurface; + int myShapeIndex; + boost::shared_ptr myPlane; + }; + /* Class : MultiConnection Description : Functor for calculating number of faces connected to the edge @@ -352,6 +420,28 @@ 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; + }; + + /* + Class : ScaledJacobian + Description : Functor returning the ScaledJacobian as implemeted in VTK for volumetric elements + */ + class SMESHCONTROLS_EXPORT ScaledJacobian: public virtual NumericalFunctor{ + public: + virtual double GetValue( long theNodeId ); + virtual double GetBadRate( double Value, int nbNodes ) const; + virtual SMDSAbs_ElementType GetType() const; + }; + /* PREDICATES @@ -364,17 +454,18 @@ 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; - void SetTolerance (const double theToler) { myToler = theToler; } + void SetTolerance (const double theToler); double GetTolerance () const { return myToler; } private: - double myToler; - TColStd_MapOfInteger myCoincidentIDs; - TMeshModifTracer myMeshModifTracer; + double myToler; + TIDsMap myCoincidentIDs; + TMeshModifTracer myMeshModifTracer; }; typedef boost::shared_ptr CoincidentNodesPtr; @@ -395,14 +486,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 ); } }; /* @@ -412,6 +506,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; @@ -428,6 +523,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; @@ -443,6 +539,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 ); @@ -465,6 +562,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 ); @@ -480,6 +578,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 ); @@ -496,6 +595,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 ); @@ -511,6 +611,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 ); @@ -526,10 +627,11 @@ 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; - static bool IsFreeEdge( const SMDS_MeshNode** theNodes, const int theFaceId ); + static bool IsFreeEdge( const SMDS_MeshNode** theNodes, const ::smIdType theFaceId ); typedef long TElemId; struct Border{ TElemId myElemId; @@ -553,6 +655,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; @@ -573,7 +676,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; @@ -586,9 +690,9 @@ namespace SMESH{ protected: const SMDS_Mesh* myMesh; - TColStd_SequenceOfInteger myMin; - TColStd_SequenceOfInteger myMax; - TColStd_MapOfInteger myIds; + std::vector< ::smIdType > myMin; + std::vector< ::smIdType > myMax; + TIDsMap myIds; SMDSAbs_ElementType myType; }; @@ -625,6 +729,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LessThan: public virtual Comparator{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new LessThan( *this ); } }; @@ -635,6 +740,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT MoreThan: public virtual Comparator{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new MoreThan( *this ); } }; @@ -645,6 +751,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(); @@ -662,6 +769,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 ); @@ -701,6 +809,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LogicalAND: public virtual LogicalBinary{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new LogicalAND( *this ); } }; @@ -711,6 +820,7 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT LogicalOR: public virtual LogicalBinary{ public: virtual bool IsSatisfy( long theElementId ); + //virtual Predicate* clone() const { return new LogicalOR( *this ); } }; @@ -747,8 +857,9 @@ 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 + // invoke when all parameters already set virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; @@ -762,7 +873,7 @@ namespace SMESH{ bool findConnected( const TDataMapFacePtrInt& theAllFacePtrInt, SMDS_MeshFace* theStartFace, TMapOfLink& theNonManifold, - TColStd_MapOfInteger& theResFaces ); + TIDsMap& theResFaces ); bool isInPlane( const SMDS_MeshFace* theFace1, const SMDS_MeshFace* theFace2 ); void expandBoundary( TMapOfLink& theMapOfBoundary, @@ -776,8 +887,8 @@ namespace SMESH{ private: const SMDS_Mesh* myMesh; - TColStd_MapOfInteger myMapIds; - TColStd_MapOfInteger myMapBadGeomIds; + TIDsMap myMapIds; + TIDsMap myMapBadGeomIds; TVectorOfFacePtr myAllFacePtr; TDataMapFacePtrInt myAllFacePtrIntDMap; double myAngToler; @@ -795,6 +906,7 @@ namespace SMESH{ { 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; @@ -818,6 +930,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; @@ -836,7 +949,7 @@ namespace SMESH{ private: TMeshModifTracer myMeshModifTracer; - TColStd_MapOfInteger myIds; + TIDsMap myIds; SMDSAbs_ElementType myType; TopoDS_Face mySurf; double myToler; @@ -852,12 +965,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; @@ -868,45 +982,31 @@ namespace SMESH{ bool GetAllNodes() const { return myAllNodesFlag; } void SetShape (const TopoDS_Shape& theShape, const SMDSAbs_ElementType theType); + bool IsSatisfy (const SMDS_MeshElement* elem); + bool IsSatisfy (const SMDS_MeshNode* node, TopoDS_Shape* okShape=0); + void GetParams( double & u, double & v ) const { u = myU; v = myV; } 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; + double myU, myV; // result of node projection on EDGE or FACE + bool myAllNodesFlag; + + TMeshModifTracer myMeshModifTracer; + std::vector myNodeIsChecked; + std::vector myNodeIsOut; }; typedef boost::shared_ptr ElementsOnShapePtr; @@ -921,6 +1021,7 @@ namespace SMESH{ { public: BelongToGeom(); + virtual Predicate* clone() const; virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual void SetGeom( const TopoDS_Shape& theShape ); @@ -940,6 +1041,7 @@ namespace SMESH{ virtual void init(); TopoDS_Shape myShape; + TColStd_MapOfInteger mySubShapesIDs; const SMESHDS_Mesh* myMeshDS; SMDSAbs_ElementType myType; bool myIsSubshape; @@ -957,6 +1059,7 @@ namespace SMESH{ { public: LyingOnGeom(); + virtual Predicate* clone() const; virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual void SetGeom( const TopoDS_Shape& theShape ); @@ -972,12 +1075,7 @@ 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; @@ -997,6 +1095,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; @@ -1012,6 +1111,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 ); @@ -1025,11 +1125,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 ); @@ -1053,6 +1154,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 ); @@ -1075,6 +1177,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; } @@ -1088,7 +1191,7 @@ namespace SMESH{ TMeshModifTracer myMeshModifTracer; long myFaceID; double myToler; - TColStd_MapOfInteger myCoplanarIDs; + TIDsMap myCoplanarIDs; }; typedef boost::shared_ptr CoplanarFacesPtr; @@ -1100,9 +1203,10 @@ namespace SMESH{ { public: ConnectedElements(); - void SetNode( int nodeID ); + //virtual Predicate* clone() const { return new ConnectedElements( *this ); } + void SetNode( ::smIdType nodeID ); void SetPoint( double x, double y, double z ); - int GetNode() const; + ::smIdType GetNode() const; std::vector GetPoint() const; void SetType( SMDSAbs_ElementType theType ); @@ -1114,14 +1218,14 @@ namespace SMESH{ //const std::set& GetDomainIDs() const { return myOkIDs; } private: - int myNodeID; - std::vector myXYZ; - SMDSAbs_ElementType myType; - TMeshModifTracer myMeshModifTracer; + ::smIdType myNodeID; + std::vector myXYZ; + SMDSAbs_ElementType myType; + TMeshModifTracer myMeshModifTracer; - void clearOkIDs(); - bool myOkIDsReady; - std::set< int > myOkIDs; // empty means that there is one domain + void clearOkIDs(); + bool myOkIDsReady; + std::set<::smIdType> myOkIDs; // empty means that there is one domain }; typedef boost::shared_ptr ConnectedElementsPtr; @@ -1138,20 +1242,22 @@ namespace SMESH{ virtual void - GetElementsId( const SMDS_Mesh* theMesh, - TIdSequence& theSequence ); + GetElementsId( const SMDS_Mesh* theMesh, + TIdSequence& theSequence, + SMDS_ElemIteratorPtr theElements=0); static void - GetElementsId( const SMDS_Mesh* theMesh, - PredicatePtr thePredicate, - TIdSequence& theSequence ); + GetElementsId( const SMDS_Mesh* theMesh, + PredicatePtr thePredicate, + TIdSequence& theSequence, + SMDS_ElemIteratorPtr theElements=0 ); protected: PredicatePtr myPredicate; }; - }; -}; + } +} #endif