src/hg/lib/wiggleCart.c 1.34
1.34 2009/11/30 17:57:11 kent
Making autoScale no longer the default for wiggle and related tracks. Making wiggleWindowingWhiskers follow name conventions better.
Index: src/hg/lib/wiggleCart.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/wiggleCart.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -B -U 4 -r1.33 -r1.34
--- src/hg/lib/wiggleCart.c 30 Nov 2009 17:55:07 -0000 1.33
+++ src/hg/lib/wiggleCart.c 30 Nov 2009 17:57:11 -0000 1.34
@@ -451,14 +451,16 @@
freeMem(horizontalGrid);
return(ret);
} /* enum wiggleGridOptEnum wigFetchHorizontalGridWithCart() */
-/****** autoScale - on by default ***************************************/
+/****** autoScale - off by default ***************************************/
enum wiggleScaleOptEnum wigFetchAutoScaleWithCart(struct cart *theCart,
struct trackDb *tdb, char *name, char **optString)
{
-char *Default = wiggleScaleEnumToString(wiggleScaleAuto);
-char *notDefault = wiggleScaleEnumToString(wiggleScaleManual);
+char *autoString = wiggleScaleEnumToString(wiggleScaleAuto);
+char *manualString = wiggleScaleEnumToString(wiggleScaleManual);
+char *Default = manualString;
+char *notDefault = autoString;
boolean compositeLevel = isNameAtCompositeLevel(tdb,name);
char *autoScale = NULL;
enum wiggleScaleOptEnum ret;
@@ -469,11 +471,11 @@
{
/* It may be the autoScale=on/off situation from custom tracks */
char * tdbDefault = trackDbSettingClosestToHomeOrDefault(tdb, AUTOSCALE, "NONE");
if (sameWord(tdbDefault,"on"))
- autoScale = cloneString(Default);
+ autoScale = cloneString(autoString);
else if (sameWord(tdbDefault,"off"))
- autoScale = cloneString(notDefault);
+ autoScale = cloneString(manualString);
else
autoScale = wigCheckBinaryOption(tdb,Default,notDefault,
AUTOSCALEDEFAULT, AUTOSCALE);
}
@@ -513,9 +515,9 @@
/****** windowingFunction - Whiskers by default **************************/
enum wiggleWindowingEnum wigFetchWindowingFunctionWithCart(struct cart *theCart,
struct trackDb *tdb, char *name, char **optString)
{
-char *Default = wiggleWindowingEnumToString(wiggleWindowingMax);
+char *Default = wiggleWindowingEnumToString(wiggleWindowingWhiskers);
boolean compositeLevel = isNameAtCompositeLevel(tdb,name);
char *windowingFunction = NULL;
enum wiggleWindowingEnum ret;