src/hg/hgTracks/bigBedTrack.c 1.5

Index: src/hg/hgTracks/bigBedTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/bigBedTrack.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -B -U 4 -r1.4 -r1.5
--- src/hg/hgTracks/bigBedTrack.c	6 Feb 2010 20:45:12 -0000	1.4
+++ src/hg/hgTracks/bigBedTrack.c	10 Feb 2010 01:51:16 -0000	1.5
@@ -26,13 +26,27 @@
     errAbort("Missing fileName in %s table", table);
 return fileName;
 }
 
+struct bbiFile *fetchBbiForTrack(struct track *track)
+/* Fetch bbiFile from track, opening it if it is not already open. */
+{
+struct bbiFile *bbi = track->bbiFile;
+if (bbi == NULL)
+    {
+    struct sqlConnection *conn = hAllocConn(database);
+    char *fileName = bbiNameFromTable(conn, track->mapName);
+    hFreeConn(&conn);
+    bbi = track->bbiFile = bigBedFileOpen(fileName);
+    }
+return bbi;
+}
+
 struct bigBedInterval *bigBedSelectRange(struct sqlConnection *conn, struct track *track,
 	char *chrom, int start, int end, struct lm *lm)
 /* Return list of intervals in range. */
 {
-struct bbiFile *bbi = track->bbiFile;
+struct bbiFile *bbi = fetchBbiForTrack(track);
 int maxItems = maximumTrackItems(track) + 1;
 struct bigBedInterval *result = bigBedIntervalQuery(bbi, chrom, start, end, maxItems, lm);
 if (slCount(result) >= maxItems)
     {
@@ -71,16 +85,8 @@
 /* Return TRUE if conditions are such that can do the fast bigBed dense data fetch and
  * draw. */
 {
 return tg->isBigBed;
-#ifdef OLD
-/* Unfortunately bigBed datasets are so big, that running filters on them is not so practical
- * in the dense mode. */
-if (!tg->isBigBed)
-    return FALSE;
-int scoreFilter = cartOrTdbInt(cart, tg->tdb, "scoreFilter", 0);
-return scoreFilter == 0 && trackDbSetting(tg->tdb, "colorByStrand") == NULL;
-#endif /* OLD */
 }
 
 
 void bigBedDrawDense(struct track *tg, int seqStart, int seqEnd,
@@ -88,17 +94,18 @@
         MgFont *font, Color color)
 /* Use big-bed summary data to quickly draw bigBed. */
 {
 struct bbiSummaryElement summary[width];
-if (bigBedSummaryArrayExtended(tg->bbiFile, chromName, seqStart, seqEnd, width, summary))
+struct bbiFile *bbi = fetchBbiForTrack(tg);
+if (bigBedSummaryArrayExtended(bbi, chromName, seqStart, seqEnd, width, summary))
     {
     char *denseCoverage = trackDbSettingClosestToHome(tg->tdb, "denseCoverage");
     if (denseCoverage != NULL)
         {
 	double startVal = 0, endVal = atof(denseCoverage);
 	if (endVal <= 0)
 	    {
-	    struct bbiSummaryElement sumAll = bbiTotalSummary(tg->bbiFile);
+	    struct bbiSummaryElement sumAll = bbiTotalSummary(bbi);
 	    double mean = sumAll.sumData/sumAll.validCount;
 	    double std = calcStdFromSums(sumAll.sumData, sumAll.sumSquares, sumAll.validCount);
 	    rangeFromMinMaxMeanStd(0, sumAll.maxVal, mean, std, &startVal, &endVal);
 	    }
@@ -130,12 +137,5 @@
                                 int wordCount, char *words[])
 /* Set up bigBed methods. */
 {
 complexBedMethods(track, tdb, TRUE, wordCount, words);
-if (track->bbiFile == NULL)
-    {
-    struct sqlConnection *conn = hAllocConn(database);
-    char *fileName = bbiNameFromTable(conn, track->mapName);
-    hFreeConn(&conn);
-    track->bbiFile = bigBedFileOpen(fileName);
-    }
 }