X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshNode.hxx;h=773f39fcf97ecfb186a46f6ff906e9adc6396138;hb=2de294b09ac8b9ace071a01db9cb4e235f1eadbb;hp=68edc975f51d837cdecc2fe7561d9fef3a7b6cf5;hpb=79c00fe8dda8de553bddf2c588ebdf5e4c0746c4;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshNode.hxx b/src/SMDS/SMDS_MeshNode.hxx
index 68edc975f..773f39fcf 100644
--- a/src/SMDS/SMDS_MeshNode.hxx
+++ b/src/SMDS/SMDS_MeshNode.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SMESH SMDS : implementaion of Salome mesh data structure
 //  File   : SMDS_MeshNode.hxx
 //  Module : SMESH
@@ -30,46 +31,53 @@
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_Position.hxx"
+#include "ObjectPool.hxx"
 #include <NCollection_List.hxx>
 
 class SMDS_EXPORT SMDS_MeshNode:public SMDS_MeshElement
 {
+public:
+  friend class SMESHDS_Mesh;
+  friend class SMDS_Mesh;
+  friend class ObjectPool<SMDS_MeshNode>;
+  friend class SMDS_VtkFace;
+
+  void Print(std::ostream & OS) const;
+  double X() const;
+  double Y() const;
+  double Z() const;
+  SMDS_ElemIteratorPtr GetInverseElementIterator(SMDSAbs_ElementType type=SMDSAbs_All) const;
+  int NbInverseElements(SMDSAbs_ElementType type=SMDSAbs_All) const;
+  const SMDS_PositionPtr& GetPosition() const;
+  SMDSAbs_ElementType GetType() const;
+  virtual vtkIdType GetVtkType() const;
+  SMDSAbs_EntityType  GetEntityType() const {return SMDSEntity_Node;}
+  int NbNodes() const;
+
+  friend bool operator<(const SMDS_MeshNode& e1, const SMDS_MeshNode& e2);
+
+  void SetPosition(const SMDS_PositionPtr& aPos);
+  void setXYZ(double x, double y, double z);
 
-  public:
-	SMDS_MeshNode(double x, double y, double z);
-	void Print(std::ostream & OS) const;
-	double X() const;
-	double Y() const;
-	double Z() const;
-	void AddInverseElement(const SMDS_MeshElement * ME);
-	void RemoveInverseElement(const SMDS_MeshElement * parent);
-	void ClearInverseElements();
-	bool emptyInverseElements();
-	SMDS_ElemIteratorPtr GetInverseElementIterator(SMDSAbs_ElementType type=SMDSAbs_All) const;
-        int NbInverseElements(SMDSAbs_ElementType type=SMDSAbs_All) const;
-	void SetPosition(const SMDS_PositionPtr& aPos);
-	const SMDS_PositionPtr& GetPosition() const;
-	SMDSAbs_ElementType GetType() const;
-	SMDSAbs_EntityType  GetEntityType() const {return SMDSEntity_Node;}
-	int NbNodes() const;
-	void setXYZ(double x, double y, double z);
-	friend bool operator<(const SMDS_MeshNode& e1, const SMDS_MeshNode& e2);
+  static int nbNodes;
 
-  /*!
-   * \brief Return node by its index
-    * \param ind - node index
-    * \retval const SMDS_MeshNode* - the node
-   */
-  virtual const SMDS_MeshNode* GetNode(const int) const { return this; }
+protected:
+  SMDS_MeshNode();
+  SMDS_MeshNode(int id, int meshId, int shapeId = -1, double x=0, double y=0, double z=0);
+  virtual ~SMDS_MeshNode();
+  void init(int id, int meshId, int shapeId = -1, double x=0, double y=0, double z=0);
+  inline void setVtkId(int vtkId) { myVtkID = vtkId; };
+  double* getCoord() const;
+  void AddInverseElement(const SMDS_MeshElement * ME);
+  void RemoveInverseElement(const SMDS_MeshElement * parent);
+  void ClearInverseElements();
+  bool emptyInverseElements();
 
-  protected:
-	SMDS_ElemIteratorPtr
-		elementsIterator(SMDSAbs_ElementType type) const;
+  SMDS_ElemIteratorPtr
+  elementsIterator(SMDSAbs_ElementType type) const;
 
-  private:
-	double myX, myY, myZ;
-	SMDS_PositionPtr myPosition;
-	NCollection_List<const SMDS_MeshElement*> myInverseElements;
+private:
+  SMDS_PositionPtr myPosition;
 };
 
 #endif