56e310552abf565c1bce2c7a58705e951e3bbf8f max Tue Sep 11 06:43:48 2018 -0700 I don't know what happened here. I committed the completely wrong file, sorry. Reverting it now. Revert "updating phegenToBed, refs #21052" This reverts commit 6985ec2b43b98f50d26ff7b3f72cefce3f6d5eba. diff --git src/hg/inc/barChartUi.h src/hg/inc/barChartUi.h index db12d7d..5f58eb0 100644 --- src/hg/inc/barChartUi.h +++ src/hg/inc/barChartUi.h @@ -2,48 +2,41 @@ /* Copyright (C) 2015 The Regents of the University of California * See README in this or parent directory for licensing information. */ #ifndef BAR_CHARTUI_H #define BAR_CHARTUI_H /* Color scheme */ #define BAR_CHART_COLORS "colorScheme" #define BAR_CHART_COLORS_RAINBOW "rainbow" /* Color scheme from user */ #define BAR_CHART_COLORS_USER "user" #define BAR_CHART_COLORS_DEFAULT BAR_CHART_COLORS_USER /* Data transform */ - -// WARNING: these also appear in JS + // WARNING: this also appears in JS #define BAR_CHART_LOG_TRANSFORM "logTransform" #define BAR_CHART_LOG_TRANSFORM_DEFAULT TRUE -#define BAR_CHART_AUTOSCALE "autoScale" -#define BAR_CHART_AUTOSCALE_DEFAULT FALSE /* Data range and viewing limits */ #define BAR_CHART_MAX_LIMIT "maxLimit" #define BAR_CHART_MAX_LIMIT_DEFAULT 10000 + // WARNING: this also appears in JS #define BAR_CHART_MAX_VIEW_LIMIT "maxViewLimit" #define BAR_CHART_MAX_VIEW_LIMIT_DEFAULT 50 -/* These cann be set via maxHeightPixels */ -#define BAR_CHART_MAX_HEIGHT_MIN 50 -#define BAR_CHART_MAX_HEIGHT_DEFAULT 175 -#define BAR_CHART_MAX_HEIGHT_MAX 250 - /* Category (bar) info */ #define BAR_CHART_MAX_CATEGORIES 100 /* Category filter */ #define BAR_CHART_CATEGORY_SELECT "categories" /* Labels for categories */ #define BAR_CHART_CATEGORY_LABELS "barChartBars" #define BAR_CHART_CATEGORY_LABEL "barChartLabel" #define BAR_CHART_CATEGORY_LABEL_DEFAULT "Categories" /* Colors for categories */ #define BAR_CHART_CATEGORY_COLORS "barChartColors" /* Units to display on bar mouseover */ @@ -80,20 +73,16 @@ struct barChartCategory *barChartUiGetCategories(char *database, struct trackDb *tdb); /* Get category colors and descriptions. * If barChartLabel setting contains label list, assign rainbow colors. * O/w look for a table naed track+Category, and use labels and colors there */ struct barChartCategory *barChartUiGetCategoryById(int id, char *database, struct trackDb *tdb); /* Get category info by id */ char *barChartUiGetCategoryLabelById(int id, char *database, struct trackDb *tdb); /* Get label for a category id */ char *barChartUiGetLabel(char *database, struct trackDb *tdb); /* Get label for category list */ -void barChartUiFetchMinMaxPixels(struct cart *cart, struct trackDb *tdb, - int *retMin, int *retMax, int *retDefault, int *retCurrent); -/* Get min/max/default/current settings for track height from cart and trackDb */ - #endif /* BAR_CHARTUI_H */