fixed read.tree so that it can read trees generated by fasttree

[mothur.git] / readtreecommand.cpp

diff --git a/readtreecommand.cpp b/readtreecommand.cpp
index da66ee1eb0971362e8f19ff62155c26239da5615..8e292af4db27b4bdbbba829fa5280c9723dfb2f7 100644 (file)
--- a/readtreecommand.cpp
+++ b/readtreecommand.cpp
@@ -141,6 +141,13 @@ int ReadTreeCommand::execute(){
 
                //assemble users trees
                for (int i = 0; i < T.size(); i++) {
+                       if (m->control_pressed) {  
+                               for (int i = 0; i < T.size(); i++) {  delete T[i];  }
+                               globaldata->gTree.clear();
+                               delete globaldata->gTreemap;
+                               return 0;
+                       }
+       
                        T[i]->assembleTree();
                }
 
@@ -154,6 +161,13 @@ int ReadTreeCommand::execute(){
                                        count++;
                                }
                                
+                               if (m->control_pressed) {  
+                                       for (int i = 0; i < T.size(); i++) {  delete T[i];  }
+                                       globaldata->gTree.clear();
+                                       delete globaldata->gTreemap;
+                                       return 0;
+                               }
+                               
                                //then you did not find it so report it 
                                if (count == globaldata->Treenames.size()) { 
                                        //if it is in your namefile then don't remove
@@ -166,6 +180,8 @@ int ReadTreeCommand::execute(){
                                        }
                                }
                        }
+                       
+                       globaldata->gTreemap = treeMap;
                }
                
                return 0;