X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectorscurvedata.h;h=bde016a62c1c6adbbcc88bfec758530a0840e52d;hb=dfae916a398508554d35c6b3c8002b69becb53be;hp=480bc362bcea7bf2c39a0f4edf75492b4a86b846;hpb=50ed3b6104d5821d6184f882e1e1423d47dcbf10;p=mothur.git

diff --git a/collectorscurvedata.h b/collectorscurvedata.h
index 480bc36..bde016a 100644
--- a/collectorscurvedata.h
+++ b/collectorscurvedata.h
@@ -1,13 +1,11 @@
 #ifndef COLLECTORSCURVEDATA_H
 #define COLLECTORSCURVEDATA_H
 
-#include "mothur.h"
 #include "sabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "display.h"
 #include "observable.h"
 
-using namespace std;
 
 /***********************************************************************/
 
@@ -42,14 +40,15 @@ class SharedCollectorsCurveData : public Observable {
 public:
 	SharedCollectorsCurveData() { }; //: shared1(0), shared2(0)
 	
-	void registerDisplay(Display* o)		{	displays.insert(o);				};
+	void registerDisplay(Display* o)		{	displays.insert(o);			};
 	void removeDisplay(Display* o)			{	displays.erase(o);	delete o;	};
 	void SharedDataChanged()				{	notifyDisplays();				};
 	void updateSharedData(vector<SharedRAbundVector*> s, int numSeqs, int numGroupComb)	{	shared = s; NumSeqs = numSeqs; NumGroupComb = numGroupComb; SharedDataChanged();	};
 	
 	void notifyDisplays(){	
 		for(set<Display*>::iterator pos=displays.begin();pos!=displays.end();pos++){
-			if ( ((*pos)->isCalcMultiple() == true) || ( ((*pos)->isCalcMultiple() == false) && (shared.size() == 2) ) ) {
+//cout << (*pos)->getName() << endl;
+			if ( ( ((*pos)->isCalcMultiple() == true) && ((*pos)->getAll() == true) ) || (shared.size() == 2)  ) {
 				(*pos)->update(shared, NumSeqs, NumGroupComb);
 			}
 		}