X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fpj2if.cpp;h=25b72cadfda6c128d9183e7e8a3fd0edf3f31d72;hb=3e346e67f7f7a331919a32439b0f54a4d53d3029;hp=c77f901c9bf538bb8d01ac99bc1b4127b7fdb13c;hpb=f4a23943110823118f35756dd41fbd6707f04511;p=ctsim.git

diff --git a/src/pj2if.cpp b/src/pj2if.cpp
index c77f901..25b72ca 100644
--- a/src/pj2if.cpp
+++ b/src/pj2if.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**   Name:          proj2if.cpp
+**   Name:          pj2if.cpp
 **   Purpose:       Convert an projection data file to an image file
 **   Programmer:    Kevin Rosenberg
 **   Date Started:  April 2000
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: pj2if.cpp,v 1.1 2000/06/17 20:12:15 kevin Exp $
+**  $Id: pj2if.cpp,v 1.6 2000/06/28 15:25:34 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
@@ -26,13 +26,14 @@
 ******************************************************************************/
 
 /* FILE
- *   proj2if.c			Convert Raysum to image
+ *   pj2if.c			Convert Raysum to image
  *
  * DATE
  *   Apr 1999
  */
 
 #include "ct.h"
+#include "timer.h"
 
 
 enum { O_VERBOSE, O_HELP, O_VERSION };
@@ -47,26 +48,26 @@ static struct option my_options[] =
 
 
 void 
-proj2if_usage (const char *program)
+pj2if_usage (const char *program)
 {
-  fprintf(stdout, "usage: %s in-proj-file out-if-file [OPTIONS]\n", fileBasename(program));
-  fprintf(stdout, "This program converts a projection file to a IF file\n");
-  fprintf(stdout, "\n");
-  fprintf(stdout, "   --verbose   Verbose mode\n");
-  fprintf(stdout, "   --version   Print version\n");
-  fprintf(stdout, "   --help      Print this help message\n");
+  cout << "usage: " << fileBasename(program) << " in-proj-file out-if-file [OPTIONS]" << endl;
+  cout << "Converts a projection file to a IF file" << endl;
+  cout << endl;
+  cout << "   --verbose   Verbose mode" << endl;
+  cout << "   --version   Print version" << endl;
+  cout << "   --help      Print this help message" << endl;
 }
 
 	  
 
 int 
-proj2if_main (const int argc, char *const argv[])
+pj2if_main (const int argc, char *const argv[])
 {
-  char *proj_name, *im_name;
-  int ix, iy;
-  bool opt_verbose = false;
+  char *pj_name, *im_name;
+  bool optVerbose = false;
   extern int optind;
-  
+  Timer timerProgram;
+
   while (1)
     {
       int c = getopt_long (argc, argv, "", my_options, NULL);
@@ -76,61 +77,59 @@ proj2if_main (const int argc, char *const argv[])
       switch (c)
 	{
 	case O_VERBOSE:
-	  opt_verbose = true;
+	  optVerbose = true;
 	  break;
         case O_VERSION:
 #ifdef VERSION
-	  fprintf(stdout, "Version %s\n", VERSION);
+          cout << "Version " << VERSION << endl;
 #else
-	  fprintf(stderr, "Unknown version number");
+          cout << "Unknown version number" << endl;
 #endif
-	  exit(0);
+	  return (0);
 	case O_HELP:
 	case '?':
-	  proj2if_usage(argv[0]);
+	  pj2if_usage(argv[0]);
 	  return (0);
 	default:
-	  proj2if_usage(argv[0]);
+	  pj2if_usage(argv[0]);
 	  return (1);
 	}
     }
   
   if (argc - optind != 2) {
-    proj2if_usage(argv[0]);
+    pj2if_usage(argv[0]);
     return (1);
   }
 
-  proj_name = argv[optind];
+  pj_name = argv[optind];
   im_name = argv[optind + 1];
 
-  Projections proj;
-  if (! proj.read (proj_name)) {
-    sys_error (ERR_SEVERE, "Can not open projection file %s", proj_name);
+  Projections pj;
+  if (! pj.read (pj_name)) {
+    sys_error (ERR_SEVERE, "Can not open projection file %s", pj_name);
     return (1);
   }
 
-  if (opt_verbose)
-      proj.printScanInfo();
+  if (optVerbose)
+      pj.printScanInfo();
   
-  ImageFile im (im_name, proj.nDet(), proj.nView());
+  ImageFile im (pj.nDet(), pj.nView());
   
   ImageFileArray v = im.getArray();
 
-  for (iy = 0; iy < proj.nView(); iy++)
+  for (int iy = 0; iy < pj.nView(); iy++)
     {
-      DetectorArray& detarray = proj.getDetectorArray (iy);
+      DetectorArray& detarray = pj.getDetectorArray (iy);
       const DetectorValue* detval = detarray.detValues();
-      for (ix = 0; ix < proj.nDet(); ix++)
+      for (int ix = 0; ix < pj.nDet(); ix++)
 	{
 	  v[ix][iy] = detval[ix];
 	}
     }
 
-  im.fileCreate ();
-  im.arrayDataWrite ();
-  im.labelAdd (Array2dFileLabel::L_HISTORY, proj.remark(), proj.calcTime());
-  im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if");
-  im.fileClose ();
+  im.labelAdd (pj.getLabel());
+  im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if", timerProgram.timerEnd());
+  im.fileWrite (im_name);
   
   return(0);
 }
@@ -140,6 +139,16 @@ proj2if_main (const int argc, char *const argv[])
 int 
 main (const int argc, char *const argv[])
 {
-  return (proj2if_main(argc, argv));
+  int retval = 1;
+
+  try {
+    retval = pj2if_main(argc, argv);
+  } catch (exception e) {
+    cerr << "Exception: " << e.what() << endl;
+  } catch (...) {
+    cerr << "Unknown exception" << endl;
+  }
+
+  return (retval);
 }
 #endif