From 0b17be9c96c4082b7cf2334c6a2cc35bb6a5814c Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Tue, 12 Jan 2010 14:17:13 +0100
Subject: Complete indexing functionality

---
 src/displaywindow.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/displaywindow.c')

diff --git a/src/displaywindow.c b/src/displaywindow.c
index 9a65fb16..008aa19f 100644
--- a/src/displaywindow.c
+++ b/src/displaywindow.c
@@ -415,13 +415,21 @@ static void load_features_from_file(struct image *image, const char *filename)
 
 	do {
 		char line[1024];
-		int x, y;
-		int r;
+		int x, y, r, d;
+		float df;
 
 		rval = fgets(line, 1023, fh);
 		if ( rval == NULL ) continue;
 		chomp(line);
 
+		/* Try long format (output of pattern_sim --near-bragg) */
+		r = sscanf(line, "%i %i %i %f (at %i,%i)",
+		           &d, &d, &d, &df, &x, &y);
+		if ( r == 6 ) {
+			image_add_feature(image->features, x, y, image, 1.0);
+			continue;
+		}
+
 		r = sscanf(line, "%i %i", &x, &y);
 		if ( r != 2 ) continue;
 
-- 
cgit v1.2.3