** 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.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
*/
#include "ct.h"
+#include "timer.h"
enum { O_VERBOSE, O_HELP, O_VERSION };
pj2if_main (const int argc, char *const argv[])
{
char *pj_name, *im_name;
- int ix, iy;
- bool opt_verbose = false;
+ bool optVerbose = false;
extern int optind;
-
+ Timer timerProgram;
+
while (1)
{
int c = getopt_long (argc, argv, "", my_options, NULL);
switch (c)
{
case O_VERBOSE:
- opt_verbose = true;
+ optVerbose = true;
break;
case O_VERSION:
#ifdef VERSION
return (1);
}
- if (opt_verbose)
+ if (optVerbose)
pj.printScanInfo();
- ImageFile im (im_name, pj.nDet(), pj.nView());
+ ImageFile im (pj.nDet(), pj.nView());
ImageFileArray v = im.getArray();
- for (iy = 0; iy < pj.nView(); iy++)
+ for (int iy = 0; iy < pj.nView(); iy++)
{
DetectorArray& detarray = pj.getDetectorArray (iy);
const DetectorValue* detval = detarray.detValues();
- for (ix = 0; ix < pj.nDet(); ix++)
+ for (int ix = 0; ix < pj.nDet(); ix++)
{
v[ix][iy] = detval[ix];
}
}
- im.fileCreate ();
- im.arrayDataWrite ();
- im.labelAdd (Array2dFileLabel::L_HISTORY, pj.remark(), pj.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);
}
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