Add reproject.{c,h}

Fix Makefile.am
Bump version to 1.0.6


git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@67 bf6ca9ba-c028-0410-8290-897cf20841d1

9 files changed, 54 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index 62f85be..6fa95bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = configure src/displaywindow.h src/trackball.h src/reflections.h src/control.h src/readpng.h src/mrc.h src/imagedisplay.h src/main.h \
-		data/displaywindow.ui src/peakdetect.h src/utils.h src/itrans.h src/qdrp.h src/ipr.h src/cache.h src/structure.h src/itrans-threshold.h \
-		src/itrans-zaefferer.h src/itrans-lsq.h src/itrans-stat.h src/mapping.h
+		data/displaywindow.ui src/utils.h src/itrans.h src/qdrp.h src/ipr.h src/cache.h src/itrans-threshold.h \
+		src/itrans-zaefferer.h src/itrans-lsq.h src/itrans-stat.h src/mapping.h src/reproject.h
 SUBDIRS = src data
diff --git a/Makefile.in b/Makefile.in
index eda9bf4..2fe4168 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -154,8 +154,8 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 EXTRA_DIST = configure src/displaywindow.h src/trackball.h src/reflections.h src/control.h src/readpng.h src/mrc.h src/imagedisplay.h src/main.h \
-		data/displaywindow.ui src/peakdetect.h src/utils.h src/itrans.h src/qdrp.h src/ipr.h src/cache.h src/structure.h src/itrans-threshold.h \
-		src/itrans-zaefferer.h src/itrans-lsq.h src/itrans-stat.h src/mapping.h
+		data/displaywindow.ui src/utils.h src/itrans.h src/qdrp.h src/ipr.h src/cache.h src/itrans-threshold.h \
+		src/itrans-zaefferer.h src/itrans-lsq.h src/itrans-stat.h src/mapping.h src/reproject.h
 
 SUBDIRS = src data
 all: config.h
diff --git a/configure b/configure
index f2babdc..6cba618 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for dtr 1.0.5.
+# Generated by GNU Autoconf 2.61 for dtr 1.0.6.
 #
 # Report bugs to <taw27@cam.ac.uk>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dtr'
 PACKAGE_TARNAME='dtr'
-PACKAGE_VERSION='1.0.5'
-PACKAGE_STRING='dtr 1.0.5'
+PACKAGE_VERSION='1.0.6'
+PACKAGE_STRING='dtr 1.0.6'
 PACKAGE_BUGREPORT='taw27@cam.ac.uk'
 
 # Factoring default headers for most tests.
