Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quality Info: tolerance change does not influence on Nb double nodes
[modules/smesh.git]
/
src
/
Controls
/
SMESH_ControlsDef.hxx
diff --git
a/src/Controls/SMESH_ControlsDef.hxx
b/src/Controls/SMESH_ControlsDef.hxx
index 34c3453efd9b6e894df193ba9f7807e2be317530..907157598c1f78aae0510a8411375546a586bf78 100644
(file)
--- a/
src/Controls/SMESH_ControlsDef.hxx
+++ b/
src/Controls/SMESH_ControlsDef.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-136,6
+136,8
@@
namespace SMESH{
const std::vector<int>& elements,
const double* minmax=0,
const bool isLogarithmic = false);
const std::vector<int>& 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;
virtual SMDSAbs_ElementType GetType() const = 0;
virtual double GetBadRate( double Value, int nbNodes ) const = 0;
long GetPrecision() const;
@@
-176,8
+178,8
@@
namespace SMESH{
virtual double GetBadRate( double Value, int nbNodes ) const;
virtual SMDSAbs_ElementType GetType() const;
};
virtual double GetBadRate( double Value, int nbNodes ) const;
virtual SMDSAbs_ElementType GetType() const;
};
-
-
+
+
/*
Class : MaxElementLength3D
Description : Functor calculating maximum length of 3D element
/*
Class : MaxElementLength3D
Description : Functor calculating maximum length of 3D element
@@
-212,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 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;
};
};
@@
-225,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 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;
};
};
@@
-237,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 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;
};
private:
double ComputeA( const gp_XYZ&, const gp_XYZ&, const gp_XYZ&, const gp_XYZ& ) const;
};
@@
-252,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 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;
};
/*
};
/*
@@
-263,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 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;
};
};
@@
-291,10
+298,12
@@
namespace SMESH{
/*
Class : Length2D
/*
Class : Length2D
- Description : Functor for calculating minimal length of edge
+ Description : Functor for calculating minimal length of edge
s of element
*/
class SMESHCONTROLS_EXPORT Length2D: public virtual NumericalFunctor{
public:
*/
class SMESHCONTROLS_EXPORT Length2D: public virtual NumericalFunctor{
public:
+ 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;
virtual double GetValue( const TSequenceOfXYZ& thePoints );
virtual double GetBadRate( double Value, int nbNodes ) const;
virtual SMDSAbs_ElementType GetType() const;
@@
-306,9
+315,22
@@
namespace SMESH{
};
typedef std::set<Value> TValues;
void GetValues(TValues& theValues);
};
typedef std::set<Value> TValues;
void GetValues(TValues& theValues);
+
+ private:
+ SMDSAbs_ElementType myType;
};
typedef boost::shared_ptr<Length2D> Length2DPtr;
};
typedef boost::shared_ptr<Length2D> 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<Length3D> Length3DPtr;
+
/*
Class : Deflection2D
Description : Functor for calculating distance between a face and geometry
/*
Class : Deflection2D
Description : Functor for calculating distance between a face and geometry
@@
-397,7
+419,7
@@
namespace SMESH{
virtual bool IsSatisfy( long theElementId );
virtual SMDSAbs_ElementType GetType() const;
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 GetTolerance () const { return myToler; }
private:
@@
-797,7
+819,7
@@
namespace SMESH{
~ManifoldPart();
//virtual Predicate* clone() const { return new ManifoldPart( *this ); }
virtual void SetMesh( const SMDS_Mesh* theMesh );
~ManifoldPart();
//virtual Predicate* clone() const { return new ManifoldPart( *this ); }
virtual void SetMesh( const SMDS_Mesh* theMesh );
- // inoke when all parameters already set
+ // in
v
oke when all parameters already set
virtual bool IsSatisfy( long theElementId );
virtual SMDSAbs_ElementType GetType() const;
virtual bool IsSatisfy( long theElementId );
virtual SMDSAbs_ElementType GetType() const;
@@
-1178,14
+1200,16
@@
namespace SMESH{
virtual
void
virtual
void
- GetElementsId( const SMDS_Mesh* theMesh,
- TIdSequence& theSequence );
+ GetElementsId( const SMDS_Mesh* theMesh,
+ TIdSequence& theSequence,
+ SMDS_ElemIteratorPtr theElements=0);
static
void
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;
protected:
PredicatePtr myPredicate;