DirAx stuff

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@139 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 19 insertions, 3 deletions

diff --git a/src/control.h b/src/control.h
index 5b0d187..bb42395 100644
--- a/src/control.h
+++ b/src/control.h
@@ -26,7 +26,8 @@ typedef enum ift_enum {
 	INPUT_NONE,
 	INPUT_QDRP,
 	INPUT_MRC,
-	INPUT_CACHE
+	INPUT_CACHE,
+	INPUT_DRX
 } InputFileType;
 
 typedef enum {
@@ -44,8 +45,9 @@ typedef enum {
 } PeakSearchMode;
 
 typedef enum {
-	RECONSTRUCTION_MAPPING,
-	RECONSTRUCTION_PREDICTION
+	RECONSTRUCTION_MAPPING		= 0,
+	RECONSTRUCTION_PREDICTION	= 1<<0,
+	RECONSTRUCTION_DIRAX		= 1<<1
 } ReconstructionMode;
 
 typedef struct imagerecord_struct {
@@ -85,6 +87,7 @@ typedef struct cctx_struct {
 	unsigned int			prealign;
 	unsigned int			savecache;
 	unsigned int			have_centres;
+	unsigned int			use_dirax;
 	
 	/* Input filename */
 	char 				*filename;
@@ -113,18 +116,31 @@ typedef struct cctx_struct {
 	/* Output */
 	struct reflectionlist_struct	*reflectionlist;
 	struct dw_struct		*dw;
+	struct basis_struct		*cell;		
 	
 	/* GTK bits */
 	GtkWidget			*combo_algorithm;
 	GtkWidget			*combo_peaksearch;
 	GtkWidget			*checkbox_prealign;
 	GtkWidget			*checkbox_savecache;
+	GtkWidget			*checkbox_dirax;
 	
 	/* IPR stuff */
 	int				ipr_cur_image;
 	struct imagedisplay_struct	*ipr_id;
 	struct reflectionlist_struct	*ipr_lat;
 	struct basis_struct		*ipr_basis;
+	
+	/* DirAx low-level stuff */
+	GIOChannel			*dirax;
+	int				dirax_pty;
+	char				*dirax_rbuffer;
+	int				dirax_rbufpos;
+	int				dirax_rbuflen;
+	
+	/* DirAx high-level stuff */
+	int				dirax_step;
+	int				dirax_read_cell;
 
 } ControlContext;