9db84144434f7a64e41bc7ca9f32d99f7cebcfd6 max Wed Aug 21 04:46:00 2024 -0700 also changing trackUi to look at trackdb for interact track, refs #34164 diff --git src/hg/lib/interactUi.c src/hg/lib/interactUi.c index aea8423..934ec72 100644 --- src/hg/lib/interactUi.c +++ src/hg/lib/interactUi.c @@ -69,32 +69,32 @@ INTERACT_DRAW, INTERACT_DRAW_DEFAULT); char cartVar[1024]; puts("<b>Draw mode:</b> "); safef(cartVar, sizeof(cartVar), "%s.%s", track, INTERACT_DRAW); cgiMakeRadioButton(cartVar, INTERACT_DRAW_CURVE , sameString(INTERACT_DRAW_CURVE, drawMode)); printf(" %s ", "curve"); cgiMakeRadioButton(cartVar, INTERACT_DRAW_ELLIPSE, sameString(INTERACT_DRAW_ELLIPSE, drawMode)); printf(" %s ", "ellipse"); cgiMakeRadioButton(cartVar, INTERACT_DRAW_LINE, sameString(INTERACT_DRAW_LINE, drawMode)); printf(" %s ", "rectangle"); } void interactUiEndpointFilter(struct cart *cart, char *track, struct trackDb *tdb) /* Radio buttons to allow excluding items lacking endpoints in window */ { -char *endsVisible = cartUsualStringClosestToHome(cart, tdb, isNameAtParentLevel(tdb, track), - INTERACT_ENDS_VISIBLE, INTERACT_ENDS_VISIBLE_DEFAULT); +char *endsVisible = cartOrTdbString(cart, tdb, INTERACT_ENDS_VISIBLE, INTERACT_ENDS_VISIBLE_DEFAULT); + char cartVar[1024]; puts("<b>Show interactions:</b> "); safef(cartVar, sizeof(cartVar), "%s.%s", track, INTERACT_ENDS_VISIBLE); cgiMakeRadioButton(cartVar, INTERACT_ENDS_VISIBLE_ANY, sameString(INTERACT_ENDS_VISIBLE_ANY, endsVisible)); printf(" %s ", "all"); //printf(" %s ", "none"); cgiMakeRadioButton(cartVar, INTERACT_ENDS_VISIBLE_ONE, sameString(INTERACT_ENDS_VISIBLE_ONE, endsVisible)); printf(" %s ", "at least one end"); //printf(" %s ", "only one end"); cgiMakeRadioButton(cartVar, INTERACT_ENDS_VISIBLE_TWO , sameString(INTERACT_ENDS_VISIBLE_TWO, endsVisible)); printf(" %s ", "both ends in window"); //printf(" %s ", "no ends in window"); } void interactUiDashedLines(struct cart *cart, char *track, struct trackDb *tdb)