r145: *** empty log message ***

[ctsim.git] / include / trace.h

diff --git a/include/trace.h b/include/trace.h
index 20e3186e8cc70164c98c81f10b04c154b8eb736f..ed29746d1fd335de4ea2f707123d743e4259ad30 100644 (file)
--- a/include/trace.h
+++ b/include/trace.h
@@ -2,12 +2,13 @@
 #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 */
+    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";
@@ -22,20 +23,24 @@ class TraceLevel
  public:
     TraceLevel (const char* const traceString);
 
-    addTrace (const char* const traceString);
+    void addTrace (const char* const traceString);
 
     bool isTrace (const char* const traceQuery) const;
 
+    int getTraceLevel(void) const { return m_traceLevel; }
+
  private:
 
+    int m_traceLevel;
+
     bool addTraceElements (const char* const traceString);
 };
 
 
 inline int 
-opt_set_trace (const char *traceString)
+convertTraceNameToID (const char *traceString)
 {
-  int traceID;
+  int traceID = TRACE_INVALID;
 
   if (strcasecmp (traceString, TRACE_NONE_STR) == 0)
     traceID = TRACE_NONE;
@@ -49,10 +54,6 @@ opt_set_trace (const char *traceString)
     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);
 }