diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/imagedisplay.c | 7 | ||||
| -rw-r--r-- | src/reproject.c | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/imagedisplay.c b/src/imagedisplay.c index 8647f74..1b55c96 100644 --- a/src/imagedisplay.c +++ b/src/imagedisplay.c @@ -154,8 +154,8 @@ void imagedisplay_close(ImageDisplay *imagedisplay) { } #define imagedisplay_draw_line(gc,x1,y1,x2,y2) (gdk_draw_line(drawingarea->window,gc, \ - xoffs+(x1), yoffs+imagedisplay->view_height-(y1), \ - xoffs+(x2), yoffs+imagedisplay->view_height-(y2))) + xoffs+(x1), yoffs+imagedisplay->view_height-1-(y1), \ + xoffs+(x2), yoffs+imagedisplay->view_height-1-(y2))) static gboolean imagedisplay_redraw(GtkWidget *drawingarea, GdkEventExpose *event, ImageDisplay *imagedisplay) { @@ -186,6 +186,7 @@ static gboolean imagedisplay_redraw(GtkWidget *drawingarea, GdkEventExpose *even * tan(deg2rad(imagedisplay->imagerecord.omega))) * scale); } + /* NB This calls the function above, which sorts out stuff */ if ( imagedisplay->flags & IMAGEDISPLAY_SHOW_CENTRE ) { imagedisplay_draw_line(imagedisplay->gc_centre, imagedisplay->imagerecord.x_centre * scale - 10, @@ -203,7 +204,7 @@ static gboolean imagedisplay_redraw(GtkWidget *drawingarea, GdkEventExpose *even while ( cur ) { gdk_draw_arc(drawingarea->window, imagedisplay->gc_marks, FALSE, xoffs + cur->x*scale - 5, - yoffs + imagedisplay->view_height-cur->y*scale - 5, + yoffs + imagedisplay->view_height-1-cur->y*scale - 5, 11, 11, 0, 64*360); cur = cur->next; } diff --git a/src/reproject.c b/src/reproject.c index 06611cd..3106998 100644 --- a/src/reproject.c +++ b/src/reproject.c @@ -176,10 +176,8 @@ ImageReflection *reproject_get_reflections(ImageRecord image, size_t *n, Reflect //printf("Reflection %i at %i,%i\n", i, refl[i-1].x, refl[i-1].y); - } else { - //fprintf(stderr, "Reflection failed sanity test (x=%f, y=%f)\n", x, y); - } - + } /* else it's outside the picture somewhere */ + } /* else this is the central beam so don't worry about it */ } |