4b46ba69f8073aa3a019804a43780cfae3b3ecd8
Merge parents dbc4115 4c96376
kate
  Thu Feb 4 15:00:58 2016 -0800
Fixing merge conflit

diff --cc src/hg/hgTracks/gtexTracks.c
index 304b135,a4c372f..f6936f0
--- src/hg/hgTracks/gtexTracks.c
+++ src/hg/hgTracks/gtexTracks.c
@@@ -275,64 -274,61 +275,68 @@@
  
  static boolean filterTissue(struct track *tg, char *name)
  /* Does tissue pass filter */
  {
  struct gtexGeneExtras *extras = (struct gtexGeneExtras *)tg->extraUiData;
  return (hashLookup(extras->tissueFilter, name) != NULL);
  }
  
  static void gtexGeneLoadItems(struct track *tg)
  /* Load method for track items */
  {
  /* Get track UI info */
  struct gtexGeneExtras *extras;
  AllocVar(extras);
  tg->extraUiData = extras;
 +
 +/* Get version info from track table name */
 +// TODO: get valid versions from gtexInfo table
 +if (endsWith(tg->table, "V6"))
 +    extras->version = "V6";
  extras->doLogTransform = cartUsualBooleanClosestToHome(cart, tg->tdb, FALSE, GTEX_LOG_TRANSFORM, 
                                                  GTEX_LOG_TRANSFORM_DEFAULT);
  char *samples = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, 
                                                  GTEX_SAMPLES, GTEX_SAMPLES_DEFAULT);
  extras->graphType = cloneString(samples);
  if (sameString(samples, GTEX_SAMPLES_COMPARE_SEX))
      extras->isComparison = TRUE;
  char *comparison = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, GTEX_COMPARISON_DISPLAY,
                          GTEX_COMPARISON_DEFAULT);
  extras->isDifference = sameString(comparison, GTEX_COMPARISON_DIFF) ? TRUE : FALSE;
 -extras->maxMedian = gtexMaxMedianScore(NULL);
 +extras->maxMedian = gtexMaxMedianScore(extras->version);
  
  /* Get geneModels in range */
  //TODO: version the table name, move to lib
 +char buf[256];
  char *modelTable = "gtexGeneModel";
 -struct hash *modelHash = loadGeneModels(modelTable);
 +safef(buf, sizeof(buf), "%s%s", modelTable, extras->version ? extras->version: "");
 +struct hash *modelHash = loadGeneModels(buf);
  
  /* Get geneBeds (names and all-sample tissue median scores) in range */
  bedLoadItem(tg, tg->table, (ItemLoader)gtexGeneBedLoad);
  
  /* Create geneInfo items with BED and geneModels */
  struct gtexGeneInfo *geneInfo = NULL, *list = NULL;
  struct gtexGeneBed *geneBed = (struct gtexGeneBed *)tg->items;
  
  /* Load tissue colors: GTEx or rainbow */
+ #ifdef COLOR_SCHEME
  char *colorScheme = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, GTEX_COLORS, 
                          GTEX_COLORS_DEFAULT);
+ #else
+ char *colorScheme = GTEX_COLORS_DEFAULT;
+ #endif
  if (sameString(colorScheme, GTEX_COLORS_GTEX))
      {
      extras->colors = getGtexTissueColors();
      }
  else
      {
      if (geneBed)
  	{
  	int expCount = geneBed->expCount;
  	extras->colors = getRainbow(&saturatedRainbowAtPos, expCount);
  	}
      }
  filterTissues(tg);
  
  while (geneBed != NULL)