r145: *** empty log message ***

[ctsim.git] / include / trace.h

diff --git a/include/trace.h b/include/trace.h
index d302d3c2f7e1f8afa61e73c2e63c66db55d3fdc9..ed29746d1fd335de4ea2f707123d743e4259ad30 100644 (file)
--- a/include/trace.h
+++ b/include/trace.h
@@ -1,7 +1,16 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-// Trace levels
+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";
@@ -9,38 +18,44 @@ static const char TRACE_RAYS_STR[]=     "rays";
 static const char TRACE_PLOT_STR[]=     "plot";
 static const char TRACE_CLIPPING_STR[]= "clipping";
 
-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 */
+class TraceLevel
+{
+ public:
+    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; }
+
+ private:
+
+    int m_traceLevel;
+
+    bool addTraceElements (const char* const traceString);
 };
 
+
 inline int 
-opt_set_trace (const char *optarg)
+convertTraceNameToID (const char *traceString)
 {
-  int opt;
-
-  if (strcmp(optarg, TRACE_NONE_STR) == 0)
-    opt = TRACE_NONE;
-  else if (strcmp(optarg, TRACE_TEXT_STR) == 0)
-    opt = TRACE_TEXT;
-  else if (strcmp(optarg, TRACE_PHM_STR) == 0)
-    opt = TRACE_PHM;
-  else if (strcmp(optarg, TRACE_PLOT_STR) == 0)
-    opt = TRACE_PLOT;
-  else if (strcmp(optarg, TRACE_CLIPPING_STR) == 0)
-    opt = TRACE_CLIPPING;
-  else if (strcmp(optarg, TRACE_RAYS_STR) == 0)
-    opt = TRACE_RAYS;
-  else {
-    sys_error(ERR_WARNING,"Invalid trace option %s\n", optarg);
-    opt = -1;
-  }
-
-  return (opt);
+  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);
 }