#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 {
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;
};