merge master 2.3.0

[bamtools.git] / src / api / BamAlignment.h

diff --git a/src/api/BamAlignment.h b/src/api/BamAlignment.h
index a2349ea9ce9b254066450dc953b99925a8f03b56..0f4fe7366dd3f8096b9f7c775f673188d81d1d41 100644 (file)
--- a/src/api/BamAlignment.h
+++ b/src/api/BamAlignment.h
@@ -2,7 +2,7 @@
 // BamAlignment.h (c) 2009 Derek Barnett
 // Marth Lab, Department of Biology, Boston College
 // ---------------------------------------------------------------------------
-// Last modified: 16 October 2011 (DB)
+// Last modified: 25 July 2013 (DB)
 // ---------------------------------------------------------------------------
 // Provides the BamAlignment data structure
 // ***************************************************************************
@@ -80,9 +80,15 @@ struct API_EXPORT BamAlignment {
         template<typename T> bool GetTag(const std::string& tag, T& destination) const;
         template<typename T> bool GetTag(const std::string& tag, std::vector<T>& destination) const;
 
+        // retrieves all current tag names
+        std::vector<std::string> GetTagNames(void) const;
+
         // retrieves the SAM/BAM type-code for requested tag name
         bool GetTagType(const std::string& tag, char& type) const;
 
+        // retrieves the SAM/BAM type-code for the data elements in an array tag
+        bool GetArrayTagType(const std::string& tag, char& type) const;
+
         // returns true if alignment has a record for this tag name
         bool HasTag(const std::string& tag) const;
 
@@ -110,8 +116,8 @@ struct API_EXPORT BamAlignment {
     public:
         std::string Name;               // read name
         int32_t     Length;             // length of query sequence
-        std::string QueryBases;         // 'original' sequence (as reported from sequencing machine)
-        std::string AlignedBases;       // 'aligned' sequence (includes any indels, padding, clipping)
+        std::string QueryBases;         // 'original' sequence (contained in BAM file)
+        std::string AlignedBases;       // 'aligned' sequence (QueryBases plus deletion, padding, clipping chars)
         std::string Qualities;          // FASTQ qualities (ASCII characters, not numeric values)
         std::string TagData;            // tag data (use provided methods to query/modify)
         int32_t     RefID;              // ID number for reference sequence