X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeNode.cpp;h=a8cf7929dc6a04e589c0cf228eb3486cbc90a8c3;hb=c75c580a44a73829a735cc5f7a7fdce84ae8bcac;hp=09c89dcadb223442b82b474976708c9b4569c1bd;hpb=5f76a3752cd6e23874e8167f19c9ceb57223b390;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeNode.cpp b/src2/creaImageIOTreeNode.cpp
index 09c89dc..a8cf792 100644
--- a/src2/creaImageIOTreeNode.cpp
+++ b/src2/creaImageIOTreeNode.cpp
@@ -17,15 +17,15 @@ namespace creaImageIO
     {
       if (parent) 
 	{
-	  GimmickMessage(5,"Default Node constructor (level "<<GetLevel()<<")"
+	  GimmickDebugMessage(6,"Default Node constructor (level "<<GetLevel()<<")"
 			 << std::endl);
 	  // Insert into parent's children list
-	  parent->GetChildrenList().push_back(this);
 	  InitializeAttributeMap();
+	 parent->GetChildrenList().push_back(this);
 	}
       else
 	{
-	  GimmickMessage(5,"Default Node constructor without parent"	
+	  GimmickDebugMessage(6,"Default Node constructor without parent"	
 			 << std::endl);
 	}
     }
@@ -38,7 +38,7 @@ namespace creaImageIO
 	mData(0),
 	mChildrenLoaded(false)
     {
-      GimmickMessage(5,"Node constructor (level "<<GetLevel()<<")"
+      GimmickDebugMessage(6,"Node constructor (level "<<GetLevel()<<")"
 		     << std::endl);
      if (parent) 
 	{
@@ -56,7 +56,7 @@ namespace creaImageIO
 		{
 		  v = i->second;
 		}
-	      GimmickMessage(5,"Setting attribute '"<<a->GetName()<<"' = '"
+	      GimmickDebugMessage(6,"Setting attribute '"<<a->GetName()<<"' = '"
 			     <<v<<"'"<<std::endl);
 	      UnsafeSetAttribute( a->GetKey(), v );
 	    }
@@ -69,7 +69,7 @@ namespace creaImageIO
     //=============================================================
     Node::~Node()
     {
-      GimmickMessage(5,"Node destructor"
+      GimmickDebugMessage(6,"Node destructor"
 		     << std::endl);
       ChildrenListType::iterator i;
       for (i=GetChildrenList().begin(); i!=GetChildrenList().end(); i++)
@@ -118,10 +118,7 @@ namespace creaImageIO
 	   a!= GetTree()->GetAttributeDescriptorList(GetLevel()).end();
 	   ++a)
 		{
-			GimmickMessage(1,"Hello my type is"<<a->GetType()<<std::endl);
-			GimmickMessage(1,"Hello my group is"<<a->GetGroup()<<std::endl);
-			GimmickMessage(1,"Hello my element is"<<a->GetElement()<<std::endl);
-			
+		
 			if(a->GetKey()==k)
 			{
 				return *a;
@@ -133,7 +130,7 @@ namespace creaImageIO
     //=============================================================
 
     //=============================================================
-    void Node::RemoveChildrenFromList(Node* node)
+    int Node::RemoveChildrenFromList(Node* node)
     {
       ChildrenListType::iterator i = find(GetChildrenList().begin(),
 					  GetChildrenList().end(),
@@ -142,6 +139,7 @@ namespace creaImageIO
 	{
 	  GetChildrenList().erase(i);
 	}
+	return GetChildrenList().size();
     }
     //=============================================================
 
@@ -180,7 +178,7 @@ namespace creaImageIO
     //=============================================================
     bool Node::Matches(  const AttributeMapType& m ) const
     {
-      GimmickMessage(2,"'"<<GetLabel()<<"' matching..."<<std::endl);
+      GimmickDebugMessage(2,"'"<<GetLabel()<<"' matching..."<<std::endl);
       const std::vector<std::string>& id 
 	= GetLevelDescriptor().GetIdentifierList();
       std::vector<std::string>::const_iterator i;
@@ -188,10 +186,10 @@ namespace creaImageIO
 	{
  	  if (mAttributeMap.find(*i)->second != m.find(*i)->second ) 
 	    {
-	      GimmickMessage(2,"IDENTIFIER '"<<*i<<"' values do not match"<<std::endl);
+	      GimmickDebugMessage(2,"IDENTIFIER '"<<*i<<"' values do not match"<<std::endl);
 	      return false;
 	    }
-	  GimmickMessage(2,"IDENTIFIER '"<<*i<<"' values match"<<std::endl);
+	  GimmickDebugMessage(2,"IDENTIFIER '"<<*i<<"' values match"<<std::endl);
 	}
       return true;
     }
@@ -222,7 +220,7 @@ namespace creaImageIO
       std::vector<std::string>::const_iterator i;
       for (i = label.begin(); i != label.end(); )
 	{
-	  GimmickMessage(3,"LABEL '"<<*i<<"'"<<std::endl);
+	  GimmickDebugMessage(9,"LABEL '"<<*i<<"'"<<std::endl);
 	  AttributeMapType::const_iterator j = mAttributeMap.find(*i);
 	  if (j != mAttributeMap.end())
 	    {