X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshNode.cxx;h=73610b6618ed2c61d789d8300392f00cda2d3db0;hb=84e136e74b2bc729df20617a9968439919337a55;hp=d7c291b520ef059bf962734466b24a9fa36608af;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshNode.cxx b/src/SMDS/SMDS_MeshNode.cxx
index d7c291b52..73610b661 100644
--- a/src/SMDS/SMDS_MeshNode.cxx
+++ b/src/SMDS/SMDS_MeshNode.cxx
@@ -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
 //
 #ifdef _MSC_VER
@@ -37,8 +38,8 @@ using namespace std;
 //=======================================================================
 
 SMDS_MeshNode::SMDS_MeshNode(double x, double y, double z):
-	myX(x), myY(y), myZ(z),
-	myPosition(SMDS_SpacePosition::originSpacePosition())
+        myX(x), myY(y), myZ(z),
+        myPosition(SMDS_SpacePosition::originSpacePosition())
 {
 }
 
@@ -66,8 +67,8 @@ void SMDS_MeshNode::RemoveInverseElement(const SMDS_MeshElement * parent)
 
 void SMDS_MeshNode::Print(ostream & OS) const
 {
-	OS << "Node <" << GetID() << "> : X = " << myX << " Y = "
-		<< myY << " Z = " << myZ << endl;
+        OS << "Node <" << GetID() << "> : X = " << myX << " Y = "
+                << myY << " Z = " << myZ << endl;
 }
 
 //=======================================================================
@@ -77,7 +78,7 @@ void SMDS_MeshNode::Print(ostream & OS) const
 
 void SMDS_MeshNode::SetPosition(const SMDS_PositionPtr& aPos)
 {
-	myPosition = aPos;
+        myPosition = aPos;
 }
 
 //=======================================================================
@@ -87,7 +88,7 @@ void SMDS_MeshNode::SetPosition(const SMDS_PositionPtr& aPos)
 
 const SMDS_PositionPtr& SMDS_MeshNode::GetPosition() const
 {
-	return myPosition;
+        return myPosition;
 }
 
 //=======================================================================
@@ -117,14 +118,15 @@ class SMDS_MeshNode_MyInvIterator:public SMDS_ElemIterator
 
   const SMDS_MeshElement* next()
   {
+    if ( !more() ) return 0;
     const SMDS_MeshElement* current=myIterator.Value();
     myIterator.Next();
     return current;
-  }	
+  }     
 };
 
 SMDS_ElemIteratorPtr SMDS_MeshNode::
-	GetInverseElementIterator(SMDSAbs_ElementType type) const
+        GetInverseElementIterator(SMDSAbs_ElementType type) const
 {
   return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(myInverseElements,type));
 }
@@ -170,7 +172,7 @@ class SMDS_MeshNode_MyIterator:public SMDS_ElemIterator
 };
 
 SMDS_ElemIteratorPtr SMDS_MeshNode::
-	elementsIterator(SMDSAbs_ElementType type) const
+        elementsIterator(SMDSAbs_ElementType type) const
 {
   if(type==SMDSAbs_Node)
     return SMDS_MeshElement::elementsIterator(SMDSAbs_Node); 
@@ -183,34 +185,34 @@ SMDS_ElemIteratorPtr SMDS_MeshNode::
 
 int SMDS_MeshNode::NbNodes() const
 {
-	return 1;
+        return 1;
 }
 
 double SMDS_MeshNode::X() const
 {
-	return myX;
+        return myX;
 }
 
 double SMDS_MeshNode::Y() const
 {
-	return myY;
+        return myY;
 }
 
 double SMDS_MeshNode::Z() const
 {
-	return myZ;
+        return myZ;
 }
 
 void SMDS_MeshNode::setXYZ(double x, double y, double z)
 {
-	myX=x;
-	myY=y;
-	myZ=z;	
+        myX=x;
+        myY=y;
+        myZ=z;  
 }
 
 SMDSAbs_ElementType SMDS_MeshNode::GetType() const
 {
-	return SMDSAbs_Node;
+        return SMDSAbs_Node;
 }
 
 //=======================================================================
@@ -265,14 +267,14 @@ int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const
 ///////////////////////////////////////////////////////////////////////////////
 bool operator<(const SMDS_MeshNode& e1, const SMDS_MeshNode& e2)
 {
-	return e1.GetID()<e2.GetID();
-	/*if(e1.myX<e2.myX) return true;
-	else if(e1.myX==e2.myX)
-	{
-	 	if(e1.myY<e2.myY) return true;
-		else if(e1.myY==e2.myY) return (e1.myZ<e2.myZ);
-		else return false;
-	}
-	else return false;*/
+        return e1.GetID()<e2.GetID();
+        /*if(e1.myX<e2.myX) return true;
+        else if(e1.myX==e2.myX)
+        {
+                if(e1.myY<e2.myY) return true;
+                else if(e1.myY==e2.myY) return (e1.myZ<e2.myZ);
+                else return false;
+        }
+        else return false;*/
 }