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

diff --git a/venn.h b/venn.h
index 35c1d1c..d3a3f05 100644
--- a/venn.h
+++ b/venn.h
@@ -9,8 +9,6 @@
  *
  */
 
-using namespace std;
-
 #include "sabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "datavector.hpp"
@@ -21,22 +19,21 @@ using namespace std;
 /***********************************************************************/
 
 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);
+	~Venn(){};
+
+	vector<string> getPic(SAbundVector*, vector<Calculator*>);
+	vector<string> getPic(vector<SharedRAbundVector*>, vector<Calculator*>);
+
+private:
+	GlobalData* globaldata;
+	Calculator* singleCalc;
+	string groupComb, outputDir;
+	ofstream outsvg;
+	MothurOut* m;
 };
+
 /***********************************************************************/
 
 #endif