X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeAttributeDescriptor.h;h=1ae86ddeb89c94381cc240dbf589a31c6d33abf6;hb=e4a54c9026a2a0c17e3be0b5915c34688a9385ad;hp=dc734bd62964469ef4d4600890d1366d5192866d;hpb=f4bdead5143dc3d816f1c2f2bd9786a21c843760;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeAttributeDescriptor.h b/src2/creaImageIOTreeAttributeDescriptor.h
index dc734bd..1ae86dd 100644
--- a/src2/creaImageIOTreeAttributeDescriptor.h
+++ b/src2/creaImageIOTreeAttributeDescriptor.h
@@ -9,24 +9,48 @@ namespace creaImageIO
 
   namespace tree
   {
+	  /**
+	* \ingroup Tree
+	*/
     //=====================================================================
-    /// Descriptor of an attribute of a node of a tree (name, dicom group/element)
+    /// Descriptor of an attribute of a node of a Tree (name, dicom group/element)
     class AttributeDescriptor
     {    
     public:
       /// Flags
       /// The attribute is hidden (not visible to user)
-      static const unsigned int HIDDEN;
-      /// The attribute enters in unique identifier constitution (KEY)
-      static const unsigned int KEY;
+      static const unsigned int PRIVATE;
+      /// The attribute enters in unique identifier constitution 
+      static const unsigned int IDENTIFIER;
       /// The attribute enters in label constitution (for printing)
       static const unsigned int LABEL;
+	   /// The attribute can be edited
+      static const unsigned int EDITABLE;
+
+	  /// Types
+      /// The attribute is of numeric type
+      static const int NUMBER=1;
+      /// The attribute is of string type
+      static const int STRING=2;
+	  /// The attribute's type is unknown
+      static const int UNKNOWN=0;
 
       /// Default ctor
       AttributeDescriptor()
 	: mKey(""), mName(""), mGroup(0), mElement(0), mFlags(0)
       {
       }
+      /// Ctor with all explicitely
+      AttributeDescriptor(const std::string& key,
+			  const std::string& name,
+			  unsigned short group,
+			  unsigned short element,
+			  unsigned int flags)
+	: mKey(key), mName(name), mGroup(group), mElement(element), 
+	  mFlags(flags)
+      {
+      }
+
       // Ctor with key, name and flags
       AttributeDescriptor(const std::string& key,
 			  const std::string& name,
@@ -47,7 +71,7 @@ namespace creaImageIO
       unsigned short GetElement() const { return mElement; }
       /// Returns the flags of the attribute
       unsigned int GetFlags() const { return mFlags; }
-    
+	  
       /// Extracts group and element from a key of the form "Dgroup_elem" 
       static void GetDicomGroupElementFromKey(const std::string& key,
 					      unsigned short& group,
@@ -56,6 +80,15 @@ namespace creaImageIO
       /// Replace simple quote by double quotes
       /// Cut string at NULL chars 
       void CleanName(std::string& str) const;
+	  ///Decodes the type of attribute into the existing ones
+	  void DecodeType(unsigned int& type) const;
+
+	  /// Determines if Attribute is a date
+	  bool isDateEntry() const;
+
+	  /// Determines if Attribute is a time
+	  bool isTimeEntry() const;
+
     private:
       std::string mKey;
       std::string mName;
@@ -73,16 +106,7 @@ namespace creaImageIO
 } // EO namespace creaImageIO
 
 
-/*
-//=====================================================================
-inline std::ostream& operator<<(std::ostream& s, 
-const creaImageIO::tree::AttributeDescriptor& d)
-{
-s << "[" << d.key << ":" << d.name << "]";
-return s;
-}
-//=====================================================================
-*/
+
 
 
 #endif // #ifndef __creaImageIOTreeAttributeDescriptor_h_INCLUDED__