more calculator edits and added coverage and whittaker

[mothur.git] / heatmap.h

diff --git a/heatmap.h b/heatmap.h
index e236ce389795e00e20fce97cd645377e83657c1b..29b6b9af302cf24b079f153eb75f993e0e83be21 100644 (file)
--- a/heatmap.h
+++ b/heatmap.h
@@ -11,10 +11,8 @@
 
 using namespace std;
 
-#include "ordervector.hpp"
 #include "rabundvector.hpp"
 #include "sharedrabundvector.h"
-#include "sharedordervector.h"
 #include "datavector.hpp"
 #include "globaldata.hpp"
 
@@ -26,26 +24,23 @@ class HeatMap {
                HeatMap();
                ~HeatMap(){};
        
-               void getPic(OrderVector*);
-               void getPic(SharedOrderVector*);
+               void getPic(RAbundVector*);
+               void getPic(vector<SharedRAbundVector*>);
 
        private:
-               void getSharedVectors(SharedOrderVector*);
-               void sortSharedVectors();
-               
+               void sortSharedVectors(vector<SharedRAbundVector*>& );
+               void printLegend(int, float);
+
                GlobalData* globaldata;
-               vector<SharedRAbundVector*> lookup;
-               RAbundVector rabund;
-               string format, sorted, groupComb;
+               string format, sorted, groupComb, scaler;
                ofstream outsvg;
-               map<int, string> colorScale;
-               map<int, string>::iterator it;
-
                        
 };
+
 /***********************************************************************/
 
 #endif
 
 
 
+