X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeDescriptor.h;h=a68794fb22dde17687c45bc31f51005bc2e42d07;hb=805ec93a6b36ad6acf63458414c545a737322354;hp=e1812d3838aab26d104b22edafc32302bb62032e;hpb=cbf693fa62cd51f4ca5c881838bbb609edc447b0;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeDescriptor.h b/src2/creaImageIOTreeDescriptor.h
index e1812d3..a68794f 100644
--- a/src2/creaImageIOTreeDescriptor.h
+++ b/src2/creaImageIOTreeDescriptor.h
@@ -1,19 +1,24 @@
 #ifndef __creaImageIOTreeDescriptor_h_INCLUDED__
 #define __creaImageIOTreeDescriptor_h_INCLUDED__
 
+#include <creaImageIOTreeAttributeMapType.h>
 #include <creaImageIOTreeLevelDescriptor.h>
-#include <map>
+
 
 namespace creaImageIO
 {
 
   namespace tree
   {
-    //=====================================================================
-    /// Descriptor of the structure a tree 
-/// (number of levels, descriptors of each level, ...).
-/// Any tree has at least one level (level 0) of name "Root"
-class Descriptor
+    
+    /**
+     * \ingroup Model
+     */
+    
+	///Descriptor of the structure of a Tree (number of levels, descriptors of each level, ...). 
+	  //Any Tree has at least one level (level 0) of name "Root"
+     
+    class Descriptor
     {
     public:
       /// Ctor : creates the mandatory level 0 descriptor called "Root"
@@ -42,13 +47,13 @@ class Descriptor
       GetAttributeDescriptorList(int level) const
       { return mLevelDescriptorList[level].GetAttributeDescriptorList(); }
       /// Returns the AttributeDescriptorList of a given level (ref)
-      LevelDescriptor::AttributeDescriptorListType& 
-      GetAttributeDescriptorList(int level) 
-      { return mLevelDescriptorList[level].GetAttributeDescriptorList(); }
+      //LevelDescriptor::AttributeDescriptorListType& 
+      //GetAttributeDescriptorList(int level) 
+      //{ return mLevelDescriptorList[level].GetAttributeDescriptorList(); }
   
 
       /// Builds the key to value map of all the attributes of the tree
-      void BuildAttributeMap( std::map<std::string,std::string>&) const;
+      void BuildAttributeMap( AttributeMapType& ) const;
 
       /// The type of LevelDescriptor container
       typedef std::vector<LevelDescriptor> LevelDescriptorListType;