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

Index: src/hg/instinct/hgGeneset/hgGenesets.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/hgGeneset/hgGenesets.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -B -U 4 -r1.6 -r1.7
--- src/hg/instinct/hgGeneset/hgGenesets.h	28 Jan 2010 23:12:29 -0000	1.6
+++ src/hg/instinct/hgGeneset/hgGenesets.h	29 Jan 2010 22:27:36 -0000	1.7
@@ -5,8 +5,10 @@
 
 #define MAX_NUM_RESPONSE 100  // maximum number of objects in JSON response
 
 #include "cart.h"
+#include "bioIntDb.h"
+#include "bioIntDriver.h"
 
 #define DEBUG 1
 #define VERSION "0.1"
 
@@ -71,18 +73,35 @@
 
     int width;
     int height;
 
-    double x_scale;
-    double y_scale;
+    MgFont *font;
+    int fontHeight;
+    
+    double hm_x_scale;
+    double hm_y_scale;
+    int hm_x;
+    int hm_y;
+    int hm_width;
+    int hm_height;
+
+    double thumb_x_scale;
+    double thumb_y_scale;
+    int thumb_x;
+    int thumb_y;
+    int thumb_width;
+    int thumb_height;
 
     struct rgbColor *low;
     struct rgbColor *zero;
     struct rgbColor *high;
     struct rgbColor *missing;
 
     struct hash *x_index;
     struct hash *y_index;
+    
+    struct hash *sampleHash;
+    struct hash *featureHash;
 };
 
 struct hmPixel {
     struct hmPixel *next;
@@ -94,9 +113,10 @@
     double val;
     int count;
 };
 
-struct mapSettings *initMapSettings(struct slName *samples, struct slName *features,
+struct mapSettings *initMapSettings(struct slName *saList, struct slName *feList,
+				    struct samples *samples, struct analysisFeatures *features,
 				    int width, int height);
 
 char *heatmapGif(struct sqlConnection *conn, struct rawData *rdList,
 		 struct mapSettings *settings);