X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Ftrace.h;h=4924d7a163ba70df486b9f9151c830d1338b9d32;hp=88aa2718b0690277b64b863a71f5b607a87edd19;hb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;hpb=27a474e0622ebb7229fd5705552021f63d8f932d

diff --git a/include/trace.h b/include/trace.h
index 88aa271..4924d7a 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -1,27 +1,25 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-enum TraceID {
-    TRACE_INVALID=-1,
-    TRACE_NONE=0, 		/* No tracing */
-    TRACE_TEXT,		/* Minimal status */
-    TRACE_PHM,		/* Show phantom */
-    TRACE_RAYS,		/* Show all rays */
-    TRACE_PLOT,		/* Plot raysums */
-    TRACE_CLIPPING	/* Plot clipping */
-};
 
-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);
   
@@ -29,13 +27,24 @@ class TraceLevel
   
   int getTraceLevel(void) const { return m_traceLevel; }
   
-  static TraceID convertTraceNameToID (const char* traceName);
+  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;
+
 };