kallithea Changeset - 1cc64983363a

Changeset - 1cc64983363a

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich - 11 years ago 2015-05-13 01:16:48
madski@unity3d.com

graph: fix graph drawing if there is less than one pixel available per branch

The branch width would be rounded down and the graph would be 0 pixels wide and
thus even more unreadable than it should have been.

1 file changed with 4 insertions and 4 deletions:

kallithea/public/js/graph.js

0 comments (0 inline, 0 general)

kallithea/public/js/graph.js

➞

Show inline comments

@@ @@ -80,25 +80,25 @@ function BranchRenderer(canvas_id, conte @@
 		var lineCount = 1;
 		for (var i=0;i<data.length;i++) {
 			var in_l = data[i][1];
 			for (var j in in_l) {
 				var m = in_l[j][0];
 				if (m > lineCount)
 					lineCount = m;
+			}
+		}
 		var edge_pad = this.dot_radius + 2;
-		var box_size = Math.min(18, Math.floor((canvasWidth - edge_pad*2)/(lineCount)));
+		var box_size = Math.min(18, (canvasWidth - edge_pad * 2) / lineCount);
 		var base_x = canvasWidth - edge_pad;
 		for (var i=0; i < data.length; ++i) {
 			var row = document.getElementById(row_id_prefix+idx);
 			if (row == null) {
 				console.log("error: row "+row_id_prefix+idx+" not found");
 				continue;
+			}
 			var next = document.getElementById(row_id_prefix+(idx+1));
 			var extra = 0;
 			cur = data[i];
@@ @@ -106,25 +106,25 @@ function BranchRenderer(canvas_id, conte @@
 			in_l = cur[1];
 			closing = cur[2];
 			var rowY = row.offsetTop + row.offsetHeight/2;
 			var nextY = (next == null) ? rowY + row.offsetHeight/2 : next.offsetTop + next.offsetHeight/2;
 			for (var j in in_l) {
 				line = in_l[j];
 				start = line[0];
 				end = line[1];
 				color = line[2];
 				x = base_x - box_size * start;
+				x = Math.floor(base_x - box_size * start);
 				// figure out if this is a dead-end;
 				// we want to fade away this line
 				var dead_end = true;
 				if (next != null) {
 					nextdata = data[i+1];
 					next_l = nextdata[1];
 					for (var k=0; k < next_l.length; ++k) {
 						if (next_l[k][0] == end) {
 							dead_end = false;
 							break;
+						}
@@ @@ -156,35 +156,35 @@ function BranchRenderer(canvas_id, conte @@
 					this.setColor(color, 0.0, 0.65);
+				}
 				this.ctx.lineWidth=this.line_width;
 				this.ctx.beginPath();
 				this.ctx.moveTo(x, rowY);
 				if (start == end)
+				{
 					this.ctx.lineTo(x,nextY+extra,3);
+				}
 				else
+				{
 					var x2 = base_x - box_size * end;
+					var x2 = Math.floor(base_x - box_size * end);
 					var ymid = (rowY+nextY) / 2;
 					this.ctx.bezierCurveTo (x,ymid,x2,ymid,x2,nextY);
+				}
 				this.ctx.stroke();
+			}
 			column = node[0];
 			color = node[1];
 			x = base_x - box_size * column;
+			x = Math.floor(base_x - box_size * column);
 			this.setColor(color, 0.25, 0.75);
 			if (closing)
+			{
 				this.ctx.fillRect(x - this.close_x, rowY - this.close_y, 2*this.close_x, 2*this.close_y);
+			}
 			else
+			{
 				this.ctx.beginPath();
 				this.ctx.arc(x, rowY, this.dot_radius, 0, Math.PI * 2, true);
 				this.ctx.fill();
+			}

0 comments (0 inline, 0 general)