Colours

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

2 files changed, 19 insertions, 11 deletions

diff --git a/src/iprtest.c b/src/iprtest.c
index e24d7ed..f7cf7e6 100644
--- a/src/iprtest.c
+++ b/src/iprtest.c
@@ -49,32 +49,39 @@ static gboolean main_window_expose(GtkWidget *drawing, GdkEventExpose *event, IP
 
 	cairo_new_path(cr);
 	cairo_rectangle(cr, 0.0, 0.0, 640.0, 640.0);
-	cairo_set_source_rgb(cr, 0.0, 0.0, 0.4);
+	cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
 	cairo_fill(cr);
 	
 	f = ctx->image->features->features;
-	cairo_set_source_rgb(cr, 0.0, 0.9, 0.0);
+	cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
 	for ( i=0; i<ctx->image->features->n_features; i++ ) {
 		cairo_new_path(cr);
-		cairo_arc(cr, f[i].x, f[i].y, 2.5, 0, 2*M_PI);
+		cairo_arc(cr, f[i].x, f[i].y, 4.0, 0, 2*M_PI);
 		cairo_fill(cr);
 	}
 	
 	f = ctx->image->rflist->features;
-	cairo_set_source_rgb(cr, 0.6, 0.0, 0.0);
+	cairo_set_line_width(cr, 1.0);
 	for ( i=0; i<ctx->image->rflist->n_features; i++ ) {
 	
 		cairo_new_path(cr);
-		cairo_arc(cr, f[i].x, f[i].y, 5.0, 0, 2*M_PI);
-		cairo_stroke(cr);
+		cairo_arc(cr, f[i].x, f[i].y, 8.0, 0, 2*M_PI);
 		
 		if ( f[i].partner != NULL ) {
 		
+			cairo_set_source_rgb(cr, 0.0, 0.8, 0.0);
+			cairo_stroke(cr);
+		
 			cairo_new_path(cr);
 			cairo_move_to(cr, f[i].x, f[i].y);
 			cairo_line_to(cr, f[i].partner->x, f[i].partner->y);
 			cairo_stroke(cr);
 			
+		} else {
+
+			cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
+			cairo_stroke(cr);
+		
 		}
 		
 	}
@@ -110,11 +117,11 @@ int main(int argc, char *argv[]) {
 	
 	ctx->image = malloc(sizeof(ImageRecord));
 	ctx->image->image = NULL;
-	ctx->image->tilt = 45.0;
-	ctx->image->omega = 0.0;
+	ctx->image->tilt = 90.0;
+	ctx->image->omega = 90.0;
 	ctx->image->slop = 0.0;
 	ctx->image->fmode = FORMULATION_PIXELSIZE;
-	ctx->image->pixel_size = 1e8;
+	ctx->image->pixel_size = 0.6e8;
 	ctx->image->camera_len = 0.0;
 	ctx->image->lambda = lambda(1000000);
 	ctx->image->resolution = 1.0;
@@ -133,8 +140,8 @@ int main(int argc, char *argv[]) {
 	ctx->reflections = reflection_list_from_cell(ctx->cell);
 	ctx->image->features = reproject_get_reflections(ctx->image, ctx->reflections);
 	/* The "model" cell */
-	ctx->cell->a.x = 5.9e9;  ctx->cell->a.y = 0.1e9;  ctx->cell->a.z = 0.0;
-	ctx->cell->b.x = 0.0;  ctx->cell->b.y = 5.1e9;  ctx->cell->b.z = 0.0;
+	ctx->cell->a.x = 5.2e9;  ctx->cell->a.y = 0.1e9;  ctx->cell->a.z = 0.0;
+	ctx->cell->b.x = 1.0e9;  ctx->cell->b.y = 4.1e9;  ctx->cell->b.z = 0.0;
 	ctx->cell->c.x = 0.0;  ctx->cell->c.y = 0.0;  ctx->cell->c.z = 5.0e9;
 	ctx->gen = reflection_list_from_cell(ctx->cell);
 	ctx->image->rflist = reproject_get_reflections(ctx->image, ctx->gen);
diff --git a/src/refine.c b/src/refine.c
index 6bd2225..3eb7522 100644
--- a/src/refine.c
+++ b/src/refine.c
@@ -134,6 +134,7 @@ ImageFeature *refine_fit_image(Basis *cell, ImageRecord *image) {
 		}	
 		
 		/* Do the fitting */
+		//gsl_matrix_set(M, 1, 1, 1.0);
 		//gsl_matrix_set(M, 2, 2, 1.0);
 		matrix_vector_show(M, p);
 		perm = gsl_permutation_alloc(M->size1);