fixed some bugs

[mothur.git] / heatmap.h

diff --git a/heatmap.h b/heatmap.h
index fe79e43c81ced356e29a8919bd58ddfac7acbb6c..7c5b561c84ade9012c49171b4b9f0b0d765b9724 100644 (file)
--- a/heatmap.h
+++ b/heatmap.h
@@ -9,12 +9,8 @@
  *
  */
 
-using namespace std;
-
-#include "ordervector.hpp"
-#include "sabundvector.hpp"
-#include "sharedsabundvector.h"
-#include "sharedordervector.h"
+#include "rabundvector.hpp"
+#include "sharedrabundvector.h"
 #include "datavector.hpp"
 #include "globaldata.hpp"
 
@@ -26,20 +22,23 @@ class HeatMap {
                HeatMap();
                ~HeatMap(){};
        
-               void getPic(OrderVector*);
-               void getPic(SharedOrderVector*);
+               void getPic(RAbundVector*);
+               void getPic(vector<SharedRAbundVector*>);
 
        private:
-               void getSharedVectors(SharedOrderVector*);
-               void setGroups();
-       
-               GlobalData* globaldata;
-               vector<SharedSAbundVector> lookup;
-               SAbundVector sabund;
-               string format;
+               void sortSharedVectors(vector<SharedRAbundVector*>& );
+               void printLegend(int, float);
 
+               GlobalData* globaldata;
+               string format, sorted, groupComb, scaler;
+               ofstream outsvg;
                        
 };
 
+/***********************************************************************/
+
 #endif
 
+
+
+