X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshNode.hxx;h=d3bf53264c15889bf720ef16b5411b3174824463;hb=da78b9467b74750ae0f1c17c3fdc814d4abbc43e;hp=69b937034aa76ac1ae905996e78bb8fe1238c38f;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshNode.hxx b/src/SMDS/SMDS_MeshNode.hxx
index 69b937034..d3bf53264 100644
--- a/src/SMDS/SMDS_MeshNode.hxx
+++ b/src/SMDS/SMDS_MeshNode.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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, 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
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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,47 +31,51 @@
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_Position.hxx"
-#include <NCollection_List.hxx>
+#include "ObjectPool.hxx"
 
-class SMDS_EXPORT SMDS_MeshNode:public SMDS_MeshElement
+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; // ! NOT thread safe methods !
+  double Y() const;
+  double Z() const;
+  void   GetXYZ(double xyz[3]) const; // thread safe getting coords
+  SMDS_ElemIteratorPtr    GetInverseElementIterator(SMDSAbs_ElementType type=SMDSAbs_All) const;
+  int                     NbInverseElements(SMDSAbs_ElementType type=SMDSAbs_All) const;
+  const SMDS_PositionPtr& GetPosition() const;
+  virtual SMDSAbs_ElementType  GetType() const;
+  virtual vtkIdType            GetVtkType() const;
+  virtual SMDSAbs_EntityType   GetEntityType() const { return SMDSEntity_Node;}
+  virtual SMDSAbs_GeometryType GetGeomType() const   { return SMDSGeom_NONE; }
+  virtual int                  NbNodes() const;
+
+  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;
-	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
-   * 
-   * Index is wrapped if it is out of a valid range
-   */
-  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);
+  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