X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fctsimtext.cpp;h=e1695b127f666d8ab34a22ce2e811a1c05b6957a;hp=be55b6ac8bcb36401cf29cb34d94935eb78c91ea;hb=728543fba0d875b2977ea2b6562df1ee4a6af8f7;hpb=d6553a81511f34757633399daec36cbe6ebd86ba

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index be55b6a..e1695b1 100644
--- a/tools/ctsimtext.cpp
+++ b/tools/ctsimtext.cpp
@@ -7,9 +7,7 @@
 **   Date Started:  Jan 2001
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id$
+**  Copyright (C) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -67,7 +65,7 @@ static int processCommand (int argc, char* const argv[]);
 static void convertStringToArgcv (char* szLine, int* piArgc, char*** pppArgv);
 
 
-void 
+void
 ctsimtext_usage (const char *program)
 {
   std::cout << "usage: " << fileBasename(program) << " ctsim-function-name ctstim-function-parameters...\n";
@@ -86,11 +84,11 @@ ctsimtext_usage (const char *program)
   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 << "  pjHinterp     Interpolate helical projections of a phantom object\n";
   std::cout << "  linogram      Print linogram sampling\n";
 }
 
-void 
+void
 interactive_usage ()
 {
   std::cout << "usage: function-name parameters...\n";
@@ -113,10 +111,10 @@ interactive_usage ()
 
 static bool s_bInteractive = false;
 
-int 
+int
 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 || strcmp(s_szProgramName3, fileBasename (argv[0])) == 0)) {
     argv++;
@@ -132,7 +130,7 @@ ctsimtext_main (int argc, char * argv[])
     std::cout << ", Version " << VERSION;
 #endif
     std::cout << " (Type \"quit\" to end)\n\n";
-    
+
     while (1) {
 #ifdef HAVE_READLINE
       char* pszInputLine = readline (szPrompt);
@@ -140,36 +138,40 @@ ctsimtext_main (int argc, char * argv[])
         break;
       if (*pszInputLine != EOS)
         add_history (pszInputLine);
-      
+
 #else  // DONT_HAVE_READLINE
-      
+
       static const int s_MaxLineLength = 1024;
       char* pszInputLine = new char [s_MaxLineLength+1];
       std::cout << szPrompt;
       std::cin.getline (pszInputLine, s_MaxLineLength);
-      
+      if (std::cin.eof()) {
+        std::cout << "\n";
+        break;
+      }
+
 #ifdef DEBUG
       std::cout << "#" << pszInputLine << "#\n";
 #endif
-      
+
       std::cout << std::flush;
       std::cout << "\n";
 #endif  // DONT_HAVE_READLINE
-      
-      if (strncasecmp (pszInputLine, "quit", 4) == 0) 
+
+      if (strncasecmp (pszInputLine, "quit", 4) == 0)
         break;
-      
+
       convertStringToArgcv (pszInputLine, &argc, &argv);
 #ifdef DEBUG
       for (int i = 0; i < argc; i++)
         std::cout << "Token " << i << ": " << argv[i] << "\n";
 #endif
       iReturn = processCommand (argc, argv);
-      
+
       delete pszInputLine;
     }
   }
-  
+
   return iReturn;
 }
 
@@ -179,12 +181,12 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
   char* pCurrentPos = pszLine;
   int nTokens = 0;
   std::vector<char*> vecpszToken;
-  
+
   // Process line
   bool bInDoubleQuote = false;
   bool bInSingleQuote = false;
   bool bInToken = false;
-  
+
   while (*pCurrentPos) {
     if (isspace (*pCurrentPos)) {
       if (! bInToken)
@@ -225,10 +227,10 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
       nTokens++;
       vecpszToken.push_back (pCurrentPos);
     }
-    
+
     pCurrentPos++;
   }
-  
+
   *piArgc = nTokens;
   if (nTokens > 0) {
     *pppArgv = new char* [nTokens];
@@ -238,15 +240,15 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
     *pppArgv = NULL;
 }
 
-static int 
+static int
 processCommand (int argc, char* const argv[])
 {
   if (argc < 1)
     return 1;
-  
+
   const char* const pszFunction = fileBasename (argv[0]);
 
-  try {  
+  try {
     if (strcasecmp (pszFunction, "if1") == 0)
       return if1_main (argc, argv);
     else if (strcasecmp (pszFunction, "if2") == 0)
@@ -283,15 +285,15 @@ processCommand (int argc, char* const argv[])
     std::cerr << "Exception: " << e.what() << std::endl;
   } catch (...) {
     std::cerr << "Unknown exception caught\n";
-  }  
+  }
 
   return 1;
 }
 
-int 
+int
 main (int argc, char* argv[])
 {
-#if defined(HAVE_FFTW) && defined(HAVE_GETENV) 
+#if defined(HAVE_FFTW) && defined(HAVE_GETENV)
   const char* const pszHome = getenv("HOME");
   char* pszWisdom = NULL;
 
@@ -305,9 +307,9 @@ main (int argc, char* argv[])
     pszWisdom[nHome] = '/';
     strcpy(pszWisdom+nHome+1,szFileBase);
     pszWisdom[nHome+nBase+2] = 0;
-    
+
     FILE *wisdom = fopen(pszWisdom,"r");
-    if (wisdom) { 
+    if (wisdom) {
       fftw_import_wisdom_from_file(wisdom);
       fclose(wisdom);
     }
@@ -315,8 +317,8 @@ main (int argc, char* argv[])
 #endif
 
   int retval = ctsimtext_main(argc, argv);
-  
-#if defined(HAVE_FFTW) && defined(HAVE_GETENV) 
+
+#if defined(HAVE_FFTW) && defined(HAVE_GETENV)
   if (pszWisdom) {
     FILE* wisdom = fopen(pszWisdom,"w+");
     if (wisdom) {
@@ -326,6 +328,6 @@ main (int argc, char* argv[])
     }
   }
 #endif
-  
+
   return retval;
 }