another attempt to fix sffinfo

[mothur.git] / mothurout.h

diff --git a/mothurout.h b/mothurout.h
index ac1ec3fd402af357cc956a816df8de6dc27f9e29..1b89caf933ea4c436743ac992206904e36b51d9e 100644 (file)
--- a/mothurout.h
+++ b/mothurout.h
@@ -2,7 +2,7 @@
 #define MOTHUROUT_H
 
 /*
- *  m->mothurOut.h
+ *  mothurOut.h
  *  Mothur
  *
  *  Created by westcott on 2/25/10.
@@ -24,18 +24,26 @@ class MothurOut {
                void mothurOutEndLine();
                void mothurOutJustToLog(string);
                void errorOut(exception&, string, string);
+               void closeLog();
+               string getDefaultPath() { return defaultPath; }
+               void setDefaultPath(string);
+
                int control_pressed;
+               bool executing;
                
 
        private:
                static MothurOut* _uniqueInstance;
                MothurOut( const MothurOut& ); // Disable copy constructor
                void operator=( const MothurOut& ); // Disable assignment operator
-               MothurOut() {};
+               MothurOut() { control_pressed = false; defaultPath=""; };
                ~MothurOut();
 
                string logFileName;
+               string defaultPath;
                ofstream out;
+               
+               int mem_usage(double&, double&);
 
 };
 /***********************************************/