src/hg/hgTables/wiggle.c 1.69
1.69 2009/03/12 19:44:21 kent
Making correlations, and bed output work with bigWig. Possibly subtrack merge works too, but need to make a test case for it. Custom track bigWig output is still broken.
Index: src/hg/hgTables/wiggle.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/wiggle.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -b -B -U 4 -r1.68 -r1.69
--- src/hg/hgTables/wiggle.c 12 Mar 2009 16:45:16 -0000 1.68
+++ src/hg/hgTables/wiggle.c 12 Mar 2009 19:44:21 -0000 1.69
@@ -351,9 +351,9 @@
}
}
}
-static int printDataVectorOut(struct dataVector *dataVectorList,
+int wigPrintDataVectorOut(struct dataVector *dataVectorList,
enum wigOutputType wigOutType, int maxOut,
char *description)
/* Print out bed or data points from list of dataVectors. */
{
@@ -374,9 +374,9 @@
};
return count;
}
-static struct dataVector *mergedWigDataVector(char *table,
+struct dataVector *mergedWigDataVector(char *table,
struct sqlConnection *conn, struct region *region)
/* Perform the specified subtrack merge wiggle-operation on table and
* all other selected subtracks and intersect if necessary. */
{
@@ -449,9 +449,9 @@
* all other selected subtracks, intersect if necessary, and print out. */
{
struct dataVector *dv = mergedWigDataVector(table, conn, region);
int resultCount =
- printDataVectorOut(dv, wigOutType, maxOut, describeSubtrackMerge("#\t"));
+ wigPrintDataVectorOut(dv, wigOutType, maxOut, describeSubtrackMerge("#\t"));
dataVectorFree(&dv);
return resultCount;
}
@@ -462,9 +462,9 @@
/* Read in bedGraph as dataVector (filtering is handled there),
* intersect if necessary, and print it out. */
{
struct dataVector *dv =bedGraphDataVector(table, conn, region);
-int resultCount = printDataVectorOut(dv, wigOutType, maxOut, NULL);
+int resultCount = wigPrintDataVectorOut(dv, wigOutType, maxOut, NULL);
dataVectorFree(&dv);
return resultCount;
}