projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2178: *** empty log message ***
[ctsim.git]
/
tools
/
ctsimtext.cpp
diff --git
a/tools/ctsimtext.cpp
b/tools/ctsimtext.cpp
index 4c632a3e9cce0ce45e5f9819abe39d0ba60ca5a5..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.
15 2001/01/16 20:55:2
9 kevin Exp $
+** $Id: ctsimtext.cpp,v 1.
21 2002/05/01 14:33:5
9 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,9
+45,10
@@
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.
15 2001/01/16 20:55:2
9 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.
21 2002/05/01 14:33:5
9 kevin Exp $";
static const char* const s_szProgramName = "ctsimtext";
static const char* const s_szProgramName2 = "ctsimtext.exe";
static const char* const s_szProgramName = "ctsimtext";
static const char* const s_szProgramName2 = "ctsimtext.exe";
+static const char* const s_szProgramName3 = "ctsimtext-lam";
extern int if1_main (int argc, char* const argv[]);
extern int if2_main (int argc, char* const argv[]);
extern int if1_main (int argc, char* const argv[]);
extern int if2_main (int argc, char* const argv[]);
@@
-55,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[]);
@@
-67,7
+70,11
@@
void
ctsimtext_usage (const char *program)
{
std::cout << "usage: " << fileBasename(program) << " ctsim-function-name ctstim-function-parameters...\n";
ctsimtext_usage (const char *program)
{
std::cout << "usage: " << fileBasename(program) << " ctsim-function-name ctstim-function-parameters...\n";
- std::cout << "CTSim text shell\n\n";
+ std::cout << "CTSim text shell";
+#ifdef VERSION
+ std::cout << ", Version " <<VERSION;
+#endif
+ std::cout << "\n\n";
std::cout << " if1 Single image file conversion\n";
std::cout << " if2 Dual image file conversions\n";
std::cout << " ifexport Export an imagefile to a graphics file\n";
std::cout << " if1 Single image file conversion\n";
std::cout << " if2 Dual image file conversions\n";
std::cout << " ifexport Export an imagefile to a graphics file\n";
@@
-77,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
@@
-90,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";
@@
-104,16
+116,20
@@
ctsimtext_main (int argc, char * argv[])
{
int iReturn = 0;
{
int iReturn = 0;
- if (argc > 1 && (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0)) {
+ if (argc > 1 && (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0
|| strcmp(s_szProgramName3, fileBasename (argv[0])) == 0
)) {
argv++;
argc--;
iReturn = processCommand (argc, argv);
argv++;
argc--;
iReturn = processCommand (argc, argv);
- } else if (argc >
1)
{
+ } else if (argc >
= 1 && ! (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName3, fileBasename (argv[0])) == 0))
{
iReturn = processCommand (argc, argv);
} else {
s_bInteractive = true;
char szPrompt[] = "CTSim> ";
iReturn = processCommand (argc, argv);
} else {
s_bInteractive = true;
char szPrompt[] = "CTSim> ";
- std::cout << "CTSim Text Shell (Type \"quit\" to end)\n\n";
+ std::cout << "CTSim Text Shell";
+#ifdef VERSION
+ std::cout << ", Version " << VERSION;
+#endif
+ std::cout << " (Type \"quit\" to end)\n\n";
while (1) {
#ifdef HAVE_READLINE
while (1) {
#ifdef HAVE_READLINE
@@
-152,7
+168,6
@@
ctsimtext_main (int argc, char * argv[])
}
}
}
}
-
return iReturn;
}
return iReturn;
}
@@
-242,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)
@@
-259,8
+278,10
@@
processCommand (int argc, char* const argv[])
} catch (exception e) {
std::cerr << "Exception: " << e.what() << std::endl;
} catch (...) {
} catch (exception e) {
std::cerr << "Exception: " << e.what() << std::endl;
} catch (...) {
-
std
:cerr << "Unknown exception caught\n";
+
std:
:cerr << "Unknown exception caught\n";
}
}
+
+ return 1;
}
int
}
int