X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fphm2if.cpp;h=53abeab5e0c1c46517988f9c4d83690dd3eb2e51;hp=9ff3b9a1cbe54d0483d81a12287b7a2e0adf65e8;hb=6bfb747f8163381d94a02c03a0351e9ca6815d22;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10

diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp
index 9ff3b9a..53abeab 100644
--- a/tools/phm2if.cpp
+++ b/tools/phm2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2if.cpp,v 1.10 2000/08/25 15:59:13 kevin Exp $
+**  $Id: phm2if.cpp,v 1.11 2000/08/27 20:32:55 kevin Exp $
 **
 **  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
@@ -50,7 +50,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.10 2000/08/25 15:59:13 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.11 2000/08/27 20:32:55 kevin Exp $";
 
 void 
 phm2if_usage (const char *program)
@@ -88,9 +88,9 @@ phm2if_usage (const char *program)
   cout << "     --nsample       Number of samples per axis per pixel (default = 1)" << endl;
   cout << "     --trace         Trace level to use" << endl;
   cout << "        none         No tracing (default)" << endl;
-  cout << "        text         Trace text level" << endl;
-  cout << "        phm          Trace phantom" << endl;
-  cout << "        rays         Trace rays" << endl;
+  cout << "        console      Trace text level" << endl;
+  cout << "        phantom      Trace phantom" << endl;
+  cout << "        proj         Trace projections" << endl;
   cout << "        plot         Trace plot" << endl;
   cout << "        clipping     Trace clipping" << endl;
   cout << "     --debug         Debug mode" << endl;
@@ -119,7 +119,7 @@ phm2if_main (int argc, char* argv[])
   int opt_nsample = 1;
   double optFilterParam = 1.;
   double optFilterBW = 1.;
-  int optTrace = TRACE_NONE;
+  int optTrace = Trace::TRACE_NONE;
   bool optVerbose = false;
   bool optDebug = false;
   char *endptr = NULL;
@@ -150,7 +150,7 @@ phm2if_main (int argc, char* argv[])
 	optDebug = true;
 	break;
       case O_TRACE:
-	if ((optTrace = TraceLevel::convertTraceNameToID(optarg)) == TRACE_INVALID) {
+	if ((optTrace = Trace::convertTraceNameToID(optarg)) == Trace::TRACE_INVALID) {
 	  phm2if_usage(argv[0]);
 	  return (1);
 	}
@@ -333,7 +333,7 @@ phm2if_main (int argc, char* argv[])
     pImGlobal->filterResponse (optDomainName.c_str(), optFilterBW, optFilterName.c_str(), optFilterParam);
   } else {
 #if HAVE_SGP
-      if (optTrace >= TRACE_PHM)
+      if (optTrace >= Trace::TRACE_PHANTOM)
 	phm.show();
 #endif
       phm.convertToImagefile (*pImGlobal, opt_nsample, optTrace);
@@ -350,7 +350,7 @@ phm2if_main (int argc, char* argv[])
     if (optVerbose)
       cout << "Time to rasterized phantom: " << calctime << " seconds" << endl;
 
-    if (optTrace >= TRACE_PHM) {
+    if (optTrace >= Trace::TRACE_PHANTOM) {
       double dmin, dmax;
       int nscale;