aboutsummaryrefslogtreecommitdiff
path: root/src/imagedisplay.c
diff options
context:
space:
mode:
authortaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2007-11-02 19:06:04 +0000
committertaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2007-11-02 19:06:04 +0000
commit4b6725f92bd05657134476056c88c3e224c10101 (patch)
tree5c7cbc5041aa955ea40eaf81194980deb452837d /src/imagedisplay.c
parent4700f1e11171d2900489e221494a42d90ccdfd4b (diff)
More work on refinement
Store absolute image coordinates in cache (not relative to centre) git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@190 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/imagedisplay.c')
-rw-r--r--src/imagedisplay.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/imagedisplay.c b/src/imagedisplay.c
index 3877da8..ceb36ff 100644
--- a/src/imagedisplay.c
+++ b/src/imagedisplay.c
@@ -210,11 +210,14 @@ static gboolean imagedisplay_redraw(GtkWidget *drawingarea, GdkEventExpose *even
switch ( cur->type ) {
case IMAGEDISPLAY_MARK_CIRCLE_1 : gc = imagedisplay->gc_marks_1; break;
case IMAGEDISPLAY_MARK_CIRCLE_2 : gc = imagedisplay->gc_marks_2; break;
+ case IMAGEDISPLAY_MARK_CIRCLE_3 : gc = imagedisplay->gc_marks_3; break;
case IMAGEDISPLAY_MARK_LINE_1 : gc = imagedisplay->gc_marks_1; break;
+ case IMAGEDISPLAY_MARK_LINE_2 : gc = imagedisplay->gc_marks_2; break;
default : gc = imagedisplay->gc_marks_1; break;
}
- if ( (cur->type == IMAGEDISPLAY_MARK_CIRCLE_1) || (cur->type == IMAGEDISPLAY_MARK_CIRCLE_2) ) {
+ if ( (cur->type == IMAGEDISPLAY_MARK_CIRCLE_1) || (cur->type == IMAGEDISPLAY_MARK_CIRCLE_2)
+ || (cur->type == IMAGEDISPLAY_MARK_CIRCLE_3) ) {
gdk_draw_arc(drawingarea->window, gc, FALSE,
xoffs + cur->x*scale - 5,
@@ -258,6 +261,10 @@ static gint imagedisplay_realize(GtkWidget *widget, ImageDisplay *imagedisplay)
gdk_color_parse("#00dd00", &colour);
gdk_gc_set_rgb_fg_color(imagedisplay->gc_marks_2, &colour);
+ imagedisplay->gc_marks_3 = gdk_gc_new(imagedisplay->drawingarea->window);
+ gdk_color_parse("#00ddff", &colour);
+ gdk_gc_set_rgb_fg_color(imagedisplay->gc_marks_3, &colour);
+
imagedisplay->realised = TRUE;
return 0;