From 24b07bf3f7c9f16caca7c3e3a3b4c080754529b4 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 10 Jan 2001 18:32:40 +0000 Subject: [PATCH] r374: ctsimtext improvements, install improvements --- tools/Makefile.am | 17 +++++++++++++++++ tools/Makefile.in | 17 +++++++++++++++++ tools/ctsimtext.cpp | 22 +++++++++++----------- 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index b64692b..6b6456d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -10,7 +10,24 @@ SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsuppor endif install-exec-hook: + rm -f $(bindir)/if1 + rm -f $(bindir)/if2 + rm -f $(bindir)/ifexport + rm -f $(bindir)/ifinfo + rm -f $(bindir)/phm2if + rm -f $(bindir)/phm2pj + rm -f $(bindir)/pj2if + rm -f $(bindir)/pjinfo + rm -f $(bindir)/pjrec + ln -s $(bindir)/ctsimtext $(bindir)/if1 + ln -s $(bindir)/ctsimtext $(bindir)/if2 + ln -s $(bindir)/ctsimtext $(bindir)/ifexport ln -s $(bindir)/ctsimtext $(bindir)/ifinfo + ln -s $(bindir)/ctsimtext $(bindir)/phm2if + ln -s $(bindir)/ctsimtext $(bindir)/phm2pj + ln -s $(bindir)/ctsimtext $(bindir)/pj2if + ln -s $(bindir)/ctsimtext $(bindir)/pjinfo + ln -s $(bindir)/ctsimtext $(bindir)/pjrec ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp ctsimtext_LDADD=@ctlibs@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 5dfc5b8..118d7ca 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -399,7 +399,24 @@ mostlyclean distclean maintainer-clean install-exec-hook: + rm -f $(bindir)/if1 + rm -f $(bindir)/if2 + rm -f $(bindir)/ifexport + rm -f $(bindir)/ifinfo + rm -f $(bindir)/phm2if + rm -f $(bindir)/phm2pj + rm -f $(bindir)/pj2if + rm -f $(bindir)/pjinfo + rm -f $(bindir)/pjrec + ln -s $(bindir)/ctsimtext $(bindir)/if1 + ln -s $(bindir)/ctsimtext $(bindir)/if2 + ln -s $(bindir)/ctsimtext $(bindir)/ifexport ln -s $(bindir)/ctsimtext $(bindir)/ifinfo + ln -s $(bindir)/ctsimtext $(bindir)/phm2if + ln -s $(bindir)/ctsimtext $(bindir)/phm2pj + ln -s $(bindir)/ctsimtext $(bindir)/pj2if + ln -s $(bindir)/ctsimtext $(bindir)/pjinfo + ln -s $(bindir)/ctsimtext $(bindir)/pjrec realclean: rm -f *.pgm *.if *~ *.pj diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp index 291cdc1..7d881bb 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.5 2001/01/09 23:21:02 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.5 2001/01/09 23:21:02 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); @@ -219,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); -- 2.34.1