Merge from V5_1_main branch 24/11/2010

[modules/smesh.git] / src / SMDS / SMDS_MeshNode.hxx

diff --git a/src/SMDS/SMDS_MeshNode.hxx b/src/SMDS/SMDS_MeshNode.hxx
index 2d932f35580594f4ccbd45d70cda2cfa94dce0b6..9ab02f20ffd002add16147c91e9d543c109ff380 100644 (file)
--- a/src/SMDS/SMDS_MeshNode.hxx
+++ b/src/SMDS/SMDS_MeshNode.hxx
@@ -38,23 +38,26 @@ class SMDS_EXPORT SMDS_MeshNode:public SMDS_MeshElement
 
 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 setXYZ(double x, double y, double z);
+
   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);
+  void Print(std::ostream & OS) const;
 
   /*!
    * \brief Return node by its index
@@ -62,6 +65,7 @@ public:
    * \retval const SMDS_MeshNode* - the node
    */
   virtual const SMDS_MeshNode* GetNode(const int) const { return this; }
+  virtual int NbNodes() const;
 
 protected:
   SMDS_ElemIteratorPtr