X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=collect.h;h=51712331401747192b62a9198ca6fa3cda8f4cef;hp=295673eca402f1f82558e3f8cf2667607cadd2d1;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=c5c7502f435e1413c19e373dab1dfebcaa67588d

diff --git a/collect.h b/collect.h
index 295673e..5171233 100644
--- a/collect.h
+++ b/collect.h
@@ -1,10 +1,6 @@
 #ifndef COLLECT_H
 #define COLLECT_H
 
-using namespace std;
-
-
-
 #include "collectorscurvedata.h"
 #include "display.h"
 #include "ordervector.hpp"
@@ -12,7 +8,7 @@ using namespace std;
 #include "rabundvector.hpp"
 #include "sharedordervector.h"
 #include "datavector.hpp"
-#include "globaldata.hpp"
+#include "mothurout.h"
 
 /***********************************************************************/
 
@@ -20,17 +16,16 @@ class Collect {
 	
 public:
 	Collect(OrderVector* order, vector<Display*> disp) :
-					numSeqs(order->getNumSeqs()), order(order), displays(disp), label(order->getLabel())  {};
+					numSeqs(order->getNumSeqs()), order(order), displays(disp), label(order->getLabel())  { m = MothurOut::getInstance(); };
 	Collect(SharedOrderVector* sharedorder, vector<Display*> disp) :
-					numSeqs(sharedorder->getNumSeqs()), sharedorder(sharedorder), displays(disp), label(sharedorder->getLabel())  {};
+					numSeqs(sharedorder->getNumSeqs()), sharedorder(sharedorder), displays(disp), label(sharedorder->getLabel())  { m = MothurOut::getInstance(); }
 
 	~Collect(){		};
-	void getCurve(int);
-	void getSharedCurve(int);
+	int getCurve(float);
+	int getSharedCurve(float);
 	
 private:
 	SharedOrderVector* sharedorder;
-	GlobalData* globaldata;
 	OrderVector* order;
 	vector<Display*> displays;
 	int numSeqs, numGroupComb, totalNumSeq;
@@ -38,6 +33,7 @@ private:
 	void getGroupComb();
 	vector<string> groupComb;
 	bool validGroup(vector<string>, string);
+	MothurOut* m;
 };