src/hg/lib/wiggleCart.c 1.29
1.29 2009/11/19 18:54:51 angie
Removed the clipping of viewing range to (optionally expanded) data range at Jim's request. Since that removes the purpose of expanding the data range to viewLimits or settingsByView's viewLimitsMax, I took that out too and those trackDb settings are now ignored & obsolete.
Index: src/hg/lib/wiggleCart.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/wiggleCart.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -B -U 4 -r1.28 -r1.29
--- src/hg/lib/wiggleCart.c 18 Nov 2009 05:45:06 -0000 1.28
+++ src/hg/lib/wiggleCart.c 19 Nov 2009 18:54:51 -0000 1.29
@@ -98,17 +98,14 @@
}
}
static void viewLimitsCompositeOverride(struct trackDb *tdb, char *name,
- double *retMin, double *retMax, double *retAbsMin, double *retAbsMax)
+ double *retMin, double *retMax)
/* If aquiring min/max for composite level wig cfg, look for trackDb.ra "settingsByView" */
{
if(isNameAtCompositeLevel(tdb,name))
{
- char *setting = trackDbSettingByView(tdb,VIEWLIMITSMAX);
- parseColonRange(setting, retAbsMin, retAbsMax);
- freez(&setting);
- setting = trackDbSettingByView(tdb,VIEWLIMITS);
+ char *setting = trackDbSettingByView(tdb, VIEWLIMITS);
parseColonRange(setting, retMin, retMax);
freez(&setting);
}
}
@@ -170,20 +167,18 @@
{
*retMin = atof(cartMinStr);
*retMax = atof(cartMaxStr);
correctOrder(*retMin, *retMax);
- // If it weren't for the expansion of absM* to viewLimits bounds,
- // and the allowance for missing data range values,
+ // If it weren't for the the allowance for missing data range values,
// we could set retAbs* and be done here.
cartMin = *retMin;
cartMax = *retMax;
}
// Get trackDb defaults, and resolve missing wiggle data range if necessary.
char *defaultViewLimits = trackDbSettingClosestToHomeOrDefault(tdb, DEFAULTVIEWLIMITS, NULL);
-char *viewLimits = trackDbSettingClosestToHomeOrDefault(tdb, VIEWLIMITS, NULL);
if (defaultViewLimits == NULL)
- defaultViewLimits = viewLimits;
+ defaultViewLimits = trackDbSettingClosestToHomeOrDefault(tdb, VIEWLIMITS, NULL);
if (defaultViewLimits != NULL)
{
double viewLimitMin = 0.0, viewLimitMax = 0.0;
parseColonRange(defaultViewLimits, &viewLimitMin, &viewLimitMax);
@@ -192,16 +187,8 @@
if (missingAbsMax)
absMax = viewLimitMax;
if (missingAbsMin)
absMin = viewLimitMin;
- // If viewLimits (not defaultViewLimits) extends beyond data value range,
- // tweak absMin and absMax to show the union:
- if (viewLimits != NULL)
- {
- parseColonRange(viewLimits, &viewLimitMin, &viewLimitMax);
- absMin = min(absMin, viewLimitMin);
- absMax = max(absMax, viewLimitMax);
- }
}
else if (missingAbsMin || missingAbsMax)
{
// I would like to make this an errAbort, but too many tracks are afflicted
@@ -235,14 +222,14 @@
if (retAbsMax)
*retAbsMax = absMax;
// After the dust settles from tdb's trackDb settings, now see if composite view
// settings from tdb's parents override that stuff anyway:
-viewLimitsCompositeOverride(tdb, name, retMin, retMax, retAbsMin, retAbsMax);
+viewLimitsCompositeOverride(tdb, name, retMin, retMax);
// And as the final word after composite override, reset retMin and retMax if from cart:
if (cartMinStr && cartMaxStr)
{
- *retMin = max(absMin, cartMin);
- *retMax = min(absMax, cartMax);
+ *retMin = cartMin;
+ *retMax = cartMax;
}
} /* void wigFetchMinMaxYWithCart() */
/* Min, Max, Default Pixel height of track