X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Ftrace.cpp;h=7d7df10bc51e681db6a1ce3c69d741c917db81d7;hp=3bb8ce8ca6a6b997fce31b002be2edd97902b92d;hb=f13a8c004b8f182b42d9e4df2bcd7c7f030bf1ad;hpb=27a474e0622ebb7229fd5705552021f63d8f932d

diff --git a/libctsim/trace.cpp b/libctsim/trace.cpp
index 3bb8ce8..7d7df10 100644
--- a/libctsim/trace.cpp
+++ b/libctsim/trace.cpp
@@ -1,14 +1,12 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**   Name:	   trace.cpp        Class for trace
+**   Name:         trace.cpp        Class for trace
 **   Programmer:   Kevin Rosenberg
 **   Date Started: June 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: trace.cpp,v 1.1 2000/07/20 11:17:31 kevin Exp $
+**  Copyright (C) 1983-2009 Kevin Rosenberg
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -26,33 +24,76 @@
 
 #include "ct.h"
 
-const char TraceLevel::TRACE_NONE_STR[]=     "none";
-const char TraceLevel::TRACE_TEXT_STR[]=     "text";
-const char TraceLevel::TRACE_PHM_STR[]=      "phm";
-const char TraceLevel::TRACE_RAYS_STR[]=     "rays";
-const char TraceLevel::TRACE_PLOT_STR[]=     "plot";
-const char TraceLevel::TRACE_CLIPPING_STR[]= "clipping";
+const int Trace::TRACE_INVALID = -1;
+const int Trace::TRACE_NONE = 0;
+const int Trace::TRACE_CONSOLE = 1;
+const int Trace::TRACE_PHANTOM = 2;
+const int Trace::TRACE_PROJECTIONS = 3;
+const int Trace::TRACE_PLOT = 4;
+const int Trace::TRACE_CLIPPING = 5;
+
+const int Trace::BIT_CONSOLE = 0x0001;
+const int Trace::BIT_PHANTOM = 0x0002;
+const int Trace::BIT_PROJECTIONS = 0x0004;
+const int Trace::BIT_PLOT = 0x0008;
+const int Trace::BIT_CLIPPING = 0x0010;
+
+const char* Trace::s_aszTraceName[] =
+{
+  "none",
+  "console",
+  "phantom",
+  "proj",
+  "plot",
+  "clipping",
+};
+
+const char* Trace::s_aszTraceTitle[] =
+{
+  "None",
+  "Console",
+  "Phantom",
+  "Projections",
+  "Plot",
+  "Clipping",
+};
+
+const int Trace::s_iTraceCount = sizeof(s_aszTraceName) / sizeof(const char*);
+
+
+const char*
+Trace::convertTraceIDToName (const int idTrace)
+{
+  const char *name = "";
+
+  if (idTrace >= 0 && idTrace < s_iTraceCount)
+      return (s_aszTraceName[idTrace]);
 
+  return (name);
+}
 
-TraceID
-TraceLevel::convertTraceNameToID (const char *traceString)
+const char*
+Trace::convertTraceIDToTitle (const int idTrace)
 {
-  TraceID 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);
+  const char *title = "";
+
+  if (idTrace >= 0 && idTrace < s_iTraceCount)
+      return (s_aszTraceName[idTrace]);
+
+  return (title);
 }
 
+int
+Trace::convertTraceNameToID (const char* const traceName)
+{
+  int id = Trace::TRACE_INVALID;
+
+  for (int i = 0; i < s_iTraceCount; i++)
+      if (strcasecmp (traceName, s_aszTraceName[i]) == 0) {
+          id = i;
+          break;
+      }
+
+  return (id);
+}