Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create Chart class that all charts inherit from #32

Closed
wants to merge 1 commit into from
Closed

Create Chart class that all charts inherit from #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
103 changes: 6 additions & 97 deletions src/Bar.js
View file
Open in desktop
@@ -1,22 +1,20 @@
import { addFontGaegu, addFontIndieFlower } from './utils/addFonts';
import { max } from 'd3-array';
import { axisBottom, axisLeft } from 'd3-axis';
import { csv, tsv } from 'd3-fetch';
import { format } from 'd3-format';
import { scaleBand, scaleLinear } from 'd3-scale';
import { mouse, select, selectAll } from 'd3-selection';
import rough from 'roughjs/dist/rough.umd';
import get from 'lodash.get';
import { roughCeiling } from './utils/roughCeiling';
import Chart from './Chart';

class Bar {
class Bar extends Chart {
constructor(opts) {
super(opts);

// load in arguments from config object
this.el = opts.element;
this.data = opts.data;
this.element = opts.element;
this.margin = opts.margin || { top: 50, right: 20, bottom: 70, left: 100 };
this.title = opts.title;
this.color = get(opts, 'color', 'skyblue');
this.highlight = get(opts, 'highlight', 'coral');
this.roughness = roughCeiling({ roughness: opts.roughness });
Expand All @@ -25,15 +23,8 @@ class Bar {
this.axisStrokeWidth = get(opts, 'axisStrokeWidth', 0.5);
this.axisRoughness = get(opts, 'axisRoughness', 0.5);
this.innerStrokeWidth = get(opts, 'innerStrokeWidth', 1);
this.fillStyle = opts.fillStyle;
this.bowing = get(opts, 'bowing', 0);
this.fillWeight = get(opts, 'fillWeight', 0.5);
this.simplification = get(opts, 'simplification', 0.2);
this.interactive = opts.interactive !== false;
this.titleFontSize = opts.titleFontSize;
this.axisFontSize = opts.axisFontSize;
this.tooltipFontSize = get(opts, 'tooltipFontSize', '0.95rem');
this.font = get(opts, 'font', 0);
this.dataFormat = (typeof opts.data === 'object') ? 'object' : 'file';
this.labels = (this.dataFormat === 'object') ? 'labels' : opts.labels;
this.values = (this.dataFormat === 'object') ? 'values' : opts.values;
Expand All @@ -44,81 +35,13 @@ class Bar {
this.yLabel = get(opts, 'yLabel', '');
this.labelFontSize = get(opts, 'labelFontSize', '1rem');
// new width
this.initChartValues(opts);
this.initChartValues(opts, 350, 450);
// resolve font
this.resolveFont();
// create the chart
this.drawChart = this.resolveData(opts.data);
this.drawChart();
if (opts.title !== 'undefined') this.setTitle(opts.title);
}

initChartValues(opts) {
let width = opts.width ? opts.width : 350;
let height = opts.height ? opts.height : 450;
this.width = width - this.margin.left - this.margin.right;
this.height = height - this.margin.top - this.margin.bottom;
this.roughId = this.el + '_svg';
this.graphClass = this.el.substring(1, this.el.length);
this.interactionG = 'g.' + this.graphClass;
this.setSvg();
}

setSvg() {
this.svg = select(this.el)
.append('svg')
.attr('width', this.width + this.margin.left + this.margin.right)
.attr('height', this.height + this.margin.top + this.margin.bottom)
.append('g')
.attr('id', this.roughId)
.attr('transform',
'translate(' + this.margin.left + ',' + this.margin.top + ')');
}

resolveFont() {
if (
this.font === 0 ||
this.font === undefined ||
this.font.toString().toLowerCase() === 'gaegu'
) {
addFontGaegu(this.svg);
this.fontFamily = 'gaeguregular';
} else if (
this.font === 1 ||
this.font.toString().toLowerCase() === 'indie flower'
) {
addFontIndieFlower(this.svg);
this.fontFamily = 'indie_flowerregular';
} else {
this.fontFamily = this.font;
}
}

// add this to abstract base
resolveData(data) {
if (typeof data === 'string') {
if (data.includes('.csv')) {
return () => {
csv(data).then(d => {
// console.log(d);
this.data = d;
this.drawFromFile();
});
};
} else if (data.includes('.tsv')) {
return () => {
tsv(data).then(d => {
this.data = d;
this.drawFromFile();
});
};
}
} else {
return () => {
this.data = data;
this.drawFromObject();
};
}
if (opts.title !== 'undefined') this.setTitle(opts.title, { fontSizeFactor: 5 });
}

addScales() {
Expand Down Expand Up @@ -238,20 +161,6 @@ class Bar {
});
}

setTitle(title) {
this.svg.append('text')
.attr('x', (this.width / 2))
.attr('y', 0 - (this.margin.top / 2))
.attr('class', 'title')
.attr('text-anchor', 'middle')
.style('font-size', (this.titleFontSize === undefined) ?
`${Math.min(40, Math.min(this.width, this.height) / 5)}px` :
this.titleFontSize)
.style('font-family', this.fontFamily)
.style('opacity', 0.8)
.text(title);
}

addInteraction() {

selectAll(this.interactionG)
Expand Down
103 changes: 6 additions & 97 deletions src/BarH.js
View file
Open in desktop
@@ -1,22 +1,20 @@
import { addFontGaegu, addFontIndieFlower } from './utils/addFonts';
import { max } from 'd3-array';
import { axisBottom, axisLeft } from 'd3-axis';
import { csv, tsv } from 'd3-fetch';
import { format } from 'd3-format';
import { scaleBand, scaleLinear } from 'd3-scale';
import { mouse, select, selectAll } from 'd3-selection';
import rough from 'roughjs/dist/rough.umd';
import get from 'lodash.get';
import { roughCeiling } from './utils/roughCeiling';
import Chart from './Chart';

class BarH {
class BarH extends Chart {
constructor(opts) {
super(opts);

// load in arguments from config object
this.el = opts.element;
// this.data = opts.data;
this.element = opts.element;
this.margin = opts.margin || { top: 50, right: 20, bottom: 50, left: 100 };
this.title = opts.title;
this.color = get(opts, 'color', 'skyblue');
this.highlight = get(opts, 'highlight', 'coral');
this.roughness = roughCeiling({ roughness: opts.roughness });
Expand All @@ -25,15 +23,8 @@ class BarH {
this.axisStrokeWidth = get(opts, 'axisStrokeWidth', 0.5);
this.axisRoughness = get(opts, 'axisRoughness', 0.5);
this.innerStrokeWidth = get(opts, 'innerStrokeWidth', 1);
this.fillStyle = opts.fillStyle;
this.bowing = get(opts, 'bowing', 0);
this.fillWeight = get(opts, 'fillWeight', 0.5);
this.simplification = get(opts, 'simplification', 0.2);
this.interactive = opts.interactive !== false;
this.titleFontSize = opts.titleFontSize;
this.axisFontSize = opts.axisFontSize;
this.tooltipFontSize = get(opts, 'tooltipFontSize', '0.95rem');
this.font = get(opts, 'font', 0);
this.dataFormat = (typeof opts.data === 'object') ? 'object' : 'file';
this.labels = (this.dataFormat === 'object') ? 'labels' : opts.labels;
this.values = (this.dataFormat === 'object') ? 'values' : opts.values;
Expand All @@ -44,81 +35,13 @@ class BarH {
this.yLabel = get(opts, 'yLabel', '');
this.labelFontSize = get(opts, 'labelFontSize', '1rem');
// new width
this.initChartValues(opts);
this.initChartValues(opts, 350, 450);
// resolve font
this.resolveFont();
// create the chart
this.drawChart = this.resolveData(opts.data);
this.drawChart();
if (opts.title !== 'undefined') this.setTitle(opts.title);
}

initChartValues(opts) {
let width = opts.width ? opts.width : 350;
let height = opts.height ? opts.height : 450;
this.width = width - this.margin.left - this.margin.right;
this.height = height - this.margin.top - this.margin.bottom;
this.roughId = this.el + '_svg';
this.graphClass = this.el.substring(1, this.el.length);
this.interactionG = 'g.' + this.graphClass;
this.setSvg();
}

setSvg() {
this.svg = select(this.el)
.append('svg')
.attr('width', this.width + this.margin.left + this.margin.right)
.attr('height', this.height + this.margin.top + this.margin.bottom)
.append('g')
.attr('id', this.roughId)
.attr('transform',
'translate(' + this.margin.left + ',' + this.margin.top + ')');
}

resolveFont() {
if (
this.font === 0 ||
this.font === undefined ||
this.font.toString().toLowerCase() === 'gaegu'
) {
addFontGaegu(this.svg);
this.fontFamily = 'gaeguregular';
} else if (
this.font === 1 ||
this.font.toString().toLowerCase() === 'indie flower'
) {
addFontIndieFlower(this.svg);
this.fontFamily = 'indie_flowerregular';
} else {
this.fontFamily = this.font;
}
}

// add this to abstract base
resolveData(data) {
if (typeof data === 'string') {
if (data.includes('.csv')) {
return () => {
csv(data).then(d => {
console.log(d);
this.data = d;
this.drawFromFile();
});
};
} else if (data.includes('.tsv')) {
return () => {
tsv(data).then(d => {
this.data = d;
this.drawFromFile();
});
};
}
} else {
return () => {
this.data = data;
this.drawFromObject();
};
}
if (opts.title !== 'undefined') this.setTitle(opts.title, { fontSizeFactor: 5 });
}

addScales() {
Expand Down Expand Up @@ -240,20 +163,6 @@ class BarH {
});
}

setTitle(title) {
this.svg.append('text')
.attr('x', (this.width / 2))
.attr('y', 0 - (this.margin.top / 2))
.attr('class', 'title')
.attr('text-anchor', 'middle')
.style('font-size', (this.titleFontSize === undefined) ?
`${Math.min(40, Math.min(this.width, this.height) / 5)}px` :
this.titleFontSize)
.style('font-family', this.fontFamily)
.style('opacity', 0.8)
.text(title);
}

addInteraction() {
// add highlight helper dom nodes
selectAll(this.interactionG)
Expand Down