7a89988d6fd56140fd0b43c0f60430a210c24570 braney Thu May 19 16:41:30 2016 -0700 connecting things up for the long-range interaction display. diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 4ab30f5..7103555 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -130,30 +130,31 @@ #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" +#include "knetUdc.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; @@ -13627,43 +13628,43 @@ 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")) { + knetUdcInstall(); 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); + complexBedMethods(track, tdb, FALSE, 2, words); + longRangeMethods(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);