95efc27edf24bba8d0c7e53d2ef4aead59982826 braney Mon Jun 15 18:29:39 2020 -0700 Merging in our gencode merge code to master branch diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 55fd569..7186846 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -6540,30 +6540,39 @@ char query[512]; sqlSafef(query, sizeof(query), "select r,g,b from kgColor where kgID='%s'", lf->name); struct sqlResult *sr = sqlGetResult(conn, query); char **row = sqlNextRow(sr); if (row != NULL) colIx = hvGfxFindColorIx(hvg, sqlUnsigned(row[0]), sqlUnsigned(row[1]), sqlUnsigned(row[2])); sqlFreeResult(&sr); hFreeConn(&conn); return colIx; } else return knownGeneColorCalc(tg, item, hvg); } +void gencodeMethods(struct track *tg) +/* Make track of known genes. */ +{ +tg->loadItems = loadKnownGene; +tg->itemName = knownGeneName; +tg->mapItemName = knownGeneMapName; +tg->itemColor = knownGeneColor; +} + void knownGeneMethods(struct track *tg) /* Make track of known genes. */ { /* use loadGenePredWithName2 instead of loadKnownGene to pick up proteinID */ tg->loadItems = loadKnownGene; tg->itemName = knownGeneName; tg->mapItemName = knownGeneMapName; tg->itemColor = knownGeneColor; } void h1n1SeqMethods(struct track *tg) /* Make track of known genes. */ { /* use loadGenePredWithName2 instead of loadKnownGene to pick up proteinID */ tg->itemName = h1n1SeqName;