X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=inline;f=tools%2Fphm2pj.cpp;h=b494aa2814b1b7f10c0d72544c897022a1c4c13c;hb=286d655a25df2668bd65ad365676c6ecc94415a1;hp=69c6ea5b853a366498d07e5863d2c237dae5302c;hpb=1fd4f7cc977b9f1499716de10d15656bd50f4816;p=ctsim.git

diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp
index 69c6ea5..b494aa2 100644
--- a/tools/phm2pj.cpp
+++ b/tools/phm2pj.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2pj.cpp,v 1.1 2000/07/13 07:01:35 kevin Exp $
+**  $Id: phm2pj.cpp,v 1.3 2000/07/22 15:45:33 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
@@ -88,7 +88,7 @@ int
 phm2pj_main (int argc, char* argv[])
 {
   Phantom phm;
-  string optGeometryName = Scanner::GEOMETRY_PARALLEL_STR;
+  string optGeometryName = Scanner::convertGeometryIDToName(Scanner::GEOMETRY_PARALLEL);
   char *opt_outfile = NULL;
   string opt_desc;
   string optPhmFileName;
@@ -96,7 +96,7 @@ phm2pj_main (int argc, char* argv[])
   int opt_nview;
   int opt_nray = 1;
   int opt_trace = 0;
-  string optPhmName = Phantom::PHM_HERMAN_STR;
+  string optPhmName (Phantom::convertPhantomIDToName(Phantom::PHM_HERMAN));
   int opt_verbose = 0;
   int opt_debug = 0;
   double opt_rotangle = 1;
@@ -133,7 +133,7 @@ phm2pj_main (int argc, char* argv[])
 	break;
 	break;
       case O_TRACE:
-	if ((opt_trace = convertTraceNameToID(optarg)) == TRACE_INVALID) {
+	if ((opt_trace = TraceLevel::convertTraceNameToID(optarg)) == TRACE_INVALID) {
 	  phm2pj_usage(argv[0]);
 	  return (1);
 	}