aboutsummaryrefslogtreecommitdiff
path: root/src/gui_merge.h
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-02-22 15:56:40 +0100
committerThomas White <taw@physics.org>2021-02-22 15:56:40 +0100
commitf7cef79ae1c8db2770f067735698850ef88da04e (patch)
treed4891f091ffb1051a917559f9d365d6e97023f0e /src/gui_merge.h
parent32ee8110102b2c939c3fcc966a41587d1bb9d316 (diff)
Read job progress from written log files, even for local BE
This simplifies the backends somewhat, and makes them look more similar - e.g. there is now only one routine to find out how far along a merging job is. It has the added bonus of adding a log file for local jobs, which we would've had to add soon anyway.
Diffstat (limited to 'src/gui_merge.h')
-rw-r--r--src/gui_merge.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui_merge.h b/src/gui_merge.h
index 460c5fce..5c684e81 100644
--- a/src/gui_merge.h
+++ b/src/gui_merge.h
@@ -32,6 +32,7 @@
#include <gtk/gtk.h>
#include "gui_project.h"
+#include "crystfel_gui.h"
extern gint merge_sig(GtkWidget *widget,
struct crystfelproject *proj);
@@ -42,4 +43,7 @@ extern int write_merge_script(const char *filename,
struct merging_params *params,
const char *out_hkl);
+extern double read_merge_progress(const char *logfile_str,
+ enum gui_job_type type);
+
#endif