src/hg/instinct/hgGeneset/hgGenesets.h 1.1

Index: src/hg/instinct/hgGeneset/hgGenesets.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/hgGeneset/hgGenesets.h,v
retrieving revision 1.3
retrieving revision 1.1
diff -b -B -U 1000000 -r1.3 -r1.1
--- src/hg/instinct/hgGeneset/hgGenesets.h	22 Jan 2010 05:11:28 -0000	1.3
+++ src/hg/instinct/hgGeneset/hgGenesets.h	19 Jan 2010 23:05:15 -0000	1.1
@@ -1,104 +1,45 @@
 /*  */
 
 #ifndef HGGENESETS_H
 #define HGGENESETS_H
 
+
 #define MAX_NUM_RESPONSE 100  // maximum number of objects in JSON response
 
 #include "cart.h"
 
-#define DEBUG 1
-#define VERSION "0.1"
+#define DEBUG 0
 
 /*** Prefixes for variables in cart we don't share with other apps. ***/
-#define hghPrefix "hgg_"
+#define bioIntPrefix "hgg_"
 #define hghDo hghPrefix "do"
 
 #define hghTableName hghPrefix "tableName"
 
 /*** Our various cart variables. ***/
 #define hghHeatmap hghPrefix "heatmap"
 #define hghDataSet hghPrefix "dataset"
 #define hghDisplayType hghPrefix "display"
 #define hghGhName hghPrefix "ghName"
 #define hghMaxGapToFill hghPrefix "maxGapToFill"
 #define hghImageWidth hghPrefix "imageWidth"
 #define hghDataConfigPrefix hghPrefix "data_" 
 
-#define hghMode hghPrefix "mode"
-#define hghDatasetId hghPrefix "dataset"
-#define hghSampleIds hghPrefix "samples"
-#define hghFeatureIds hghPrefix "features"
-#define hghWidth hghPrefix "width"
-#define hghHeight hghPrefix "height"
-
-
 /** Commands from Javascript client **/
 
 #define bioIntPrefix "hgg_"
 
 /* Obtaining Heatmaps */
 #define bioIntMode bioIntPrefix "mode"
 #define bioIntFeature bioIntPrefix "feature"
 #define bioIntCohortId bioIntPrefix "cohort_id"
 #define bioIntAnalysisId bioIntPrefix "analysis_id"
 #define bioIntFeatureId bioIntPrefix "feature_id"
 #define bioIntFeatureName bioIntPrefix "feature_name"
 #define bioIntTakeTop bioIntPrefix "take_top"
 #define bioIntSourceName bioIntPrefix "source"
 
-#define DEFAULT_HEATMAP_WIDTH 500
-#define DEFAULT_HEATMAP_HEIGHT 500
-
 /* ---- Global variables declared in hgHeatmap.c */
 extern struct cart *cart;	/* This holds cgi and other variables between clicks. */
 
-struct rawData {
-    struct rawData *next;
-
-    int sample_id;
-    int feature_id;
-    double val;
-    double conf;
-};
-
-struct mapSettings {
-    double gain;
-    double max_deviation;
-
-    int width;
-    int height;
-
-    double x_scale;
-    double y_scale;
-
-    struct rgbColor *low;
-    struct rgbColor *zero;
-    struct rgbColor *high;
-    struct rgbColor *missing;
-
-    struct hash *x_index;
-    struct hash *y_index;
-};
-
-struct hmPixel {
-    struct hmPixel *next;
-    int x;
-    int y;
-    int w;
-    int h;
-
-    double val;
-    int count;
-};
-
-struct mapSettings *initMapSettings(struct slName *samples, struct slName *features,
-				    int width, int height);
-
-char *heatmapGif(struct sqlConnection *conn, struct rawData *rdList,
-		 struct mapSettings *settings);
-
-void trashDirMD5File(struct tempName *tn, char *dirName, char *suffix, char *strToHash);
-
-
 #endif /* HGGENESETS_H */