X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fctsimtext.cpp;h=ae89495cc2fe5232bbaffe30125609416cb812c5;hp=af29a13f01ff1575b0070e214cbe2b8a619b1761;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=cb88bca6d3cd7c1bf25c84c4f66e17f978c50f70

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index af29a13..ae89495 100644
--- 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
 **
-**  $Id: ctsimtext.cpp,v 1.16 2001/01/16 23:48:45 kevin Exp $
+**  $Id$
 **
 **  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
@@ -38,16 +38,17 @@ extern "C" {
 #include <readline/history.h>
 };
 #endif
-
+#include <exception>
 
 // Master shell for all command-line tools
 // If called as ctsimtext, program will look to next token on command-line as the function name
 // 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.16 2001/01/16 23:48:45 kevin Exp $";
+static const char* const g_szIdStr = "$Id$";
 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[]);
@@ -55,9 +56,12 @@ 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 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 linogram_main (int argc, char* const argv[]);
 
 static int processCommand (int argc, char* const argv[]);
 static void convertStringToArgcv (char* szLine, int* piArgc, char*** pppArgv);
@@ -67,7 +71,11 @@ void
 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";
@@ -77,6 +85,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 << "  phm2helix     Take projections of a phantom object\n";
+  std::cout << "  pjHinterp 	Interpolate helical projections of a phantom object\n";
+  std::cout << "  linogram      Print linogram sampling\n";
 }
 
 void 
@@ -90,10 +101,13 @@ 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 << "  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 << "  pjHinterp     Interpolate helical projections of a phantom object\n";
   std::cout << "  pjrec         Projection reconstruction\n";
   std::cout << "  quit          Quits shell\n";
+  std::cout << "  linogram      Display linogram sampling\n";
   std::cout << "All functions accept --help as parameter for online help\n\n";
 }
 
@@ -104,16 +118,20 @@ ctsimtext_main (int argc, char * argv[])
 {
   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);
-  } 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> ";
-    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
@@ -143,7 +161,7 @@ ctsimtext_main (int argc, char * argv[])
       
       convertStringToArgcv (pszInputLine, &argc, &argv);
 #ifdef DEBUG
-      for (unsigned int i = 0; i < argc; i++)
+      for (int i = 0; i < argc; i++)
         std::cout << "Token " << i << ": " << argv[i] << "\n";
 #endif
       iReturn = processCommand (argc, argv);
@@ -227,7 +245,7 @@ processCommand (int argc, char* const argv[])
     return 1;
   
   const char* const pszFunction = fileBasename (argv[0]);
-  
+
   try {  
     if (strcasecmp (pszFunction, "if1") == 0)
       return if1_main (argc, argv);
@@ -241,12 +259,18 @@ processCommand (int argc, char* const 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)
       return pjinfo_main (argc, argv);
     else if (strcasecmp (pszFunction, "pjrec") == 0)
       return pjrec_main (argc, argv);
+    else if (strcasecmp (pszFunction, "linogram") == 0)
+      return linogram_main (argc, argv);
     else {
       std::cout << "Unknown function name: " << pszFunction << "\n";
       if (s_bInteractive)
@@ -255,7 +279,7 @@ processCommand (int argc, char* const argv[])
         ctsimtext_usage (s_szProgramName);
       return 1;
     }
-  } catch (exception e) {
+  } catch (std::exception e) {
     std::cerr << "Exception: " << e.what() << std::endl;
   } catch (...) {
     std::cerr << "Unknown exception caught\n";
@@ -273,4 +297,3 @@ main (int argc, char* argv[])
   
   return retval;
 }
-