basic bars widget (7feccd0e) · Commits · github_fork / Clip

web/haml/distribution_gauge.haml

+3 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@
		%span.desc Mode
		%span.value= 0

		=@histogram.histogram(@opts[:histogram])

		:gaugejs

		FnordMetric.ui.resizable('.report_view');
		@@ -47,7 +49,7 @@
		color: "#{FnordMetric::COLORS.last}",
		elem: $('.widget_histogram_bars'),
		height: 320,
		values: #{@histogram.histogram(@opts[:histogram]).map{ \|r,v\| [r.first, v] }.to_json}
		values: #{@histogram.histogram(@opts[:histogram]).map{ \|r,v\| [r.to_s, v] }.to_json}
		});

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,14 +14,13 @@ FnordMetric.widgets.barsWidget = function(){
		draw_layout();

		width = opts.elem.width() - 50;
		console.log(width);
		height = opts.height \|\| 240;

		gconfig = {
		element: $('.container', opts.elem)[0],
		renderer: "bar",
		width: width,
		height: height,
		height: height - 20,
		padding: { top: 0.1, bottom: 0 }
		}

		@@ -86,6 +85,8 @@ FnordMetric.widgets.barsWidget = function(){
		data: []
		}];

		console.log(values);

		for(var n=0; n < values.length; n++){
		gconfig.series[0].data.push({
		x: n,

+17 −2

Original line number	Diff line number	Diff line
		@@ -2114,8 +2114,6 @@ Rickshaw.Graph.Renderer.Bar = Rickshaw.Class.create( Rickshaw.Graph.Renderer, {
		var frequentInterval = this._frequentInterval();
		var barWidth = this.graph.x(data[0].x + frequentInterval.magnitude * (1 - this.gapSize));

		console.log(stackedData);

		return ((this.graph.width - (this.xPadding * 2)) / data.length);
		},

		@@ -2151,6 +2149,23 @@ Rickshaw.Graph.Renderer.Bar = Rickshaw.Class.create( Rickshaw.Graph.Renderer, {
		.attr("width", seriesBarDrawWidth)
		.attr("height", function(d) { return graph.y.magnitude(d.y) });


		var sdata = series.stack;
		for(var ind=0; ind < sdata.length; ind++){
		$(graph.element).append(
		$("<div>")
		.css("position", "absolute")
		.css("color", "#666")
		.css("width", seriesBarWidth)
		.css("textAlign", "center")
		.css("marginTop", "5px")
		.css("marginLeft", xpad + (sdata[ind].x * seriesBarWidth))
		.css("y", graph.height)
		.html(sdata[ind].label)
		);
		//
		}

		Array.prototype.forEach.call(nodes[0], function(n) {
		n.setAttribute('fill', series.color);
		} );