Draw partnering lines on ImageDisplay

Fix silly mistake in partner selection


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

1 files changed, 5 insertions, 3 deletions

diff --git a/src/reproject.c b/src/reproject.c
index 535dc0e..1726639 100644
--- a/src/reproject.c
+++ b/src/reproject.c
@@ -189,7 +189,7 @@ static ImageFeature *reproject_find_partner(ImageFeature *feature, ImageRecord *
 	
 		double d;
 		
-		d = distance(image->features->features[i].x, image->features->features[i].x, feature->x, feature->y);
+		d = distance(image->features->features[i].x, image->features->features[i].y, feature->x, feature->y);
 	
 		if ( d < dmin ) {
 			dmin = d;
@@ -198,7 +198,7 @@ static ImageFeature *reproject_find_partner(ImageFeature *feature, ImageRecord *
 	
 	}
 	
-	if ( dmin < 20 ) {
+	if ( dmin <= 70.0 ) {
 		return &image->features->features[closest];
 	}
 	
@@ -242,9 +242,11 @@ static void reproject_mark_peaks(ControlContext *ctx) {
 	/* Now connect partners */
 	reproject_partner_features(rflist, &ctx->images->images[ctx->reproject_cur_image]);
 	for ( j=0; j<rflist->n_features; j++ ) {
-		imagedisplay_add_line(ctx->reproject_id, xc+rflist->features[j].x, yc+rflist->features[j].y,
+		if ( rflist->features[j].partner ) {
+			imagedisplay_add_line(ctx->reproject_id, xc+rflist->features[j].x, yc+rflist->features[j].y,
 							 xc+rflist->features[j].partner->x, yc+rflist->features[j].partner->y,
 							 IMAGEDISPLAY_MARK_LINE_1);
+		}
 	}	
 	
 	image_feature_list_free(rflist);