Alter the semantics of caching

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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/control.h b/src/control.h
index 17a41bd..6d318e9 100644
--- a/src/control.h
+++ b/src/control.h
@@ -39,7 +39,8 @@ typedef enum {
 	PEAKSEARCH_ADAPTIVE_THRESHOLD,
 	PEAKSEARCH_LSQ,
 	PEAKSEARCH_ZAEFFERER,
-	PEAKSEARCH_STAT
+	PEAKSEARCH_STAT,
+	PEAKSEARCH_CACHED
 } PeakSearchMode;
 
 typedef struct imagerecord_struct {
@@ -75,12 +76,11 @@ typedef struct cctx_struct {
 	InputFileType			inputfiletype;
 	PeakSearchMode 			psmode;
 	unsigned int			prealign;
-	unsigned int			savecache;
 	unsigned int			have_centres;
-	unsigned int			use_dirax;
 	
 	/* Input filename */
 	char 				*filename;
+	char				*cache_filename;
 	
 	/* Basic parameters, stored here solely so they can be copied
 	 * into the ImageRecord(s) more easily */
@@ -115,6 +115,7 @@ typedef struct cctx_struct {
 	GtkWidget			*checkbox_prealign;
 	GtkWidget			*checkbox_savecache;
 	GtkWidget			*checkbox_dirax;
+	GtkWidget			*cache_file_selector;
 	
 	/* IPR stuff */
 	int				ipr_cur_image;