diff options
Diffstat (limited to 'src/control.h')
| -rw-r--r-- | src/control.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/control.h b/src/control.h index 76eb2ff..17a41bd 100644 --- a/src/control.h +++ b/src/control.h @@ -20,8 +20,6 @@ #include <inttypes.h> #include <GL/gl.h> -#define MAX_IMAGES 256 - typedef enum ift_enum { INPUT_NONE, INPUT_QDRP, @@ -44,12 +42,6 @@ typedef enum { PEAKSEARCH_STAT } PeakSearchMode; -typedef enum { - RECONSTRUCTION_MAPPING = 0, - RECONSTRUCTION_PREDICTION = 1<<0, - RECONSTRUCTION_DIRAX = 1<<1 -} ReconstructionMode; - typedef struct imagerecord_struct { uint16_t *image; @@ -81,8 +73,6 @@ typedef struct cctx_struct { /* Modes */ InputFileType inputfiletype; - FormulationMode fmode; - ReconstructionMode rmode; PeakSearchMode psmode; unsigned int prealign; unsigned int savecache; @@ -94,6 +84,7 @@ typedef struct cctx_struct { /* Basic parameters, stored here solely so they can be copied * into the ImageRecord(s) more easily */ + FormulationMode fmode; double camera_length; double omega; /* Degrees */ double resolution; @@ -111,15 +102,15 @@ typedef struct cctx_struct { /* The input images */ int n_images; - ImageRecord images[MAX_IMAGES]; + ImageRecord *images; /* Output */ struct reflectionlist_struct *reflectionlist; struct dw_struct *dw; - struct basis_struct *cell; + struct basis_struct *cell; /* Current estimate of the reciprocal unit cell */ + struct reflectionlist_struct *cell_lattice; /* Reflections calculated from 'cell' */ /* GTK bits */ - GtkWidget *combo_algorithm; GtkWidget *combo_peaksearch; GtkWidget *checkbox_prealign; GtkWidget *checkbox_savecache; @@ -142,7 +133,11 @@ typedef struct cctx_struct { /* DirAx high-level stuff */ int dirax_step; int dirax_read_cell; - + + /* Reprojection stuff */ + int reproject_cur_image; + struct imagedisplay_struct *reproject_id; + } ControlContext; extern int control_add_image(ControlContext *ctx, uint16_t *image, int width, int height, double tilt); |