src/hg/hgTables/mainPage.c 1.139
1.139 2009/03/17 10:13:26 aamp
Adding microarray stuff to output microarray names in the microarrayGroupings.ra file. Also put in some bits to output the microarray groupings themselves but that's incomplete currently.
Index: src/hg/hgTables/mainPage.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/mainPage.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -b -B -U 4 -r1.138 -r1.139
--- src/hg/hgTables/mainPage.c 17 Mar 2009 04:28:39 -0000 1.138
+++ src/hg/hgTables/mainPage.c 17 Mar 2009 10:13:26 -0000 1.139
@@ -475,13 +475,18 @@
"MAF - multiple alignment format", };
struct outputType otChromGraphData = { NULL,
outChromGraphData,
"data points", };
-
+struct outputType otMicroarrayNames = { NULL,
+ outMicroarrayNames,
+ "microarray names", };
+struct outputType otMicroarrayGroupings = { NULL,
+ outMicroarrayGroupings,
+ "microarray groupings", };
static void showOutputTypeRow(boolean isWig, boolean isBedGr,
boolean isPositional, boolean isMaf, boolean isChromGraphCt,
- boolean isPal)
+ boolean isPal, boolean isMicroarray)
/* Print output line. */
{
struct outputType *otList = NULL, *otDefault = NULL;
boolean bedifiedOnly = (anySubtrackMerge(database, curTable) || anyIntersection());
@@ -514,8 +519,14 @@
else if (isChromGraphCt)
{
slAddTail(&otList, &otChromGraphData);
}
+else if (isMicroarray)
+ {
+ slAddTail(&otList, &otMicroarrayNames);
+ slAddTail(&otList, &otAllFields);
+ slAddTail(&otList, &otSelected);
+ }
else if (isPositional)
{
if (! bedifiedOnly)
{
@@ -552,9 +563,9 @@
/* Put up table with main controls for main page. */
{
struct grp *selGroup;
boolean isWig = FALSE, isPositional = FALSE, isMaf = FALSE, isBedGr = FALSE,
- isChromGraphCt = FALSE, isPal = FALSE;
+ isChromGraphCt = FALSE, isPal = FALSE, isArray = FALSE;
boolean gotClade = hGotClade();
struct hTableInfo *hti = NULL;
hPrintf("<TABLE BORDER=0>\n");
@@ -620,8 +631,9 @@
isWig = TRUE;
}
isMaf = isMafTable(database, curTrack, curTable);
isBedGr = isBedGraph(curTable);
+ isArray = isMicroarray(curTrack, curTable);
isPal = isPalCompatible(conn, curTrack, curTable);
nbSpaces(1);
if (isCustomTrack(curTable))
{
@@ -706,8 +718,11 @@
hPrintf("</TD></TR>\n");
}
}
+/* microarray options */
+/* button for option page here (median/log-ratio, etc) */
+
/* Filter line. */
{
hPrintf("<TR><TD><B>filter:</B>\n");
if (anyFilter())
@@ -806,9 +821,9 @@
hPrintf("</TD></TR>\n");
}
/* Print output type line. */
-showOutputTypeRow(isWig, isBedGr, isPositional, isMaf, isChromGraphCt, isPal);
+showOutputTypeRow(isWig, isBedGr, isPositional, isMaf, isChromGraphCt, isPal, isArray);
/* Print output destination line. */
{
char *compressType =