4e4629ec70e0b6635441790483d6d24bb30df91b braney Fri May 13 17:00:35 2016 -0700 first cut at long range interaction track diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index d07eb52..4ab30f5 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -129,30 +129,31 @@ #include "pcrResult.h" #include "variome.h" #include "pubsTracks.h" #endif /* GBROWSE */ #ifdef LOWELAB #include "loweLabTracks.h" #include "rnaPLFoldTrack.h" #endif /* LOWELAB */ #ifdef LOWELAB_WIKI #include "wiki.h" #endif /* LOWELAB_WIKI */ #include "trackVersion.h" #include "genbank.h" +#include "bedTabix.h" #define CHROM_COLORS 26 /* Declare our color gradients and the the number of colors in them */ Color shadesOfGreen[EXPR_DATA_SHADES]; Color shadesOfRed[EXPR_DATA_SHADES]; Color shadesOfBlue[EXPR_DATA_SHADES]; Color shadesOfYellow[EXPR_DATA_SHADES]; Color shadesOfGreenOnWhite[EXPR_DATA_SHADES]; Color shadesOfRedOnWhite[EXPR_DATA_SHADES]; Color shadesOfBlueOnWhite[EXPR_DATA_SHADES]; Color shadesOfYellowOnWhite[EXPR_DATA_SHADES]; Color shadesOfRedOnYellow[EXPR_DATA_SHADES]; Color shadesOfBlueOnYellow[EXPR_DATA_SHADES]; Color orangeColor = 0; @@ -13624,30 +13625,48 @@ // this probably needs to stay here (it's in the wrong function) if (startsWith("pubs", track->track) && stringIn("Marker", track->track)) pubsMarkerMethods(track); if (startsWith("pubs", track->track) && stringIn("Blat", track->track)) pubsBlatMethods(track); } /* else if (sameWord(type, "bedLogR")) { wordCount++; words[1] = "9"; complexBedMethods(track, tdb, FALSE, wordCount, words); //track->bedSize = 10; } */ +else if (sameWord(type, "bedTabix")) + { + tdb->canPack = TRUE; + complexBedMethods(track, tdb, FALSE, wordCount, words); + if (trackShouldUseAjaxRetrieval(tg)) + track->loadItems = dontLoadItems; + } +else if (sameWord(type, "longTabix")) + { + char *words[2]; + words[0] = type; + words[1] = "5"; + tdb->canPack = TRUE; + complexBedMethods(track, tdb, FALSE, wordCount, words); + connectMethods(track, tdb); + if (trackShouldUseAjaxRetrieval(tg)) + track->loadItems = dontLoadItems; + } else if (sameWord(type, "bigBed")) { bigBedMethods(track, tdb, wordCount, words); if (trackShouldUseAjaxRetrieval(track)) track->loadItems = dontLoadItems; } else if (sameWord(type, "bigMaf")) { tdb->canPack = TRUE; wordCount++; words[1] = "3"; wigMafMethods(track, tdb, wordCount, words); track->isBigBed = TRUE; if (trackShouldUseAjaxRetrieval(track)) track->loadItems = dontLoadItems;