Spacing between the heat maps.

flexera-public · Jun 18, 2010 · 0d8334d · 0d8334d
1 parent f59a3ff
commit 0d8334d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
@@ -124,7 +124,7 @@ gfx_color_t gfx_pick_heat_color(
 	color.green = color1.green;	
 	color.blue = color1.blue;
 	*/
-	printf("CALCULATING COLOR WITH VALUE %f\n", y);	
+	//printf("CALCULATING COLOR WITH VALUE %f\n", y);	
 	color.red = color1.red + (color2.red - color1.red)*y;	
 	color.green = color1.green + (color2.green - color1.green)*y;	
 	color.blue = color1.blue + (color2.blue - color1.blue)*y;

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
@@ -3729,18 +3729,17 @@ int graph_paint(
                         (double *) malloc(sizeof(double) * im->xsize * 2);
 					gfx_color_t *col = (gfx_color_t*) malloc(sizeof(gfx_color_t) * im->xsize * 2);
                     int       drawem = 0;
-					printf("											New GF");				
 
                     for (ii = 0; ii <= im->xsize; ii++) {
                         double    ybase, ytop;
 						/* PICKING HEAT COLOR*/
 
-						printf("Data %f\n", im->gdes[i].p_data[ii]);
+						//printf("Data %f\n", im->gdes[i].p_data[ii]);
 						color = gfx_pick_heat_color(im->gdes[i].p_data[ii], im->gdes[i].col, im->gdes[i].col2);
-						printf("Calculated color %0.0f,%0.0f,%0.0f,%0.0f\n", color.red,
-		                color.green, color.blue, color.alpha);
-						printf("color1 %0.0f,%0.0f,%0.0f,%0.0f\n", im->gdes[i].col.red, im->gdes[i].col.green, im->gdes[i].col.blue, im->gdes[i].col.alpha);
-						printf("color2 %0.0f,%0.0f,%0.0f,%0.0f\n", im->gdes[i].col2.red, im->gdes[i].col2.green, im->gdes[i].col2.blue, im->gdes[i].col2.alpha);
+						//printf("Calculated color %0.0f,%0.0f,%0.0f,%0.0f\n", color.red,
+		                //color.green, color.blue, color.alpha);
+						//printf("color1 %0.0f,%0.0f,%0.0f,%0.0f\n", im->gdes[i].col.red, im->gdes[i].col.green, im->gdes[i].col.blue, im->gdes[i].col.alpha);
+						//printf("color2 %0.0f,%0.0f,%0.0f,%0.0f\n", im->gdes[i].col2.red, im->gdes[i].col2.green, im->gdes[i].col2.blue, im->gdes[i].col2.alpha);
 
 
 					//	color = im->gdes[i].col2;
@@ -3815,11 +3814,19 @@ int graph_paint(
                             foreY[idxI] = ytop + 0.2;
                             foreX[idxI] = ii + im->xorigin - 1;
                         }
-                        backY[++idxI] = ybase - 0.2;
-                        backX[idxI] = ii + im->xorigin;
-                        foreY[idxI] = ytop + 0.2;
-                        foreX[idxI] = ii + im->xorigin;
-						col[idxI]=color;
+						if (i == 0){
+							backY[++idxI] = ybase - 0.2;
+							backX[idxI] = ii + im->xorigin;
+							foreY[idxI] = ytop + 0.2;
+							foreX[idxI] = ii + im->xorigin;
+							col[idxI]=color;
+						}else{
+							backY[++idxI] = ybase - 0.2 + 5;
+							backX[idxI] = ii + im->xorigin;
+							foreY[idxI] = ytop + 0.2;
+							foreX[idxI] = ii + im->xorigin;
+							col[idxI]=color;
+						}
                     }
                     free(foreY);
                     free(foreX);
@@ -3839,7 +3846,10 @@ int graph_paint(
                 }
 			}
 			if(im->gdes[i].gf == GF_HEAT){
-				cum_height = cum_height + im->gdes[i].heat_height;
+				if(i == 0)
+					cum_height = cum_height + im->gdes[i].heat_height;
+				else
+					cum_height = cum_height + im->gdes[i].heat_height + 5;
 			}
 			lastgdes = &(im->gdes[i]);
             break;