From 79953995d6be8ef572ab20576509c8daa86cabaf Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Thu, 18 Jul 2013 15:07:42 +0200 Subject: Print some statistics --- bin/gui/control.c | 84 +++++++++++++++++- bin/gui/control.glade | 238 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 271 insertions(+), 51 deletions(-) (limited to 'bin/gui') diff --git a/bin/gui/control.c b/bin/gui/control.c index 3d108df..74b8312 100644 --- a/bin/gui/control.c +++ b/bin/gui/control.c @@ -44,6 +44,10 @@ typedef struct { GtkWidget *record_button; GtkWidget *download_button; GtkComboBox *zoom_box; + GtkLabel *mean_label; + GtkLabel *sigma_label; + GtkLabel *max_label; + GtkLabel *min_label; GtkDialog *download_dialog; GtkProgressBar *download_progressbar; @@ -166,6 +170,54 @@ up_scale (ThreadData *data, gpointer buffer) } } +static void +get_statistics (ThreadData *data, gdouble *mean, gdouble *sigma, guint *_max, guint *_min) +{ + gdouble sum = 0.0; + gdouble squared_sum = 0.0; + guint min = G_MAXUINT; + guint max = 0; + guint n = data->width * data->height; + + if (data->pixel_size == 1) { + guint8 *input = (guint8 *) ring_buffer_get_current_pointer (data->buffer); + + for (gint i = 0; i < n; i++) { + guint8 val = input[i]; + + if (val > max) + max = val; + + if (val < min) + min = val; + + sum += val; + squared_sum += val * val; + } + } + else { + guint16 *input = (guint16 *) ring_buffer_get_current_pointer (data->buffer); + + for (gint i = 0; i < n; i++) { + guint16 val = input[i]; + + if (val > max) + max = val; + + if (val < min) + min = val; + + sum += val; + squared_sum += val * val; + } + } + + *mean = sum / n; + *sigma = sqrt((squared_sum - sum*sum/n) / (n - 1)); + *_min = min; + *_max = max; +} + static void convert_grayscale_to_rgb (ThreadData *data, gpointer buffer) { @@ -178,10 +230,36 @@ convert_grayscale_to_rgb (ThreadData *data, gpointer buffer) static void update_pixbuf (ThreadData *data) { + GString *string; + gdouble mean; + gdouble sigma; + guint min; + guint max; + gdk_flush (); gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), data->pixbuf); gtk_widget_queue_draw_area (data->image, 0, 0, data->display_width, data->display_height); + egg_histogram_view_update (EGG_HISTOGRAM_VIEW (data->histogram_view), + ring_buffer_get_current_pointer (data->buffer)); + + get_statistics (data, &mean, &sigma, &min, &max); + string = g_string_new_len (NULL, 32); + + g_string_printf (string, "\u03bc = %3.2f", mean); + gtk_label_set_text (data->mean_label, string->str); + + g_string_printf (string, "\u03c3 = %3.2f", sigma); + gtk_label_set_text (data->sigma_label, string->str); + + g_string_printf (string, "min = %i", min); + gtk_label_set_text (data->min_label, string->str); + + g_string_printf (string, "max = %i", max); + gtk_label_set_text (data->max_label, string->str); + + g_string_free (string, TRUE); + if (gtk_toggle_button_get_active (data->histogram_button)) gtk_widget_queue_draw (data->histogram_view); } @@ -237,7 +315,6 @@ preview_frames (void *args) uca_camera_grab (data->camera, buffer, &error); if (error == NULL) { - egg_histogram_view_update (EGG_HISTOGRAM_VIEW (data->histogram_view), buffer); convert_grayscale_to_rgb (data, buffer); gdk_threads_enter (); @@ -605,6 +682,11 @@ create_main_window (GtkBuilder *builder, const gchar* camera_name) td.frame_slider = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "frames-adjustment")); td.count = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "acquisitions-adjustment")); + td.mean_label = GTK_LABEL (gtk_builder_get_object (builder, "mean-label")); + td.sigma_label = GTK_LABEL (gtk_builder_get_object (builder, "sigma-label")); + td.max_label = GTK_LABEL (gtk_builder_get_object (builder, "max-label")); + td.min_label = GTK_LABEL (gtk_builder_get_object (builder, "min-label")); + td.download_dialog = GTK_DIALOG (gtk_builder_get_object (builder, "download-dialog")); td.download_adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "download-adjustment")); td.download_close_button = GTK_WIDGET (gtk_builder_get_object (builder, "download-close-button")); diff --git a/bin/gui/control.glade b/bin/gui/control.glade index 9784d09..7b497ab 100644 --- a/bin/gui/control.glade +++ b/bin/gui/control.glade @@ -462,44 +462,106 @@ - + True 12 - + True + 0 + Histogram + + + + + + False + False + 0 + + + + + True + 12 - + True - 0 - Minimum: + + + True + 0 + Minimum: + + + False + False + 0 + + + + + 100 + True + True + • + min-bin-value-adjustment + + + False + False + 6 + 1 + + + + + True + 0 + Maximum: + + + False + False + 2 + + + + + 100 + True + True + • + max-bin-value-adjustment + + + False + False + 6 + 3 + + False False + 6 0 - - 100 - True - True - • - min-bin-value-adjustment - - - False - False - 6 - 1 - + - + + Live Update True + True + False + 6 0 - Maximum: + True + True False @@ -507,42 +569,19 @@ 2 - - - 100 - True - True - • - max-bin-value-adjustment - - - False - False - 6 - 3 - - - False - False - 6 - 0 + 1 - - - - - Live Update + True - True - False - 6 0 - True - True + Statistics + + + False @@ -550,6 +589,105 @@ 2 + + + True + 12 + 2 + 2 + 6 + 6 + + + True + 0 + Pixel counts: + + + GTK_FILL + + + + + True + 0 + Distribution: + + + 1 + 2 + GTK_FILL + + + + + True + 6 + + + True + 0 + µ = 0.0 + + + 0 + + + + + True + 0 + σ = 0.0 + + + 1 + + + + + True + 0 + min = 0 + + + 2 + + + + + True + 0 + max = 0 + + + 3 + + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + 0 + + + 1 + 2 + + + + + 3 + + 1 @@ -558,7 +696,7 @@ True - Histogram + Statistics 1 -- cgit v1.2.3