src/hg/hgTrackUi/hgTrackUi.c 1.510

1.510 2009/12/11 15:14:44 angie
A couple other places where cds-reference needs to be omitted from the list of SNP functions if version >= 130 (Thanks again Katrina!). Also removed an extraneous comment left over from a branch tag move demo (1.429).

Index: src/hg/hgTrackUi/hgTrackUi.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTrackUi/hgTrackUi.c,v
retrieving revision 1.509
retrieving revision 1.510
diff -b -B -U 4 -r1.509 -r1.510
--- src/hg/hgTrackUi/hgTrackUi.c	9 Dec 2009 21:57:06 -0000	1.509
+++ src/hg/hgTrackUi/hgTrackUi.c	11 Dec 2009 15:14:44 -0000	1.510
@@ -345,12 +345,12 @@
 			  snp125ClassIncludeDefault, snp125ClassLabelsSize);
 snp125PrintFilterControls("Validation", snp125ValidIncludeStrings,
 			  snp125ValidLabels, snp125ValidIncludeCart,
 			  snp125ValidIncludeDefault, snp125ValidLabelsSize);
-int size = (version < 130) ? snp125FuncLabelsSize : (snp125FuncLabelsSize - 1);
+int funcLabelsSize = (version < 130) ? snp125FuncLabelsSize : (snp125FuncLabelsSize - 1);
 snp125PrintFilterControls("Function", snp125FuncIncludeStrings,
 			  snp125FuncLabels, snp125FuncIncludeCart,
-			  snp125FuncIncludeDefault, size);
+			  snp125FuncIncludeDefault, funcLabelsSize);
 snp125PrintFilterControls("Molecule Type", snp125MolTypeIncludeStrings,
 			  snp125MolTypeLabels, snp125MolTypeIncludeCart,
 			  snp125MolTypeIncludeDefault, snp125MolTypeLabelsSize);
 printf("</TABLE><BR>\n");
@@ -379,13 +379,12 @@
 		       snp125ClassLabelsSize);
     cartSetStringArray(cart, snp125ValidStrings, snp125ValidDefault,
 		       snp125ValidLabelsSize);
     cartSetStringArray(cart, snp125FuncStrings, snp125FuncDefault,
-		       snp125FuncLabelsSize);
+		       funcLabelsSize);
     cartSetStringArray(cart, snp125MolTypeStrings, snp125MolTypeDefault,
 		       snp125MolTypeLabelsSize);
     }
-/* Something in the middle of a function. */
 printf("<A name=\"colorSpec\"><HR>\n");
 printf("<B>SNP Feature for Color Specification:</B>\n");
 snp125ColorSourceCart[0] = cartUsualString(cart, snp125ColorSourceDataName[0],
 					   snp125ColorSourceDefault[0]);
@@ -433,9 +432,9 @@
 			 snp125ValidLabelsSize);
 else if (sameString(snp125ColorSourceCart[0], "Function"))
     snp125PrintColorSpec(snp125FuncStrings, snp125FuncLabels,
 			 snp125FuncCart, snp125FuncDefault,
-			 snp125FuncLabelsSize);
+			 funcLabelsSize);
 else if (sameString(snp125ColorSourceCart[0], "Molecule Type"))
     snp125PrintColorSpec(snp125MolTypeStrings, snp125MolTypeLabels,
 			 snp125MolTypeCart, snp125MolTypeDefault,
 			 snp125MolTypeLabelsSize);