024350b3ce6fdf80e44f62e7fcbfdfc3535ebb93 max Tue May 7 14:05:00 2013 -0700 fixing a bug where a bed3 file crashed the mouseOver mapItem method. Moved this method now into the linkedFeatures code, where it should have been from the start diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index 1b6381c..848a825 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -8,33 +8,30 @@ #include "jksql.h" #include "hdb.h" #include "bedCart.h" #include "hgTracks.h" #include "hmmstats.h" #include "localmem.h" #include "wigCommon.h" #include "bbiFile.h" #include "obscure.h" #include "bigWig.h" #include "bigBed.h" #include "bigWarn.h" #include "errCatch.h" #include "trackHub.h" - - - 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) { char *fileName = NULL; if (track->parallelLoading) // do not use mysql during parallel fetch { fileName = cloneString(trackDbSetting(track->tdb, "bigDataUrl")); } else { struct sqlConnection *conn = NULL; if (!trackHubDatabase(database)) @@ -212,39 +209,21 @@ else { int x; for (x=0; x 0) { hvGfxBox(hvg, x+xOff, yOff, 1, tg->heightPer, color); } } } } freez(&tg->summary); } -static void bigBedMapItem(struct track *tg, struct hvGfx *hvg, void *item, - char *itemName, char *mapItemName, int start, int end, - int x, int y, int width, int height) -/* Pull out special mouseover text from item->mouseOver. - * Fallback to item->name if it's not set. - * (derived from bedPlusLabelMapItem) */ -{ -// Don't bother if we are imageV2 and a dense child. -if (theImgBox && tg->limitedVis == tvDense && tdbIsCompositeChild(tg->tdb)) - return; - -struct linkedFeatures *lf = item; -//char *mouseOverText = (lf->mouseOver==NULL || isEmpty(lf->mouseOver)) ? lf->name : lf->mouseOver; -char *mouseOverText = lf->name; -mapBoxHc(hvg, start, end, x, y, width, height, tg->track, mapItemName, mouseOverText); -} - void bigBedMethods(struct track *track, struct trackDb *tdb, int wordCount, char *words[]) /* Set up bigBed methods. */ { complexBedMethods(track, tdb, TRUE, wordCount, words); -track->mapItem = bigBedMapItem; }