X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ftrace.h;h=4924d7a163ba70df486b9f9151c830d1338b9d32;hb=01ee1e0085970643368d65c38b09008927e24cd5;hp=64826e9a47ab6b5e97ec471b231eff7f1e2e4fec;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10;p=ctsim.git

diff --git a/include/trace.h b/include/trace.h
index 64826e9..4924d7a 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -1,25 +1,25 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-static const int TRACE_INVALID = 0xFFFF;
-static const int TRACE_NONE = 0x0000;
-static const int TRACE_TEXT = 0x0001;
-static const int TRACE_PHM = 0x0002;
-static const int TRACE_RAYS = 0x0004;
-static const int TRACE_PLOT = 0x0008;
-static const int TRACE_CLIPPING = 0x0010;
-
-class TraceLevel
+
+class Trace
 {
  public:
-  static const char TRACE_NONE_STR[];
-  static const char TRACE_TEXT_STR[];
-  static const char TRACE_PHM_STR[];
-  static const char TRACE_RAYS_STR[];
-  static const char TRACE_PLOT_STR[];
-  static const char TRACE_CLIPPING_STR[];
-  
-  TraceLevel (const char* const traceString);
+    static const int TRACE_INVALID;
+    static const int TRACE_NONE;
+    static const int TRACE_CONSOLE;
+    static const int TRACE_PHANTOM;
+    static const int TRACE_PROJECTIONS;
+    static const int TRACE_PLOT;
+    static const int TRACE_CLIPPING;
+    
+    static const int BIT_CONSOLE;
+    static const int BIT_PHANTOM;
+    static const int BIT_PROJECTIONS;
+    static const int BIT_PLOT;
+    static const int BIT_CLIPPING;
+
+  Trace (const char* const traceString);
   
   void addTrace (const char* const traceString);
   
@@ -28,12 +28,23 @@ class TraceLevel
   int getTraceLevel(void) const { return m_traceLevel; }
   
   static int convertTraceNameToID (const char* traceName);
+  static const char* convertTraceIDToTitle (int idTrace);
+  static const char* convertTraceIDToName (int idTrace);
+  
+  static const int getTraceCount() {return s_iTraceCount;}
+  static const char** getTraceNameArray() {return s_aszTraceName;}
+  static const char** getTraceTitleArray() {return s_aszTraceTitle;}
 
  private:
   
   int m_traceLevel;
   
   bool addTraceElements (const char* const traceString);
+
+  static const char* s_aszTraceName[];
+  static const char* s_aszTraceTitle[];
+  static const int s_iTraceCount;
+
 };