X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fctsimtext.cpp;h=291cdc1232ed0eb027a3c082162bf3b212e6f937;hb=7cc12efbeb8ab0d09ccc03990c9ce73b2d40b4c8;hp=cd02ac68fb8569aeb8ed8e2de5db45259d4814f3;hpb=da7c413d9b557a45c17a5af5d13de0825507a22d;p=ctsim.git

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index cd02ac6..291cdc1 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.3 2001/01/09 20:38:53 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.5 2001/01/09 23:21:02 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
@@ -27,9 +27,16 @@
 
 #include "ct.h"
 
-#ifdef HAVE_READLINE
+#ifdef HAVE_READLINE_H
+extern "C" {
 #include <readline.h>
 #include <history.h>
+};
+#elif defined(HAVE_READLINE_READLINE_H)
+extern "C" {
+#include <readline/readline.h>
+#include <readline/history.h>
+};
 #endif
 
 
@@ -38,7 +45,7 @@
 // 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.3 2001/01/09 20:38:53 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.5 2001/01/09 23:21:02 kevin Exp $";
 static const char* const s_szProgramName = "ctsimtext";
 
 extern int if1_main (int argc, char* const argv[]);
@@ -55,7 +62,6 @@ static int processCommand (int argc, char* const argv[]);
 static void convertStringToArgcv (char* szLine, int* piArgc, char*** pppArgv);
 
 
-
 void 
 ctsimtext_usage (const char *program)
 {
@@ -72,38 +78,76 @@ ctsimtext_usage (const char *program)
   std::cout << "  pj2if         Convert an projection file into an imagefile\n";
 }
 
+void 
+interactive_usage ()
+{
+  std::cout << "usage: function-name parameters...\n";
+  std::cout << "Available functions:\n";
+  std::cout << "  ifinfo        Image file information\n";
+  std::cout << "  if1           Single image file conversion\n";
+  std::cout << "  if2           Dual image file conversions\n";
+  std::cout << "  pjrec         Projection reconstruction\n";
+  std::cout << "  pjinfo        Projection file information\n";
+  std::cout << "  phm2if        Convert a geometric phantom into an imagefile\n";
+  std::cout << "  phm2pj        Take projections of a phantom object\n";
+  std::cout << "  ifexport      Export an imagefile to a graphics file\n";
+  std::cout << "  pj2if         Convert an projection file into an imagefile\n";
+  std::cout << "  quit          Quits shell\n";
+  std::cout << "All functions accept --help as parameter for online help\n\n";
+}
+
+static bool s_bInteractive = false;
+
 
 int 
 ctsimtext_main (int argc, char * argv[])
 {
   int iReturn = 0;
 
-  if (strcmp(argv[0],s_szProgramName) == 0) {
+  if (argc > 1 && strstr(argv[0], s_szProgramName)) {
     argv = &argv[1];
     argc--;
     iReturn = processCommand (argc, argv);
   } else if (argc > 1){
     iReturn = processCommand (argc, argv);
   } else {
+    s_bInteractive = true;
     char szPrompt[] = "CTSim> ";
-    std::string strInput;
+    std::cout << "CTSim Text Shell (Type \"quit\" to end)\n\n";
     while (1) {
-      std::cout << "CTSimText Interactive mode\nType quit to end";
 #ifdef HAVE_READLINE
       char* pszInput = readline (szPrompt);
+      if (! pszInput)
+	break;
+      if (*pszInput != EOS)
+	add_history (pszInput);
 #else
       std::cout << szPrompt;
+      std::string strInput;
+#ifdef MSVC
+      std::getline (std::cin, strInput);
+#else
       std::cin >> strInput;
-      char* pszInput = new char [strInput.length() + 1];
-      strncpy (pszInput, strInput.c_str(), sizeof(pszInput));
+#endif
+#ifdef DEBUG
+      std::cout << "#" << strInput << "#\n";
+#endif
+      std::cout << std::flush;
+      std::cout << "\n";
+      char* pszInput = new char [strlen(strInput.c_str()) + 1];
+      strcpy (pszInput, strInput.c_str());
 #endif
       if (strncasecmp (pszInput, "quit", 4) == 0) {
         delete pszInput;
         break;
       }
       convertStringToArgcv (pszInput, &argc, &argv);
-      delete pszInput;
+#ifdef DEBUG
+        for (unsigned int i = 0; i < argc; i++)
+          std::cout << "Token " << i << ": " << argv[i] << "\n";
+#endif
       iReturn = processCommand (argc, argv);
+      delete pszInput;
     }
   }
 
@@ -123,7 +167,7 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
   bool bInToken = false;
 
   while (*pCurrentPos) {
-    if (iswhite (*pCurrentPos)) {
+    if (isspace (*pCurrentPos)) {
       if (! bInToken)
         *pCurrentPos = 0;
       else if (bInSingleQuote || bInDoubleQuote)
@@ -133,9 +177,10 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
         bInToken = false;
       }
     }
-    else if (*pCurrentPos = '\"') {
+    else if (*pCurrentPos == '\"') {
       if (bInSingleQuote) {
         bInSingleQuote = false;
+	*pCurrentPos = 0;
       } else {
         bInSingleQuote = true;
         if (! bInToken) {
@@ -144,9 +189,10 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
           vecpszToken.push_back (pCurrentPos+1);
         }
       }
-    } else if (*pCurrentPos = '\'') {
+    } else if (*pCurrentPos == '\'') {
       if (bInDoubleQuote) {
         bInDoubleQuote = false;
+	*pCurrentPos = 0;
       } else {
         bInDoubleQuote = true;
         if (! bInToken) {
@@ -165,7 +211,7 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
   }
 
   *piArgc = nTokens;
-  pppArgv = new char** [nTokens];
+  *pppArgv = new char* [nTokens];
   for (unsigned int iToken = 0; iToken < vecpszToken.size(); iToken++)
     (*pppArgv)[iToken] = vecpszToken[iToken];
 }
@@ -194,8 +240,11 @@ processCommand (int argc, char* const argv[])
   else if (strcasecmp (pszFunction, "pjrec") == 0)
     return pjrec_main (argc, argv);
   else {
-    std::cout << "Unknown function name" << pszFunction << "\n\n";
-    ctsimtext_usage (argv[0]);
+    std::cout << "Unknown function name: " << pszFunction << "\n";
+    if (s_bInteractive)
+      interactive_usage();
+    else
+      ctsimtext_usage (s_szProgramName);
     return 1;
   }
 }