diff options
| author | Thomas White <taw@physics.org> | 2013-01-28 15:23:20 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-01-28 15:23:20 +0100 |
| commit | 6f5f23d94db49ccc3881dad0954ff5d4fbb41a93 (patch) | |
| tree | 4f1c698c55afbf645ffa07925e758e0dfee177b5 | |
| parent | 1c82ece5bab805488ac31b3533ee327e030651e0 (diff) | |
hdfsee: Boost, as given on command line, can be a non-integer
| -rw-r--r-- | src/dw-hdfsee.c | 2 | ||||
| -rw-r--r-- | src/dw-hdfsee.h | 2 | ||||
| -rw-r--r-- | src/hdfsee.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index 19aa6f35..6ef12e7a 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -1778,7 +1778,7 @@ static gint displaywindow_press(GtkWidget *widget, GdkEventButton *event, DisplayWindow *displaywindow_open(const char *filename, const char *peaks, - int boost, int binning, int cmfilter, + double boost, int binning, int cmfilter, int noisefilter, int colscale, const char *element, const char *geometry, int show_rings, double *ring_radii, diff --git a/src/dw-hdfsee.h b/src/dw-hdfsee.h index 6d8c9782..84095a41 100644 --- a/src/dw-hdfsee.h +++ b/src/dw-hdfsee.h @@ -117,7 +117,7 @@ typedef struct { /* Open an image display window showing the given filename, or NULL */ extern DisplayWindow *displaywindow_open(const char *filename, - const char *peaks, int boost, + const char *peaks, double boost, int binning, int cmfilter, int noisefilter, int colscale, const char *element, diff --git a/src/hdfsee.c b/src/hdfsee.c index be1f4876..620b684b 100644 --- a/src/hdfsee.c +++ b/src/hdfsee.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) size_t i; int nfiles; char *peaks = NULL; - int boost = 1; + double boost = 1.0; int binning = 2; int config_cmfilter = 0; int config_noisefilter = 0; @@ -161,10 +161,10 @@ int main(int argc, char *argv[]) break; case 'i' : - boost = atoi(optarg); - if ( boost < 1 ) { + boost = atof(optarg); + if ( boost <= 0 ) { ERROR("Intensity boost must be a positive" - " integer.\n"); + " number.\n"); return 1; } break; |