4c479e3bbf02d10115c867a5f7a6e25d89146567 kate Mon Jan 25 16:04:43 2016 -0800 Cleanup styling. diff --git src/hg/lib/gtexUi.c src/hg/lib/gtexUi.c index e4ae2cd..93f954d 100644 --- src/hg/lib/gtexUi.c +++ src/hg/lib/gtexUi.c @@ -8,42 +8,51 @@ #include "hui.h" #include "trackDb.h" #include "jsHelper.h" #include "gtexTissue.h" #include "gtexUi.h" #define SYSTEM_BRAIN "Brain" #define SYSTEM_REPRODUCTIVE "Reproductive" #define SYSTEM_GASTRO "Digestive" #define SYSTEM_ENDOCRINE "Endocrine" #define SYSTEM_CARDIO "Cardiovascular" #define SYSTEM_OTHER "Other" +static void initTissueTableStyle() +{ +puts("\n"); +} + static char *makeTissueColorPatch(struct gtexTissue *tis) { char buf[256]; -safef(buf, sizeof(buf), "", tis->color); +safef(buf, sizeof(buf), "", tis->color); return(cloneString(buf)); } static char *makeTissueLabel(struct gtexTissue *tis) { char buf[256]; -safef(buf, sizeof(buf), "" - " %s", +safef(buf, sizeof(buf), "" + " %s", tis->color, tis->description); return(cloneString(buf)); } static char *getSystem(struct gtexTissue *tis) { if (startsWith("brain", tis->name)) return(SYSTEM_BRAIN); else if (sameString(tis->name, "uterus") || sameString(tis->name, "testis") || sameString(tis->name, "vagina") || sameString(tis->name, "prostate") || sameString(tis->name, "ovary") || sameString(tis->name, "breastMamTissue") || sameString(tis->name, "ectocervix") || sameString(tis->name, "endocervix") || sameString(tis->name, "fallopianTube")) return(SYSTEM_REPRODUCTIVE); else if (startsWith("esophagus", tis->name) || startsWith("colon", tis->name) || @@ -58,31 +67,31 @@ else return(SYSTEM_OTHER); } struct tissueSelect { struct tissueSelect *next; char *name; char *label; boolean checked; }; static void makeGroupCheckboxes(char *name, char *title, struct tissueSelect *tisSelects) { if (title != NULL) - printf("%s\n", title); + printf("%s\n", title); int count = slCount(tisSelects); struct tissueSelect **tisArray; AllocArray(tisArray, count); int i=0; struct tissueSelect *tsel; for (i=0, tsel = tisSelects; tsel != NULL; tsel = tsel->next, i++) tisArray[i] = tsel; int col=0; int row=0; int tableColumns=3; for (i=0; i=count) { @@ -121,95 +130,96 @@ else tsel->checked = (hashLookup(checkHash, tis->name) != NULL); slAddHead(&allTissues, tsel); } slReverse(&allTissues); makeGroupCheckboxes(name, NULL, allTissues); puts(""); char buf[512]; safef(buf, sizeof(buf), "%s%s", cgiMultListShadowPrefix(), name); cgiMakeHiddenVar(buf, "0"); } static void makeTableTissueCheckboxes(char *name, struct gtexTissue *tissues, struct slName *checked, struct cart *cart) { +initTissueTableStyle(); char *onClick = ""; // Sortable table can't be displayed when UI is activated from right-click (popup mode) if (!cartVarExists(cart, "ajax")) { jsIncludeFile("hui.js", NULL); onClick = "'tableSortAtButtonPress(this);"; } struct hash *checkHash = hashNew(0); struct slName *sel; for (sel = checked; sel != NULL; sel = sel->next) hashAdd(checkHash, sel->name, sel->name); //puts(""); puts("\n
"); /* table header */ char orderVar[256]; safef(orderVar, sizeof(orderVar), "%s.sortOrder", name); char *sortOrder = cartCgiUsualString(cart, orderVar, "tissue=+ samples=+ organ=+ system=+"); puts("\n"); puts("\n"); printf("\n\n", orderVar, sortOrder); puts(""); -printf("", onClick); -printf("", onClick); -printf("", onClick); -printf("", onClick); puts("\n"); puts(""); /* table body */ printf(""); struct hash *tscHash = gtexGetTissueSampleCount(); struct gtexTissue *tis; boolean isChecked = FALSE; for (tis = tissues; tis != NULL; tis = tis->next) { puts("\n"); // checkbox if (hashNumEntries(checkHash) == 0) isChecked = TRUE; else isChecked = (hashLookup(checkHash, tis->name) != NULL); printf("", name, tis->name, isChecked ? "checked" : ""); // color patch printf("\n%s", makeTissueColorPatch(tis)); // tissue name - printf("\n", tis->description); + printf("\n", tis->description); // sample count int samples = hashIntValDefault(tscHash, tis->name, 0); - printf("\n", samples, samples); + printf("\n", samples, samples); // organ - printf("\n", tis->organ); + printf("\n", tis->organ); // system - printf("\n", getSystem(tis)); + printf("\n", getSystem(tis)); puts("\n"); } puts(""); puts("
      Tissue Samples Organ System
 %s %s %d %d %s %s %s %s
"); char buf[512]; safef(buf, sizeof(buf), "%s%s", cgiMultListShadowPrefix(), name); cgiMakeHiddenVar(buf, "0"); } static void makeGroupedTissueCheckboxes(char *name, struct gtexTissue *tissues, struct slName *checked) { struct hash *checkHash = hashNew(0); struct slName *sel; for (sel = checked; sel != NULL; sel = sel->next)