changed file divide for trim.seqs

[mothur.git] / mothurout.h

diff --git a/mothurout.h b/mothurout.h
index 7b4732b45108b05cca9b17be98e9205b50e1a2ab..92363f5b6f26996b2e83badf681befa1ae9e3e0a 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,34 @@ class MothurOut {
                void mothurOutEndLine();
                void mothurOutJustToLog(string);
                void errorOut(exception&, string, string);
+               void closeLog();
+               string getDefaultPath() { return defaultPath; }
+               void setDefaultPath(string);
+               
+               string getReleaseDate() { return releaseDate; }
+               void setReleaseDate(string r) { releaseDate = r; }
+               string getVersion() { return version; }
+               void setVersion(string r) { version = r; }
+
+
                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;
+               string releaseDate, version;
+               
                ofstream out;
+               
+               int mem_usage(double&, double&);
 
 };
 /***********************************************/