From 10f4d845158e331da7b2174394c0c6190018e16c Mon Sep 17 00:00:00 2001
From: taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>
Date: Fri, 23 Nov 2007 11:37:39 +0000
Subject: Finish previous commit..

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@206 bf6ca9ba-c028-0410-8290-897cf20841d1
---
 src/refine.c    |  5 ++++-
 src/reproject.c | 45 ++++++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/refine.c b/src/refine.c
index 9b901d0..812d5a5 100644
--- a/src/refine.c
+++ b/src/refine.c
@@ -279,8 +279,11 @@ static gint refine_step(GtkWidget *step_button, ControlContext *ctx) {
 		ImageFeature *fitted;
 		
 		fitted = refine_fit_image(ctx->cell, &ctx->images->images[ctx->reproject_cur_image], ctx->cell_lattice);
+		
+		ctx->images->images[ctx->reproject_cur_image].rflist = NULL;
 		reproject_lattice_changed(ctx);
 		displaywindow_update(ctx->dw);
+		
 		if ( fitted ) {
 			imagedisplay_add_mark(ctx->reproject_id, fitted->x,fitted->y, IMAGEDISPLAY_MARK_CIRCLE_3);
 		}
@@ -306,7 +309,7 @@ static int refine_sequence_sweep(ControlContext *ctx, double *fit, double *warp)
 		/* Ensure lattice is up to date */
 		reproject_lattice_changed(ctx);
 		ctx->images->images[i].rflist = NULL;	/* Invalidate reprojection for this image - it's wrong */
-	
+		
 		if ( is_odd(i) ) {
 			
 			/* Odd-numbered images: measure */
diff --git a/src/reproject.c b/src/reproject.c
index 9efe965..3768a5e 100644
--- a/src/reproject.c
+++ b/src/reproject.c
@@ -18,7 +18,28 @@
 #include "imagedisplay.h"
 #include "displaywindow.h"
 #include "image.h"
-#include "reproject.h"
+
+/* Attempt to find partners from the feature list of "image" for each feature in "flist". */
+void reproject_partner_features(ImageFeatureList *flist, ImageRecord *image) {
+
+	int i;
+	
+	for ( i=0; i<flist->n_features; i++ ) {
+	
+		double d = 0.0;
+		ImageFeature *partner;
+		int idx;
+		
+		partner = image_feature_closest(image->features, flist->features[i].x, flist->features[i].y, &d, &idx);
+		
+		if ( (d <= 20.0) && partner ) {
+			flist->features[i].partner = partner;
+			flist->features[i].partner_d = d;
+		}
+	
+	}
+
+}
 
 ImageFeatureList *reproject_get_reflections(ImageRecord *image, ReflectionList *reflectionlist) {
 
@@ -181,28 +202,6 @@ ImageFeatureList *reproject_get_reflections(ImageRecord *image, ReflectionList *
 
 }
 
-/* Attempt to find partners from the feature list of "image" for each feature in "flist". */
-void reproject_partner_features(ImageFeatureList *flist, ImageRecord *image) {
-
-	int i;
-	
-	for ( i=0; i<flist->n_features; i++ ) {
-	
-		double d = 0.0;
-		ImageFeature *partner;
-		int idx;
-		
-		partner = image_feature_closest(image->features, flist->features[i].x, flist->features[i].y, &d, &idx);
-		
-		if ( (d <= 20.0) && partner ) {
-			flist->features[i].partner = partner;
-			flist->features[i].partner_d = d;
-		}
-	
-	}
-
-}
-
 static void reproject_mark_peaks(ControlContext *ctx) {
 
 	ImageFeatureList *flist;
-- 
cgit v1.2.3