X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=venn.h;h=50d49d1b98c4c364faed44366534daf91d017b55;hb=b866e1519a60681527244036428104ad1cb90c93;hp=35c1d1cbbe6d71663fa345bc97856c6194a6fda5;hpb=d59f91eb1230d2c7867a92cb86138b7003100ab4;p=mothur.git

diff --git a/venn.h b/venn.h
index 35c1d1c..50d49d1 100644
--- a/venn.h
+++ b/venn.h
@@ -9,34 +9,31 @@
  *
  */
 
-using namespace std;
-
 #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);
+	~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;
+	int fontSize;
 };
+
 /***********************************************************************/
 
 #endif