r517: *** empty log message ***

diff --git a/configure b/configure
index 1defa15527770b01cc3b43e5892b69e8ba3aadf8..499f37ce439a235d4bc0b0c5f1c4265523c081b0 100755 (executable)
--- a/configure
+++ b/configure
@@ -4758,7 +4758,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 

-trap 'rm -fr `echo "Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile doc/tex2rtf/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15

 EOF
 cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<EOF
 


@@ -4889,7 +4889,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile doc/tex2rtf/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile"}

 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 26ba09bd2738a8671c2884eb29ab588e683f4557..528ae6031e6e86053e2dc01a0f9a0d82f6ea61b5 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 docs=ctsim.tex ctsim.bib texhelp.sty psbox.tex logo-huge.bmp tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty mysober.sty fancyhea.sty ctsim.bib 
 docs=ctsim.tex ctsim.bib texhelp.sty psbox.tex logo-huge.bmp tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty mysober.sty fancyhea.sty ctsim.bib 

-EXTRA_DIST = ${docs} 
+EXTRA_DIST = ${docs} ctsim.htb 

 
 dvi: ctsim.tex
        bibtex ctsim
 
 dvi: ctsim.tex
        bibtex ctsim

diff --git a/include/Makefile.in b/include/Makefile.in
index ee196750629334c7e5c7cc7aed1a8facd836b83b..f7a38b1e880faf8f37de180468c64faddfb8f524 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -90,7 +90,7 @@ wxcflags = @wxcflags@
 wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
 wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 

-noinst_HEADERS = ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h fnetorderstream.h phantom.h timer.h sstream_subst scanner.h projections.h ctsupport.h filter.h array2dfile.h trace.h transformmatrix.h procsignal.h reconstruct.h plotfile.h hashtable.h fourier.h ctglobals.h dlgezplot.h
+noinst_HEADERS = ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h fnetorderstream.h phantom.h timer.h sstream_subst scanner.h projections.h ctsupport.h filter.h array2dfile.h trace.h transformmatrix.h procsignal.h reconstruct.h plotfile.h hashtable.h fourier.h ctglobals.h dlgezplot.h cubicinterp.h

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

diff --git a/libctsupport/Makefile.in b/libctsupport/Makefile.in
index e788b7e4a721fc959e1b6c002491d659404ac394..02666e1dc106c5f06bce733c65133180a296d336 100644 (file)
--- a/libctsupport/Makefile.in
+++ b/libctsupport/Makefile.in
@@ -92,7 +92,7 @@ wxlibs = @wxlibs@
 
 noinst_LIBRARIES = libctsupport.a
 INCLUDES = @my_includes@
 
 noinst_LIBRARIES = libctsupport.a
 INCLUDES = @my_includes@

-libctsupport_a_SOURCES = strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp plotfile.cpp hashtable.cpp
+libctsupport_a_SOURCES = strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp plotfile.cpp hashtable.cpp cubicinterp.cpp

 EXTRA_DIST = Makefile.nt
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 EXTRA_DIST = Makefile.nt
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h


@@ -106,7 +106,8 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libctsupport_a_LIBADD = 
 libctsupport_a_OBJECTS =  strfuncs.o syserror.o fnetorderstream.o \
 LIBS = @LIBS@
 libctsupport_a_LIBADD = 
 libctsupport_a_OBJECTS =  strfuncs.o syserror.o fnetorderstream.o \

-consoleio.o mathfuncs.o xform.o clip.o plotfile.o hashtable.o
+consoleio.o mathfuncs.o xform.o clip.o plotfile.o hashtable.o \
+cubicinterp.o

 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)


@@ -119,9 +120,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
 
 TAR = gtar
 GZIP_ENV = --best

-DEP_FILES =  .deps/clip.P .deps/consoleio.P .deps/fnetorderstream.P \
-.deps/hashtable.P .deps/mathfuncs.P .deps/plotfile.P .deps/strfuncs.P \
-.deps/syserror.P .deps/xform.P
+DEP_FILES =  .deps/clip.P .deps/consoleio.P .deps/cubicinterp.P \
+.deps/fnetorderstream.P .deps/hashtable.P .deps/mathfuncs.P \
+.deps/plotfile.P .deps/strfuncs.P .deps/syserror.P .deps/xform.P

 SOURCES = $(libctsupport_a_SOURCES)
 OBJECTS = $(libctsupport_a_OBJECTS)
 
 SOURCES = $(libctsupport_a_SOURCES)
 OBJECTS = $(libctsupport_a_OBJECTS)
 

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 95ca5e7c4c8ab2f78952dc8b27c77b1c3cdd945a..953ab6f3fbbc67a7ec5684b50c789435be7fe478 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: ctsim.cpp,v 1.71 2001/02/09 21:42:03 kevin Exp $
+**  $Id: ctsim.cpp,v 1.72 2001/02/09 22:09:38 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
 **
 **  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


@@ -70,7 +70,7 @@
 #endif
 #endif
 
 #endif
 #endif
 

-static const char* rcsindent = "$Id: ctsim.cpp,v 1.71 2001/02/09 21:42:03 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.72 2001/02/09 22:09:38 kevin Exp $";

 
 struct option CTSimApp::ctsimOptions[] = 
 {
 
 struct option CTSimApp::ctsimOptions[] = 
 {


@@ -189,7 +189,7 @@ CTSimApp::OnInit()
        wxString helpDir;
        if (! m_pConfig->Read("HelpDir", &helpDir))
                helpDir = ::wxGetCwd();
        wxString helpDir;
        if (! m_pConfig->Read("HelpDir", &helpDir))
                helpDir = ::wxGetCwd();

-       if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") ||
+       if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") &&

                ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
                *m_pLog << "Cannot initialize the HTML Help system" << "\n";
        
                ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
                *m_pLog << "Cannot initialize the HTML Help system" << "\n";