818ea30b1cb9ac557a82ee0529ecef13005ed553
braney
  Wed Jun 3 18:36:52 2015 -0700
Revert "support setting transMap track default item labeling in trackDb (#15440)"

This reverts commit ec6300a5b8e9b70968f7657becefb23ef9b23021.

diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index 7e76ed1..2ff9d7c 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -933,34 +933,33 @@
 {
 int i = 0; /* variable to walk through array */
 
 printf("<BR><B>Type of region to display: </B> ");
 printf("&nbsp;(Click <A HREF=\"http://www.oreganno.org/oregano/help/records.html\" target=\"_blank\">here</A> for detailed information on these element types)<BR>");
 for (i = 0; i < oregannoTypeSize; i++)
     {
     cartMakeCheckBox(cart, oregannoTypeString[i], TRUE);
     printf (" %s<BR>", oregannoTypeLabel[i]);
     }
 }
 
 void labelMakeCheckBox(struct trackDb *tdb, char *sym, char *desc, boolean dflt)
 /* add a checkbox use to choose labels to enable. */
 {
-/* some how the closest to home magic prepends the track name for cart  */
 char varName[64];
-safef(varName, sizeof(varName), "label.%s", sym);
-boolean option = cartOrTdbBoolean(cart, tdb, varName, dflt);
+safef(varName, sizeof(varName), "%s.label.%s", tdb->track, sym);
+boolean option = cartUsualBoolean(cart, varName, dflt);
 cgiMakeCheckBox(varName, option);
 printf(" %s&nbsp;&nbsp;&nbsp;", desc);
 }
 
 void gvIdControls (struct trackDb *tdb)
 /* print the controls for the label choice */
 {
 printf("<B>Label:</B> ");
 labelMakeCheckBox(tdb, "hgvs", "HGVS name", FALSE);
 labelMakeCheckBox(tdb, "common", "Common name", FALSE);
 printf("<BR>\n");
 }
 
 void gvUi(struct trackDb *tdb)
 /* print UI for human mutation filters */
@@ -1874,35 +1873,35 @@
 printf("<BR>\n");
 
 /* Put up noncoding option and codon coloring stuff. */
 hideNoncodingOpt(tdb);
 baseColorDrawOptDropDown(cart, tdb);
 printf("<BR>\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 */
 {
 printf("<B>Label:</B> ");
-labelMakeCheckBox(tdb, "orgCommon", "common name", transMapLabelDefaultOrgCommon);
-labelMakeCheckBox(tdb, "orgAbbrv", "organism abbreviation", transMapLabelDefaultOrgAbbrv);
-labelMakeCheckBox(tdb, "db", "assembly database", transMapLabelDefaultDb);
-labelMakeCheckBox(tdb, "gene", "gene", transMapLabelDefaultGene);
-labelMakeCheckBox(tdb, "acc", "accession", transMapLabelDefaultAcc);
+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("<B>Label:</B> ");
 labelMakeCheckBox(tdb, "gene", "gene", FALSE);
 labelMakeCheckBox(tdb, "acc", "accession", FALSE);
 
 baseColorDrawOptDropDown(cart, tdb);
 }