Skip to content

Multiple Lines on Graph Functionality #24

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

Merged
Hermanya merged 6 commits into from
Jul 12, 2018
Merged

Multiple Lines on Graph Functionality #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8252b48
Multiple Datasets Dots
mrfambo Jul 7, 2018
e7bd2fe
Rendering Multiple Lines
mrfambo Jul 7, 2018
5b5d1b6
Rending Shadows on multiple lines
mrfambo Jul 7, 2018
d0a98f5
Bazier Issue
mrfambo Jul 7, 2018
9b44a05
Multiple Lines Functionality
mrfambo Jul 7, 2018
a9debd4
PR fixes
Hermanya Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules/
.expo/
.DS_Store
npm-debug.*
package-lock.json
18 changes: 18 additions & 0 deletions data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,24 @@ const data = {
71,
100
]
},{
data: [
20,
10,
4,
56,
87,
90
]
},{
data: [
30,
90,
67,
54,
10,
2
]
}]
}

Expand Down
149 changes: 102 additions & 47 deletions src/line-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,92 +15,145 @@ class LineChart extends AbstractChart {

renderDots = config => {
const { data, width, height, paddingTop, paddingRight } = config
return data.map((x, i) => {
return (
<Circle
key={Math.random()}
cx={paddingRight + (i * (width - paddingRight) / data.length)}
cy={((height / 4 * 3 * (1 - ((x - Math.min(...data)) / this.calcScaler(data)))) + paddingTop)}
r="4"
fill={this.props.chartConfig.color(0.7)}
/>)
let output = [];
data.map((dataset,index)=>{
dataset.data.map((x, i) => {
output.push (
<Circle
key={Math.random()}
cx={paddingRight + (i * (width - paddingRight) / dataset.data.length)}
cy={((height / 4 * 3 * (1 - ((x - Math.min(...dataset.data)) / this.calcScaler(dataset.data)))) + paddingTop)}
r="4"
fill={this.props.chartConfig.color(0.7)}
/>)
})
})
return (
output
)


}

renderShadow = config => {
if (this.props.bezier) {
return this.renderBezierShadow(config)
}
const { data, width, height, paddingRight, paddingTop } = config
let output = [];
config.data.map((dataset,index)=>{
output.push (
<Polygon
key={index}
points={dataset.data.map((x, i) =>
(paddingRight + (i * (width - paddingRight) / dataset.data.length)) +
',' +
(((height / 4 * 3 * (1 - ((x - Math.min(...dataset.data)) / this.calcScaler(dataset.data)))) + paddingTop))
).join(' ') + ` ${paddingRight + ((width - paddingRight) / dataset.data.length * (dataset.data.length - 1))},${(height / 4 * 3) + paddingTop} ${paddingRight},${(height / 4 * 3) + paddingTop}`}
fill="url(#fillShadowGradient)"
strokeWidth={0}
/>)
})
return (
<Polygon
points={data.map((x, i) =>
(paddingRight + (i * (width - paddingRight) / data.length)) +
',' +
(((height / 4 * 3 * (1 - ((x - Math.min(...data)) / this.calcScaler(data)))) + paddingTop))
).join(' ') + ` ${paddingRight + ((width - paddingRight) / data.length * (data.length - 1))},${(height / 4 * 3) + paddingTop} ${paddingRight},${(height / 4 * 3) + paddingTop}`}
fill="url(#fillShadowGradient)"
strokeWidth={0}
/>)
output
)


}

renderLine = config => {
if (this.props.bezier) {
return this.renderBezierLine(config)
}
const { width, height, paddingRight, paddingTop, data } = config
const points = data.map((x, i) =>
(paddingRight + (i * (width - paddingRight) / data.length)) +
let output = [];
data.map((dataset,index) => {

const points = dataset.data.map((x, i) =>
(paddingRight + (i * (width - paddingRight) / dataset.data.length)) +
',' +
(((height / 4 * 3 * (1 - ((x - Math.min(...data)) / this.calcScaler(data))))) + paddingTop))
(((height / 4 * 3 * (1 - ((x - Math.min(...dataset.data)) / this.calcScaler(dataset.data))))) + paddingTop))

output.push (
<Polyline
key = {index}
points={points.join(' ')}
fill="none"
stroke={this.props.chartConfig.color(0.2)}
strokeWidth={3}
/>
)

})

return (
<Polyline
points={points.join(' ')}
fill="none"
stroke={this.props.chartConfig.color(0.2)}
strokeWidth={3}
/>
output
)


}

getBezierLinePoints = config => {
getBezierLinePoints = (dataset, config) => {

const { width, height, paddingRight, paddingTop, data } = config
if (data.length === 0) {
let output = [];
if (dataset.data.length === 0) {
return 'M0,0'
}
const x = i => Math.floor(paddingRight + i * (width - paddingRight) / data.length)
const y = i => Math.floor(((height / 4 * 3 * (1 - ((data[i] - Math.min(...data)) / this.calcScaler(data)))) + paddingTop))
return [`M${x(0)},${y(0)}`].concat(data.slice(0, -1).map((_, i) => {
const x = i => Math.floor(paddingRight + i * (width - paddingRight) / dataset.data.length)
const y = i => Math.floor(((height / 4 * 3 * (1 - ((dataset.data[i] - Math.min(...dataset.data)) / this.calcScaler(dataset.data)))) + paddingTop))

return [`M${x(0)},${y(0)}`].concat(dataset.data.slice(0, -1).map((_, i) => {
const x_mid = (x(i) + x(i + 1)) / 2
const y_mid = (y(i) + y(i + 1)) / 2
const cp_x1 = (x_mid + x(i)) / 2
const cp_x2 = (x_mid + x(i + 1)) / 2
return `Q ${cp_x1}, ${y(i)}, ${x_mid}, ${y_mid}` +
` Q ${cp_x2}, ${y(i + 1)}, ${x(i + 1)}, ${y(i + 1)}`
})).join(' ')


}

renderBezierLine = config => {
let output = [];
config.data.map((dataset,index)=>{
let result = this.getBezierLinePoints(dataset,config);
output.push (
<Path
key = {index}
d={result}
fill="none"
stroke={this.props.chartConfig.color(0.2)}
strokeWidth={3}
/>
)
});
return (
<Path
d={this.getBezierLinePoints(config)}
fill="none"
stroke={this.props.chartConfig.color(0.2)}
strokeWidth={3}
/>
output
)


}

renderBezierShadow = config => {
const { width, height, paddingRight, paddingTop, data } = config
let output = [];
data.map((dataset,index)=>{
let d = this.getBezierLinePoints(dataset,config) +
` L${paddingRight + ((width - paddingRight) / dataset.data.length * (dataset.data.length - 1))},${(height / 4 * 3) + paddingTop} L${paddingRight},${(height / 4 * 3) + paddingTop} Z`
output.push (
<Path
key={index}
d={d}
fill="url(#fillShadowGradient)"
strokeWidth={0}
/>)
})
return (
<Path
d={this.getBezierLinePoints(config) +
` L${paddingRight + ((width - paddingRight) / data.length * (data.length - 1))},${(height / 4 * 3) + paddingTop} L${paddingRight},${(height / 4 * 3) + paddingTop} Z`}
fill="url(#fillShadowGradient)"
strokeWidth={0}
/>)
output
)

}

render() {
Expand Down Expand Up @@ -159,17 +212,19 @@ class LineChart extends AbstractChart {
...config,
paddingRight,
paddingTop,
data: data.datasets[0].data
// data: data.datasets[0].data

@Hermanya Hermanya Jul 7, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And please remove this commented code.

data: data.datasets

})}
{withShadow && this.renderShadow({
...config,
data: data.datasets[0].data,
data: data.datasets,
paddingRight,
paddingTop
})}
{withDots && this.renderDots({
...config,
data: data.datasets[0].data,
data: data.datasets,
paddingTop,
paddingRight
})}
Expand Down