created mothurOut class to handle logfiles

[mothur.git] / collect.cpp

diff --git a/collect.cpp b/collect.cpp
index 2d1f6e38573d10288f4192c1208f19c919673821..08426a8499bdf41c0fab815f20421d4bc070de0f 100644 (file)
--- a/collect.cpp
+++ b/collect.cpp
@@ -52,7 +52,7 @@ void Collect::getCurve(int increment = 1){
                                delete ccd;
         }
         catch(exception& e) {
-                       errorOut(e, "Collect", "getCurve");
+                       m->errorOut(e, "Collect", "getCurve");
                        exit(1);
         }
 }
@@ -88,7 +88,7 @@ try {
                                
                 for(int i=0;i<displays.size();i++){
                         ccd->registerDisplay(displays[i]); //adds a display[i] to cdd
-                                               if (displays[i]->isCalcMultiple() == true)  {   displays[i]->init(groupLabelAll); }
+                                               if ((displays[i]->isCalcMultiple() == true) && (displays[i]->getAll() == true)) {   displays[i]->init(groupLabelAll); }
                                                else {  displays[i]->init(groupLabel);  }           
                 }
                 
@@ -106,7 +106,6 @@ try {
                                                                break;
                                                        }
                         }
-                        
        
                         //calculate at 0 and the given increment
                         if((i == 0) || (i+1) % increment == 0){
@@ -129,7 +128,7 @@ try {
                         totalNumSeq = i+1;
                 }
                 
-                //calculate last line if you haven't already
+                //calculate last label if you haven't already
                 if(numSeqs % increment != 0){
                         //how many comparisons to make i.e. for group a, b, c = ab, ac, bc.
                         int n = 1;
@@ -159,7 +158,7 @@ try {
 
         }
         catch(exception& e) {
-                errorOut(e, "Collect", "getSharedCurve");
+                m->errorOut(e, "Collect", "getSharedCurve");
                                exit(1);
         }
 }