r7061: initial property settings

[ctsim.git] / tools / pj2if.cpp

diff --git a/tools/pj2if.cpp b/tools/pj2if.cpp
index 1bbfb112b00d6b4f7147e0aed4850ee0ef90c8b7..d55b0e1b9a85b8d46a78cdc11284da46cfa1d397 100644 (file)
--- a/tools/pj2if.cpp
+++ b/tools/pj2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: pj2if.cpp,v 1.6 2000/12/16 07:28:25 kevin Exp $
+**  $Id$
 **
 **  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
@@ -36,39 +36,36 @@
 #include "timer.h"
 
 
-enum { O_VERBOSE, O_DUMP, O_HELP, O_VERSION };
+enum { O_VERBOSE, O_HELP, O_VERSION, O_POLAR };
 
 static struct option my_options[] =
 {
+  {"polar", 0, 0, O_POLAR},
   {"verbose", 0, 0, O_VERBOSE},
-  {"dump", 0, 0, O_DUMP},
   {"help", 0, 0, O_HELP},
   {"version", 0, 0, O_VERSION},
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: pj2if.cpp,v 1.6 2000/12/16 07:28:25 kevin Exp $";
+static const char* g_szIdStr = "$Id$";
 
 void 
 pj2if_usage (const char *program)
 {
   std::cout << "usage: " << fileBasename(program) << " in-proj-file out-if-file [OPTIONS]\n";
-  std::cout << "Converts a projection file to a IF file\n";
+  std::cout << "Converts a projection file to a imagefile\n";
   std::cout << std::endl;
+  std::cout << "   --polar     Convert to polar format\n";
   std::cout << "   --verbose   Verbose mode\n";
-  std::cout << "   --dump      Dump all scan data\n";
   std::cout << "   --version   Print version\n";
   std::cout << "   --help      Print this help message\n";
 }
 
-         
-
 int 
 pj2if_main (const int argc, char *const argv[])
 {
   char *pj_name, *im_name;
   bool optVerbose = false;
-  bool optDump = false;
   extern int optind;
   Timer timerProgram;
 
@@ -83,9 +80,6 @@ pj2if_main (const int argc, char *const argv[])
        case O_VERBOSE:
          optVerbose = true;
          break;
-       case O_DUMP:
-         optDump = true;
-         break;
         case O_VERSION:
 #ifdef VERSION
          std::cout << "Version " << VERSION << std::endl << g_szIdStr << std::endl;
@@ -117,9 +111,7 @@ pj2if_main (const int argc, char *const argv[])
     return (1);
   }
 
-  if (optDump)
-    pj.printProjectionData();
-  else if (optVerbose) {
+  if (optVerbose) {
     std::ostringstream os;
     pj.printScanInfo (os);
     std::cout << os.str();
@@ -154,9 +146,9 @@ main (const int argc, char *const argv[])
   try {
     retval = pj2if_main(argc, argv);
   } catch (exception e) {
-    cerr << "Exception: " << e.what() << std::endl;
+    std::cerr << "Exception: " << e.what() << std::endl;
   } catch (...) {
-    cerr << "Unknown exception\n";
+    std::cerr << "Unknown exception\n";
   }
 
   return (retval);