src/hg/hgTrackUi/hgTrackUi.c 1.495

Index: src/hg/hgTrackUi/hgTrackUi.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTrackUi/hgTrackUi.c,v
retrieving revision 1.494
retrieving revision 1.495
diff -b -B -U 4 -r1.494 -r1.495
--- src/hg/hgTrackUi/hgTrackUi.c	23 Jun 2009 05:52:28 -0000	1.494
+++ src/hg/hgTrackUi/hgTrackUi.c	17 Jul 2009 06:24:57 -0000	1.495
@@ -45,29 +45,13 @@
 char *chromosome = NULL;	        /* Chromosome. */
 
 void superTrackUi(struct trackDb *superTdb);
 
-void radioButton(char *var, char *val, char *ourVal)
-/* Print one radio button */
-{
-cgiMakeRadioButton(var, ourVal, sameString(ourVal, val));
-printf("%s ", ourVal);
-}
+
 
 /* Even more of a mess. */
 
-void filterButtons(char *filterTypeVar, char *filterTypeVal, boolean none)
-/* Put up some filter buttons. */
-{
-printf("<B>Filter:</B> ");
-radioButton(filterTypeVar, filterTypeVal, "red");
-radioButton(filterTypeVar, filterTypeVal, "green");
-radioButton(filterTypeVar, filterTypeVal, "blue");
-radioButton(filterTypeVar, filterTypeVal, "exclude");
-radioButton(filterTypeVar, filterTypeVal, "include");
-if (none)
-    radioButton(filterTypeVar, filterTypeVal, "none");
-}
+
 
 void tfbsConsSitesUi(struct trackDb *tdb)
 {
 float tfbsConsSitesCutoff =
@@ -1466,17 +1450,8 @@
 {
 ensemblNonCodingTypeConfig(tdb);
 }
 
-void oneMrnaFilterUi(struct controlGrid *cg, char *text, char *var)
-/* Print out user interface for one type of mrna filter. */
-{
-controlGridStartCell(cg);
-printf("%s:<BR>", text);
-cgiMakeTextVar(var, cartUsualString(cart, var, ""), 19);
-controlGridEndCell(cg);
-}
-
 void mrnaUi(struct trackDb *tdb, boolean isXeno)
 /* Put up UI for an mRNA (or EST) track. */
 {
 struct mrnaUiData *mud = newMrnaUiData(tdb->tableName, isXeno);
@@ -1497,39 +1472,15 @@
 /* List various fields you can filter on. */
 printf("<table border=0 cellspacing=1 cellpadding=1 width=%d>\n", CONTROL_TABLE_WIDTH);
 cg = startControlGrid(4, NULL);
 for (fil = mud->filterList; fil != NULL; fil = fil->next)
-     oneMrnaFilterUi(cg, fil->label, fil->key);
+    oneMrnaFilterUi(cg, fil->label, fil->key, cart);
 endControlGrid(&cg);
 baseColorDrawOptDropDown(cart, tdb);
 indelShowOptions(cart, tdb);
 }
 
-void bedUi(struct trackDb *tdb)
-/* Put up UI for an mRNA (or EST) track. */
-{
-struct mrnaUiData *mud = newBedUiData(tdb->tableName);
-struct mrnaFilter *fil;
-struct controlGrid *cg = NULL;
-char *filterTypeVar = mud->filterTypeVar;
-char *filterTypeVal = cartUsualString(cart, filterTypeVar, "red");
-char *logicTypeVar = mud->logicTypeVar;
-char *logicTypeVal = cartUsualString(cart, logicTypeVar, "and");
-
-/* Define type of filter. */
-filterButtons(filterTypeVar, filterTypeVal, FALSE);
-printf("  <B>Combination Logic:</B> ");
-radioButton(logicTypeVar, logicTypeVal, "and");
-radioButton(logicTypeVar, logicTypeVal, "or");
-printf("<BR>\n");
 
-/* List various fields you can filter on. */
-printf("<table border=0 cellspacing=1 cellpadding=1 width=%d>\n", CONTROL_TABLE_WIDTH);
-cg = startControlGrid(4, NULL);
-for (fil = mud->filterList; fil != NULL; fil = fil->next)
-     oneMrnaFilterUi(cg, fil->label, fil->key);
-endControlGrid(&cg);
-}
 
 static void filterByChrom(struct trackDb *tdb)
 {
 char *filterSetting;
@@ -2263,9 +2214,11 @@
     mrnaUi(tdb, FALSE);
 else if (sameString(track, "mrna"))
     mrnaUi(tdb, FALSE);
 else if (sameString(track, "splicesP"))
-    bedUi(tdb);
+    bedUi(tdb, cart, "", FALSE);
+else if(sameString(track,"FantomCageH04V2")) 
+    bedUi(tdb, cart, "", FALSE);
 else if (sameString(track, "all_est"))
         mrnaUi(tdb, FALSE);
 else if (sameString(track, "est"))
         mrnaUi(tdb, FALSE);