@@ -1211,7 +1211,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dtr 1.0.5 to adapt to many kinds of systems.
+\`configure' configures dtr 1.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1277,7 +1277,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dtr 1.0.5:";;
+     short | recursive ) echo "Configuration of dtr 1.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1363,7 +1363,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dtr configure 1.0.5
+dtr configure 1.0.6
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1377,7 +1377,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dtr $as_me 1.0.5, which was
+It was created by dtr $as_me 1.0.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1730,7 +1730,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VERSION=1.0.5
+VERSION=1.0.6
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -7024,7 +7024,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dtr $as_me 1.0.5, which was
+This file was extended by dtr $as_me 1.0.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7077,7 +7077,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dtr config.status 1.0.5
+dtr config.status 1.0.6
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index e36d595..43849f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(dtr, 1.0.5, taw27@cam.ac.uk)
+AC_INIT(dtr, 1.0.6, taw27@cam.ac.uk)
 VERSION=AC_PACKAGE_VERSION
 
 AM_CONFIG_HEADER(config.h)
diff --git a/src/Makefile.am b/src/Makefile.am
index 65c8218..3705cfc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = dtr
 dtr_SOURCES = main.c displaywindow.c trackball.c reflections.c readpng.c mrc.c imagedisplay.c utils.c itrans.c qdrp.c ipr.c cache.c \
-		itrans-threshold.c itrans-zaefferer.c itrans-lsq.c itrans-stat.c control.c mapping.c
+		itrans-threshold.c itrans-zaefferer.c itrans-lsq.c itrans-stat.c control.c mapping.c reproject.c
 dtr_LDADD = @LIBS@ @GTK_LIBS@ -lm @GTKGLEXT_LIBS@ -lgsl -lgslcblas
 AM_CFLAGS = -Wall -g @CFLAGS@ @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@
 AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\"
diff --git a/src/Makefile.in b/src/Makefile.in
index dc8fe2f..e8f6064 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,7 +53,7 @@ am_dtr_OBJECTS = main.$(OBJEXT) displaywindow.$(OBJEXT) \
 	itrans.$(OBJEXT) qdrp.$(OBJEXT) ipr.$(OBJEXT) cache.$(OBJEXT) \
 	itrans-threshold.$(OBJEXT) itrans-zaefferer.$(OBJEXT) \
 	itrans-lsq.$(OBJEXT) itrans-stat.$(OBJEXT) control.$(OBJEXT) \
-	mapping.$(OBJEXT)
+	mapping.$(OBJEXT) reproject.$(OBJEXT)
 dtr_OBJECTS = $(am_dtr_OBJECTS)
 dtr_DEPENDENCIES =
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -153,7 +153,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 dtr_SOURCES = main.c displaywindow.c trackball.c reflections.c readpng.c mrc.c imagedisplay.c utils.c itrans.c qdrp.c ipr.c cache.c \
-		itrans-threshold.c itrans-zaefferer.c itrans-lsq.c itrans-stat.c control.c mapping.c
+		itrans-threshold.c itrans-zaefferer.c itrans-lsq.c itrans-stat.c control.c mapping.c reproject.c
 
 dtr_LDADD = @LIBS@ @GTK_LIBS@ -lm @GTKGLEXT_LIBS@ -lgsl -lgslcblas
 AM_CFLAGS = -Wall -g @CFLAGS@ @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@
@@ -240,6 +240,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qdrp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpng.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reflections.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reproject.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trackball.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
 
diff --git a/src/ipr.c b/src/ipr.c
index 31de6bf..0d25ee6 100644
--- a/src/ipr.c
+++ b/src/ipr.c
@@ -22,6 +22,7 @@
 #include "itrans.h"
 #include "utils.h"
 #include "imagedisplay.h"
+#include "reproject.h"
 
 static int ipr_choose_max(Basis *basis) {
 
@@ -251,6 +252,7 @@ int ipr_refine(ControlContext *ctx) {
 		
 		i = ipr_random_image(ctx);
 		cur = imagedisplay_open(ctx->images[i].image, ctx->images[i].width, ctx->images[i].height, "Current Image");
+		
 		finished = 1;
 		
 	} while ( !finished );
diff --git a/src/reproject.c b/src/reproject.c
new file mode 100644
index 0000000..ad709d4
--- /dev/null
+++ b/src/reproject.c
@@ -0,0 +1,12 @@
+/*
+ * reproject.c
+ *
+ * Synthesize diffraction patterns
+ *
+ * (c) 2007 Thomas White <taw27@cam.ac.uk>
+ *
+ *  dtr - Diffraction Tomography Reconstruction
+ *
+ */
+
+
diff --git a/src/reproject.h b/src/reproject.h
new file mode 100644
index 0000000..482cd8c
--- /dev/null
+++ b/src/reproject.h
@@ -0,0 +1,21 @@
+/*
+ * reproject.h
+ *
+ * Synthesize diffraction patterns
+ *
+ * (c) 2007 Thomas White <taw27@cam.ac.uk>
+ *
+ *  dtr - Diffraction Tomography Reconstruction
+ *
+ */
+ 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifndef REPROJECT_H
+#define REPROJECT_H
+
+
+#endif	/* REPROJECT_H */
+