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

fix: autoplay on scatter and line plots #552

Merged
merged 1 commit into from
Sep 17, 2024
Merged

fix: autoplay on scatter and line plots #552

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
54 changes: 28 additions & 26 deletions src/js/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,20 +506,9 @@ class Control {
});
}

// TODO control rewrite starts here
// plan: generally switch from if chart.type > control, to control > if chart.type
// This will standardize and separate controls so we can manage more easily, I hope
// It'll also mean we have a single control.UpdateAll / control.UpdateAllBraille / etc
//
// todo
// ! move BTS, prefix, chart init to separate functions
// ! move ctrl movement at least to top of SetControls, maybe separate function later
// ! move cursor routing at least to top of SetControls, maybe separate function later
// reroute control.UpdateAll etc to new class level functions
// rearrange nested ifs to start with actual controls (just arrow, ctrl arrow, etc), then if chart.type inside
// final routing from nested ifs to class level functions
// bugfixes :D

// #####################################################################################################
// #####################################################################################################
// #####################################################################################################
if ([].concat(singleMaidr.type).includes('bar')) {
// control eventlisteners
constants.events.push([
Expand Down Expand Up @@ -681,6 +670,9 @@ class Control {
},
]);
}
// #####################################################################################################
// #####################################################################################################
// #####################################################################################################
} else if ([].concat(singleMaidr.type).includes('box')) {
let xMax = 0;
let yMax = 0;
Expand Down Expand Up @@ -1144,6 +1136,9 @@ class Control {
},
]);
}
// #####################################################################################################
// #####################################################################################################
// #####################################################################################################
} else if ([].concat(singleMaidr.type).includes('heat')) {
let xMax = plot.num_cols - 1;
let yMax = plot.num_rows - 1;
Expand Down Expand Up @@ -1462,6 +1457,9 @@ class Control {
}
},
]);
// #####################################################################################################
// #####################################################################################################
// #####################################################################################################
} else if (
[].concat(singleMaidr.type).includes('point') ||
[].concat(singleMaidr.type).includes('smooth')
Expand Down Expand Up @@ -1687,6 +1685,9 @@ class Control {
}
},
]);
// #####################################################################################################
// #####################################################################################################
// #####################################################################################################
} else if ([].concat(singleMaidr.type).includes('hist')) {
// control eventlisteners
constants.events.push([
Expand Down Expand Up @@ -1826,6 +1827,9 @@ class Control {
},
]);
}
// #####################################################################################################
// #####################################################################################################
// #####################################################################################################
} else if (
[].concat(singleMaidr.type).includes('stacked_bar') ||
[].concat(singleMaidr.type).includes('stacked_normalized_bar') ||
Expand Down Expand Up @@ -2040,6 +2044,9 @@ class Control {
},
]);
}
// #####################################################################################################
// #####################################################################################################
// #####################################################################################################
} else if ([].concat(singleMaidr.type).includes('line')) {
window.position = new Position(-1, -1);
window.plot = new LinePlot();
Expand Down Expand Up @@ -2394,13 +2401,14 @@ class Control {
singleMaidr.rect.UpdateRect();
} else if ([].concat(singleMaidr.type).includes('heat')) {
singleMaidr.rect.UpdateRectDisplay();
} else if (
[].concat(singleMaidr.type).includes('point') ||
[].concat(singleMaidr.type).includes('smooth')
) {
} else if ([].concat(singleMaidr.type).includes('point')) {
if (layer0Point.hasRect) {
layer0Point.UpdatePointDisplay();
}
} else if ([].concat(singleMaidr.type).includes('smooth')) {
if (layer1Point.hasRect) {
layer1Point.UpdatePointDisplay();
}
} else if ([].concat(singleMaidr.type).includes('hist')) {
if (constants.showRect && constants.hasRect) {
plot.Select();
Expand Down Expand Up @@ -2541,10 +2549,10 @@ class Control {

constants.autoplayId = setInterval(function () {
position.x += step;
if (position.x < 0 || plot.plotData.length - 1 < position.x) {
if (position.x < 0 || end - 1 < position.x) {
constants.KillAutoplay();
control.lockPosition();
} else if (position.x == end) {
} else if (position.x >= end) {
constants.KillAutoplay();
control.UpdateAllAutoPlay();
} else {
Expand Down Expand Up @@ -2724,8 +2732,6 @@ class Control {
if (constants.chartType == 'point') {
constants.autoplayId = setInterval(function () {
position.x += step;
// autoplay for two layers: point layer & smooth layer in braille
// plot.numPoints is not available anymore
if (position.x < 0 || position.x > plot.y.length - 1) {
constants.KillAutoplay();
control.lockPosition(xMax, yMax);
Expand All @@ -2739,8 +2745,6 @@ class Control {
} else if (constants.chartType == 'smooth') {
constants.autoplayId = setInterval(function () {
positionL1.x += step;
// autoplay for two layers: point layer & smooth layer in braille
// plot.numPoints is not available anymore
if (positionL1.x < 0 || positionL1.x > plot.curvePoints.length - 1) {
constants.KillAutoplay();
control.lockPosition(xMax, yMax);
Expand Down Expand Up @@ -2869,8 +2873,6 @@ class Control {
}
}
PlayLine(dir) {
lastPlayed = dir;

let freqArr = [];
let panningArr = [];
let panPoint = audio.SlideBetween(
Expand Down
6 changes: 0 additions & 6 deletions src/js/scatterplot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,6 @@ class Layer0Point {
* @returns {Promise<void>}
*/
async PrintPoints() {
await this.ClearPoints();
await this.UpdatePoints();
for (let i = 0; i < this.circleIndex.length; i++) {
const svgns = 'http://www.w3.org/2000/svg';
Expand Down Expand Up @@ -754,8 +753,6 @@ class Layer0Point {
* Clears the points, updates them, and prints them to the screen.
*/
UpdatePointDisplay() {
this.ClearPoints();
this.UpdatePoints();
this.PrintPoints();
}
}
Expand Down Expand Up @@ -796,7 +793,6 @@ class Layer1Point {
* @returns {Promise<void>}
*/
async PrintPoints() {
await this.ClearPoints();
await this.UpdatePoints();
const svgns = 'http://www.w3.org/2000/svg';
var point = document.createElementNS(svgns, 'circle');
Expand Down Expand Up @@ -838,8 +834,6 @@ class Layer1Point {
* Clears the points, updates them, and prints them to the screen.
*/
UpdatePointDisplay() {
this.ClearPoints();
this.UpdatePoints();
this.PrintPoints();
}
}
Loading