Skip to content

Cursor scale value sync #216

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
leeoniya merged 1 commit into from
May 27, 2020
Merged

Cursor scale value sync #216

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion demos/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ <h2>Drawing</h2>
<h2>Zooming</h2>
<a href="zoom-variations.html">Different zoom variants (adaptive, uni/omnidirectional)</a>
<a href="zoom-fetch.html">Fetch &amp; update data on zoom</a>
<a href="zoom-ranger.html">Secondary sync'd overview chart for zoom ranging</a>
<a href="zoom-ranger.html">Secondary sync'd overview chart for x-axis zoom ranging</a>
<a href="zoom-ranger-xy.html">Secondary sync'd overview chart for x/y-axis zoom ranging</a>
<a href="zoom-touch.html">Pinch zooming/panning plugin</a>
<a href="zoom-wheel.html">Mouswheel zooming plugin</a>

Expand Down
123 changes: 123 additions & 0 deletions demos/zoom-ranger-xy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>Zoom Ranger XY</title>
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" href="../dist/uPlot.min.css">
<style>
.uplot {
display: block;
width: 800px;
}

.uplot .select {
background: rgba(127,0,256,0.3);
}
</style>
</head>
<body>
<script src="../dist/uPlot.iife.js"></script>
<script>
var loop = 100;

let data = [
Array(loop),
Array(loop),
];

for (var i = 0; i < loop; i++) {
let x = 2 * Math.PI * i / loop;
let y = Math.sin(x);

data[0][i] = x;
data[1][i] = y;
}

let initXmin = 1;
let initXmax = 4.5;

const rangerOpts = {
width: 800,
height: 100,
cursor: {
points: {
show: false,
},
drag: {
setScale: false,
x: true,
y: true,
uni: 10
},
sync: {
key: "moo",
scales: ["x", "y"]
}
},
legend: {
show: false
},
scales: {
x: {
time: false,
},
},
series: [
{},
{
stroke: "rgba(0,0,0,0.8)",
}
],
hooks: {
ready: [
uRanger => {
let left = Math.round(uRanger.valToPos(initXmin, 'x'));
let width = Math.round(uRanger.valToPos(initXmax, 'x')) - left;
let height = uRanger.bbox.height / devicePixelRatio;
uRanger.setSelect({left, width, height}, false);
}
]
}
};

let uRanger = new uPlot(rangerOpts, data, document.body);

const zoomedOpts = {
// title: "Zoomed Area",
width: 800,
height: 400,
cursor: {
drag: {
x: true,
y: true,
uni: 40
},
sync: {
key: "moo",
scales: ["x", "y"]
}
},
scales: {
x: {
time: false,
min: initXmin,
max: initXmax,
},
},
series: [
{
label: "x",
},
{
label: "sin(x)",
stroke: "purple",
}
]
};

let uZoomed = new uPlot(zoomedOpts, data, document.body);
</script>
</body>
</html>
44 changes: 15 additions & 29 deletions demos/zoom-ranger.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@
let initXmin = 1;
let initXmax = 4.5;

let viaRanger = false;
let viaZoom = false;

const rangerOpts = {
width: 800,
height: 100,
cursor: {
y: false,
points: {
show: false,
},
Expand All @@ -49,6 +47,9 @@
x: true,
y: false,
},
sync: {
key: "moo"
}
},
legend: {
show: false
Expand All @@ -65,22 +66,11 @@
}
],
hooks: {
setSelect: [
uRanger => {
if (!viaZoom) {
viaRanger = true;
let min = uRanger.posToVal(uRanger.select.left, 'x');
let max = uRanger.posToVal(uRanger.select.left + uRanger.select.width, 'x');
uZoomed.setScale('x', {min, max});
viaRanger = false;
}
}
],
ready: [
uRanger => {
let left = Math.round(uRanger.valToPos(initXmin, 'x'));
let width = Math.round(uRanger.valToPos(initXmax, 'x')) - left;
let height = uRanger.root.querySelector(".over").getBoundingClientRect().height;
let height = uRanger.bbox.height / devicePixelRatio;
uRanger.setSelect({left, width, height}, false);
}
]
Expand All @@ -93,6 +83,15 @@
// title: "Zoomed Area",
width: 800,
height: 400,
cursor: {
drag: {
x: true,
y: false
},
sync: {
key: "moo"
}
},
scales: {
x: {
time: false,
Expand All @@ -108,20 +107,7 @@
label: "sin(x)",
stroke: "red",
}
],
hooks: {
setScale: [
(uZoomed, key) => {
if (key == 'x' && !viaRanger) {
viaZoom = true;
let left = Math.round(uRanger.valToPos(uZoomed.scales.x.min, 'x'));
let right = Math.round(uRanger.valToPos(uZoomed.scales.x.max, 'x'));
uRanger.setSelect({left, width: right - left});
viaZoom = false;
}
}
]
}
]
};

let uZoomed = new uPlot(zoomedOpts, data, document.body);
Expand Down
4 changes: 4 additions & 0 deletions dist/uPlot.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ declare class uPlot {
declare namespace uPlot {
export type AlignedData = readonly (number | null)[][];

export type SyncScales = [string, string];

export type MinMax = [number, number];

export interface DateNames {
Expand Down Expand Up @@ -245,6 +247,8 @@ declare namespace uPlot {
key: string;
/** determines if series toggling and focus via cursor is synced across charts */
setSeries?: boolean; // true
/** sets the x and y scales to sync by values. null will sync by relative (%) position */
scales?: SyncScales; // [xScaleKey, null]
};

/** focus series closest to cursor */
Expand Down
Loading