X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fpj2if.cpp;h=8723429cf541e18b959094799b60eabacebbf2c9;hb=949b7c917af311cd38f911bc5d0af36f524a6086;hp=530f23be1537bf1fe6eeffbcb5fea650eec0ef67;hpb=2c61ff85796550481227f2fbec53506a6b5bd365;p=ctsim.git

diff --git a/src/pj2if.cpp b/src/pj2if.cpp
index 530f23b..8723429 100644
--- a/src/pj2if.cpp
+++ b/src/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/06/18 10:27:11 kevin Exp $
+**  $Id: pj2if.cpp,v 1.5 2000/06/27 10:48:11 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
@@ -112,7 +112,7 @@ pj2if_main (const int argc, char *const argv[])
   if (opt_verbose)
       pj.printScanInfo();
   
-  ImageFile im (im_name, pj.nDet(), pj.nView());
+  ImageFile im (pj.nDet(), pj.nView());
   
   ImageFileArray v = im.getArray();
 
@@ -126,11 +126,9 @@ pj2if_main (const int argc, char *const argv[])
 	}
     }
 
-  im.fileCreate ();
-  im.arrayDataWrite ();
-  im.labelAdd (Array2dFileLabel::L_HISTORY, pj.remark(), pj.calcTime());
+  im.labelAdd (pj.getLabel());
   im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if");
-  im.fileClose ();
+  im.fileWrite (im_name);
   
   return(0);
 }
@@ -140,6 +138,16 @@ pj2if_main (const int argc, char *const argv[])
 int 
 main (const int argc, char *const argv[])
 {
-  return (pj2if_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