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.

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

D3fc plugin - Basic OHLC and Candlestick charts #488

Merged
merged 64 commits into from
Mar 25, 2019
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
c831f18
Tooltips for line charts
Mar 8, 2019
b7727fb
remove duplicate withOutOpacity method from seriesColours
Mar 8, 2019
1807f26
Merge pull request #85 from redbearsam/remove_duplicate_method
matt-hooper Mar 11, 2019
daa8234
Refactored tooltips into cartesian-chart component
Mar 11, 2019
3818fd7
Only apply XY colour for category colours
Mar 12, 2019
4d10af7
Default highlight colour
Mar 12, 2019
c31da4e
Merge pull request #86 from redbearsam/feature/tooltip_refactor
matt-hooper Mar 12, 2019
48d092e
Updated d3fc and replaced local cartesianSvgChart
Mar 11, 2019
5958468
Fixed problem with non-rotated labels
Mar 12, 2019
7e520a0
Fix non-category axis bug
Mar 12, 2019
6f17306
Updated test results
Mar 12, 2019
67442a6
Fixed merge error
Mar 12, 2019
c724cae
Merge pull request #87 from redbearsam/feature/d3fc-new-chart
matt-hooper Mar 12, 2019
1d83355
Add tooltips for Area charts
Mar 12, 2019
3b00eec
Removed old SVG X/Y chart and replace with the Canvas one (#88)
Mar 12, 2019
c7c8032
Fixed some MS-Edge issues (#90)
Mar 12, 2019
84eb792
Merge pull request #89 from redbearsam/feature/area_tooltip
matt-hooper Mar 12, 2019
133e0d9
replace colour references with color
Mar 12, 2019
d5709ed
Merge pull request #91 from redbearsam/feature/colorize
matt-hooper Mar 12, 2019
f78c419
Improved and simplified nearby-tooltip code and used on y-scatter
Mar 12, 2019
e83c254
Use extentLinear to pad domain
Ro4052 Mar 12, 2019
4e3402b
Merge pull request #92 from redbearsam/feature/improve-nearby-tip
Mar 13, 2019
4d73fb5
Refactored tooltip html generation
Ro4052 Mar 13, 2019
56acea1
Converted formatNumber to arrow function
Ro4052 Mar 13, 2019
556b2a5
Removed unused filter
Ro4052 Mar 13, 2019
53e308f
Fixed tooltip for line charts
Ro4052 Mar 13, 2019
7ae689e
Slight refactor to generateHtml
Ro4052 Mar 13, 2019
89bedf4
Fixed tooltip for data values
Ro4052 Mar 13, 2019
432ca4f
Fixed tooltip for xy with split
Ro4052 Mar 13, 2019
7345081
Merge pull request #96 from redbearsam/fix/line-bar-tip
matt-hooper Mar 13, 2019
3147906
basic OHLC chart
Mar 13, 2019
710d253
add tooltip for ohlc
Mar 13, 2019
c372d49
Add vertical and horizontal zoom
Mar 13, 2019
aea2174
Added candlestick chart
Ro4052 Mar 14, 2019
aee8d31
Merge pull request #97 from redbearsam/feature/candlestick
matt-hooper Mar 14, 2019
3f949d7
Ohlc/candlestick charts default to 4 values
Ro4052 Mar 14, 2019
3f097f0
basic OHLC chart
Mar 13, 2019
c4f1f86
add tooltip for ohlc
Mar 13, 2019
1813063
Add vertical and horizontal zoom
Mar 13, 2019
073fd92
Added candlestick chart
Ro4052 Mar 14, 2019
bba217b
Ohlc/candlestick charts default to 4 values
Ro4052 Mar 14, 2019
360be4e
refactor less file
Mar 14, 2019
de180aa
add support for just two values (open/close) and infer the high/low f…
Mar 14, 2019
bc31642
ohlc support split-by
Mar 15, 2019
f8cbfd0
rebase and merge
Mar 15, 2019
7e3d29b
Updated d3fc and used its new ordinalAxis
Mar 15, 2019
87f32fc
Merge pull request #99 from redbearsam/feature/d3fc-ordinal
matt-hooper Mar 15, 2019
2a4aa79
replace lowerValueName and upperValueName with valueNames
matt-hooper Mar 15, 2019
8a32668
Add an OHLC example to the simple examples folder
matt-hooper Mar 15, 2019
8084948
Merge pull request #95 from redbearsam/feature/ohlc
matt-hooper Mar 15, 2019
0449c1c
remove unnecessary slice
matt-hooper Mar 18, 2019
9ecef29
Merge pull request #101 from redbearsam/fix/missing_tooltip_value
matt-hooper Mar 18, 2019
615db26
Add upColors and downColors to series
matt-hooper Mar 18, 2019
ef12186
Merge pull request #104 from redbearsam/develop
matt-hooper Mar 18, 2019
c1fc975
update perspective-viewer-d3fc/test/results
matt-hooper Mar 19, 2019
7bd2e35
Merge pull request #105 from redbearsam/fix/screenshots
matt-hooper Mar 19, 2019
7ba7e5e
Merge pull request #106 from redbearsam/develop
matt-hooper Mar 19, 2019
028ac30
use opacity to distinguish up and down on multi-series version
matt-hooper Mar 19, 2019
6f00972
Merge branch 'develop' of https://github.com/redbearsam/perspective i…
matt-hooper Mar 19, 2019
253daec
add legend
matt-hooper Mar 19, 2019
b476aa2
replaced seriesSvgRepeat with seriesSvgMulti to resolve issue where d…
matt-hooper Mar 19, 2019
1130587
update legend to support on-click hide functionality
matt-hooper Mar 19, 2019
bf4ab7c
Merge pull request #102 from redbearsam/feature/color_ohlc
matt-hooper Mar 19, 2019
567dfaf
Merge pull request #107 from redbearsam/develop
matt-hooper Mar 19, 2019
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
Prev Previous commit
Next Next commit
replaced seriesSvgRepeat with seriesSvgMulti to resolve issue where d…
…ifferent length dataset caused a problem
  • Loading branch information
matt-hooper committed Mar 19, 2019
commit b476aa299a3d5efe211de12d23933ec7014a2638
7 changes: 4 additions & 3 deletions packages/perspective-viewer-d3fc/src/js/charts/ohlcCandle.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ function ohlcCandle(seriesSvg) {
return function(container, settings) {
const data = ohlcData(settings, filterData(settings));

console.log("data", data);

const keys = data.map(k => k.key);
const upColor = seriesUpColors(keys);
const downColor = seriesDownColors(keys);
Expand All @@ -46,7 +44,10 @@ function ohlcCandle(seriesSvg) {
selection.style("stroke", d => (isUp(d) ? upColor(d.key) : downColor(d.key)));
});

const multi = fc.seriesSvgRepeat().series(series);
const multi = fc
.seriesSvgMulti()
.mapping((data, index) => data[index])
.series(data.map(() => series));

const paddingStrategy = hardLimitZeroPadding()
.pad([0.1, 0.1])
Expand Down