Skip to content

Commit

Permalink
fix up bar situation
Browse files Browse the repository at this point in the history
  • Loading branch information
@iamlemec
iamlemec committed Sep 2, 2024
1 parent e7a2104 commit 7e3a33d
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 125 deletions.
98 changes: 38 additions & 60 deletions dist/js/gum.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2253,33 +2253,15 @@ class SymPoints extends Container {
**/

class Bar extends Container {
constructor(direc, length, args) {
let {zero, size, color, shape, ...attr} = args ?? {};
constructor(args) {
let {size, color, shape, ...attr} = args ?? {};
shape = shape ?? (a => new Rect(a));
zero = zero ?? 0;

// get standardized direction
direc = get_orient(direc);

// make shape
let child = shape({stroke: color, fill: color, ...attr});

// call constructor
super([child]);
this.lim = [zero, zero + length];
this.size = size;
}
}

class VBar extends Bar {
constructor(length, args) {
super('v', length, args);
}
}

class HBar extends Bar {
constructor(length, args) {
super('h', length, args);
}
}

Expand Down Expand Up @@ -2319,65 +2301,56 @@ class HMultiBar extends MultiBar {
}
}

// custom bars must have a ylim and optionally a width
// custom bars are aspectless
// variables named for vertical bars case
class Bars extends Container {
constructor(direc, bars, args) {
let {lim, shrink, size, integer, ...attr0} = args ?? {};
constructor(direc, data, args) {
let {lim, shrink, zero, width, integer, ...attr0} = args ?? {};
let [bar_attr, attr] = prefix_split(['bar'], attr0);
integer = integer ?? false;
shrink = shrink ?? 0;
let n = bars.length;
zero = zero ?? 0;
let n = data.length;

// get standardized direction
direc = get_orient(direc);

// check input sizes
let arrs = new Set(bars.map(is_array));
if (arrs.size > 1) {
throw new Error('Error: bar specs must all be same type');
}
let [arr,] = arrs;
// fill in default bars
let bar0 = new Bar(bar_attr);
data = data.map(b => is_array(b) ? b : [bar0, b]);
let [bars, heights] = zip(...data);

// expand scalar list case
let vals;
if (arr) {
[vals, bars] = zip(...bars);
} else {
let lim_int = (n > 1) ? [0, n-1] : [-0.5, 0.5];
let lim_def = (integer) ? lim_int : limit_base;
lim = lim ?? lim_def;
vals = linspace(...lim, n);
if (direc == 'h') { vals = vals.reverse(); }
}
let lim_int = (n > 1) ? [0, n-1] : [-0.5, 0.5];
let lim_def = (integer) ? lim_int : limit_base;
lim = lim ?? lim_def;
let xlocs = linspace(...lim, n);
if (direc == 'h') { xlocs = xlocs.reverse(); }

// get data parameters
let [vmin, vmax] = [min(...vals), max(...vals)];
size = size ?? ((n > 1) ? (1-shrink)*(vmax-vmin)/(n-1) : 1);

// handle scalar and custom bars
bars = bars.map(b =>
is_scalar(b) ? new Bar(direc, b, {size, ...bar_attr}) : b
);
let [xmin, xmax] = [min(...xlocs), max(...xlocs)];
width = width ?? ((n > 1) ? (1-shrink)*(xmax-xmin)/(n-1) : 1);

// aggregate lengths
let [zmins, zmaxs] = zip(...bars.map(b => b.lim));
let [zmin, zmax] = [min(...zmins), max(...zmaxs)];
let ymins = heights.map(h => min(zero, h));
let ymaxs = heights.map(h => max(zero, h));
let [ymin, ymax] = [min(...ymins), max(...ymaxs)];

// compute boxes
let children = zip(vals, bars).map(([v, b]) => {
let [zlo, zhi, s] = [...b.lim, b.size ?? size];
let box = (direc == 'v') ? [v-s/2, zlo, v+s/2, zhi] : [zlo, v-s/2, zhi, v+s/2];
let children = zip(ymins, ymaxs, xlocs, bars).map(([ylo, yhi, x, b]) => {
let w = width;
let box = (direc == 'v') ? [x-w/2, ylo, x+w/2, yhi] : [ylo, x-w/2, yhi, x+w/2];
return [b, box];
});

// set up container
let attr1 = {clip: false, ...attr};
super(children, attr1);
this.vals = vals;
this.locs = xlocs;

// set axis limits
this.xlim = lim ?? [vmin, vmax];
this.ylim = [zmin, zmax];
this.xlim = lim ?? [xmin, xmax];
this.ylim = [ymin, ymax];
if (direc == 'h') { [this.xlim, this.ylim] = [this.ylim, this.xlim]; }
}
}
Expand Down Expand Up @@ -2848,22 +2821,19 @@ class BarPlot extends Plot {
shrink = shrink ?? 0.2;
color = color ?? 'lightgray';

// wrangle data
data = is_object(data) ? Object.entries(data) : data;
let n = data.length;

// standardize direction
direc = get_orient(direc);

// set up appropriate padding
let n = data.length;
let zpad = min(0.5, 1/n);
let padding0 = (direc == 'v') ? [zpad, 0] : [0, zpad];
padding = padding ?? padding0;

// generate actual bars
let [labs, bars] = zip(...data);
let bars1 = new Bars(direc, bars, {shrink, bar_fill: color, ...bars_attr});
let ticks = zip(bars1.vals, labs);
let ticks = zip(bars1.locs, labs);

// send to general plot
let attr1 = {aspect, padding, ...attr};
Expand Down Expand Up @@ -3214,7 +3184,11 @@ class Animation {
**/

let Gum = [
<<<<<<< HEAD
Context, Element, Container, Group, SVG, Frame, VStack, HStack, Place, Rotate, Anchor, Scatter, Spacer, Ray, Line, HLine, VLine, Rect, Square, Ellipse, Circle, Dot, Polyline, Polygon, Path, Arrowhead, Text, Tex, Node, MoveTo, LineTo, VerticalTo, VerticalDel, HorizontalTo, HorizontalDel, Bezier2, Bezier3, ArcTo, ArcDel, Bezier2Path, Bezier2Line, Bezier3Line, Arrow, Field, SymField, Edge, Network, ClosePath, SymPath, SymFill, SymPoly, SymPoints, Bar, VBar, HBar, VMultiBar, HMultiBar, Bars, VBars, HBars, Scale, VScale, HScale, Labels, VLabels, HLabels, Axis, HAxis, VAxis, Grid, Graph, Plot, BarPlot, Legend, Note, Interactive, Variable, Slider, Toggle, List, Animation, Continuous, Discrete, range, linspace, enumerate, repeat, meshgrid, lingrid, hex2rgb, rgb2hex, rgb2hsl, interpolateVectors, interpolateHex, interpolateVectorsPallet, gzip, zip, reshape, split, pos_rect, pad_rect, rad_rect, exp, log, sin, cos, min, max, abs, pow, sqrt, floor, ceil, round, norm, add, mul, pi, phi, r2d, rounder, make_ticklabel, aspect_invariant, random, random_uniform, random_gaussian, cumsum, blue, red, green, Filter, Effect, Composite, MergeNode, Merge, Flood, GaussianBlur, DropShadow,
=======
Context, Element, Container, Group, SVG, Frame, VStack, HStack, Place, Rotate, Anchor, Scatter, Spacer, Ray, Line, HLine, VLine, Rect, Square, Ellipse, Circle, Dot, Polyline, Polygon, Path, Arrowhead, Text, Tex, Node, MoveTo, LineTo, VerticalTo, VerticalDel, HorizontalTo, HorizontalDel, Bezier2, Bezier3, ArcTo, ArcDel, Bezier2Path, Bezier2Line, Bezier3Line, Arrow, Field, SymField, Edge, Network, ClosePath, SymPath, SymFill, SymPoly, SymPoints, Bar, VMultiBar, HMultiBar, Bars, VBars, HBars, Scale, VScale, HScale, Labels, VLabels, HLabels, Axis, HAxis, VAxis, Grid, Graph, Plot, BarPlot, Legend, Note, Interactive, Variable, Slider, Toggle, List, Animation, Continuous, Discrete, range, linspace, enumerate, repeat, meshgrid, lingrid, hex2rgb, rgb2hex, rgb2hsl, interpolateVectors, interpolateHex, interpolateVectorsPallet, gzip, zip, reshape, split, pos_rect, pad_rect, rad_rect, exp, log, sin, cos, min, max, abs, pow, sqrt, floor, ceil, round, norm, add, mul, pi, phi, r2d, rounder, make_ticklabel, aspect_invariant, random, random_uniform, random_gaussian, cumsum, blue, red, green
>>>>>>> ee4d73b (fix up bar situation)
];

// detect object types
Expand Down Expand Up @@ -3322,4 +3296,8 @@ function injectImages(elem) {
});
}

<<<<<<< HEAD
export { Anchor, Animation, ArcDel, ArcTo, Arrow, Arrowhead, Axis, Bar, BarPlot, Bars, Bezier2, Bezier2Line, Bezier2Path, Bezier3, Bezier3Line, Circle, ClosePath, Container, Context, Continuous, Discrete, Dot, DropShadow, Edge, Effect, Element, Ellipse, Field, Filter, Frame, Graph, Grid, Group, Gum, HAxis, HBar, HBars, HLabels, HLine, HMultiBar, HScale, HStack, HorizontalDel, HorizontalTo, Interactive, Labels, Legend, Line, LineTo, List, MoveTo, Network, Node, Note, Path, Place, Plot, Polygon, Polyline, Ray, Rect, Rotate, SVG, Scale, Scatter, Slider, Spacer, Square, SymField, SymFill, SymPath, SymPoints, SymPoly, Tex, Text, Toggle, VAxis, VBar, VBars, VLabels, VLine, VMultiBar, VScale, VStack, Variable, VerticalDel, VerticalTo, abs, add, aspect_invariant, ceil, cos, cumsum, demangle, enumerate, exp, floor, gums, gzip, hex2rgb, injectImage, injectImages, injectScripts, interpolateHex, interpolateVectors, interpolateVectorsPallet, lingrid, linspace, log, make_ticklabel, mako, max, meshgrid, min, mul, norm, pad_rect, parseGum, phi, pi, pos_rect, pow, props_repr, r2d, rad_rect, random, random_gaussian, random_uniform, range, renderElem, renderGum, repeat, reshape, rgb2hex, rgb2hsl, round, rounder, setTextSizer, sin, split, sqrt, zip };
=======
export { Anchor, Animation, ArcDel, ArcTo, Arrow, Arrowhead, Axis, Bar, BarPlot, Bars, Bezier2, Bezier2Line, Bezier2Path, Bezier3, Bezier3Line, Circle, ClosePath, Container, Context, Continuous, Discrete, Dot, Edge, Element, Ellipse, Field, Frame, Graph, Grid, Group, Gum, HAxis, HBars, HLabels, HLine, HMultiBar, HScale, HStack, HorizontalDel, HorizontalTo, Interactive, Labels, Legend, Line, LineTo, List, MoveTo, Network, Node, Note, Path, Place, Plot, Polygon, Polyline, Ray, Rect, Rotate, SVG, Scale, Scatter, Slider, Spacer, Square, SymField, SymFill, SymPath, SymPoints, SymPoly, Tex, Text, Toggle, VAxis, VBars, VLabels, VLine, VMultiBar, VScale, VStack, Variable, VerticalDel, VerticalTo, abs, add, aspect_invariant, ceil, cos, cumsum, demangle, enumerate, exp, floor, gums, gzip, hex2rgb, injectImage, injectImages, injectScripts, interpolateHex, interpolateVectors, interpolateVectorsPallet, lingrid, linspace, log, make_ticklabel, mako, max, meshgrid, min, mul, norm, pad_rect, parseGum, phi, pi, pos_rect, pow, props_repr, r2d, rad_rect, random, random_gaussian, random_uniform, range, renderElem, renderGum, repeat, reshape, rgb2hex, rgb2hsl, round, rounder, setTextSizer, sin, split, sqrt, zip };
>>>>>>> ee4d73b (fix up bar situation)
6 changes: 3 additions & 3 deletions docs/code/barplot.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// bar plot with default and custom colors
let abar = VBar(3, {fill: '#ff0d57', stroke: 'black'});
let bbar = VBar(8, {fill: '#1e88e5', stroke: 'black'});
let bars = BarPlot([['A', abar], ['B', bbar], ['C', 6]], {
let abar = Bar({fill: '#ff0d57', stroke: 'black'});
let bbar = Bar({fill: '#1e88e5', stroke: 'black'});
let bars = BarPlot([['A', [abar, 3]], ['B', [bbar, 8]], ['C', 6]], {
ylim: [0, 10], yticks: 6, title: 'Example BarPlot',
xlabel: 'Category', ylabel: 'Value', bar_fill: '#AAA'
});
Expand Down
Loading

0 comments on commit 7e3a33d

Please sign in to comment.