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

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 2df7915..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.22 2002/09/09 22:45:20 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,14 +38,14 @@ 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.22 2002/09/09 22:45:20 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";
@@ -61,6 +61,7 @@ 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);
@@ -86,7 +87,7 @@ ctsimtext_usage (const char *program)
   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 
@@ -106,6 +107,7 @@ interactive_usage ()
   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";
 }
 
@@ -159,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);
@@ -243,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);
@@ -267,6 +269,8 @@ processCommand (int argc, char* const argv[])
       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)
@@ -275,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";
@@ -293,16 +297,3 @@ main (int argc, char* argv[])
   
   return retval;
 }
-
-#include "nographics.cpp"
-#include "if1.cpp"
-#include "if2.cpp"
-#include "ifinfo.cpp"
-#include "ifexport.cpp"
-#include "phm2if.cpp"
-#include "phm2pj.cpp"
-#include "pj2if.cpp"
-#include "pjinfo.cpp"
-#include "pjrec.cpp"
-#include "phm2helix.cpp"
-#include "pjHinterp.cpp"