X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ftrace.h;fp=include%2Ftrace.h;h=bf062076df8148ccfb91394667f922edd5a65dd7;hb=03c4bc505de131323cbc70a70bdceda9229269bf;hp=20e3186e8cc70164c98c81f10b04c154b8eb736f;hpb=534cfbea401b6f802a6efb9a70b2c3a49dc76b13;p=ctsim.git

diff --git a/include/trace.h b/include/trace.h
index 20e3186..bf06207 100644
--- 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";
@@ -26,16 +27,20 @@ class TraceLevel
 
     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);
 }