a few modifications for 1.9

[mothur.git] / display.h

diff --git a/display.h b/display.h
index f8daae26eff95bf40bab64e26455281244cd8729..8671fa6fde96ed137c48b0e9763a029f942df8fd 100644 (file)
--- a/display.h
+++ b/display.h
@@ -5,9 +5,7 @@
 #include "sharedsabundvector.h"
 #include "calculator.h"
 #include "fileoutput.h"
-#include <vector>
 
-using namespace std;
 
 /***********************************************************************/
 
@@ -15,13 +13,20 @@ class Display {
        
 public:
        virtual void update(SAbundVector* rank) = 0;
-       virtual void update(SharedRAbundVector* shared1, SharedRAbundVector* shared2, int numSeqs, int numGroupComb) = 0;
+       virtual void update(vector<SharedRAbundVector*> shared, int numSeqs, int numGroupComb) = 0;
        virtual void init(string) = 0;
        virtual void reset() = 0;
        virtual void close() = 0;
+       virtual bool isCalcMultiple() = 0;
+       virtual void setAll(bool){}
+       virtual bool getAll()   {       bool a; return a;       }
+       virtual string getName() { return ""; };
+       virtual ~Display() {}
+       Display() {  m = MothurOut::getInstance();  }
+       
+protected:
+       MothurOut* m;
        
-private:
-
 };
 
 /***********************************************************************/