projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r224: *** empty log message ***
[ctsim.git]
/
tools
/
pj2if.cpp
diff --git
a/tools/pj2if.cpp
b/tools/pj2if.cpp
index f65d55d12e9d6aa57e285e29ab2251bc54bec0b1..fb3277a8349d386f97a3f170127af6894eef7a3e 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: pj2if.cpp,v 1.
3 2000/08/03 09:57:29
kevin Exp $
+** $Id: pj2if.cpp,v 1.
5 2000/11/22 07:17:06
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
**
** 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"
#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},
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}
};
{"help", 0, 0, O_HELP},
{"version", 0, 0, O_VERSION},
{0, 0, 0, 0}
};
-static const char* g_szIdStr = "$Id: pj2if.cpp,v 1.
3 2000/08/03 09:57:29
kevin Exp $";
+static const char* g_szIdStr = "$Id: pj2if.cpp,v 1.
5 2000/11/22 07:17:06
kevin Exp $";
void
pj2if_usage (const char *program)
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 << "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;
}
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;
{
char *pj_name, *im_name;
bool optVerbose = false;
+ bool optDump = false;
extern int optind;
Timer timerProgram;
extern int optind;
Timer timerProgram;
@@
-80,6
+83,9
@@
pj2if_main (const int argc, char *const argv[])
case O_VERBOSE:
optVerbose = true;
break;
case O_VERBOSE:
optVerbose = true;
break;
+ case O_DUMP:
+ optDump = true;
+ break;
case O_VERSION:
#ifdef VERSION
cout << "Version " << VERSION << endl << g_szIdStr << endl;
case O_VERSION:
#ifdef VERSION
cout << "Version " << VERSION << endl << g_szIdStr << endl;
@@
-111,15
+117,20
@@
pj2if_main (const int argc, char *const argv[])
return (1);
}
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());
ImageFileArray v = im.getArray();
for (int iy = 0; iy < pj.nView(); iy++) {
ImageFile im (pj.nDet(), pj.nView());
ImageFileArray v = im.getArray();
for (int iy = 0; iy < pj.nView(); iy++) {
- const DetectorArray& detarray = pj.getDetectorArray (
iy
);
+ const DetectorArray& detarray = pj.getDetectorArray (
pj.nView() - iy - 1
);
const DetectorValue* detval = detarray.detValues();
for (int ix = 0; ix < pj.nDet(); ix++) {
v[ix][iy] = detval[ix];
const DetectorValue* detval = detarray.detValues();
for (int ix = 0; ix < pj.nDet(); ix++) {
v[ix][iy] = detval[ix];