06257075cb492d423ed0c96a749ea64e2fe96f61 kate Wed Feb 1 15:51:33 2017 -0800 Further work on details page for barchart. refs #18736 diff --git src/hg/hgc/barChartClick.c src/hg/hgc/barChartClick.c index d35014a..eab9e29 100644 --- src/hg/hgc/barChartClick.c +++ src/hg/hgc/barChartClick.c @@ -29,44 +29,46 @@ "SELECT * FROM %s WHERE name = '%s' " "AND chrom = '%s' AND chromStart = %d AND chromEnd = %d", table, item, chrom, start, end); sr = sqlGetResult(conn, query); row = sqlNextRow(sr); if (row != NULL) { barChart = barChartBedLoad(row); } sqlFreeResult(&sr); } hFreeConn(&conn); return barChart; } +#define BAR_CHART_UNITS_DEFAULT "Value" + void doBarChartDetails(struct trackDb *tdb, char *item) /* Details of barChart item */ { int start = cartInt(cart, "o"); int end = cartInt(cart, "t"); struct barChartBed *barChart = getBarChart(item, seqName, start, end, tdb->table); if (barChart == NULL) errAbort("Can't find item %s in barChart table %s\n", item, tdb->table); genericHeader(tdb, item); int categId; float highLevel = barChartHighestValue(barChart, &categId); printf("Highest value: %0.2f in %s
\n", - highLevel, barChartGetCategoryLabel(categId, database, tdb->table)); + highLevel, barChartUiGetCategoryLabelById(categId, database, tdb)); printf("Total all values: %0.2f
\n", barChartTotalValue(barChart)); printf("Score: %d
\n", barChart->score); printf("Genomic position: " "%s %s:%d-%d
\n", database, hgTracksPathAndSettings(), database, barChart->chrom, barChart->chromStart+1, barChart->chromEnd, barChart->chrom, barChart->chromStart+1, barChart->chromEnd); puts("

"); #ifdef BOXPLOT struct tempName pngTn; if (barChartBoxplot(barChart->name, &pngTn)) printf("
\n", pngTn.forHtml); printf("
"); #endif