X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fpj2if.cpp;h=b9bd2e9e6987c4d8c48b77454f715b05207feb63;hb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3;hp=daf4028645935582082f623c2e097a1b79ba9302;hpb=a35f9818445c3d30109ebf7d68422ca81d02aaf9;p=ctsim.git

diff --git a/tools/pj2if.cpp b/tools/pj2if.cpp
index daf4028..b9bd2e9 100644
--- 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.2 2000/08/02 18:09:11 kevin Exp $
+**  $Id: pj2if.cpp,v 1.4 2000/08/31 08:38:58 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
@@ -36,17 +36,18 @@
 #include "timer.h"
 
 
-enum { O_VERBOSE, O_HELP, O_VERSION };
+enum { O_VERBOSE, O_DUMP, O_HELP, O_VERSION };
 
 static struct option my_options[] =
 {
   {"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$";
+static const char* g_szIdStr = "$Id: pj2if.cpp,v 1.4 2000/08/31 08:38:58 kevin Exp $";
 
 void 
 pj2if_usage (const char *program)
@@ -55,6 +56,7 @@ pj2if_usage (const char *program)
   cout << "Converts a projection file to a IF file" << endl;
   cout << endl;
   cout << "   --verbose   Verbose mode" << endl;
+  cout << "   --dump      Dump all scan data" << endl;
   cout << "   --version   Print version" << endl;
   cout << "   --help      Print this help message" << endl;
 }
@@ -66,6 +68,7 @@ pj2if_main (const int argc, char *const argv[])
 {
   char *pj_name, *im_name;
   bool optVerbose = false;
+  bool optDump = false;
   extern int optind;
   Timer timerProgram;
 
@@ -80,9 +83,12 @@ 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
-          cout << "Version " << VERSION << endl;
+	  cout << "Version " << VERSION << endl << g_szIdStr << endl;
 #else
           cout << "Unknown version number" << endl;
 #endif
@@ -111,8 +117,13 @@ pj2if_main (const int argc, char *const argv[])
     return (1);
   }
 
-  if (optVerbose)
-      pj.printScanInfo();
+  if (optDump)
+    pj.printProjectionData();
+  else if (optVerbose) {
+    ostringstream os;
+    pj.printScanInfo (os);
+    cout << os.str();
+  }
   
   ImageFile im (pj.nDet(), pj.nView());