[CHANGE] added latest patch by David Moreno-Dominguez to hierarchical Clustering code.

src/modules/hierarchicalClustering/hierchClustDisplay/WHtree.h

@@ -34,7 +34,7 @@
 // This file is also part of OpenWalnut ( http://www.openwalnut.org ).
 //
 // For more reference on the underlying algorithm and research they have been used for refer to:
-// - Moreno-Dominguez, D., Anwander, A., & Knösche, T. R. (2014).
+// - Moreno-Dominguez, D., Anwander, A., & Knoesche, T. R. (2014).
 //   A hierarchical method for whole-brain connectivity-based parcellation.
 //   Human Brain Mapping, 35(10), 5000-5025. doi: http://dx.doi.org/10.1002/hbm.22528
 // - Moreno-Dominguez, D. (2014).
@@ -65,11 +65,7 @@
 #include <list>
 #include <string>
 
-// boost library
-// Use filesystem version 2 for compatibility with newer boost versions.
-#ifndef BOOST_FILESYSTEM_VERSION
-    #define BOOST_FILESYSTEM_VERSION 2
-#endif
+
 #include <boost/filesystem.hpp>
 
 // hClustering
@@ -196,6 +192,12 @@ public:
      */
     std::vector<WHcoord> getRoi() const;
 
+    /**
+     * Returns the tractogram IDs vector
+     * \return vector containing the tractogram ids per leaf
+     */
+    std::vector<size_t> getTrackids() const;
+
     /**
      * Returns the discarded list
      * \return list containing the discarded coordinates
@@ -289,6 +291,13 @@ public:
      */
     size_t getLeafID( const WHcoord &thisCoord ) const;
 
+    /**
+     * returns the corresponding track ID to a leaf ID on the tree
+     * \param leafID input leaf ID
+     * \return ID of seed tractogram corresponding to that leaf
+     */
+    size_t getTrackID( const size_t &leafID ) const;
+
     /**
      * Returns a vector with all the leaf IDs contained in that cluster
      * \param nodeID id of the selected node
@@ -863,6 +872,11 @@ inline std::vector<WHcoord> WHtree::getRoi() const
     return m_coordinates;
 }
 
+inline std::vector<size_t> WHtree::getTrackids() const
+{
+    return m_trackids;
+}
+
 inline std::list<WHcoord> WHtree::getDiscarded() const
 {
     return m_discarded;

src/modules/hierarchicalClustering/resources/META

@@ -100,6 +100,16 @@
     // The URL. Required.
     url="https://www.youtube.com/watch?v=bfe3jqzzzSs&feature=youtu.be";
   };
+
+  online
+  {
+    // Name that appears for this resource. Required.
+    name="Data preparation tools.";
+    // Optional description for a resource
+    description ="Hierarchical clustering algorithms for whole-brain connectivity similarity analysis.";
+    // The URL. Required.
+    url="https://github.com/dmordom/hClustering";
+  };
 };
 
 "Hierarchical Clustering Display"
@@ -169,6 +179,16 @@
     url="https://www.youtube.com/watch?v=bfe3jqzzzSs&feature=youtu.be";
   };
 
+  online
+  {
+    // Name that appears for this resource. Required.
+    name="Data preparation tools.";
+    // Optional description for a resource
+    description ="Hierarchical clustering algorithms for whole-brain connectivity similarity analysis.";
+    // The URL. Required.
+    url="https://github.com/dmordom/hClustering";
+  };
+
   tag = "Hierarchical";
   tag = "Clustering";
   tag = "Dendrogram";