diff options
author | Thomas White <taw@bitwiz.org.uk> | 2011-02-27 20:28:13 +0100 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:15 +0100 |
commit | ff7c2952b7d10d3c337714695175c12528dd9b94 (patch) | |
tree | 0c7803fe2c065c12564077fac026c39364a3b5bf /src | |
parent | 6f12fbf4eb971e64d98449e2549f2c9b9f0fc6e1 (diff) |
Remove dead code
Diffstat (limited to 'src')
-rw-r--r-- | src/geomatic.c | 81 | ||||
-rw-r--r-- | src/render.c | 107 | ||||
-rw-r--r-- | src/render.h | 3 |
3 files changed, 0 insertions, 191 deletions
diff --git a/src/geomatic.c b/src/geomatic.c deleted file mode 100644 index 94975c25..00000000 --- a/src/geomatic.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * geomatic.c - * - * GUI geometry calibration - * - * (c) 2006-2011 Thomas White <taw@physics.org> - * - * Part of CrystFEL - crystallography with a FEL - * - */ - - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <gtk/gtk.h> -#include <getopt.h> - -#include "dw-geomatic.h" -#include "utils.h" -#include "render.h" - - -static void show_help(const char *s) -{ - printf("Syntax: %s [options] image.h5\n\n", s); - printf( -"GUI geometry calibration.\n" -"\n" -" -h, --help Display this help message.\n" -"\n"); -} - - -int main(int argc, char *argv[]) -{ - int c; - int nfiles; - - /* Long options */ - const struct option longopts[] = { - {"help", 0, NULL, 'h'}, - {0, 0, NULL, 0} - }; - - gtk_init(&argc, &argv); - - /* Short options */ - while ((c = getopt_long(argc, argv, "hp:b:i:c:", - longopts, NULL)) != -1) { - - switch (c) { - case 'h' : - show_help(argv[0]); - return 0; - - case 0 : - break; - - default : - return 1; - } - - } - - nfiles = argc-optind; - - if ( nfiles < 1 ) { - ERROR("You need to give me a file to open!\n"); - return -1; - } - - if ( geomatic_open(argv[optind]) == NULL ) { - ERROR("Couldn't open display window\n"); - return 1; - } - gtk_main(); - - return 0; -} diff --git a/src/render.c b/src/render.c index eeeda871..ba64b779 100644 --- a/src/render.c +++ b/src/render.c @@ -139,52 +139,6 @@ void render_scale(float val, float max, int scale, #ifdef HAVE_GTK -static float *get_binned_image(struct image *image, int binning, float *pmax) -{ - float *data; - int x, y; - int w, h; - int inw, inh; - float *in; - float max; - - inw = image->width; - inh = image->height; - in = image->data; - - w = inw / binning; - h = inh / binning; /* Some pixels might get discarded */ - - data = malloc(w*h*sizeof(float)); - max = 0.0; - - for ( x=0; x<w; x++ ) { - for ( y=0; y<h; y++ ) { - - double total; - size_t xb, yb; - - total = 0; - for ( xb=0; xb<binning; xb++ ) { - for ( yb=0; yb<binning; yb++ ) { - - total += in[binning*x+xb + (binning*y+yb)*inw]; - - } - } - - data[x+w*y] = total / ((double)binning * (double)binning); - if ( data[x+w*y] > max ) max = data[x+w*y]; - - } - } - - *pmax = max; - return data; - -} - - static float *get_binned_panel(struct image *image, int binning, int min_fs, int max_fs, int min_ss, int max_ss) { @@ -237,67 +191,6 @@ static void render_free_data(guchar *data, gpointer p) } -/* Return a pixbuf containing a rendered version of the image after binning. - * This pixbuf might be scaled later - hopefully mostly in a downward - * direction. */ -GdkPixbuf *render_get_image(struct image *image, int binning, int scale, - double boost) -{ - int w, h; - guchar *data; - float *hdr; - int x, y; - float max; - int mw, mh; - - mw = image->width; - mh = image->height; - w = mw / binning; - h = mh / binning; - - /* High dynamic range version */ - hdr = get_binned_image(image, binning, &max); - if ( hdr == NULL ) return NULL; - - /* Rendered (colourful) version */ - data = malloc(3*w*h); - if ( data == NULL ) { - free(hdr); - return NULL; - } - - max /= boost; - if ( max <= 6 ) { max = 10; } - /* These x,y coordinates are measured relative to the bottom-left - * corner */ - for ( y=0; y<h; y++ ) { - for ( x=0; x<w; x++ ) { - - float val; - float r, g, b; - - val = hdr[x+w*y]; - render_scale(val, max, scale, &r, &g, &b); - - /* Stuff inside square brackets makes this pixel go to - * the expected location in the pixbuf (which measures - * from the top-left corner */ - data[3*( x+w*(h-1-y) )+0] = 255*r; - data[3*( x+w*(h-1-y) )+1] = 255*g; - data[3*( x+w*(h-1-y) )+2] = 255*b; - - } - } - - /* Finished with this */ - free(hdr); - - /* Create the pixbuf from the 8-bit display data */ - return gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, FALSE, 8, - w, h, w*3, render_free_data, NULL); -} - - static GdkPixbuf *render_panel(struct image *image, int binning, int scale, double boost, int min_fs, int max_fs, int min_ss, int max_ss) diff --git a/src/render.h b/src/render.h index 79d7ec68..bdfb9bc4 100644 --- a/src/render.h +++ b/src/render.h @@ -37,9 +37,6 @@ extern void render_scale(float val, float max, int scale, #include <gdk-pixbuf/gdk-pixbuf.h> -extern GdkPixbuf *render_get_image(struct image *image, - int binning, int scale, double boost); - extern GdkPixbuf **render_panels(struct image *image, int binning, int scale, double boost, int *n_pixbufs); |