diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-03-31 00:19:35 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-03-31 00:19:35 +0000 |
| commit | 8810e9ff13e9fb0db420dbdc529ef2f9dfe89d7c (patch) | |
| tree | f256152050817b789554e0d18974fafcfbdf9644 /src/displaywindow.c | |
| parent | 3db95bb6d650a56eefd8c6d7dbd6bdc57e0e2350 (diff) | |
Fussiness:
Disable choice of peak detection algorithm when cached reflections used
Fix formatting and namespace convention in cache.{c,h}
Prevent reading beyond bounds of Reflection struct when saving cache
Handle caching when no reflections were found
(Temporarily?) disable octtree hooks
Tweak some credits anad syntax message
Other (mostly trivial) tweaks
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@15 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/displaywindow.c')
| -rw-r--r-- | src/displaywindow.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/displaywindow.c b/src/displaywindow.c index 1ed6493..f4a8b4a 100644 --- a/src/displaywindow.c +++ b/src/displaywindow.c @@ -447,7 +447,6 @@ static gint displaywindow_gl_expose(GtkWidget *widget, GdkEventExpose *event, Co } /* Zero plane */ - /* glBegin(GL_QUADS); glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, yellow_glass); glVertex3f(50, 50, 0.0); @@ -455,10 +454,9 @@ static gint displaywindow_gl_expose(GtkWidget *widget, GdkEventExpose *event, Co glVertex3f(-50, -50, 0.0); glVertex3f(-50, 50, 0.0); glEnd(); - */ //octtree bit - temporary - glBegin(GL_LINES); + /*glBegin(GL_LINES); glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue); disp_oct_stack(o); @@ -466,7 +464,7 @@ static gint displaywindow_gl_expose(GtkWidget *widget, GdkEventExpose *event, Co glBegin(GL_POINTS); glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, red); disp_oct_list(ol); - glEnd(); + glEnd();*/ if ( gdk_gl_drawable_is_double_buffered(gldrawable) ) { @@ -539,11 +537,11 @@ void displaywindow_open(ControlContext *ctx) { char *title; GdkGLConfig *glconfig; - o = gen_octtree(ctx->reflectionctx,15); + /*o = gen_octtree(ctx->reflectionctx,15); print_octtree(o); int count=0; ol = find_sparse_trees(o,3,1,&count); - + */ filename = basename(ctx->filename); title = malloc(10+strlen(filename)); strcpy(title, "dtr: "); |