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

Allow selectZoom to be adaptive #67

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Allow selectZoom to be adaptive #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d228cc
Implement adaptive selectZoom
janekfleper Aug 9, 2023
bed460f
Fix application of zoom onMouseUp event
janekfleper Apr 20, 2024
784e324
Improve selection conditions
janekfleper Apr 28, 2024
ca7b774
Add private properties for the select flags
janekfleper Apr 28, 2024
3e5b30e
Handle special case of equal width and height
janekfleper Apr 28, 2024
700df87
Rename w and h to width and height
janekfleper Apr 28, 2024
f029408
Add inputs for the select thresholds
janekfleper Apr 28, 2024
62c78b7
Merge branch 'huww98:master' into master
janekfleper Jun 10, 2024
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
10 changes: 9 additions & 1 deletion demo/plugins/select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ <h1>Select & Zoom with Mouse</h1>

<label for="y">Y</label>
<input type="checkbox" id="y" name="y">

<label for="threshold-x">thresholdX</label>
<input type="number" size="4" id="threshold-x" name="thresholdX" value="20" min="0">

<label for="threshold-y">thresholdY</label>
<input type="number" size="4" id="threshold-y" name="thresholdY" value="20" min="0">
</form>

<script src="https://cdn.jsdelivr.net/npm/d3-array@3"></script>
Expand Down Expand Up @@ -54,9 +60,11 @@ <h1>Select & Zoom with Mouse</h1>

const form = document.querySelector('form');
function syncSelectZoom() {
const { x, y } = form;
const { x, y, thresholdX, thresholdY } = form;
chart.plugins.selectZoom.options.enableX = x.checked;
chart.plugins.selectZoom.options.enableY = y.checked;
chart.plugins.selectZoom.options.thresholdX = thresholdX.value;
chart.plugins.selectZoom.options.thresholdY = thresholdY.value;
}
form.addEventListener('change', syncSelectZoom);
syncSelectZoom();
Expand Down
71 changes: 39 additions & 32 deletions src/plugins_extra/selectZoom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ export interface SelectZoomOptions {
mouseButtons: number;
enableX: boolean;
enableY: boolean;
thresholdX: number;
thresholdY: number;
cancelOnSecondPointer: boolean;
}

const defaultOptions = {
mouseButtons: 1,
enableX: true,
enableY: true,
thresholdX: 0,
thresholdY: 0,
cancelOnSecondPointer: false,
} as const;

Expand Down Expand Up @@ -50,6 +54,8 @@ export class SelectZoom {
}

private start: {p: Point, id: number} | null = null;
private selectX: boolean = false;
private selectY: boolean = false;

private reset() {
if (this.start === null)
Expand Down Expand Up @@ -95,21 +101,26 @@ export class SelectZoom {
return;
const p = this.getPoint(ev);

if (this.options.enableX) {
const x = Math.min(this.start.p.x, p.x);
const w = Math.abs(this.start.p.x - p.x);
const x = Math.min(this.start.p.x, p.x);
const y = Math.min(this.start.p.y, p.y);
const width = Math.abs(this.start.p.x - p.x);
const height = Math.abs(this.start.p.y - p.y);
const minWidth = Math.min(height, this.options.thresholdX);
const minHeight = Math.min(width, this.options.thresholdY);
this.selectX = width >= minWidth || !this.options.enableY;
this.selectY = height > minHeight || !this.options.enableX;

if (this.options.enableX && this.selectX) {
this.visual.x.baseVal.value = x;
this.visual.width.baseVal.value = w;
this.visual.width.baseVal.value = width;
} else {
this.visual.setAttribute('x', '0');
this.visual.setAttribute('width', '100%');
}

if (this.options.enableY) {
const y = Math.min(this.start.p.y, p.y);
const h = Math.abs(this.start.p.y - p.y);
if (this.options.enableY && this.selectY) {
this.visual.y.baseVal.value = y;
this.visual.height.baseVal.value = h;
this.visual.height.baseVal.value = height;
} else {
this.visual.setAttribute('y', '0');
this.visual.setAttribute('height', '100%');
Expand All @@ -121,33 +132,29 @@ export class SelectZoom {
return;

const p = this.getPoint(ev);
const x1 = Math.min(this.start.p.x, p.x);
const x2 = Math.max(this.start.p.x, p.x);
const y1 = Math.max(this.start.p.y, p.y);
const y2 = Math.min(this.start.p.y, p.y);

let changed = false;
if (this.options.enableX) {
const x1 = Math.min(this.start.p.x, p.x);
const x2 = Math.max(this.start.p.x, p.x);
if (x2 - x1 > 0) {
const newDomain = [
this.chart.model.xScale.invert(x1),
this.chart.model.xScale.invert(x2),
];
this.chart.model.xScale.domain(newDomain);
this.chart.options.xRange = null;
changed = true;
}
if (this.options.enableX && this.selectX && x2 != x1) {
const newDomain = [
this.chart.model.xScale.invert(x1),
this.chart.model.xScale.invert(x2),
];
this.chart.model.xScale.domain(newDomain);
this.chart.options.xRange = null;
changed = true;
}
if (this.options.enableY) {
const y1 = Math.max(this.start.p.y, p.y);
const y2 = Math.min(this.start.p.y, p.y);
if (y1 - y2 > 0) {
const newDomain = [
this.chart.model.yScale.invert(y1),
this.chart.model.yScale.invert(y2),
];
this.chart.model.yScale.domain(newDomain);
this.chart.options.yRange = null;
changed = true;
}
if (this.options.enableY && this.selectY && y2 != y1) {
const newDomain = [
this.chart.model.yScale.invert(y1),
this.chart.model.yScale.invert(y2),
];
this.chart.model.yScale.domain(newDomain);
this.chart.options.yRange = null;
changed = true;
}
if (changed)
this.chart.model.requestRedraw();
Expand Down