working on pam

[mothur.git] / venn.h

diff --git a/venn.h b/venn.h
index 8a789c364ac9e6e25bb0bc0312994e4c0e319d34..db26b272045458540cfb4ab7ca2f44bd563ba4bc 100644 (file)
--- a/venn.h
+++ b/venn.h
@@ -12,29 +12,28 @@
 #include "sabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "datavector.hpp"
-#include "globaldata.hpp"
 #include "calculator.h"
 
 
 /***********************************************************************/
 
 class Venn {
-       
-       public:
-               Venn();
-               ~Venn(){};
-       
-               void getPic(SAbundVector*, vector<Calculator*>);
-               void getPic(vector<SharedRAbundVector*>, vector<Calculator*>);
-
-       private:
-               GlobalData* globaldata;
-               Calculator* singleCalc;
-               string format, groupComb;
-               ofstream outsvg;
-
-                       
+public:
+       Venn(string, bool, string, int, bool);
+       ~Venn(){};
+
+       vector<string> getPic(SAbundVector*, vector<Calculator*>);
+       vector<string> getPic(vector<SharedRAbundVector*>, vector<Calculator*>);
+
+private:
+       Calculator* singleCalc;
+       string groupComb, outputDir, inputfile;
+       ofstream outsvg;
+       MothurOut* m;
+       bool nseqs, sharedOtus;
+       int fontSize;
 };
+
 /***********************************************************************/
 
 #endif