X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshElement.hxx;h=d35e151bd4d249f5b2a69b3a7a4cebead2f893bd;hp=0bd0d407d337ac2359f4431bb5dc6caf87f06299;hb=00c069f8d414099a12268c42d58c6cfae9d1bff9;hpb=007c0191337598a9431229b2d3dec7fde25d4c4e

diff --git a/src/SMDS/SMDS_MeshElement.hxx b/src/SMDS/SMDS_MeshElement.hxx
index 0bd0d407d..d35e151bd 100644
--- a/src/SMDS/SMDS_MeshElement.hxx
+++ b/src/SMDS/SMDS_MeshElement.hxx
@@ -26,134 +26,49 @@
 
 #ifndef _SMDS_MeshElement_HeaderFile
 #define _SMDS_MeshElement_HeaderFile
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_SMDS_MeshElement_HeaderFile
-#include "Handle_SMDS_MeshElement.hxx"
-#endif
-
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _SMDSAbs_ElementType_HeaderFile                                                                           
+	
 #include "SMDSAbs_ElementType.hxx"
-#endif
-#ifndef _Handle_TColgp_HArray1OfDir_HeaderFile
-#include "Handle_TColgp_HArray1OfDir.hxx"
-#endif
-#ifndef _SMDS_MeshObject_HeaderFile
 #include "SMDS_MeshObject.hxx"
-#endif
-#ifndef _Standard_Boolean_HeaderFile
-#include <Standard_Boolean.hxx>
-#endif
-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_Real_HeaderFile
-#include <Standard_Real.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
-#include <Standard_OStream.hxx>
-#endif
-class TColgp_HArray1OfDir;
-class Standard_OutOfRange;
-class SMDS_ListOfMeshElement;
-class gp_Vec;
-class gp_Dir;
-
-
-class SMDS_MeshElement : public SMDS_MeshObject {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT inline   Standard_Integer HashCode(const Standard_Integer Upper) const;
-Standard_EXPORT inline   Standard_Boolean IsSame(const Handle(SMDS_MeshElement)& other) const;
-Standard_EXPORT inline   Standard_Boolean IsEqual(const Handle(SMDS_MeshElement)& other) const;
-Standard_EXPORT inline   Standard_Boolean IsNodeInElement(const Standard_Integer idnode) const;
-Standard_EXPORT virtual  void GetEdgeDefinedByNodes(const Standard_Integer rank,Standard_Integer& idnode1,Standard_Integer& idnode2) const;
-Standard_EXPORT virtual  void GetFaceDefinedByNodes(const Standard_Integer rank,const Standard_Address idnode,Standard_Integer& nb) const;
-Standard_EXPORT virtual  Standard_Integer GetConnection(const Standard_Integer rank) const;
-Standard_EXPORT virtual  void AddInverseElement(const Handle(SMDS_MeshElement)& ME) ;
-Standard_EXPORT virtual const SMDS_ListOfMeshElement& InverseElements() const;
-Standard_EXPORT virtual  void ClearInverseElements() ;
-Standard_EXPORT inline   Standard_Integer NbNodes() const;
-Standard_EXPORT virtual  Standard_Integer NbEdges() const;
-Standard_EXPORT virtual  Standard_Integer NbFaces() const;
-Standard_EXPORT inline   Standard_Integer GetID() const;
-Standard_EXPORT virtual  Standard_Integer GetKey() const = 0;
-Standard_EXPORT virtual  void SetNormal(const Standard_Integer rank,const Standard_Real vx,const Standard_Real vy,const Standard_Real vz) ;
-Standard_EXPORT virtual  void SetNormal(const Standard_Integer rank,const gp_Vec& v) ;
-Standard_EXPORT virtual  gp_Dir GetNormal(const Standard_Integer rank) ;
-Standard_EXPORT virtual  void Print(Standard_OStream& OS) const;
-friend Standard_EXPORT Standard_OStream& operator << (Standard_OStream& OS, const Handle(SMDS_MeshElement)& );
-Standard_EXPORT inline   SMDSAbs_ElementType GetType() const;
-Standard_EXPORT ~SMDS_MeshElement();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMDS_MeshElement_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-Standard_EXPORT SMDS_MeshElement(const Standard_Integer ID,const Standard_Integer NbConnections,const SMDSAbs_ElementType Type);
-Standard_EXPORT virtual  Standard_Address GetConnections() const;
-
-
- // Fields PROTECTED
- //
-Standard_Integer myID;
-Standard_Integer myNbNodes;
-Handle_TColgp_HArray1OfDir myNormals;
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-SMDSAbs_ElementType myType;
-
-
+#include "SMDS_Iterator.hxx"
+#include "SMDS_MeshElementIDFactory.hxx"
+
+#include <vector>
+#include <ostream>
+
+using namespace std;
+class SMDS_MeshNode;
+class SMDS_MeshEdge;
+class SMDS_MeshFace;	
+
+///////////////////////////////////////////////////////////////////////////////
+/// Base class for elements
+///////////////////////////////////////////////////////////////////////////////
+class SMDS_MeshElement:public SMDS_MeshObject
+{
+
+  public:
+	SMDS_Iterator<const SMDS_MeshElement *> * nodesIterator() const;
+	SMDS_Iterator<const SMDS_MeshElement *> * edgesIterator() const;
+	SMDS_Iterator<const SMDS_MeshElement *> * facesIterator() const;
+	virtual SMDS_Iterator<const SMDS_MeshElement *> *
+		elementsIterator(SMDSAbs_ElementType type) const;
+
+	virtual int NbNodes() const;
+	virtual int NbEdges() const;
+	virtual int NbFaces() const;
+	int GetID() const;
+
+	///Return the type of the current element
+	virtual SMDSAbs_ElementType GetType() const = 0;
+	friend ostream & operator <<(ostream & OS, const SMDS_MeshElement *);
+	friend bool SMDS_MeshElementIDFactory::BindID(int ID,SMDS_MeshElement*elem);
+
+  protected:
+	SMDS_MeshElement(int ID=-1);
+	virtual void Print(ostream & OS) const;
+	
+  private:
+	int myID;
 };
 
-
-#include "SMDS_MeshElement.lxx"
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif