4cab7f311cadce7428c1d7e1c4dfdcb0d3a43033 angie Wed Jul 27 10:32:19 2011 -0700 Feature #3710 (vcfTabix UI options): Added controls for selection of centervariant for haplotype clustering/sorting. Also, some hgc improvements: made the Genotype Details table into a collapsible section; better display of QUAL and FILTER column values, which also involved improving the representation of those columns in src/inc/vcf.h. diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 70d4831..78621f3 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -26,30 +26,31 @@ #include "oregannoUi.h" #include "chromGraph.h" #include "hgConfig.h" #include "customTrack.h" #include "dbRIP.h" #include "tfbsConsSites.h" #include "hapmapSnps.h" #include "nonCodingUi.h" #include "expRecord.h" #include "wikiTrack.h" #include "hubConnect.h" #include "trackHub.h" #include "pcrResult.h" #include "dgv.h" #include "transMapStuff.h" +#include "vcfUi.h" #include "bbiFile.h" #include "ensFace.h" #include "microarray.h" #define MAIN_FORM "mainForm" #define WIGGLE_HELP_PAGE "../goldenPath/help/hgWiggleTrackHelp.html" static char const rcsid[] = "$Id: hgTrackUi.c,v 1.527 2010/06/04 21:54:56 angie Exp $"; struct cart *cart = NULL; /* Cookie cart with UI settings */ char *database = NULL; /* Current database. */ char *chromosome = NULL; /* Chromosome. */ struct hash *trackHash = NULL; /* Hash of all tracks in database. */ void tfbsConsSitesUi(struct trackDb *tdb) @@ -2597,32 +2598,34 @@ oregannoUi(tdb); else if (startsWith("retroposons", track)) retroposonsUi(tdb); else if (sameString(track, "tfbsConsSites")) tfbsConsSitesUi(tdb); else if (sameString(track, "CGHBreastCancerUCSF")) ucsfdemoUi(tdb); else if (startsWith("hapmapSnps", track)) hapmapSnpsUi(tdb); else if (sameString(track, "switchDbTss")) switchDbScoreUi(tdb); else if (sameString(track, "dgv") || (startsWith("dgvV", track) && isdigit(track[4]))) dgvUi(tdb); #ifdef USE_BAM else if (sameString(tdb->type, "bam")) - bamCfgUi(cart, tdb, track, NULL, FALSE); // tim would like to see this boxed when at composite level: tdbIsComposite(tdb)); + bamCfgUi(cart, tdb, track, NULL, FALSE); #endif +else if (sameString(tdb->type, "vcfTabix")) + vcfCfgUi(cart, tdb, track, NULL, FALSE); else if (tdb->type != NULL) { /* handle all tracks with type genePred or bed or "psl xeno " */ char *typeLine = cloneString(tdb->type); char *words[8]; int wordCount = 0; wordCount = chopLine(typeLine, words); if (wordCount > 0) { if (sameWord(words[0], "genePred")) { genePredCfgUi(cart,tdb,tdb->track,NULL,FALSE); } else if(sameWord(words[0], "encodePeak") || sameWord(words[0], "narrowPeak") || sameWord(words[0], "broadPeak") || sameWord(words[0], "gappedPeak"))