kallithea Changeset - fcbcef60be02

Changeset - fcbcef60be02

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Aras Pranckevicius - 13 years ago 2012-10-15 15:33:57
aras@unity3d.com

graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)

3 files changed with 30 insertions and 24 deletions:

rhodecode/public/css/style.css

rhodecode/public/js/graph.js

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2525,13 +2525,13 @@ h3.files_location { @@
 #graph {
 	overflow: hidden;
+}
 #graph_nodes {
 	float: left;
-	margin-right: -6px;
+	margin-right: 0px;
 	margin-top: 0px;
+}
 #graph_content {
 	width: 80%;
 	float: left;

rhodecode/public/js/graph.js

➞

Show inline comments

@@ @@ -45,17 +45,22 @@ function BranchRenderer() { @@
 		blue = Math.round(blue * 255);
 		var s = 'rgb(' + red + ', ' + green + ', ' + blue + ')';
 		this.ctx.strokeStyle = s;
 		this.ctx.fillStyle = s;
+	}
 	this.render = function(data,canvasWidth) {
+	this.render = function(data,canvasWidth,lineCount) {
 		var idx = 1;
 		var rela = document.getElementById('graph');
 		var box_size = 18;
 		if (lineCount == 0)
 			lineCount = 1;
 		var edge_pad = this.dot_radius + 2;
 		var box_size = Math.min(18, Math.floor((canvasWidth - edge_pad*2)/(lineCount)));
 		var base_x = canvasWidth - edge_pad;
 		for (var i in data) {
 			var row = document.getElementById("chg_"+idx);
 			if (row == null)
 				continue;
@@ @@ -69,44 +74,44 @@ function BranchRenderer() { @@
 			var rowY = row.offsetTop + row.offsetHeight/2 - rela.offsetTop;
 			var nextY = (next == null) ? rowY + row.offsetHeight/2 : next.offsetTop + next.offsetHeight/2 - rela.offsetTop;
 			for (var j in in_l) {
 				line = in_l[j];
 				start = line[0] + 1;
 				end = line[1] + 1;
 				start = line[0];
 				end = line[1];
 				color = line[2];
 				this.setColor(color, 0.0, 0.65);
-				x = canvasWidth - box_size * start;
+				x = base_x - box_size * start;
 				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 = canvasWidth - box_size * end;
+					var x2 = 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] + 1;
 			column = node[0];
 			color = node[1];
 			radius = this.dot_radius;
-			x = canvasWidth - box_size * column;
+			x = base_x - box_size * column;
 			this.ctx.beginPath();
 			this.setColor(color, 0.25, 0.75);
 			this.ctx.arc(x, rowY, radius, 0, Math.PI * 2, true);
 			this.ctx.fill();

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -190,17 +190,17 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
+                    }
                     YUE.on(YUQ('.expand'),'click',function(e){
                     	var elem = e.currentTarget.parentNode.parentNode;
                     	YUD.setStyle(e.currentTarget,'display','none');
                     	YUD.setStyle(elem,'height','auto');
                     	//redraw the graph, max_w and jsdata are global vars
                         set_canvas(max_w);
                     	//redraw the graph, line_count and jsdata are global vars
                         set_canvas(100);
                         var r = new BranchRenderer();
-                        r.render(jsdata,max_w);
+                        r.render(jsdata,100,line_count);
                     })
                     // Fetch changeset details
                     YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
                     	var id = e.currentTarget.id;
@@ @@ -220,37 +220,38 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                     	}else{
                     		window.location = url_main;
+                    	}
                     });
-					function set_canvas(heads) {
+					function set_canvas(width) {
 						var c = document.getElementById('graph_nodes');
 						var t = document.getElementById('graph_content');
 						canvas = document.getElementById('graph_canvas');
 						var div_h = t.clientHeight;
 						c.style.height=div_h+'px';
 						canvas.setAttribute('height',div_h);
 						c.style.height=max_w+'px';
 						canvas.setAttribute('width',max_w);
 						c.style.height=width+'px';
 						canvas.setAttribute('width',width);
 					};
 					var heads = 1;
-					var max_heads = 0;
+					var line_count = 0;
 					var jsdata = ${c.jsdata|n};
 					for( var i=0;i<jsdata.length;i++){
 					    var m = Math.max.apply(Math, jsdata[i][1]);
 					    if (m>max_heads){
 					        max_heads = m;
+					    }
 					for (var i=0;i<jsdata.length;i++) {
                         var in_l = jsdata[i][2];
                         for (var j in in_l) {
                             var m = in_l[j][1];
                             if (m > line_count)
                                 line_count = m;
+                        }
+					}
 					var max_w = Math.max(100,max_heads*25);
 					set_canvas(max_w);
 					set_canvas(100);
 					var r = new BranchRenderer();
-					r.render(jsdata,max_w);
+					r.render(jsdata,100,line_count);
 				});
 			</script>
 		%else:
 			${_('There are no changes yet')}
 		%endif

0 comments (0 inline, 0 general)