src/hg/instinct/hgBamBam/hgBamBam.c 1.7

Index: src/hg/instinct/hgBamBam/hgBamBam.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/hgBamBam/hgBamBam.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -B -U 4 -r1.6 -r1.7
--- src/hg/instinct/hgBamBam/hgBamBam.c	1 Jun 2010 03:45:09 -0000	1.6
+++ src/hg/instinct/hgBamBam/hgBamBam.c	1 Jun 2010 04:00:48 -0000	1.7
@@ -19,10 +19,8 @@
 /* ---- Global variables. ---- */
 struct cart *cart;	         /* This holds cgi and other variables between clicks. */
 struct hash *oldVars;	         /* Old cart hash. */
 
-#define FLOAT_NULL -9999
-
 char *db = "pdata";
 char *localDb = "localDb";
 
 void usage()
@@ -37,10 +35,9 @@
 
 /****** BEGIN HELPER FUNCTIONS *******/
 
 
-struct bed *getBed(struct sqlConnection *conn, char *tableName, char *pos, int nField, 
-		   float *retMinVal, float *retMaxVal)
+struct bed *getBed(struct sqlConnection *conn, char *tableName, char *pos, int nField) 
 {
 /* get the data from the database */
 char **row = NULL;
 char query[512];
@@ -64,25 +61,15 @@
 struct sqlResult *sr = sqlGetResult(conn, query);
 struct bed *tuple = NULL;
 struct bed *tupleList = NULL;
 
-float val, maxVal = -1, minVal = 9999999.9;
-
 /* all copy number tracks are bed 4 */
 while ((row = sqlNextRow(sr)) != NULL)
     {
     tuple = bedLoadN(row+1, nField);
     slAddHead(&tupleList, tuple);
-    val = sqlFloat(tuple->name);
-    if (val > maxVal)
-	maxVal = val;
-    if (val < minVal)
-	minVal = val;
     }
 
-*retMinVal = minVal;
-*retMaxVal = maxVal;
-
 slReverse(&tupleList);
 sqlFreeResult(&sr);
 return tupleList;
 }
@@ -156,14 +143,9 @@
 {
 char tableName[256];
 safef(tableName, sizeof(tableName), "%s_%s", sampleName, suffix);
 
-float minVal = 0;
-float tmpMax = 0;
-struct bed *bed = getBed(conn, tableName, pos, 4, &minVal, &tmpMax);
-
-if (maxVal == FLOAT_NULL)
-    maxVal = tmpMax;
+struct bed *bed = getBed(conn, tableName, pos, 4); 
 
 struct settings *settings = initSettings(conn, pos, title, width, height, 0.0, maxVal);
 
 char *filename = copyNumberGif(conn, bed, settings, suffix, 0.0, col);
@@ -175,9 +157,9 @@
 jsonAddString(js, jsName, filename);
 
 bedFree(&bed);
 
-return tmpMax;
+return settings->maxVal;
 }
 
 void drawInterBreaks(struct sqlConnection *conn, struct json *js, 
 		     char *pos, int width, char *name, char *suffix)