b2acdf83569bcb30013ed09d885d3f48b19c1d4e jcasper Wed Sep 11 16:03:26 2019 -0700 Better support for hic composite tracks, and hic trackUi pages now include metadata from the file, refs #22316 diff --git src/hg/inc/hic.h src/hg/inc/hic.h index 190d4d9..b2b7ac2 100644 --- src/hg/inc/hic.h +++ src/hg/inc/hic.h @@ -1,31 +1,34 @@ /* hic.h contains a few helpful wrapper functions for managing Hi-C data. */ #ifndef HIC_H #define HIC_H #include "interact.h" /* Metadata associated with a Hi-C track */ struct hicMeta { char *filename; char *fileAssembly; -char **chromNames; int nChroms; -char **resolutions; +char **chromNames; +int *chromSizes; int nRes; +char **resolutions; +int nAttributes; +char **attributes; char *ucscAssembly; struct hash *ucscToAlias; // Takes UCSC chrom names to names the underlying file recognizes }; char *hicLoadHeader(char *filename, struct hicMeta **header, char *ucscAssembly); /* Create a hicMeta structure for the supplied Hi-C file. If * the return value is non-NULL, it points to a string containing * an error message that explains why the retrieval failed. */ char *hicLoadData(struct hicMeta *fileInfo, int resolution, char *normalization, char *chrom1, int start1, int end1, char *chrom2, int start2, int end2, struct interact **resultPtr); /* Fetch heatmap data from a hic file. The hic file info must be provided in fileInfo, which should be * populated by hicLoadHeader. The result is a linked list of interact structures in *resultPtr, * and the return value (if non-NULL) is the text of any error message encountered by the underlying * Straw library. */