src/hg/lib/wiggleCart.c 1.32

Index: src/hg/lib/wiggleCart.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/wiggleCart.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -B -U 4 -r1.31 -r1.32
--- src/hg/lib/wiggleCart.c	25 Nov 2009 18:34:47 -0000	1.31
+++ src/hg/lib/wiggleCart.c	25 Nov 2009 18:44:41 -0000	1.32
@@ -115,9 +115,9 @@
  *	Absolute limits are defined on the trackDb type line for wiggle,
  *	or MIN_LIMIT / MAX_LIMIT trackDb settings for bedGraph
  *	User requested limits are defined in the cart
  *	Default opening display limits are optionally defined with the
- *		viewLimits declaration from trackDb
+ *		defaultViewLimits or viewLimits declaration from trackDb
  *****************************************************************************/
 void wigFetchMinMaxYWithCart(struct cart *theCart, struct trackDb *tdb, char *name,
 			     double *retMin, double *retMax, double *retAbsMin, double *retAbsMax,
 			     int wordCount, char **words)
@@ -156,10 +156,10 @@
     }
 correctOrder(absMin, absMax);
 
 // Determine current minY,maxY.
-// Precedence:  1. cart;  2. viewLimits;
-//              3. absolute [which may need to default to #2 or #3!]
+// Precedence:  1. cart;  2. defaultViewLimits;  3. viewLimits;
+//              4. absolute [which may need to default to #2 or #3!]
 boolean compositeLevel = isNameAtCompositeLevel(tdb, name);
 char *cartMinStr = cartOptionalStringClosestToHome(theCart, tdb, compositeLevel, MIN_Y);
 char *cartMaxStr = cartOptionalStringClosestToHome(theCart, tdb, compositeLevel, MAX_Y);
 double cartMin = 0.0, cartMax = 0.0;
@@ -174,13 +174,15 @@
     cartMax = *retMax;
     }
 
 // Get trackDb defaults, and resolve missing wiggle data range if necessary.
-char *viewLimits = trackDbSettingClosestToHomeOrDefault(tdb, VIEWLIMITS, NULL);
-if (viewLimits != NULL)
+char *defaultViewLimits = trackDbSettingClosestToHomeOrDefault(tdb, DEFAULTVIEWLIMITS, NULL);
+if (defaultViewLimits == NULL)
+    defaultViewLimits = trackDbSettingClosestToHomeOrDefault(tdb, VIEWLIMITS, NULL);
+if (defaultViewLimits != NULL)
     {
     double viewLimitMin = 0.0, viewLimitMax = 0.0;
-    parseColonRange(viewLimits, &viewLimitMin, &viewLimitMax);
+    parseColonRange(defaultViewLimits, &viewLimitMin, &viewLimitMax);
     *retMin = viewLimitMin;
     *retMax = viewLimitMax;
     if (missingAbsMax)
 	absMax = viewLimitMax;
@@ -685,9 +687,10 @@
  *	Absolute limits are defined by minLimit, maxLimit in the trackDb
  *		default to 0 and 1000 if not present
  *	User requested limits are defined in the cart
  *	Default opening display limits are optionally defined with the
- *		viewLimits declaration from trackDb or custom tracks
+ *		defaultViewLimits declaration from trackDb
+ *		or viewLimits from custom tracks
  *		(both identifiers work from either custom or trackDb)
  *****************************************************************************/
 void wigFetchMinMaxLimitsWithCart(struct cart *theCart, struct trackDb *tdb, char *name,
     double *min, double *max,double *tDbMin, double *tDbMax)