X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FControls%2FSMESH_ControlsDef.hxx;h=907157598c1f78aae0510a8411375546a586bf78;hp=bc5b9bb745a4f2f0d61bc5c98517622650e94d17;hb=b8917880e4fa9abc35a42386a76dd222c6ff7ad6;hpb=101919845f4f9504b3abad75a027b2938cb11924 diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index bc5b9bb74..907157598 100644 --- a/src/Controls/SMESH_ControlsDef.hxx +++ b/src/Controls/SMESH_ControlsDef.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 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,26 @@ #ifndef _SMESH_CONTROLSDEF_HXX_ #define _SMESH_CONTROLSDEF_HXX_ -#include -#include -#include +#include "SMESH_Controls.hxx" -#include +#include "SMESH_TypeDefs.hxx" -#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; @@ -54,7 +51,11 @@ class SMDS_Mesh; class SMESHDS_Mesh; class SMESHDS_SubMesh; +class SMESHDS_GroupBase; +class BRepClass3d_SolidClassifier; +class ShapeAnalysis_Surface; +class gp_Pln; class gp_Pnt; namespace SMESH{ @@ -67,7 +68,7 @@ namespace SMESH{ public: TSequenceOfXYZ(); - TSequenceOfXYZ(size_type n); + explicit TSequenceOfXYZ(size_type n); TSequenceOfXYZ(size_type n, const gp_XYZ& t); @@ -92,8 +93,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; }; /*! @@ -127,6 +136,8 @@ namespace SMESH{ const std::vector& 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; @@ -167,8 +178,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 @@ -203,6 +214,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; }; @@ -216,6 +228,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; }; @@ -228,7 +241,8 @@ 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; + private: double ComputeA( const gp_XYZ&, const gp_XYZ&, const gp_XYZ&, const gp_XYZ& ) const; }; @@ -243,6 +257,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; }; /* @@ -254,6 +269,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; }; @@ -282,11 +298,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{ @@ -297,9 +315,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 @@ -344,6 +391,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,11 +414,12 @@ 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: @@ -387,14 +446,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 +466,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 +483,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 +499,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 +522,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 +538,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 +555,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 +571,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 +587,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 +615,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 +636,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 +689,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 +700,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 +711,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 +729,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 +769,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 +780,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,8 +817,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; @@ -763,8 +842,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 +858,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 +890,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 +911,6 @@ namespace SMESH{ TMeshModifTracer myMeshModifTracer; TColStd_MapOfInteger myIds; SMDSAbs_ElementType myType; - //Handle(Geom_Surface) mySurf; TopoDS_Face mySurf; double myToler; bool myUseBoundaries; @@ -824,12 +925,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; @@ -840,42 +942,109 @@ 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); 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 isOutOfFace (const gp_Pnt& p); - bool isOutOfEdge (const gp_Pnt& p); - bool isOutOfVertex(const gp_Pnt& p); - - bool (TClassifier::* myIsOutFun)(const gp_Pnt& p); - BRepClass3d_SolidClassifier mySolidClfr; - 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< 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; + }; - std::vector< TClassifier* > myClassifiers; - const SMDS_Mesh* myMesh; - SMDSAbs_ElementType myType; - TopoDS_Shape myShape; - double myToler; - bool myAllNodesFlag; + 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 Predicate* clone() const; + + 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; + TColStd_MapOfInteger mySubShapesIDs; + 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; - typedef boost::shared_ptr ElementsOnShapePtr; + /* + 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 Predicate* clone() const; + + 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; + TColStd_MapOfInteger mySubShapesIDs; + 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 @@ -884,6 +1053,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; @@ -899,6 +1069,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 ); @@ -912,11 +1083,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 ); @@ -940,6 +1112,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 ); @@ -962,6 +1135,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; } @@ -975,7 +1149,7 @@ namespace SMESH{ TMeshModifTracer myMeshModifTracer; long myFaceID; double myToler; - std::set< long > myCoplanarIDs; + TColStd_MapOfInteger myCoplanarIDs; }; typedef boost::shared_ptr CoplanarFacesPtr; @@ -987,6 +1161,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; @@ -1025,14 +1200,16 @@ 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;