aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-12-11 16:13:22 +0100
committerThomas White <taw@physics.org>2020-12-11 16:13:22 +0100
commit90adbfa497c6fa2623081edc69a4ac665f37d543 (patch)
treefa97ad9dfb49dc75a2badbe12d2bdf2ffd361d1c
parent46224d3794d33896c978a6ac6da76f671b88d873 (diff)
Skeleton figure of merit window for GUI
-rw-r--r--CMakeLists.txt2
-rw-r--r--meson.build1
-rw-r--r--src/crystfel_gui.c3
-rw-r--r--src/gui_fom.c206
-rw-r--r--src/gui_fom.h39
5 files changed, 249 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3328c2a..4cf197ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -394,7 +394,7 @@ if (GTK_FOUND)
set(CRYSTFEL_GUI_SOURCES src/crystfel_gui.c src/crystfelimageview.c
src/gui_peaksearch.c src/gui_index.c src/gui_merge.c src/gui_backend_local.c
src/gui_project.c src/crystfelindexingopts.c src/crystfelmergeopts.c
- src/crystfelsymmetryselector.c src/gtk-util-routines.c)
+ src/crystfelsymmetryselector.c src/gtk-util-routines.c src/gui_fom.c)
if (HAVE_SLURM)
set(CRYSTFEL_GUI_SOURCES ${CRYSTFEL_GUI_SOURCES} src/gui_backend_slurm.c)
diff --git a/meson.build b/meson.build
index 69a4b9e6..af6c5735 100644
--- a/meson.build
+++ b/meson.build
@@ -215,6 +215,7 @@ if gtkdep.found()
'src/gui_peaksearch.c',
'src/gui_index.c',
'src/gui_merge.c',
+ 'src/gui_fom.c',
'src/gui_backend_local.c',
'src/gui_project.c',
versionc]
diff --git a/src/crystfel_gui.c b/src/crystfel_gui.c
index 6a88beb1..cf727018 100644
--- a/src/crystfel_gui.c
+++ b/src/crystfel_gui.c
@@ -48,6 +48,7 @@
#include "gui_peaksearch.h"
#include "gui_index.h"
#include "gui_merge.h"
+#include "gui_fom.h"
#include "gui_project.h"
#include "version.h"
@@ -845,7 +846,7 @@ static void add_task_buttons(GtkWidget *vbox, struct crystfelproject *proj)
add_button(vbox, "Merge", "applications-science",
G_CALLBACK(merge_sig), proj);
add_button(vbox, "Figures of merit", "trophy-gold",
- G_CALLBACK(NULL), proj);
+ G_CALLBACK(fom_sig), proj);
add_button(vbox, "Export data", "document-send",
G_CALLBACK(NULL), proj);
}
diff --git a/src/gui_fom.c b/src/gui_fom.c
new file mode 100644
index 00000000..73d80f41
--- /dev/null
+++ b/src/gui_fom.c
@@ -0,0 +1,206 @@
+/*
+ * gui_fom.c
+ *
+ * Figures of merit via CrystFEL GUI
+ *
+ * Copyright © 2020 Deutsches Elektronen-Synchrotron DESY,
+ * a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ * 2020 Thomas White <taw@physics.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <assert.h>
+
+#include <utils.h>
+
+#include "gui_project.h"
+#include "crystfel_gui.h"
+#include "gtk-util-routines.h"
+
+
+static void fom_response_sig(GtkWidget *dialog, gint resp,
+ struct crystfelproject *proj)
+{
+ gtk_widget_destroy(dialog);
+}
+
+
+static void add_fom(GtkWidget *menu,
+ const char *text,
+ const char *markup)
+{
+ GtkWidget *label;
+ GtkWidget *item;
+
+ item = gtk_check_menu_item_new();
+
+ label = gtk_label_new(text);
+ if ( markup != NULL ) {
+ gtk_label_set_markup(GTK_LABEL(label), markup);
+ }
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+
+ gtk_container_add(GTK_CONTAINER(item), label);
+ gtk_widget_show_all(item);
+
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+}
+
+
+static void add_separator(GtkWidget *menu)
+{
+ GtkWidget *item;
+ item = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ gtk_widget_show_all(item);
+}
+
+
+static GtkWidget *make_fom_menu()
+{
+ GtkWidget *menu;
+ GtkWidget *item;
+
+ menu = gtk_menu_new();
+
+ item = gtk_tearoff_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ gtk_widget_show_all(item);
+
+ add_fom(menu, "I/σ(I), completeness etc", NULL);
+ add_fom(menu, "Rsplit", "R<sub>split</sub>");
+ add_fom(menu, "CC", "CC<sub>½</sub>");
+ add_fom(menu, "CC*", "CC<sup>*</sup>");
+ add_separator(menu);
+ add_fom(menu, "CCano", "CC<sub>ano</sub>");
+ add_fom(menu, "Rano", "R<sub>ano</sub>");
+ add_fom(menu, "Rano ÷ Rsplit", "R<sub>ano</sub> ÷ R<sub>split</sub>");
+ add_fom(menu, "RMS anomalous correlation ratio", NULL);
+ add_separator(menu);
+ add_fom(menu, "Fraction of differences within 1σ(I)", NULL);
+ add_fom(menu, "Fraction of differences within 2σ(I)", NULL);
+
+ return menu;
+}
+
+
+gint fom_sig(GtkWidget *widget, struct crystfelproject *proj)
+{
+ GtkWidget *dialog;
+ GtkWidget *content_area;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *combo;
+ GtkWidget *button;
+ GtkWidget *entry;
+ GtkWidget *check;
+ GtkWidget *da;
+
+ dialog = gtk_dialog_new_with_buttons("Calculate figures of merit",
+ GTK_WINDOW(proj->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ "Close", GTK_RESPONSE_CLOSE,
+ NULL);
+
+ g_signal_connect(G_OBJECT(dialog), "response",
+ G_CALLBACK(fom_response_sig),
+ proj);
+
+ vbox = gtk_vbox_new(FALSE, 0.0);
+ content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+ gtk_container_add(GTK_CONTAINER(content_area), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(content_area), 8);
+
+ hbox = gtk_hbox_new(FALSE, 0.0);
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbox),
+ FALSE, FALSE, 4.0);
+ label = gtk_label_new("Merged results:");
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label),
+ FALSE, FALSE, 4.0);
+ combo = gtk_combo_box_text_new();
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(combo),
+ FALSE, FALSE, 4.0);
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo),
+ "xxx", "Dummy result");
+
+ label = gtk_label_new("Figures of merit to show:");
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label),
+ FALSE, FALSE, 4.0);
+ button = gtk_menu_button_new();
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(button),
+ FALSE, FALSE, 4.0);
+ gtk_menu_button_set_popup(GTK_MENU_BUTTON(button),
+ make_fom_menu());
+
+ hbox = gtk_hbox_new(FALSE, 0.0);
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbox),
+ FALSE, FALSE, 4.0);
+ label = gtk_label_new("Resolution range:");
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label),
+ FALSE, FALSE, 4.0);
+ entry = gtk_entry_new();
+ gtk_entry_set_width_chars(GTK_ENTRY(entry), 4);
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry),
+ FALSE, FALSE, 4.0);
+ label = gtk_label_new("to");
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label),
+ FALSE, FALSE, 4.0);
+ entry = gtk_entry_new();
+ gtk_entry_set_width_chars(GTK_ENTRY(entry), 4);
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry),
+ FALSE, FALSE, 4.0);
+ label = gtk_label_new("Å. Number of bins:");
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label),
+ FALSE, FALSE, 4.0);
+ entry = gtk_entry_new();
+ gtk_entry_set_width_chars(GTK_ENTRY(entry), 4);
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry),
+ FALSE, FALSE, 4.0);
+
+ hbox = gtk_hbox_new(FALSE, 0.0);
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbox),
+ FALSE, FALSE, 4.0);
+ check = gtk_check_button_new_with_label("Discard reflections with I/sigI less than");
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(check),
+ FALSE, FALSE, 4.0);
+ entry = gtk_entry_new();
+ gtk_entry_set_width_chars(GTK_ENTRY(entry), 4);
+ gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry),
+ FALSE, FALSE, 4.0);
+
+ da = gtk_drawing_area_new();
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(da),
+ FALSE, FALSE, 4.0);
+
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog),
+ GTK_RESPONSE_CLOSE);
+ gtk_widget_show_all(dialog);
+
+ return FALSE;
+}
diff --git a/src/gui_fom.h b/src/gui_fom.h
new file mode 100644
index 00000000..06207578
--- /dev/null
+++ b/src/gui_fom.h
@@ -0,0 +1,39 @@
+/*
+ * gui_fom.h
+ *
+ * Figures of merit via CrystFEL GUI
+ *
+ * Copyright © 2020 Deutsches Elektronen-Synchrotron DESY,
+ * a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ * 2020 Thomas White <taw@physics.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef GUI_FOM_H
+#define GUI_FOM_H
+
+#include <gtk/gtk.h>
+
+#include "gui_project.h"
+
+extern gint fom_sig(GtkWidget *widget,
+ struct crystfelproject *proj);
+
+#endif