0f09add63f6f06980b54fe6b18881d38747db60b kate Thu Nov 19 12:20:50 2015 -0800 Add difference graph feature to GTEx track. refs #15645 diff --git src/hg/lib/gtexUi.c src/hg/lib/gtexUi.c index 95bfe73..110867c 100644 --- src/hg/lib/gtexUi.c +++ src/hg/lib/gtexUi.c @@ -1,57 +1,70 @@ /* GTEx (Genotype Tissue Expression) track controls */ /* Copyright (C) 2015 The Regents of the University of California * See README in this or parent directory for licensing information. */ #include "cheapcgi.h" #include "cart.h" #include "hui.h" #include "trackDb.h" #include "gtexUi.h" void gtexGeneUi(struct cart *cart, struct trackDb *tdb, char *name, char *title, boolean boxed) /* GTEx (Genotype Tissue Expression) per gene data */ { boxed = cfgBeginBoxAndTitle(tdb, boxed, title); -printf("",boxed?" width='100%'":""); +printf("",boxed?" width='100%'":""); char cartVarName[1024]; char *selected = NULL; /* Sample selection */ -printf("

Samples: "); +printf("Samples: "); safef(cartVarName, sizeof(cartVarName), "%s.%s", name, GTEX_SAMPLES); selected = cartCgiUsualString(cart, cartVarName, GTEX_SAMPLES_DEFAULT); boolean isAllSamples = sameString(selected, GTEX_SAMPLES_ALL); cgiMakeRadioButton(cartVarName, GTEX_SAMPLES_ALL, isAllSamples); printf("All\n"); cgiMakeRadioButton(cartVarName, GTEX_SAMPLES_COMPARE_SEX, !isAllSamples); printf("Compare by gender\n"); +printf("

"); + +/* Comparison type */ +printf("

Comparison display:\n"); +safef(cartVarName, sizeof(cartVarName), "%s.%s", name, GTEX_COMPARISON_DISPLAY); +selected = cartCgiUsualString(cart, cartVarName, GTEX_COMPARISON_DEFAULT); +boolean isMirror = sameString(selected, GTEX_COMPARISON_MIRROR); +cgiMakeRadioButton(cartVarName, GTEX_COMPARISON_MIRROR, isMirror); +printf("Two graphs\n"); +cgiMakeRadioButton(cartVarName, GTEX_COMPARISON_DIFF, !isMirror); +printf("Difference graph\n"); +printf("

"); /* Data transform */ -printf("

Log10 transform:\n"); +printf("

Log10 transform:\n"); safef(cartVarName, sizeof(cartVarName), "%s.%s", name, GTEX_LOG_TRANSFORM); boolean isLogTransform = cartCgiUsualBoolean(cart, cartVarName, GTEX_LOG_TRANSFORM_DEFAULT); cgiMakeCheckBox(cartVarName, isLogTransform); -printf("

\n"); /* Viewing limits max */ -printf("

View limits maximum:\n"); +printf("  View limits maximum:\n"); safef(cartVarName, sizeof(cartVarName), "%s.%s", name, GTEX_MAX_LIMIT); // TODO: set max and initial limits from gtexInfo table int viewMax = cartCgiUsualInt(cart, cartVarName, GTEX_MAX_LIMIT_DEFAULT); cgiMakeIntVar(cartVarName, viewMax, 4); -printf("RKPM (range 10-180000)
\n"); +printf(" RPKM (range 10-180000)
\n"); +printf("

"); /* Color scheme */ -printf("

Tissue colors:\n"); +printf("

Tissue colors:\n"); safef(cartVarName, sizeof(cartVarName), "%s.%s", name, GTEX_COLORS); selected = cartCgiUsualString(cart, cartVarName, GTEX_COLORS_DEFAULT); boolean isGtexColors = sameString(selected, GTEX_COLORS_GTEX); cgiMakeRadioButton(cartVarName, GTEX_COLORS_GTEX, isGtexColors); printf("GTEx\n"); cgiMakeRadioButton(cartVarName, GTEX_COLORS_RAINBOW, !isGtexColors); -printf("rainbow\n"); +printf("Rainbow\n"); +printf("

"); cfgEndBox(boxed); }