r332: *** empty log message ***

diff --git a/configure b/configure
index 95fdf28e17f4f4621f511bf742e8b4f54f0db090..fc93465eb00ddaaf5c65eb3fe54bcc485773dd18 100755 (executable)
--- a/configure
+++ b/configure
@@ -715,7 +715,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=2.5.0
+VERSION=3.0.0alpha1
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

diff --git a/libctsim/Makefile.in b/libctsim/Makefile.in
index 2d727fa23950814d414f569139170344d0846da3..591f2b2efc8ddaf4b971f98adfffc62bbeb811ad 100644 (file)
--- a/libctsim/Makefile.in
+++ b/libctsim/Makefile.in
@@ -91,7 +91,7 @@ wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
 noinst_LIBRARIES = libctsim.a 
-libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp
+libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp
 
 INCLUDES = @my_includes@
 EXTRA_DIST = Makefile.nt
@@ -108,7 +108,7 @@ LIBS = @LIBS@
 libctsim_a_LIBADD = 
 libctsim_a_OBJECTS =  filter.o scanner.o projections.o phantom.o \
 imagefile.o backprojectors.o array2dfile.o trace.o procsignal.o \
-reconstruct.o
+reconstruct.o fourier.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -122,7 +122,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/array2dfile.P .deps/backprojectors.P .deps/filter.P \
-.deps/imagefile.P .deps/phantom.P .deps/procsignal.P \
+.deps/fourier.P .deps/imagefile.P .deps/phantom.P .deps/procsignal.P \
 .deps/projections.P .deps/reconstruct.P .deps/scanner.P .deps/trace.P
 SOURCES = $(libctsim_a_SOURCES)
 OBJECTS = $(libctsim_a_OBJECTS)

diff --git a/libctsupport/Makefile.in b/libctsupport/Makefile.in
index 87a95e3daabdcc53835533bdd901b3c8d1cef1ab..e788b7e4a721fc959e1b6c002491d659404ac394 100644 (file)
--- a/libctsupport/Makefile.in
+++ b/libctsupport/Makefile.in
@@ -92,7 +92,7 @@ wxlibs = @wxlibs@
 
 noinst_LIBRARIES = libctsupport.a
 INCLUDES = @my_includes@
-libctsupport_a_SOURCES = strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp
+libctsupport_a_SOURCES = strfuncs.cpp syserror.cpp fnetorderstream.cpp consoleio.cpp mathfuncs.cpp xform.cpp clip.cpp plotfile.cpp hashtable.cpp
 EXTRA_DIST = Makefile.nt
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -106,7 +106,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libctsupport_a_LIBADD = 
 libctsupport_a_OBJECTS =  strfuncs.o syserror.o fnetorderstream.o \
-consoleio.o mathfuncs.o xform.o clip.o
+consoleio.o mathfuncs.o xform.o clip.o plotfile.o hashtable.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -120,7 +120,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/clip.P .deps/consoleio.P .deps/fnetorderstream.P \
-.deps/mathfuncs.P .deps/strfuncs.P .deps/syserror.P .deps/xform.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)
 

diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp
index e0ca9c81238e97137226410af2f2ed05bff77ab5..80dc0d121e32e12aac046e4c6cc6ca19f956bcf8 100644 (file)
--- a/tools/phm2if.cpp
+++ b/tools/phm2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2if.cpp,v 1.17 2001/01/02 05:34:57 kevin Exp $
+**  $Id: phm2if.cpp,v 1.18 2001/01/02 07:24:26 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
@@ -50,7 +50,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.17 2001/01/02 05:34:57 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.18 2001/01/02 07:24:26 kevin Exp $";
 
 void 
 phm2if_usage (const char *program)
@@ -356,7 +356,7 @@ phm2if_main (int argc, char* argv[])
       
       std::cout << "Enter display size scale (nominal = 1): ";
       std::cin >> nscale;
-      std::cout ("Enter minimum and maximum densities (min, max): ";
+      std::cout << "Enter minimum and maximum densities (min, max): ";
       std::cin >> dmin;\r
       std::cin >> dmax;
       pImGlobal->displayScaling (nscale, dmin, dmax);