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 updateSharedData(vector<SharedRAbundVector*> s, int numSeqs, int numGroupComb, bool p) { pairs = p; shared = s; NumSeqs = numSeqs; NumGroupComb = numGroupComb; SharedDataChanged(); };
void notifyDisplays(){
for(set<Display*>::iterator pos=displays.begin();pos!=displays.end();pos++){
-//cout << (*pos)->getName() << endl;
- if ( ( ((*pos)->isCalcMultiple() == true) && ((*pos)->getAll() == true) ) || (shared.size() == 2) ) {
+
+ if ((*pos)->calcNeedsAll() == true) {
(*pos)->update(shared, NumSeqs, NumGroupComb);
+ }else{
+
+ if ( ((*pos)->isCalcMultiple() == true) && ((*pos)->getAll() == true) && (!pairs) ) {
+ (*pos)->update(shared, NumSeqs, NumGroupComb);
+ }else {
+ vector<SharedRAbundVector*> temp; temp.push_back(shared[0]); temp.push_back(shared[1]);
+ shared = temp;
+
+ (*pos)->update(shared, NumSeqs, NumGroupComb);
+ }
}
}
};
vector<Display*> multiDisplays;
vector<SharedRAbundVector*> shared;
int NumSeqs, NumGroupComb;
+ bool pairs;
};
/***********************************************************************/