diff options
| author | Thomas White <taw27@cam.ac.uk> | 2008-11-04 10:50:12 +0000 |
|---|---|---|
| committer | Thomas White <taw27@cam.ac.uk> | 2008-11-04 10:50:12 +0000 |
| commit | 7992f60bbb46bb8fff758b41e45f7dc28c31012e (patch) | |
| tree | 3452ede7027b5635475c39803bf6d4fd61aae646 | |
| parent | a38d93733759b5e515bc75378c0b4fc53aad0440 (diff) | |
Don't draw a scale bar on the summed image stack
| -rw-r--r-- | src/displaywindow.c | 3 | ||||
| -rw-r--r-- | src/imagedisplay.c | 4 | ||||
| -rw-r--r-- | src/imagedisplay.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/displaywindow.c b/src/displaywindow.c index 2992b95..f925de6 100644 --- a/src/displaywindow.c +++ b/src/displaywindow.c @@ -683,7 +683,8 @@ DisplayWindow *displaywindow_open(ControlContext *ctx) { if ( ctx->images->n_images > 0 ) { dw->stack = imagedisplay_new_nowindow(ctx->images->images[dw->cur_image], - IMAGEDISPLAY_SHOW_TILT_AXIS | IMAGEDISPLAY_SHOW_CENTRE, NULL, NULL, NULL); + IMAGEDISPLAY_SHOW_TILT_AXIS | IMAGEDISPLAY_SHOW_CENTRE | IMAGEDISPLAY_SCALE_BAR, + NULL, NULL, NULL); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dw->stack->vbox, gtk_label_new("Image Stack")); displaywindow_update_imagestack(dw); } else { diff --git a/src/imagedisplay.c b/src/imagedisplay.c index ca730e5..8915c41 100644 --- a/src/imagedisplay.c +++ b/src/imagedisplay.c @@ -231,7 +231,9 @@ static gboolean imagedisplay_redraw(GtkWidget *drawingarea, GdkEventExpose *even } /* Add scale bar */ - imagedisplay_add_scalebar(imagedisplay, drawingarea, scale, xoffs, yoffs); + if ( imagedisplay->flags & IMAGEDISPLAY_SCALE_BAR ) { + imagedisplay_add_scalebar(imagedisplay, drawingarea, scale, xoffs, yoffs); + } /* NB This calls the function above, which sorts out stuff */ if ( imagedisplay->flags & IMAGEDISPLAY_SHOW_CENTRE ) { diff --git a/src/imagedisplay.h b/src/imagedisplay.h index 3462a83..9933201 100644 --- a/src/imagedisplay.h +++ b/src/imagedisplay.h @@ -26,7 +26,8 @@ typedef enum { IMAGEDISPLAY_SHOW_CENTRE = 1<<1, IMAGEDISPLAY_SHOW_TILT_AXIS = 1<<2, IMAGEDISPLAY_QUIT_IF_CLOSED = 1<<3, - IMAGEDISPLAY_FREE = 1<<4 + IMAGEDISPLAY_FREE = 1<<4, + IMAGEDISPLAY_SCALE_BAR = 1<<5 } ImageDisplayFlags; typedef enum { |