X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeDescriptor.h;h=101db65c0de0f2dea3a810d28e8282d35843406f;hb=4ef5bb7efa72c0d9a016f270b5a56e8302f6e209;hp=29f0ba88b7d9f33cc2afaea99d88d40d7ae87890;hpb=74deda5137bba320405e3c4f50cc2a3f40a9dfc7;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeDescriptor.h b/src2/creaImageIOTreeDescriptor.h
index 29f0ba8..101db65 100644
--- a/src2/creaImageIOTreeDescriptor.h
+++ b/src2/creaImageIOTreeDescriptor.h
@@ -1,23 +1,25 @@
 #ifndef __creaImageIOTreeDescriptor_h_INCLUDED__
 #define __creaImageIOTreeDescriptor_h_INCLUDED__
 
+#include <creaImageIOTreeAttributeMapType.h>
 #include <creaImageIOTreeLevelDescriptor.h>
-#include <map>
+
 
 namespace creaImageIO
 {
 
   namespace tree
   {
-
-	  /**
-	* \ingroup Model
-	*/
+    
+    /**
+     * \ingroup Model
+     */
     //=====================================================================
-    /// 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
+    /** 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
     {
     public:
       /// Ctor : creates the mandatory level 0 descriptor called "Root"
@@ -46,13 +48,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;