X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Algo.hxx;h=8aeaf7bb67636f791f51f7a2ac0ab62f5aef2aeb;hb=3f0822bd99d7a77dda623a448d2ee63282744c3d;hp=76f6de97957d6168ffd8a7d2ada8f59598e06321;hpb=9a54694a0ab1e5cbc558a35c4606ceea4f7af2ef;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Algo.hxx b/src/SMESH/SMESH_Algo.hxx index 76f6de979..8aeaf7bb6 100644 --- a/src/SMESH/SMESH_Algo.hxx +++ b/src/SMESH/SMESH_Algo.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 @@ -30,9 +30,10 @@ #include "SMESH_SMESH.hxx" -#include "SMESH_Hypothesis.hxx" -#include "SMESH_ComputeError.hxx" +#include "SMDSAbs_ElementType.hxx" #include "SMESH_Comment.hxx" +#include "SMESH_ComputeError.hxx" +#include "SMESH_Hypothesis.hxx" #include #include @@ -42,6 +43,7 @@ #include #include #include +#include class SMDS_MeshNode; class SMESHDS_Mesh; @@ -50,6 +52,7 @@ class SMESH_Gen; class SMESH_HypoFilter; class SMESH_Mesh; class SMESH_MesherHelper; +class SMESH_ProxyMesh; class SMESH_subMesh; class TopoDS_Face; class TopoDS_Shape; @@ -60,6 +63,7 @@ class gp_XYZ; typedef std::map< SMESH_subMesh*, std::vector > MapShapeNbElems; typedef std::map< SMESH_subMesh*, std::vector >::iterator MapShapeNbElemsItr; +// ================================================================================== /*! * \brief Root of all algorithms * @@ -69,9 +73,33 @@ typedef std::map< SMESH_subMesh*, std::vector >::iterator MapShapeNbElemsIt * - methods related to dependencies between sub-meshes imposed by the algorith * - static utilities, like EdgeLength() */ -class SMESH_EXPORT SMESH_Algo:public SMESH_Hypothesis +// ================================================================================== + +class SMESH_EXPORT SMESH_Algo : public SMESH_Hypothesis { -public: + public: + //================================================================================== + /*! + * \brief Structure describing algorithm features + */ + // -------------------------------------------------------------------------------- + struct Features + { + int _dim; + std::set _inElemTypes; // acceptable types of input mesh element + std::set _outElemTypes; // produced types of mesh elements + std::string _label; // GUI type name + + bool IsCompatible( const Features& algo2 ) const; + }; + /*! + * \brief Returns a structure describing algorithm features + */ + static const Features& GetFeatures( const std::string& algoType ); + const Features& GetFeatures() const { return GetFeatures( _name ); } + + public: + //================================================================================== /*! * \brief Creates algorithm * \param hypId - algorithm ID @@ -142,6 +170,11 @@ public: */ virtual void CancelCompute(); + /*! + * \brief If possible, returns progress of computation [0.,1.] + */ + virtual double GetProgress() const; + /*! * \brief evaluates size of prospective mesh on a shape * \param aMesh - the mesh @@ -168,7 +201,7 @@ public: virtual const std::list & GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, - const bool ignoreAuxiliary=true); + const bool ignoreAuxiliary=true) const; /*! * \brief Returns a list of compatible hypotheses assigned to a shape in a mesh * \param aMesh - the mesh @@ -183,7 +216,7 @@ public: const list & GetAppliedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, - const bool ignoreAuxiliary=true); + const bool ignoreAuxiliary=true) const; /*! * \brief Make the filter recognize only compatible hypotheses * \param theFilter - the filter to initialize @@ -197,14 +230,23 @@ public: */ virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); + /*! * \brief return compute error */ SMESH_ComputeErrorPtr GetComputeError() const; /*! - * \brief initialize compute error + * \brief initialize compute error etc. before call of Compute() */ void InitComputeError(); + /*! + * \brief Return compute progress by nb of calls of this method + */ + double GetProgressByTic() const; + /*! + * Return a vector of sub-meshes to Compute() + */ + std::vector& SubMeshesToCompute() { return _smToCompute; } public: // ================================================================== @@ -287,14 +329,10 @@ public: const bool ignoreMediumNodes, std::map< double, const SMDS_MeshNode* > & theNodes); /*! - * \brief Find out elements orientation on a geometrical face - * \param theFace - The face correctly oriented in the shape being meshed - * \param theMeshDS - The mesh data structure - * \retval bool - true if the face normal and the normal of first element - * in the correspoding submesh point in different directions + * Moved to SMESH_MesherHelper */ - static bool IsReversedSubMesh (const TopoDS_Face& theFace, - SMESHDS_Mesh* theMeshDS); + // static bool IsReversedSubMesh (const TopoDS_Face& theFace, + // SMESHDS_Mesh* theMeshDS); /*! * \brief Compute length of an edge * \param E - the edge @@ -302,11 +340,6 @@ public: */ static double EdgeLength(const TopoDS_Edge & E); - /*! - * \brief Calculate normal of a mesh face - */ - static bool FaceNormal(const SMDS_MeshElement* F, gp_XYZ& normal, bool normalized=true); - //static int NumberOfWires(const TopoDS_Shape& S); int NumberOfPoints(SMESH_Mesh& aMesh,const TopoDS_Wire& W); @@ -324,6 +357,14 @@ public: static bool IsContinuous(const TopoDS_Edge & E1, const TopoDS_Edge & E2) { return ( Continuity( E1, E2 ) >= GeomAbs_G1 ); } + /*! + * \brief Return true if an edge can be considered straight + */ + static bool IsStraight( const TopoDS_Edge & E, const bool degenResult=false ); + /*! + * \brief Return true if an edge has no 3D curve + */ + static bool isDegenerated( const TopoDS_Edge & E ); /*! * \brief Return the node built on a vertex @@ -333,12 +374,6 @@ public: */ static const SMDS_MeshNode* VertexNode(const TopoDS_Vertex& V, const SMESHDS_Mesh* meshDS); - /*! - * \brief Return nodes common to two elements - */ - static std::vector< const SMDS_MeshNode*> GetCommonNodes(const SMDS_MeshElement* e1, - const SMDS_MeshElement* e2); - enum EMeshError { MEr_OK = 0, MEr_HOLES, MEr_BAD_ORI, MEr_EMPTY }; /*! @@ -395,8 +430,14 @@ protected: std::list _badInputElements; //!< to explain COMPERR_BAD_INPUT_MESH volatile bool _computeCanceled; //!< is set to True while computing to stop it + + double _progress; /* progress of Compute() [0.,1.], + to be set by an algo really tracking the progress */ + int _progressTic; // counter of calls from SMESH_Mesh::GetComputeProgress() + std::vector _smToCompute; // sub-meshes to Compute() }; + class SMESH_EXPORT SMESH_0D_Algo: public SMESH_Algo { public: @@ -413,6 +454,13 @@ class SMESH_EXPORT SMESH_2D_Algo: public SMESH_Algo { public: SMESH_2D_Algo(int hypId, int studyId, SMESH_Gen* gen); + /*! + * \brief Method in which an algorithm generating a structured mesh + * fixes positions of in-face nodes after there movement + * due to insertion of viscous layers. + */ + virtual bool FixInternalNodes(const SMESH_ProxyMesh& mesh, + const TopoDS_Face& face); }; class SMESH_EXPORT SMESH_3D_Algo: public SMESH_Algo