Skip to content

Commit

Permalink
update d3panels.js and change version number
Browse files Browse the repository at this point in the history
  • Loading branch information
kbroman committed May 13, 2017
1 parent 6fc0adc commit 3325b19
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 32 deletions.
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## d3panels 1.3.0 (2017-05-12)
## d3panels 1.3.1 (2017-05-13)

- Added functions `slider()` and `double_slider()`.

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d3panels",
"version": "1.3.0",
"version": "1.3.1",
"description": "D3-based graphics panels",
"homepage": "https://github.com/kbroman/d3panels",
"authors": [
Expand Down
40 changes: 17 additions & 23 deletions d3panels.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!function() { // encapsulate d3panels functions
var d3panels = {
version: "1.3.0"
version: "1.3.1"
};
// Generated by CoffeeScript 1.12.5
d3panels.formatAxis = function(d, extra_digits) {
Expand Down Expand Up @@ -792,6 +792,14 @@ d3panels.calc_hist_path = function(freq, breaks) {
});
return result;
};

d3panels.index_of_nearest = function(d, vec) {
var abs_diff;
abs_diff = vec.map(function(val) {
return Math.abs(val - d);
});
return abs_diff.indexOf(d3.min(abs_diff));
};
// Generated by CoffeeScript 1.12.5
d3panels.lod2dheatmap = function(chartOpts) {
var cellSelect, cells, celltip, chart, chrGap, colors, equalCells, height, hilitcolor, margin, nullcolor, oneAtTop, ref, ref1, ref10, ref11, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9, svg, tipclass, width, xscale, yscale, zlim, zscale, zthresh;
Expand Down Expand Up @@ -4635,7 +4643,7 @@ d3panels.slider = function(chartOpts) {
stopindex = 0;
slider_svg = null;
chart = function(selection, callback, range, stops) {
var button, clamp_pixels, dragged, end_drag, nearest_stop, xcscale, xscale;
var button, clamp_pixels, dragged, end_drag, xcscale, xscale;
if (range == null) {
range = [margin, width - margin * 2];
}
Expand All @@ -4646,17 +4654,10 @@ d3panels.slider = function(chartOpts) {
value = (range[1] - range[0]) * Math.random() + range[0];
}
slider_svg = selection.insert("svg").attr("height", height).attr("width", width);
nearest_stop = function(d) {
var abs_diff;
abs_diff = stops.map(function(val) {
return Math.abs(val - d);
});
return abs_diff.indexOf(d3.min(abs_diff));
};
xcscale = d3.scaleLinear().range([margin, width - margin]).domain(range).clamp(true);
xscale = function(d) {
if (stops != null) {
return xcscale(stops[nearest_stop(d)]);
return xcscale(stops[d3panels.index_of_nearest(d, stops)]);
}
return xcscale(d);
};
Expand Down Expand Up @@ -4693,7 +4694,7 @@ d3panels.slider = function(chartOpts) {
value = xcscale.invert(clamped_pixels + margin);
d3.select(this).attr("transform", "translate(" + xcscale(value) + ",0)");
if (stops != null) {
stopindex = nearest_stop(value);
stopindex = d3panels.index_of_nearest(value, stops);
value = stops[stopindex];
}
if (callback != null) {
Expand All @@ -4706,7 +4707,7 @@ d3panels.slider = function(chartOpts) {
clamped_pixels = clamp_pixels(pixel_value, [0, width - margin * 2]);
value = xcscale.invert(clamped_pixels + margin);
if (stops != null) {
stopindex = nearest_stop(value);
stopindex = d3panels.index_of_nearest(value, stops);
value = stops[stopindex];
}
if (callback != null) {
Expand Down Expand Up @@ -4765,7 +4766,7 @@ d3panels.double_slider = function(chartOpts) {
buttondotcolor = [buttondotcolor, buttondotcolor];
}
chart = function(selection, callback1, callback2, range, stops) {
var buttons, callbacks, clamp_pixels, dragged, end_drag, nearest_stop, start_drag, xcscale, xscale;
var buttons, callbacks, clamp_pixels, dragged, end_drag, start_drag, xcscale, xscale;
callbacks = [callback1, callback2];
if (range == null) {
range = [margin, width - margin * 2];
Expand All @@ -4783,17 +4784,10 @@ d3panels.double_slider = function(chartOpts) {
});
}
slider_svg = selection.insert("svg").attr("height", height).attr("width", width);
nearest_stop = function(d) {
var abs_diff;
abs_diff = stops.map(function(val) {
return Math.abs(val - d);
});
return abs_diff.indexOf(d3.min(abs_diff));
};
xcscale = d3.scaleLinear().range([margin, width - margin]).domain(range).clamp(true);
xscale = function(d) {
if (stops != null) {
return xcscale(stops[nearest_stop(d)]);
return xcscale(stops[d3panels.index_of_nearest(d, stops)]);
}
return xcscale(d);
};
Expand Down Expand Up @@ -4842,7 +4836,7 @@ d3panels.double_slider = function(chartOpts) {
value[i] = xcscale.invert(clamped_pixels + margin);
d3.select(this).attr("transform", "translate(" + xcscale(value[i]) + ",0)");
if (stops != null) {
stopindex[i] = nearest_stop(value[i]);
stopindex[i] = d3panels.index_of_nearest(value[i], stops);
value[i] = stops[stopindex[i]];
}
if (callbacks[i] != null) {
Expand All @@ -4857,7 +4851,7 @@ d3panels.double_slider = function(chartOpts) {
clamped_pixels = clamp_pixels(pixel_value, [0, width - margin * 2]);
value[i] = xcscale.invert(clamped_pixels + margin);
if (stops != null) {
stopindex[i] = nearest_stop(value[i]);
stopindex[i] = d3panels.index_of_nearest(value[i], stops);
value[i] = stops[stopindex[i]];
}
if (callbacks[i] != null) {
Expand Down
10 changes: 5 additions & 5 deletions d3panels.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d3panels",
"version": "1.3.0",
"version": "1.3.1",
"description": "D3-based graphics panels",
"authors": [
"Karl Broman <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion src/d3panels_top.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!function() { // encapsulate d3panels functions
var d3panels = {
version: "1.3.0"
version: "1.3.1"
};

0 comments on commit 3325b19

Please sign in to comment.