X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=include%2Ftrace.h;h=64826e9a47ab6b5e97ec471b231eff7f1e2e4fec;hb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10;hp=bf062076df8148ccfb91394667f922edd5a65dd7;hpb=03c4bc505de131323cbc70a70bdceda9229269bf;p=ctsim.git

diff --git a/include/trace.h b/include/trace.h
index bf06207..64826e9 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -1,63 +1,41 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-enum {
-    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 */
-};
-
-static const char TRACE_NONE_STR[]=     "none";
-static const char TRACE_TEXT_STR[]=     "text";
-static const char TRACE_PHM_STR[]=      "phm";
-static const char TRACE_RAYS_STR[]=     "rays";
-static const char TRACE_PLOT_STR[]=     "plot";
-static const char TRACE_CLIPPING_STR[]= "clipping";
+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
 {
  public:
-    TraceLevel (const char* const traceString);
-
-    addTrace (const char* const traceString);
-
-    bool isTrace (const char* const traceQuery) const;
-
-    int getTraceLevel(void) const { return m_traceLevel; }
+  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);
+  
+  void addTrace (const char* const traceString);
+  
+  bool isTrace (const char* const traceQuery) const;
+  
+  int getTraceLevel(void) const { return m_traceLevel; }
+  
+  static int convertTraceNameToID (const char* traceName);
 
  private:
-
-    int m_traceLevel;
-
-    bool addTraceElements (const char* const traceString);
+  
+  int m_traceLevel;
+  
+  bool addTraceElements (const char* const traceString);
 };
 
 
-inline int 
-convertTraceNameToID (const char *traceString)
-{
-  int traceID = TRACE_INVALID;
-
-  if (strcasecmp (traceString, TRACE_NONE_STR) == 0)
-    traceID = TRACE_NONE;
-  else if (strcasecmp (traceString, TRACE_TEXT_STR) == 0)
-    traceID = TRACE_TEXT;
-  else if (strcasecmp (traceString, TRACE_PHM_STR) == 0)
-    traceID = TRACE_PHM;
-  else if (strcasecmp (traceString, TRACE_PLOT_STR) == 0)
-    traceID = TRACE_PLOT;
-  else if (strcasecmp (traceString, TRACE_CLIPPING_STR) == 0)
-    traceID = TRACE_CLIPPING;
-  else if (strcasecmp (traceString, TRACE_RAYS_STR) == 0)
-    traceID = TRACE_RAYS;
-
-  return (traceID);
-}
-
-
 #endif