Feature quantification

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

1 files changed, 15 insertions, 3 deletions

diff --git a/src/imagedisplay.c b/src/imagedisplay.c
index 9774a33..db1f3db 100644
--- a/src/imagedisplay.c
+++ b/src/imagedisplay.c
@@ -219,9 +219,16 @@ static gboolean imagedisplay_redraw(GtkWidget *drawingarea, GdkEventExpose *even
 	cur = imagedisplay->marks;
 	max = 0.0;
 	while ( cur ) {
-		if ( cur->weight > max ) max = cur->weight;
-		if ( cur->weight < 0.0 ) printf("ID: Warning: ImageDisplayMark with negative weight\n");
+	
+		if ( cur->weight < 0.0 ) {
+			printf("ID: Warning: ImageDisplayMark with negative weight\n");
+			cur = cur->next;
+			continue;
+		}
+		
+		if ( log(1+0.1*cur->weight) > max ) max = log(1+0.1*cur->weight);
 		cur = cur->next;
+		
 	}
 	
 	cur = imagedisplay->marks;
@@ -243,7 +250,12 @@ static gboolean imagedisplay_redraw(GtkWidget *drawingarea, GdkEventExpose *even
 		
 			double r;
 		
-			r = 20 * (cur->weight/max);
+			if ( cur->weight < 0.0 ) {
+				cur = cur->next;
+				continue;
+			}
+			
+			r = 20.0 * (log(1+0.1*cur->weight)/max);
 			
 			gdk_draw_arc(drawingarea->window, gc, FALSE,
 						xoffs + cur->x*scale - r,