32871546f1e735f004c53697f0aa180470e925cf kate Mon Feb 17 14:16:20 2014 -0800 Following up on UI suggestion from code review. Move checkbox for cleaner page (motif highligting) diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 6e09033..7c310bc 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -2591,53 +2591,52 @@ hFreeConn(&conn); } static void factorSourceUi(char *db, struct trackDb *tdb) { // Multi-select filter on factors // NOTE: this UI code doesn't currently support the use of factorSource tracks // as subtracks in a composite (would require moving to hui.c, using newer cfgByType approach) filterBy_t *filters = filterBySetGet(tdb, cart, tdb->track); if (filters != NULL) { puts("<p>"); filterBySetCfgUi(cart, tdb, filters, TRUE); filterBySetFree(&filters); } - char varName[64]; +if (trackDbSetting(tdb, "motifTable") != NULL) + { + printf("<BR><B>Highlight motifs: </B> "); + safef(varName, sizeof(varName), "%s.highlightMotifs", tdb->track); + cartMakeCheckBox(cart, varName, trackDbSettingClosestToHomeOn(tdb, "motifDrawDefault")); + printf("<BR>"); + } + printf("<BR><B>Show cell abbreviations (to right of cluster): </B> "); safef(varName, sizeof(varName), "%s.showCellAbbrevs", tdb->track); cartMakeCheckBox(cart, varName, TRUE); puts("<p><table>"); jsBeginCollapsibleSectionFontSize(cart, tdb->track, "cellSources", "Cell Abbreviations", FALSE, "medium"); struct sqlConnection *conn = hAllocConn(db); hPrintFactorSourceAbbrevTable(conn, tdb); jsEndCollapsibleSection(); puts("</table>"); hFreeConn(&conn); - - -if (trackDbSetting(tdb, "motifTable") != NULL) - { - printf("<BR><B>Highlight motifs: </B> "); - safef(varName, sizeof(varName), "%s.highlightMotifs", tdb->track); - cartMakeCheckBox(cart, varName, trackDbSettingClosestToHomeOn(tdb, "motifDrawDefault")); - } } #ifdef UNUSED static boolean isInTrackList(struct trackDb *tdbList, struct trackDb *target) /* Return TRUE if target is in tdbList. */ { struct trackDb *tdb; for (tdb = tdbList; tdb != NULL; tdb = tdb->next) if (tdb == target) return TRUE; return FALSE; } #endif /* UNUSED */ void superTrackUi(struct trackDb *superTdb, struct trackDb *tdbList)