From e6fecaa7b2f3cd7931b51781b55808cb07b66b0f Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 29 Nov 2022 17:06:50 +0100 Subject: GUI: FoM graph, part 1: Skeleton widget code --- src/crystfelfomgraph.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ src/crystfelfomgraph.h | 75 +++++++++++++++++++++++++++++ src/gui_fom.c | 9 ++-- 3 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 src/crystfelfomgraph.c create mode 100644 src/crystfelfomgraph.h (limited to 'src') diff --git a/src/crystfelfomgraph.c b/src/crystfelfomgraph.c new file mode 100644 index 00000000..c3d679fa --- /dev/null +++ b/src/crystfelfomgraph.c @@ -0,0 +1,128 @@ +/* + * crystfelfomgraph.c + * + * Figure of merit graph plot widget + * + * Copyright © 2020-2022 Deutsches Elektronen-Synchrotron DESY, + * a research centre of the Helmholtz Association. + * + * Authors: + * 2020-2022 Thomas White + * + * This file is part of CrystFEL. + * + * CrystFEL is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * CrystFEL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with CrystFEL. If not, see . + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include + +#include "crystfelfomgraph.h" + + +G_DEFINE_TYPE(CrystFELFoMGraph, crystfel_fom_graph, + GTK_TYPE_DRAWING_AREA) + +static gint destroy_sig(GtkWidget *window, CrystFELFoMGraph *fg) +{ + return FALSE; +} + + +static gint configure_sig(GtkWidget *window, GdkEventConfigure *rec, + CrystFELFoMGraph *fg) +{ + fg->visible_width = rec->width; + fg->visible_height = rec->height; + return FALSE; +} + + +static gint draw_sig(GtkWidget *window, cairo_t *cr, CrystFELFoMGraph *fg) +{ + cairo_save(cr); + + /* Overall background */ + cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); + cairo_paint(cr); + + + cairo_restore(cr); + + return FALSE; +} + + +static GtkSizeRequestMode get_request_mode(GtkWidget *widget) +{ + return GTK_SIZE_REQUEST_CONSTANT_SIZE; +} + + +static void get_preferred_width(GtkWidget *widget, gint *min, gint *natural) +{ + *min = 0; + *natural = 480; +} + + +static void get_preferred_height(GtkWidget *widget, gint *min, gint *natural) +{ + *min = 0; + *natural = 320; +} + + +static void crystfel_fom_graph_class_init(CrystFELFoMGraphClass *klass) +{ + GTK_WIDGET_CLASS(klass)->get_request_mode = get_request_mode; + GTK_WIDGET_CLASS(klass)->get_preferred_width = get_preferred_width; + GTK_WIDGET_CLASS(klass)->get_preferred_height = get_preferred_height; + GTK_WIDGET_CLASS(klass)->get_preferred_height_for_width = NULL; +} + + +static void crystfel_fom_graph_init(CrystFELFoMGraph *fg) +{ +} + + +GtkWidget *crystfel_fom_graph_new() +{ + CrystFELFoMGraph *fg; + + fg = g_object_new(CRYSTFEL_TYPE_FOM_GRAPH, NULL); + + g_signal_connect(G_OBJECT(fg), "destroy", + G_CALLBACK(destroy_sig), fg); + g_signal_connect(G_OBJECT(fg), "configure-event", + G_CALLBACK(configure_sig), fg); + g_signal_connect(G_OBJECT(fg), "draw", + G_CALLBACK(draw_sig), fg); + + gtk_widget_set_can_focus(GTK_WIDGET(fg), FALSE); + + gtk_widget_show(GTK_WIDGET(fg)); + + return GTK_WIDGET(fg); +} diff --git a/src/crystfelfomgraph.h b/src/crystfelfomgraph.h new file mode 100644 index 00000000..b38752ef --- /dev/null +++ b/src/crystfelfomgraph.h @@ -0,0 +1,75 @@ +/* + * crystfelfomgraph.h + * + * Figure of merit graph plot widget + * + * Copyright © 2020-2022 Deutsches Elektronen-Synchrotron DESY, + * a research centre of the Helmholtz Association. + * + * Authors: + * 2020-2022 Thomas White + * + * This file is part of CrystFEL. + * + * CrystFEL is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * CrystFEL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with CrystFEL. If not, see . + * + */ + +#ifndef CRYSTFELFOMGRAPH_H +#define CRYSTFELFOMGRAPH_H + +#ifdef HAVE_CONFIG_H +#include +#endif + +#define CRYSTFEL_TYPE_FOM_GRAPH (crystfel_fom_graph_get_type()) + +#define CRYSTFEL_FOM_GRAPH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + CRYSTFEL_TYPE_FOM_GRAPH, CrystFELFoMGraph)) + +#define CRYSTFEL_IS_FOM_GRAPH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ + CRYSTFEL_TYPE_FOM_GRAPH)) + +#define CRYSTFEL_FOM_GRAPH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((obj), \ + CRYSTFEL_TYPE_FOM_GRAPH, CrystFELFoMGraph)) + +#define CRYSTFEL_IS_FOM_GRAPH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((obj), \ + CRYSTFEL_TYPE_FOM_GRAPH)) + +#define CRYSTFEL_FOM_GRAPH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \ + CRYSTFEL_TYPE_FOM_GRAPH, CrystFELFoMGraph)) + + +#define COLSCALE_N_BINS (256) +#define COLSCALE_SAMPLE_SIZE (4096) + +struct _crystfelfomgraph +{ + GtkDrawingArea parent_instance; + double visible_width; + double visible_height; +}; + +struct _crystfelfomgraphclass +{ + GtkDrawingAreaClass parent_class; +}; + +typedef struct _crystfelfomgraph CrystFELFoMGraph; +typedef struct _crystfelfomgraphclass CrystFELFoMGraphClass; + +extern GType crystfel_fom_graph_get_type(void); +extern GtkWidget *crystfel_fom_graph_new(void); + +#endif /* CRYSTFELFOMGRAPH_H */ diff --git a/src/gui_fom.c b/src/gui_fom.c index c30ff5af..160e84e3 100644 --- a/src/gui_fom.c +++ b/src/gui_fom.c @@ -44,6 +44,7 @@ #include "gui_project.h" #include "crystfel_gui.h" #include "gtk-util-routines.h" +#include "crystfelfomgraph.h" #define MAX_DATASETS (64) @@ -57,6 +58,7 @@ struct fom_window GtkWidget *min_snr; GtkWidget *min_meas; GtkWidget *cell_chooser; + GtkWidget *graph; int n_datasets; GtkWidget *dataset_checkboxes[MAX_DATASETS]; @@ -616,7 +618,6 @@ gint fom_sig(GtkWidget *widget, struct crystfelproject *proj) GtkWidget *hbox; GtkWidget *label; GtkWidget *button; - GtkWidget *da; char tmp[64]; struct fom_window *f; @@ -761,9 +762,9 @@ gint fom_sig(GtkWidget *widget, struct crystfelproject *proj) snprintf(tmp, 64, "%i", proj->fom_min_meas); gtk_entry_set_text(GTK_ENTRY(f->min_meas), tmp); - da = gtk_drawing_area_new(); - gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(da), - FALSE, FALSE, 4.0); + f->graph = crystfel_fom_graph_new(); + gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(f->graph), + TRUE, TRUE, 4.0); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); -- cgit v1.2.3