X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fctsimtext.cpp;h=c9e6297f0fb7c4398976ba7e70b71995d0adb372;hb=fad03eb65e23652bb5ff46335d011413cccf03d5;hp=54236af2434427345044bb3b9ded2f8d82c253e5;hpb=bd1d464294e037da19ccc80d8cc60475768eb2ca;p=ctsim.git

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 54236af..c9e6297 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.20 2001/09/24 09:40:42 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.25 2003/01/30 04:16:27 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
@@ -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.20 2001/09/24 09:40:42 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.25 2003/01/30 04:16:27 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";
@@ -100,10 +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 << "  phm2helix        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 << "  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";
@@ -159,7 +159,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 +243,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);
@@ -257,10 +257,10 @@ 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, "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)
@@ -275,7 +275,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,4 +293,3 @@ main (int argc, char* argv[])
   
   return retval;
 }
-