X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ftrace.h;h=88aa2718b0690277b64b863a71f5b607a87edd19;hb=08a5cd04c3994d5ea24713b9b000791bd2e406fe;hp=20e3186e8cc70164c98c81f10b04c154b8eb736f;hpb=7ef485116d6859eb1e31753b3e3a89de44985272;p=ctsim.git

diff --git a/include/trace.h b/include/trace.h
index 20e3186..88aa271 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -1,62 +1,43 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-enum {
-  TRACE_NONE, 		/* No tracing */
-  TRACE_TEXT,		/* Minimal status */
-  TRACE_PHM,		/* Show phantom */
-  TRACE_RAYS,		/* Show all rays */
-  TRACE_PLOT,		/* Plot raysums */
-  TRACE_CLIPPING	/* Plot clipping */
+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 */
 };
 
-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";
-
 class TraceLevel
 {
  public:
-    TraceLevel (const char* const traceString);
-
-    addTrace (const char* const traceString);
-
-    bool isTrace (const char* const traceQuery) const;
+  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 TraceID convertTraceNameToID (const char* traceName);
 
  private:
-
-    bool addTraceElements (const char* const traceString);
+  
+  int m_traceLevel;
+  
+  bool addTraceElements (const char* const traceString);
 };
 
 
-inline int 
-opt_set_trace (const char *traceString)
-{
-  int traceID;
-
-  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;
-  else {
-    sys_error(ERR_WARNING,"Invalid trace option %s\n", traceString);
-    traceID = -1;
-  }
-
-  return (traceID);
-}
-
-
 #endif