X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=rarefactioncurvedata.h;h=ecbdbfd5052c568808a1030bc5c004d68dca17e2;hp=e08f9d769af5aeed6a1a09d275ff9b6643834d84;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05

diff --git a/rarefactioncurvedata.h b/rarefactioncurvedata.h
index e08f9d7..ecbdbfd 100644
--- a/rarefactioncurvedata.h
+++ b/rarefactioncurvedata.h
@@ -1,13 +1,11 @@
 #ifndef RAREFACTIONCURVEDATA_H
 #define RAREFACTIONCURVEDATA_H
 
-#include <set>
+#include "mothur.h"
 #include "sabundvector.hpp"
 #include "display.h"
 #include "observable.h"
 
-using namespace std;
-
 /***********************************************************************/
 
 class RarefactionCurveData : public Observable {
@@ -38,23 +36,22 @@ private:
 class SharedRarefactionCurveData : public Observable {
 	
 public:
-	SharedRarefactionCurveData() : shared1(0), shared2(0) {};
+	SharedRarefactionCurveData() {}; //: shared1(0), shared2(0) 
 	
 	void registerDisplay(Display* o)	{	displays.insert(o);				};
 	void removeDisplay(Display* o)		{	displays.erase(o);	delete o;	};
 	void SharedDataChanged()			{	notifyDisplays();				};
-	void updateSharedData(SharedRAbundVector* rv, SharedRAbundVector* rv2, int numSeqs, int numGroupComb)	{	shared1 = rv; shared2 = rv2; NumSeqs = numSeqs; NumGroupComb = numGroupComb; SharedDataChanged(); };
+	void updateSharedData(vector<SharedRAbundVector*> r, int numSeqs, int numGroupComb)	{	shared = r; NumSeqs = numSeqs; NumGroupComb = numGroupComb; SharedDataChanged(); };
 
 	void notifyDisplays(){	
 		for(set<Display*>::iterator pos=displays.begin();pos!=displays.end();pos++){
-				(*pos)->update(shared1, shared2, NumSeqs, NumGroupComb);
+				(*pos)->update(shared, NumSeqs, NumGroupComb);
 		}	
 	};
 	
 private:
 	set<Display*> displays;
-	SharedRAbundVector* shared1;
-	SharedRAbundVector* shared2;
+	vector<SharedRAbundVector*> shared;
 	int NumSeqs, NumGroupComb;
 	
 };