r374: ctsimtext improvements, install improvements

[ctsim.git] / tools / ctsimtext.cpp

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 8989706491e87d6ea71978b9bdef930ccb35c89b..7d881bbc1b86b8a38ed7e2c730f35932ac004471 100644 (file)
--- 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.4 2001/01/09 22:31:47 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.6 2001/01/10 18:32:40 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
@@ -45,7 +45,7 @@ extern "C" {
 // 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.4 2001/01/09 22:31:47 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.6 2001/01/10 18:32:40 kevin Exp $";
 static const char* const s_szProgramName = "ctsimtext";
 
 extern int if1_main (int argc, char* const argv[]);
@@ -67,15 +67,15 @@ 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 << "  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 << "  ifexport      Export an imagefile to a graphics file\n";
+  std::cout << "  ifinfo        Image file information\n";
+  std::cout << "  pj2if         Convert an projection file into an imagefile\n";
   std::cout << "  pjinfo        Projection file information\n";
+  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 << "  ifexport      Export an imagefile to a graphics file\n";
-  std::cout << "  pj2if         Convert an projection file into an imagefile\n";
 }
 
 void 
@@ -83,15 +83,15 @@ interactive_usage ()
 {
   std::cout << "usage: function-name parameters...\n";
   std::cout << "Available functions:\n";
+  std::cout << "  ifexport      Export an imagefile to a graphics file\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 << "  pjinfo        Projection file information\n";
   std::cout << "  pj2if         Convert an projection file into an imagefile\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";
 }
@@ -104,7 +104,7 @@ ctsimtext_main (int argc, char * argv[])
 {
   int iReturn = 0;
 
-  if (argc > 1 && strstr(argv[0], s_szProgramName)) {
+  if (argc > 1 && strcmp(argv[0], fileBasename (s_szProgramName)) == 0) {
     argv = &argv[1];
     argc--;
     iReturn = processCommand (argc, argv);
@@ -124,17 +124,28 @@ ctsimtext_main (int argc, char * argv[])
 #else
       std::cout << szPrompt;
       std::string strInput;
+#ifdef MSVC
+      std::getline (std::cin, strInput);
+#else
       std::cin >> strInput;
-      std::cout << std::flush:;
+#endif
+#ifdef DEBUG
+      std::cout << "#" << strInput << "#\n";
+#endif
+      std::cout << std::flush;
       std::cout << "\n";
-      char* pszInput = new char [strInput.length() + 1];
-      strncpy (pszInput, strInput.c_str(), sizeof(pszInput));
+      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);
+#ifdef DEBUG
+        for (unsigned int i = 0; i < argc; i++)
+          std::cout << "Token " << i << ": " << argv[i] << "\n";
+#endif
       iReturn = processCommand (argc, argv);
       delete pszInput;
     }
@@ -208,7 +219,7 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
 static int 
 processCommand (int argc, char* const argv[])
 {
-  const char* const pszFunction = argv[0];
+  const char* const pszFunction = fileBasename (argv[0]);
 
   if (strcasecmp (pszFunction, "if1") == 0)
     return if1_main (argc, argv);