aboutsummaryrefslogtreecommitdiff
path: root/src/gui_project.h
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-11-30 16:43:17 +0100
committerThomas White <taw@physics.org>2020-11-30 17:32:30 +0100
commitd6f6658a29ed309b47a0b8fd0fc6bfdb023cb258 (patch)
tree6395e024e78c77d319a90082b248fa2007aaf654 /src/gui_project.h
parent27c00c6dde58d6e4f7a7f2f3a9b00fd001f2dcff (diff)
Pass result to backend for merging
Diffstat (limited to 'src/gui_project.h')
-rw-r--r--src/gui_project.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/gui_project.h b/src/gui_project.h
index bb35eb0c..d892f7c3 100644
--- a/src/gui_project.h
+++ b/src/gui_project.h
@@ -114,6 +114,15 @@ struct merging_params {
float push_res;
};
+struct gui_result
+{
+ char *name;
+
+ int n_streams;
+ char **streams;
+ StreamIndex **indices;
+};
+
struct crystfelproject;
struct crystfel_backend {
@@ -158,6 +167,7 @@ struct crystfel_backend {
void *(*run_merging)(const char *job_title,
const char *job_notes,
struct crystfelproject *proj,
+ struct gui_result *input,
void *opts_priv);
/* Called to ask the backend to write its merging options */
@@ -183,15 +193,6 @@ struct gui_task
void *job_priv;
};
-struct gui_result
-{
- char *name;
-
- int n_streams;
- char **streams;
- StreamIndex **indices;
-};
-
struct crystfelproject {
GtkWidget *window;