Skip to content

Commit

Permalink
Reformat javascript code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@akuhn
akuhn committed Oct 2, 2015
1 parent ad1ebaa commit 4a256b1
Show file tree
Hide file tree
Showing 3 changed files with 217 additions and 227 deletions.
14 changes: 7 additions & 7 deletions panoramix/static/widgets/viz_bignumber.css
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.viz_bignumber g.axis text{
font-size:10px;
font-weight:normal;
.viz_bignumber g.axis text {
font-size: 10px;
font-weight: normal;
color: gray;
fill: gray;
text-anchor:middle;
text-anchor: middle;
alignment-baseline: middle;
font-weight: none;
}

.viz_bignumber text.big{
.viz_bignumber text.big {
stroke: black;
text-anchor:middle;
text-anchor: middle;
fill: black;
}

Expand All @@ -22,5 +22,5 @@
.viz_bignumber .domain {
fill: none;
stroke: black;
stroke-width; 1;
stroke-width: 1;
}
172 changes: 83 additions & 89 deletions panoramix/static/widgets/viz_bignumber.js
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,131 @@
function viz_bignumber(token, json_callback) {
var div = d3.select('#' + token);
var render = function() {
d3.json(json_callback, function(error, payload){
json = payload.data;
div.html("");
//Define the percentage bounds that define color from red to green
if (error != null){
var err = '<div class="alert alert-danger">' + error.responseText + '</div>';
div.html(err);
return '';
}
var color_range = [-1, 1];
var compare_pos = -23
var target_url = 'd3js.org';

var div = d3.select('#' + token);
var render = function(){
d3.json(json_callback, function(error, payload){
json = payload.data;
div.html("");
//Define the percentage bounds that define color from red to green
if(error != null){
var err = '<div class="alert alert-danger">' + error.responseText + '</div>';
div.html(err);
return '';
}
var color_range = [-1,1];
var compare_pos = -23
var target_url = 'd3js.org';

var f = d3.format('.3s');
var fp = d3.format('+.1%');
var xy = div.node().getBoundingClientRect();
var width = xy.width;
var height = xy.height-30;
var svg = div.append('svg');
svg.attr("width", width);
svg.attr("height", height);
data = json.data;
var compare_suffix = ' ' + json.compare_suffix;
var v_compare = null;
var v = data[data.length -1][1];
if (json.compare_lag >0){
pos = data.length - (json.compare_lag+1);
if(pos >=0){
v_compare = (v / data[pos][1])-1;
var f = d3.format('.3s');
var fp = d3.format('+.1%');
var xy = div.node().getBoundingClientRect();
var width = xy.width;
var height = xy.height - 30;
var svg = div.append('svg');
svg.attr("width", width);
svg.attr("height", height);
data = json.data;
var compare_suffix = ' ' + json.compare_suffix;
var v_compare = null;
var v = data[data.length - 1][1];
if (json.compare_lag > 0){
pos = data.length - (json.compare_lag + 1);
if (pos >= 0){
v_compare = (v / data[pos][1]) - 1;
}
}
}
var date_ext = d3.extent(data, function(d){return d[0]});
var value_ext = d3.extent(data, function(d){return d[1]});
var date_ext = d3.extent(data, function(d) { return d[0]; });
var value_ext = d3.extent(data, function(d) { return d[1]; });

var margin=20;
var scale_x = d3.time.scale.utc().domain(date_ext).range([margin, width-margin]);
var scale_y = d3.scale.linear().domain(value_ext).range([height-(margin),margin]);
var colorRange = [d3.hsl(0,1,0.3), d3.hsl(120, 1, 0.3)];
var scale_color = d3.scale
.linear().domain(color_range)
.interpolate(d3.interpolateHsl)
.range(colorRange).clamp(true);
var line = d3.svg.line()
.x(function(d) { return scale_x(d[0])})
.y(function(d) { return scale_y(d[1])})
.interpolate("basis");
var margin = 20;
var scale_x = d3.time.scale.utc().domain(date_ext).range([margin, width - margin]);
var scale_y = d3.scale.linear().domain(value_ext).range([height - (margin), margin]);
var colorRange = [d3.hsl(0, 1, 0.3), d3.hsl(120, 1, 0.3)];
var scale_color = d3.scale
.linear().domain(color_range)
.interpolate(d3.interpolateHsl)
.range(colorRange).clamp(true);
var line = d3.svg.line()
.x(function(d) { return scale_x(d[0]); })
.y(function(d) { return scale_y(d[1]); })
.interpolate("basis");

//Drawing trend line
var g = svg.append('g');
var path = g.append('path')
.attr('d', function(d){return line(data);})
.attr('stroke-width', 5)
.attr('opacity', 0.5)
.attr('fill', "none")
.attr('stroke-linecap',"round")
.attr('stroke', "grey");
//Drawing trend line
var g = svg.append('g');
var path = g.append('path')
.attr('d', function(d) { return line(data); })
.attr('stroke-width', 5)
.attr('opacity', 0.5)
.attr('fill', "none")
.attr('stroke-linecap',"round")
.attr('stroke', "grey");

var g = svg.append('g')
.attr('class', 'digits')
.attr('opacity', 1);
var g = svg.append('g')
.attr('class', 'digits')
.attr('opacity', 1);

var y = height/2;
if(v_compare != null)
y = (height/8) * 3;
var y = height / 2;
if (v_compare != null) {
y = (height / 8) * 3;
}

//Printing big number
//Printing big number
g.append('text')
.attr('x', width/2)
.attr('x', width / 2)
.attr('y', y)
.attr('class', 'big')
.attr('alignment-baseline', 'middle')
.attr('id', 'bigNumber')
.style('font-weight', 'bold')
.style('cursor', 'pointer')
.text(f(v))
.style('font-size', d3.min([height, width])/3.5)
.style('font-size', d3.min([height, width]) / 3.5)
.attr('fill','white');

var c = scale_color(v_compare);
var c = scale_color(v_compare);

//Printing compare %
if(v_compare != null){
g.append('text')
.attr('x', width/2)
.attr('y', (height/16) *12)
.text(fp(v_compare) + compare_suffix)
.style('font-size', d3.min([height, width])/8)
.style('text-anchor', 'middle')
.attr('fill', c)
.attr('stroke', c);
}
//Printing compare %
if (v_compare != null) {
g.append('text')
.attr('x', width / 2)
.attr('y', (height / 16) *12)
.text(fp(v_compare) + compare_suffix)
.style('font-size', d3.min([height, width]) / 8)
.style('text-anchor', 'middle')
.attr('fill', c)
.attr('stroke', c);
}

var g_axis = svg.append('g').attr('class', 'axis').attr('opacity',0);
var g_axis = svg.append('g').attr('class', 'axis').attr('opacity', 0);
var g = g_axis.append('g');
var x_axis = d3.svg.axis()
.scale(scale_x)
.orient('bottom')
//.tickFormat(d3.time.format('%I%p'))
.ticks(4);
g.call(x_axis);
g.attr('transform', 'translate(0,'+ (height-margin) +')');
g.attr('transform', 'translate(0,' + (height - margin) + ')');

var g = g_axis.append('g').attr('transform', 'translate('+(width-margin)+',0)');
var g = g_axis.append('g').attr('transform', 'translate(' + (width - margin) + ',0)');
var y_axis = d3.svg.axis()
.scale(scale_y)
.orient('left')
.tickFormat(d3.format('.3s'))
.tickValues(value_ext);
g.call(y_axis);
g.selectAll('text')
.style('text-anchor','end')
.style('text-anchor', 'end')
.attr('y','-5')
.attr('x','1');

g.selectAll("text")
.style('font-size','10px');

/*
g_axis.selectAll('path.domain')
.attr('stroke-width:1px;');
*/
.style('font-size', '10px');

div.on('mouseover', function(d){
div.on('mouseover', function(d) {
var div = d3.select(this);
div.select('path').transition().duration(500).attr('opacity', 1)
.style('stroke-width', '2px');
div.select('g.digits').transition().duration(500).attr('opacity', 0.1);
div.select('g.axis').transition().duration(500).attr('opacity', 1);
})
.on('mouseout', function(d){
.on('mouseout', function(d) {
var div = d3.select(this);
div.select('path').transition().duration(500).attr('opacity', 0.5)
.style('stroke-width', '5px');
Expand Down
Loading

0 comments on commit 4a256b1

Please sign in to comment.