X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=heatmap.h;h=922147ccb62d54f154f34796a7ad7786717841d6;hb=250e3b11b1c9c1e1ad458ab6c7e71ac2e67e11d9;hp=c291a4ded677b6394aa5da9819a0140cda75a8c6;hpb=7ae40733a270f73ec8a331540cc7f28fd60b24fc;p=mothur.git

diff --git a/heatmap.h b/heatmap.h
index c291a4d..922147c 100644
--- a/heatmap.h
+++ b/heatmap.h
@@ -13,7 +13,7 @@
 #include "sharedrabundvector.h"
 #include "sharedrabundfloatvector.h"
 #include "datavector.hpp"
-#include "globaldata.hpp"
+
 
 /***********************************************************************/
 struct binCount {
@@ -43,7 +43,7 @@ inline bool comparebinFloatCounts(binCountFloat left, binCountFloat right){
 class HeatMap {
 	
 	public:
-		HeatMap(string, string, int, int, string);
+		HeatMap(string, string, int, int, string, string);
 		~HeatMap(){};
 	
 		string getPic(RAbundVector*);
@@ -51,13 +51,12 @@ class HeatMap {
 		string getPic(vector<SharedRAbundFloatVector*>);
 
 	private:
-		int sortSharedVectors(vector<SharedRAbundVector*>& );
-		int sortSharedVectors(vector<SharedRAbundFloatVector*>& );
+		vector<string> sortSharedVectors(vector<SharedRAbundVector*>& );
+		vector<string> sortSharedVectors(vector<SharedRAbundFloatVector*>& );
 		int sortRabund(RAbundVector*&);
 		void printLegend(int, float);
 
-		GlobalData* globaldata;
-		string format, sorted, groupComb, scaler, outputDir;
+		string format, sorted, groupComb, scaler, outputDir, inputfile;
 		ofstream outsvg;
 		MothurOut* m;
 		int numOTU, fontSize;