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

Usability improvements #12

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

Usability improvements #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d921ad
remove patch cables with middle-mouse click (oldest connections first)
zykure Feb 3, 2020
b3a9b71
reset knobs & toggles on middle-mouse click
zykure Feb 3, 2020
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
79 changes: 58 additions & 21 deletions js/front-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ class FrontPanel {
this.toggleValues = initialValues.toggleValues || []
this.lightValues = initialValues.lightValues || {}

// make deep copies of default values
this.knobDefaults = Object.assign([], this.knobValues)
this.buttonDefaults = Object.assign([], this.buttonValues)
this.toggleDefaults = Object.assign([], this.toggleValues)
this.lightDefaults = Object.assign({}, this.lightValues);

// Init
this.loadPatchData();
Expand Down Expand Up @@ -288,36 +293,62 @@ class FrontPanel {
// console.log("mousedown", pos, e)
this.connectors.forEach(circle => {
if (this.isIntersect(pos, circle, this.connectorOptions.cellRadius)) {
const inOut = circle.input ? "input" : "output";
// const inOut = circle.input ? "input" : "output";
// console.log("mousedown " + circle.name + " (" + inOut + ") at " + circle.row + ", " + circle.col);
this.dragging = true;
this.dragFromIdx = circle.idx;
this.dragFromInput = circle.input;
this.dragToX = pos.x;
this.dragToY = pos.y;
this.dragColor = this.nextCableColor();
if (e.which == 2) {
// remove an existing connection
this.dragging = false;
const foundIdx = this.connections.findIndex(connection => {
return (circle.input && connection.to === circle.idx) ||
(!circle.input && connection.from === circle.idx);
});
if (foundIdx > -1) {
this.connections.splice(foundIdx, 1);
}
this.updatePatchCableOutput();
}
else {
this.dragging = true;
this.dragFromIdx = circle.idx;
this.dragFromInput = circle.input;
this.dragToX = pos.x;
this.dragToY = pos.y;
this.dragColor = this.nextCableColor();
}
this.requestRedraw()
}
});

this.knobs.forEach(knob => {
const knobType = this.knobTypes[knob.type];
if (this.isIntersect(pos, knob, knobType.radius)) {
// console.log("mousedown" + knob.name);
this.turning = true;
this.turnKnobIdx = knob.idx;
this.turnPreviousY = pos.y;
this.turnOldValue = knob.value;
this.turnNewValue = knob.value;
console.log("mousedown" + knob.name);
if (e.which == 2) {
this.turning = false;
this.knobValues[knob.idx] = this.knobDefaults[knob.idx];
}
else {
this.turning = true;
this.turnKnobIdx = knob.idx;
this.turnPreviousY = pos.y;
this.turnOldValue = knob.value;
this.turnNewValue = knob.value;
}
this.requestRedraw()
}
})

this.buttons.forEach(button => {
const circle = {x: button.x + this.buttonOptions.width / 2, y: button.y + this.buttonOptions.height / 2}
if (this.isIntersect(pos, circle, this.buttonOptions.width)) {
// Call handler in subclass
this.onButtonClick(button)
if (e.which == 2) {
this.buttonValues[button.idx] = this.buttonDefaults[button.idx];
this.lightValues[button.name] = this.lightDefaults[button.name];
}
else {
// Call handler in subclass
this.onButtonClick(button)
}
this.updatePatchCableOutput()
this.requestRedraw()
}
Expand All @@ -326,14 +357,19 @@ class FrontPanel {
this.toggles.forEach(toggle => {
const circle = {x: toggle.x + this.toggleOptions.width / 2, y: toggle.y + this.toggleOptions.height / 2}
if (this.isIntersect(pos, circle, this.toggleOptions.width)) {
this.onToggleClick(toggle)
if (e.which == 2) {
this.toggleValues[toggle.idx] = this.toggleDefaults[toggle.idx];
}
else {
this.onToggleClick(toggle)
}
this.updatePatchCableOutput()
this.requestRedraw()
}
})

// e.preventDefault()
}, false);
}, false)

this.canvas.addEventListener("mousemove", (e) => {
if (!this.dragging && !this.turning) return;
Expand Down Expand Up @@ -371,17 +407,18 @@ class FrontPanel {
if (this.dragging) {
this.connectors.forEach(circle => {
if (this.isIntersect(pos, circle, this.connectorOptions.cellRadius)) {
const inOut = circle.input ? "input" : "output";
// const inOut = circle.input ? "input" : "output";
const fromIdx = circle.input ? this.dragFromIdx : circle.idx;
const toIdx = circle.input ? circle.idx : this.dragFromIdx;
if (this.dragFromInput != circle.input) {
// if this connection already exists, remove it
const foundIdx = this.connections.findIndex(connection => {
return (connection.from === this.dragFromIdx && connection.to === circle.idx) ||
(connection.from === circle.idx && connection.to === this.dragFromIdx);
return (connection.from === fromIdx && connection.to === toIdx);
});
if (foundIdx > -1) {
this.connections.splice(foundIdx, 1);
} else {
this.connections.push({from: this.dragFromIdx, to: circle.idx, color: this.dragColor});
this.connections.push({from: fromIdx, to: toIdx, color: this.dragColor});
}
this.updatePatchCableOutput();
}
Expand Down