src/hg/instinct/hgHeatmap2/hgHeatmap2.c 1.78

Index: src/hg/instinct/hgHeatmap2/hgHeatmap2.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/hgHeatmap2/hgHeatmap2.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -b -B -U 4 -r1.77 -r1.78
--- src/hg/instinct/hgHeatmap2/hgHeatmap2.c	21 Aug 2009 22:24:01 -0000	1.77
+++ src/hg/instinct/hgHeatmap2/hgHeatmap2.c	6 Oct 2009 23:41:05 -0000	1.78
@@ -1104,21 +1104,14 @@
     if (!ptSubsets)
 	errAbort("ptSubsets == NULL");
     int i;
 
-    int height = 0;
+    int height =totalHeight/ ifSubsets;
     for (i = 0; i < subsetNum; i++)
 	{
 	if (!ptSubsets[i])
-	    errAbort("ptSubsets[%d] == NULL", i);
-	height += slCount(ptSubsets[i]) * hl->sampleHeight;
-	}
-    if (height < totalHeight)
-	height = totalHeight;
-    height /= subsetNum;
+	    continue;
 
-    for (i = 0; i < subsetNum; i++)
-	{
 	heatmapLayResetMinMax(hl);
 
 	char *gGif = genomeSummaryGif(conn, hl, gh, ptSubsets[i], height, i, subsetNum);
 	char heatStr[128];
@@ -1387,17 +1380,22 @@
 	errAbort("ptSubsets == NULL");
     
     int i, buffer = slCount(gh->sampleList) * hl->sampleHeight;
     for (i = 0; i < subsetNum; i++)
+	{	
+	if (!ptSubsets[i])
+	    continue;
 	buffer -= slCount(ptSubsets[i]) * hl->sampleHeight;
-
+	}
     if (buffer <= 0)
 	buffer = 1;
     
     addPixelOffsetHeatmapLay(hl, hghSubgroupDefaultPixWidth + 3);  // add 3 pixel buffer
 
     for (i = 0; i < subsetNum; i++)
 	{
+	if (!ptSubsets[i])
+	    continue;
 	char *fGif = featureSummaryGif(conn, hl, gh, gh->name, 
 				       ptSubsets[i], buffer, i, subsetNum);    
 	struct slName *sl;
 	if (fGif)