diff options
| author | Thomas White <taw@physics.org> | 2020-11-30 16:43:17 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-11-30 17:32:30 +0100 |
| commit | d6f6658a29ed309b47a0b8fd0fc6bfdb023cb258 (patch) | |
| tree | 6395e024e78c77d319a90082b248fa2007aaf654 /src/gui_merge.c | |
| parent | 27c00c6dde58d6e4f7a7f2f3a9b00fd001f2dcff (diff) | |
Pass result to backend for merging
Diffstat (limited to 'src/gui_merge.c')
| -rw-r--r-- | src/gui_merge.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/gui_merge.c b/src/gui_merge.c index 971f49fc..6d0afe35 100644 --- a/src/gui_merge.c +++ b/src/gui_merge.c @@ -94,9 +94,19 @@ static int run_merging(struct crystfelproject *proj, { struct crystfel_backend *be; void *job_priv; + const gchar *results_name; + struct gui_result *input; + + /* Which result to merge? */ + results_name = gtk_combo_box_get_active_id(GTK_COMBO_BOX(proj->results_combo)); + input = find_result_by_name(proj, results_name); + if ( input == NULL ) { + ERROR("Please select a result first\n"); + return 1; + } be = &proj->backends[backend_idx]; - job_priv = be->run_merging(job_title, job_notes, proj, + job_priv = be->run_merging(job_title, job_notes, proj, input, be->merging_opts_priv); if ( job_priv != NULL ) { |