e37cefb4196b1aaf8685b1eb750a74c3967bd84e
markd
Tue Feb 7 18:59:27 2017 -0800
update transmap label fields
diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index a1deefe..3e299be 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -1870,32 +1870,33 @@
safef(sym, sizeof(sym), "omim%s", cartString(cart, "db"));
labelMakeCheckBox(tdb, sym, "OMIM ID", FALSE);
}
printf("
\n");
/* Put up noncoding option and codon coloring stuff. */
hideNoncodingOpt(tdb);
baseColorDrawOptDropDown(cart, tdb);
printf("
\n");
// let the user choose to see the track in wiggle mode
wigOption(cart, tdb->track, tdb->shortLabel, tdb);
}
void transMapUI(struct trackDb *tdb)
-/* Put up transMap-specific controls */
+/* Put up transMap-specific controls for table-based transMap */
{
+// FIXME: this can be deleted once table-based transMap is no longer supported.
printf("Label: ");
labelMakeCheckBox(tdb, "orgCommon", "common name", FALSE);
labelMakeCheckBox(tdb, "orgAbbrv", "organism abbreviation", FALSE);
labelMakeCheckBox(tdb, "db", "assembly database", FALSE);
labelMakeCheckBox(tdb, "gene", "gene", FALSE);
labelMakeCheckBox(tdb, "acc", "accession", FALSE);
baseColorDrawOptDropDown(cart, tdb);
indelShowOptions(cart, tdb);
}
void retroGeneUI(struct trackDb *tdb)
/* Put up retroGene-specific controls */
{
printf("Label: ");
@@ -2882,31 +2883,31 @@
cbrWabaUi(tdb);
else if (sameString(track, "fishClones"))
fishClonesUi(tdb);
else if (sameString(track, "recombRate"))
recombRateUi(tdb);
else if (sameString(track, "recombRateRat"))
recombRateRatUi(tdb);
else if (sameString(track, "recombRateMouse"))
recombRateMouseUi(tdb);
else if (sameString(track, "cghNci60"))
cghNci60Ui(tdb);
else if (sameString(track, "xenoRefGene")
|| sameString(track, "ncbiGene")
|| sameString(track, "refGene"))
refGeneUI(tdb);
-else if (startsWith("transMapAln", track))
+else if (startsWith("transMapAln", track) && (trackDbSetting(tdb, "bigDataUrl") == NULL))
transMapUI(tdb);
else if (sameString(track, "rgdGene2"))
rgdGene2UI(tdb);
else if (sameString(track, "knownGene"))
knownGeneUI(tdb);
else if (sameString(track, "omimLocation"))
omimLocationUI(tdb);
else if (sameString(track, "omimGene2"))
omimGene2UI(tdb);
else if (sameString(track, "omimGene"))
omimGeneUI(tdb);
else if (sameString(track, "hg17Kg"))
hg17KgUI(tdb);
else if (startsWith("ucscRetro", track)
|| startsWith("retroMrnaInfo", track))