X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fctsimtext.cpp;h=242689ab2468213dca5e5b11f015ade33a310dc3;hp=8989706491e87d6ea71978b9bdef930ccb35c89b;hb=5ff5b33a6bc64fb804106c4d50b83e4cf0d7b0f4;hpb=36c820a392f2e9e023d373aaf46e8bfb6018bdd4 diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp index 8989706..242689a 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.4 2001/01/09 22:31:47 kevin Exp $ +** $Id: ctsimtext.cpp,v 1.8 2001/01/10 21:21:53 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.8 2001/01/10 21:21:53 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,28 +83,27 @@ 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"; } static bool s_bInteractive = false; - int ctsimtext_main (int argc, char * argv[]) { - int iReturn = 0; - - if (argc > 1 && strstr(argv[0], s_szProgramName)) { + int iReturn = 0; + + if (argc > 1 && strcmp(argv[0], fileBasename (s_szProgramName)) == 0) { argv = &argv[1]; argc--; iReturn = processCommand (argc, argv); @@ -114,32 +113,45 @@ ctsimtext_main (int argc, char * argv[]) s_bInteractive = true; char szPrompt[] = "CTSim> "; std::cout << "CTSim Text Shell (Type \"quit\" to end)\n\n"; + while (1) { #ifdef HAVE_READLINE - char* pszInput = readline (szPrompt); - if (! pszInput) - break; - if (*pszInput != EOS) - add_history (pszInput); -#else + char* pszInputLine = readline (szPrompt); + if (! pszInputLine) + 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::string strInput; - std::cin >> strInput; - std::cout << std::flush:; - std::cout << "\n"; - char* pszInput = new char [strInput.length() + 1]; - strncpy (pszInput, strInput.c_str(), sizeof(pszInput)); + std::cin.getline (pszInputLine, s_MaxLineLength); + +#ifdef DEBUG + std::cout << "#" << pszInputLine << "#\n"; #endif - if (strncasecmp (pszInput, "quit", 4) == 0) { - delete pszInput; + + std::cout << std::flush; + std::cout << "\n"; +#endif // DONT_HAVE_READLINE + + if (strncasecmp (pszInputLine, "quit", 4) == 0) break; - } - convertStringToArgcv (pszInput, &argc, &argv); + + convertStringToArgcv (pszInputLine, &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; + + delete pszInputLine; } } - + + return iReturn; } @@ -149,12 +161,12 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv) char* pCurrentPos = pszLine; int nTokens = 0; std::vector vecpszToken; - + // Process line bool bInDoubleQuote = false; bool bInSingleQuote = false; bool bInToken = false; - + while (*pCurrentPos) { if (isspace (*pCurrentPos)) { if (! bInToken) @@ -169,7 +181,7 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv) else if (*pCurrentPos == '\"') { if (bInSingleQuote) { bInSingleQuote = false; - *pCurrentPos = 0; + *pCurrentPos = 0; } else { bInSingleQuote = true; if (! bInToken) { @@ -181,7 +193,7 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv) } else if (*pCurrentPos == '\'') { if (bInDoubleQuote) { bInDoubleQuote = false; - *pCurrentPos = 0; + *pCurrentPos = 0; } else { bInDoubleQuote = true; if (! bInToken) { @@ -195,21 +207,27 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv) nTokens++; vecpszToken.push_back (pCurrentPos); } - + pCurrentPos++; } - + *piArgc = nTokens; - *pppArgv = new char* [nTokens]; - for (unsigned int iToken = 0; iToken < vecpszToken.size(); iToken++) - (*pppArgv)[iToken] = vecpszToken[iToken]; + if (nTokens > 0) { + *pppArgv = new char* [nTokens]; + for (unsigned int iToken = 0; iToken < vecpszToken.size(); iToken++) + (*pppArgv)[iToken] = vecpszToken[iToken]; + } else + *pppArgv = NULL; } static int processCommand (int argc, char* const argv[]) { - const char* const pszFunction = argv[0]; + if (argc < 1) + return 1; + const char* const pszFunction = fileBasename (argv[0]); + if (strcasecmp (pszFunction, "if1") == 0) return if1_main (argc, argv); else if (strcasecmp (pszFunction, "if2") == 0) @@ -242,15 +260,15 @@ int main (int argc, char* argv[]) { int retval = 1; - + try { retval = ctsimtext_main(argc, argv); } catch (exception e) { - std::cerr << "Exception: " << e.what() << std::endl; + std::cerr << "Exception: " << e.what() << std::endl; } catch (...) { - std::cerr << "Unknown exception\n"; + std::cerr << "Unknown exception\n"; } - + return (retval); }