diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-09-06 12:24:48 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-09-06 12:24:48 +0000 |
| commit | 66e9ee944e8e595685405fe206495eff6d60bdf5 (patch) | |
| tree | fdaeeb2b14a3b4fc1e9236b73ac01a588f32ac53 /src/imagedisplay.c | |
| parent | 26736a29bfa67118143faf3ac840c7b89ce934e1 (diff) | |
Fix ImageDisplay offsets
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@124 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/imagedisplay.c')
| -rw-r--r-- | src/imagedisplay.c | 7 |
1 files changed, 4 insertions, 3 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; } |