X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedlistvector.cpp;fp=sharedlistvector.cpp;h=6dfcb97f0aff013d15c1c641e93a24b0d7b229a3;hb=55386dddad84cc1140d736cabaf4dd0ae16f2e01;hp=3852c0cb508cb77b79198df1b50da87053cff399;hpb=990ded2eb38078a417fa00b4fbb4d3c24f4b5046;p=mothur.git diff --git a/sharedlistvector.cpp b/sharedlistvector.cpp index 3852c0c..6dfcb97 100644 --- a/sharedlistvector.cpp +++ b/sharedlistvector.cpp @@ -266,17 +266,20 @@ vector SharedListVector::getSharedRAbundVector() { vector lookup; //contains just the groups the user selected map finder; //contains all groups in groupmap string group, names, name; - - util->setGroups(m->Groups, groupmap->namesOfGroups); + + vector Groups = m->getGroups(); + vector allGroups = groupmap->getNamesOfGroups(); + util->setGroups(Groups, allGroups); + m->setGroups(Groups); delete util; - for (int i = 0; i < groupmap->namesOfGroups.size(); i++) { + for (int i = 0; i < allGroups.size(); i++) { SharedRAbundVector* temp = new SharedRAbundVector(data.size()); - finder[groupmap->namesOfGroups[i]] = temp; - finder[groupmap->namesOfGroups[i]]->setLabel(label); - finder[groupmap->namesOfGroups[i]]->setGroup(groupmap->namesOfGroups[i]); - if (m->inUsersGroups(groupmap->namesOfGroups[i], m->Groups)) { //if this group is in user groups - lookup.push_back(finder[groupmap->namesOfGroups[i]]); + finder[allGroups[i]] = temp; + finder[allGroups[i]]->setLabel(label); + finder[allGroups[i]]->setGroup(allGroups[i]); + if (m->inUsersGroups(allGroups[i], m->getGroups())) { //if this group is in user groups + lookup.push_back(finder[allGroups[i]]); } }