2eb99e0866866ceddb4a2cce801a37bb0df7997e
kate
  Wed Oct 21 17:59:25 2015 -0700
Cleanup trackUi in prep for merging into main. refs #15645

diff --git src/hg/inc/gtexUi.h src/hg/inc/gtexUi.h
index 37a9652..7b8b56e 100644
--- src/hg/inc/gtexUi.h
+++ src/hg/inc/gtexUi.h
@@ -1,34 +1,40 @@
 /* gtexUi - GTEx (Genotype Tissue Expression) tracks */
 
 /* Copyright (C) 2015 The Regents of the University of California 
  * See README in this or parent directory for licensing information. */
 #ifndef GTEXUI_H
 #define GTEXUI_H
 
-#include "cart.h"
-#include "trackDb.h"
-
-// Color scheme
+/* Color scheme */
 #define GTEX_COLORS                     "colorScheme"
 #define GTEX_COLORS_RAINBOW             "rainbow"
-// color scheme from GTEX papers and portal
+
+/* Color scheme from GTEX papers and portal */
 #define GTEX_COLORS_GTEX                "gtex"
 #define GTEX_COLORS_DEFAULT             GTEX_COLORS_GTEX
 
-// Data transform
+/* Data transform */
 #define GTEX_LOG_TRANSFORM              "logTransform"
 #define GTEX_LOG_TRANSFORM_DEFAULT      TRUE
 
-// Graph type
+/* Viewing limits */
+#define GTEX_MAX_LIMIT                  "maxLimit"
+/* Get default from gtexInfo table */
+
+/* Sample selection and comparison */
+#define GTEX_SAMPLES                    "samples"
+#define GTEX_SAMPLES_ALL                "all"
+#define GTEX_SAMPLES_COMPARE_SEX        "sex"
+#define GTEX_SAMPLES_DEFAULT            GTEX_SAMPLES_ALL
+
+#define GTEX_SAMPLES_COMPARE_AGE        "age"
+#define GTEX_COMPARE_AGE_YEARS          "years"
+#define GTEX_COMPARE_AGE_DEFAULT        50
+
+/* Graph type */
 #define GTEX_GRAPH              "graphType"
 #define GTEX_GRAPH_RAW          "raw"
 #define GTEX_GRAPH_NORMAL       "normalized"
-// comparison graphs
-#define GTEX_GRAPH_SEX          "sex"
-#define GTEX_GRAPH_AGE          "age"
-#define GTEX_GRAPH_AGE_YEARS    "years"
-#define GTEX_GRAPH_AGE_DEFAULT   50
-
 #define GTEX_GRAPH_DEFAULT      GTEX_GRAPH_RAW
 
 #endif /* GTEXUI_H */