projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2123: *** empty log message ***
[ctsim.git]
/
tools
/
ctsimtext.cpp
diff --git
a/tools/ctsimtext.cpp
b/tools/ctsimtext.cpp
index 75f941f22f5a2e4643ad51b4228310295e509326..2e05f71c7b1918de0f5a93a7f5c6705690b8a669 100644
(file)
--- a/
tools/ctsimtext.cpp
+++ b/
tools/ctsimtext.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: ctsimtext.cpp,v 1.
19 2001/04/02 22:50:25
kevin Exp $
+** $Id: ctsimtext.cpp,v 1.
21 2002/05/01 14:33:59
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
@@
-45,7
+45,7
@@
extern "C" {
// If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
// linked name as name of function.
// If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
// linked name as name of function.
-static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.
19 2001/04/02 22:50:25
kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.
21 2002/05/01 14:33:59
kevin Exp $";
static const char* const s_szProgramName = "ctsimtext";
static const char* const s_szProgramName2 = "ctsimtext.exe";
static const char* const s_szProgramName3 = "ctsimtext-lam";
static const char* const s_szProgramName = "ctsimtext";
static const char* const s_szProgramName2 = "ctsimtext.exe";
static const char* const s_szProgramName3 = "ctsimtext-lam";
@@
-56,6
+56,8
@@
extern int ifexport_main (int argc, char* const argv[]);
extern int ifinfo_main (int argc, char* const argv[]);
extern int phm2if_main (int argc, char* const argv[]);
extern int phm2pj_main (int argc, char* const argv[]);
extern int ifinfo_main (int argc, char* const argv[]);
extern int phm2if_main (int argc, char* const argv[]);
extern int phm2pj_main (int argc, char* const argv[]);
+extern int phm2helix_main (int argc, char* const argv[]);
+extern int pjHinterp_main (int argc, char* const argv[]);
extern int pj2if_main (int argc, char* const argv[]);
extern int pjinfo_main (int argc, char* const argv[]);
extern int pjrec_main (int argc, char* const argv[]);
extern int pj2if_main (int argc, char* const argv[]);
extern int pjinfo_main (int argc, char* const argv[]);
extern int pjrec_main (int argc, char* const argv[]);
@@
-82,6
+84,9
@@
ctsimtext_usage (const char *program)
std::cout << " pjrec Projection reconstruction\n";
std::cout << " phm2if Convert a geometric phantom into an imagefile\n";
std::cout << " phm2pj Take projections of a phantom object\n";
std::cout << " pjrec Projection reconstruction\n";
std::cout << " phm2if Convert a geometric phantom into an imagefile\n";
std::cout << " phm2pj Take projections of a phantom object\n";
+ std::cout << " phm2helix Take projections of a phantom object\n";
+ std::cout << " pjHinterp Interpolate helical projections of a phantom object\n";
+
}
void
}
void
@@
-95,8
+100,10
@@
interactive_usage ()
std::cout << " if2 Dual image file conversions\n";
std::cout << " phm2if Convert a geometric phantom into an imagefile\n";
std::cout << " phm2pj Take projections of a phantom object\n";
std::cout << " if2 Dual image file conversions\n";
std::cout << " phm2if Convert a geometric phantom into an imagefile\n";
std::cout << " phm2pj Take projections of a phantom object\n";
+ std::cout << " phm2helix Take projections of a phantom object\n";
std::cout << " pjinfo Projection file information\n";
std::cout << " pj2if Convert an projection file into an imagefile\n";
std::cout << " pjinfo Projection file information\n";
std::cout << " pj2if Convert an projection file into an imagefile\n";
+ std::cout << " pjHinterp Interpolate helical projections of a phantom object\n";
std::cout << " pjrec Projection reconstruction\n";
std::cout << " quit Quits shell\n";
std::cout << "All functions accept --help as parameter for online help\n\n";
std::cout << " pjrec Projection reconstruction\n";
std::cout << " quit Quits shell\n";
std::cout << "All functions accept --help as parameter for online help\n\n";
@@
-250,6
+257,10
@@
processCommand (int argc, char* const argv[])
return phm2if_main (argc, argv);
else if (strcasecmp (pszFunction, "phm2pj") == 0)
return phm2pj_main (argc, argv);
return phm2if_main (argc, argv);
else if (strcasecmp (pszFunction, "phm2pj") == 0)
return phm2pj_main (argc, argv);
+ else if (strcasecmp (pszFunction, "phm2helix") == 0)
+ return phm2helix_main (argc, argv);
+ else if (strcasecmp (pszFunction, "pjHinterp") == 0)
+ return pjHinterp_main (argc, argv);
else if (strcasecmp (pszFunction, "pj2if") == 0)
return pj2if_main (argc, argv);
else if (strcasecmp (pszFunction, "pjinfo") == 0)
else if (strcasecmp (pszFunction, "pj2if") == 0)
return pj2if_main (argc, argv);
else if (strcasecmp (pszFunction, "pjinfo") == 0)