f9d03e79d5565c0d9a28d57c0c67986a085a40c4 kent Tue Dec 14 21:09:37 2021 -0800 Fixing a three little bugs. Adding some #defines to avoid magic numbers. Fixing differences in sorting between expression values and labels. diff --git src/hg/inc/facetedTable.h src/hg/inc/facetedTable.h index 6f25360..01f63a8 100644 --- src/hg/inc/facetedTable.h +++ src/hg/inc/facetedTable.h @@ -74,21 +74,22 @@ struct facetedTableMergedOffset /* What we need to know to merge */ { struct facetedTableMergedOffset *next; char *name; /* Name of merged bar */ char color[8]; /* Color for merged bar */ int totalCount; /* Total count of all merged elements */ struct facetedTableCountOffset *colList; /* List of indexes int parent table to sum together */ int outIx; /* Position in output file */ }; struct facetedTableMergedOffset *facetedTableMakeMergedOffsets(struct facetedTable *facTab, struct cart *cart); /* Return a structure that will let us relatively rapidly merge together one row */ -void facetedTableMergeVals(struct facetedTableMergedOffset *tmoList, float *inVals, float *outVals); +void facetedTableMergeVals(struct facetedTableMergedOffset *tmoList, float *inVals, int inValCount, + float *outVals, int outValCount); /* Populate outVals array with columns of weighted averages derived from applying * tmoList to inVals array. */ #endif /* FACETEDTABLE_H */