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

Feature/dual y axis POC #564

Merged
merged 10 commits into from
May 15, 2019
Merged

Feature/dual y axis POC #564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6beee2e
Implemented dual-y axis on line chart
andy-lee-eng May 2, 2019
802adbf
Split by name instead of index, and add color
andy-lee-eng May 2, 2019
cdfdf37
Use d3fc axis component, instead of d3
andy-lee-eng May 3, 2019
816ee7c
Fixed issue with date x-axis
andy-lee-eng May 3, 2019
50cab94
Merge branch 'develop' of https://github.com/redbearsam/perspective i…
matt-hooper May 7, 2019
fb3ebcd
Merge pull request #190 from redbearsam/develop
matt-hooper May 8, 2019
5b26818
Merge branch 'master' of https://github.com/finos/perspective into fe…
matt-hooper May 13, 2019
03f4015
update results to account for ui changes based on dual axis
matt-hooper May 15, 2019
71ddec3
merge master and resolve conflicts
matt-hooper May 15, 2019
6bf5d02
update results.json
matt-hooper May 15, 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
Fixed issue with date x-axis 
The Zoomable component was replacing the decorator function, so we need to chain them
  • Loading branch information
@andy-lee-eng
andy-lee-eng committed May 3, 2019
commit 816ee7c211771a7c2fe7d134228cf63570360590
7 changes: 5 additions & 2 deletions packages/perspective-viewer-d3fc/src/js/axis/chartFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ const chartFactory = (xAxis, yAxis, cartesian, canvas) => {
.xDomain(xAxis.domain)
.xLabel(xAxis.label)
.xAxisHeight(xAxis.size)
.xDecorate(xAxis.decorate)
.yDomain(yAxis.domain)
.yLabel(yAxis.label)
.yAxisWidth(yAxis.size)
.yDecorate(yAxis.decorate)
.yOrient("left");

if (xAxis.decorate) chart.xDecorate(xAxis.decorate);
if (yAxis.decorate) chart.yDecorate(yAxis.decorate);

// Padding defaults can be overridden
chart.xPaddingInner && chart.xPaddingInner(1);
chart.xPaddingOuter && chart.xPaddingOuter(0.5);
Expand All @@ -54,7 +55,9 @@ const chartFactory = (xAxis, yAxis, cartesian, canvas) => {
return chart;
};

const oldDecorate = chart.decorate();
chart.decorate((container, data) => {
oldDecorate(container, data);
if (!axisSplitter) return;

if (axisSplitter.haveSplit()) {
Expand Down
4 changes: 3 additions & 1 deletion packages/perspective-viewer-d3fc/src/js/zoom/zoomableChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ export default () => {
}
});

chart.decorate(sel => {
const oldDecorate = chart.decorate();
chart.decorate((sel, data) => {
oldDecorate(sel, data);
if (!bound) {
bound = true;
// add the zoom interaction on the enter selection
Expand Down